`, ``, and ``.
-$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
-$font-family-base: $font-family-sans-serif;
-
// ----------------------------------
// Layout
// ----------------------------------
+
$header-text-shadow: 1px 3px 4px rgba(0, 0, 0, 0.45);
// navigation
-$navbar-breakpoint-min: $screen-md-min;
-
$navbar-height: 60px;
$navbar-link-vertical-spacing: 8px;
$navbar-link-underline-height: 2px;
@@ -70,8 +59,10 @@ $navbar-link-hover-underline: $navbar-link-color;
$navbar-link-active-color: $navbar-link-color;
$navbar-link-active-underline: $navbar-link-color;
-$navbar-brand-color: $brand-color;
-$navbar-brand-hover-color: darken($brand-color, 15%);
+$navbar-brand-color: $primary;
+$navbar-brand-hover-color: darken($primary, 15%);
+
+$nav-link-hover-bg: none;
// User menu
$usermenu-button-bg: $navbar-background;
@@ -79,6 +70,7 @@ $usermenu-button-hover-bg: darken($usermenu-button-bg, 8%);
// Footer
$footer-height: 80px;
+$footer-spacing: 1rem;
$footer-border-color: $border-color;
$footer-text-color: $text-secondary-color;
$footer-link-color: $footer-text-color;
@@ -99,17 +91,17 @@ $button-primary-color: white;
$button-primary-bg: #5fbc49;
$button-brand-color: white;
-$button-brand-bg: $brand-color;
+$button-brand-bg: $primary;
// State
$button-info-color: white;
-$button-info-bg: $brand-info;
+$button-info-bg: $info;
$button-success-color: white;
-$button-success-bg: $brand-success;
+$button-success-bg: $success;
$button-warning-color: white;
-$button-warning-bg: $brand-warning;
+$button-warning-bg: $warning;
$button-danger-color: white;
-$button-danger-bg: $brand-danger;
+$button-danger-bg: $danger;
// Company.
@@ -136,7 +128,7 @@ $list-group-item-background: transparent;
$list-group-item-border-color: $gray-light;
$list-group-hover-background: $gray-lightest;
-$list-group-item-active-background: $brand-color;
+$list-group-item-active-background: $primary;
// ----------------------------------
// List group
@@ -185,8 +177,8 @@ $pagination-border: $border-color;
$pagination-hover: $hover-color;
$pagination-active-color: $white;
-$pagination-active-bg: $brand-color;
-$pagination-active-border: darken($brand-color, 5%);
+$pagination-active-bg: $primary;
+$pagination-active-border: darken($primary, 5%);
// ----------------------------------
// Section
@@ -218,4 +210,4 @@ $callback-list-arrow-color: $callback-list-border-color;
// ----------------------------------
$request-item-secondary-color: $text-secondary-color;
-$request-detail-background: lighten($brand-color, 45%);
+$request-detail-background: lighten($primary, 45%);
diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss
index f44df01..134a1f5 100644
--- a/app/assets/sass/application.scss
+++ b/app/assets/sass/application.scss
@@ -1,23 +1,54 @@
-// ---------------------------
-// Bootstrap & Fonts
-// ---------------------------
-
-@import "bootstrap-custom";
+// Fonts
@import url('https://fonts.googleapis.com/css?family=Lato:400,400i,700,700i');
@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700,700i');
+@import "bootstrap/scss/functions";
+
+// ---------------------------
+// Bootstrap config
+// ---------------------------
+
+@import "bootstrap-config";
+
+// ---------------------------
+// Bootstrap
+// ---------------------------
+
+@import "bootstrap/scss/variables";
+@import "bootstrap/scss/maps";
+@import "bootstrap/scss/mixins";
+@import "bootstrap/scss/root";
+
+// Optional
+@import "bootstrap/scss/reboot";
+@import "bootstrap/scss/utilities";
+@import "bootstrap/scss/close";
+@import "bootstrap/scss/alert";
+@import "bootstrap/scss/type";
+@import "bootstrap/scss/tables";
+@import "bootstrap/scss/forms";
+@import "bootstrap/scss/containers";
+@import "bootstrap/scss/grid";
+@import "bootstrap/scss/nav";
+@import "bootstrap/scss/dropdown";
+@import "bootstrap/scss/modal";
+@import "bootstrap/scss/images";
+@import "bootstrap/scss/transitions";
+
+@import "bootstrap/scss/utilities/api";
+
// ---------------------------
// Site
// ---------------------------
-// variables & mixins.
@import "variables";
@import "mixins";
// Base
@import "base/global";
@import "base/typography";
+@import "base/utils";
// Layout
@import "layout/sections";
diff --git a/app/assets/sass/base/_global.scss b/app/assets/sass/base/_global.scss
index a507247..aa9f68b 100644
--- a/app/assets/sass/base/_global.scss
+++ b/app/assets/sass/base/_global.scss
@@ -1,5 +1,6 @@
-html {
- position: relative;
- min-height: 100%;
+body {
+ display: flex;
+ flex-direction: column;
+ min-height: 100vh;
}
diff --git a/app/assets/sass/base/_typography.scss b/app/assets/sass/base/_typography.scss
index 93ac4c4..37e0e67 100644
--- a/app/assets/sass/base/_typography.scss
+++ b/app/assets/sass/base/_typography.scss
@@ -12,3 +12,14 @@
.text-gitlab { color: $gitlab-color; }
.text-google { color: $google-color; }
.text-linkedin { color: $linkedin-color; }
+
+a:hover {
+ text-decoration: underline;
+}
+
+.code {
+ background: $gray-100;
+ border: solid $gray-300 1px;
+ border-radius: $border-radius;
+ padding: .6em;
+}
diff --git a/app/assets/sass/base/_utils.scss b/app/assets/sass/base/_utils.scss
new file mode 100644
index 0000000..0fe5777
--- /dev/null
+++ b/app/assets/sass/base/_utils.scss
@@ -0,0 +1,8 @@
+
+.center-block {
+ @include center-block();
+}
+
+.clearfix {
+ @include clearfix();
+}
diff --git a/app/assets/sass/components/_badge.scss b/app/assets/sass/components/_badge.scss
index 2ef9993..f0f9c7f 100644
--- a/app/assets/sass/components/_badge.scss
+++ b/app/assets/sass/components/_badge.scss
@@ -21,7 +21,7 @@
&-primary {
color: white;
- background-color: $brand-color;
+ background-color: $primary;
}
&-info {
diff --git a/app/assets/sass/components/_button.scss b/app/assets/sass/components/_button.scss
index 8c00811..c3e2d28 100644
--- a/app/assets/sass/components/_button.scss
+++ b/app/assets/sass/components/_button.scss
@@ -64,7 +64,7 @@
// Sizes
// ----------------------------------
-.button-large { font-size: $text-size-large; }
+.button-large { font-size: $font-size-large; }
.button-small { font-size: 0.6em; }
// Block button
diff --git a/app/assets/sass/components/_callback-list.scss b/app/assets/sass/components/_callback-list.scss
index c2a4b5b..da81b8a 100644
--- a/app/assets/sass/components/_callback-list.scss
+++ b/app/assets/sass/components/_callback-list.scss
@@ -1,78 +1,81 @@
+.callback-list {
+ margin-top: 1em;
-.callback-list-item {
- @extend .clearfix;
- position: relative;
- padding: .6em 1em;
+ &-item {
+ @include clearfix();
+ position: relative;
+ padding: .6em 1em;
- &:hover {
- background: $gray-lightest;
- }
+ &:hover {
+ background: $gray-lightest;
+ }
- // Borders.
- // --------
+ // Borders.
+ // --------
- border: solid $callback-list-border-color $callback-list-border-size;
+ border: solid $callback-list-border-color $callback-list-border-size;
- // Remove top border for all except first child.
- &:not(:first-child) {
- border-top: 0;
- }
+ // Remove top border for all except first child.
+ &:not(:first-child) {
+ border-top: 0;
+ }
- // top border radius for first child.
- &:first-child {
- border-top-left-radius: $callback-list-border-radius;
- border-top-right-radius: $callback-list-border-radius;
- }
+ // top border radius for first child.
+ &:first-child {
+ border-top-left-radius: $callback-list-border-radius;
+ border-top-right-radius: $callback-list-border-radius;
+ }
- // bottom border radius for first child.
- &:last-child {
- border-bottom-left-radius: $callback-list-border-radius;
- border-bottom-right-radius: $callback-list-border-radius;
- }
+ // bottom border radius for first child.
+ &:last-child {
+ border-bottom-left-radius: $callback-list-border-radius;
+ border-bottom-right-radius: $callback-list-border-radius;
+ }
- // Sections.
- // ---------
+ // Sections.
+ // ---------
- &-header {
- margin-bottom: .4em;
- }
+ &-header {
+ margin-bottom: .4em;
+ }
- &-info {
- font-size: $font-size-small;
- color: $callback-list-info-color;
+ &-info {
+ font-size: $font-size-small;
+ color: $callback-list-info-color;
- > span {
- display: inline-block;
- margin-right: 1.6em;
- }
+ > span {
+ display: inline-block;
+ margin-right: 1.6em;
+ }
- .icon {
- @include icon-vcenter();
- font-size: 20px;
- padding: .2em;
- }
- }
+ .icon {
+ @include icon-vcenter();
+ font-size: 20px;
+ padding: .2em;
+ }
+ }
- &-name {
- margin-right: 1em;
- font-size: $callback-list-name-text-size;
- color: $callback-list-name-color;
+ &-name {
+ margin-right: 1em;
+ font-size: $callback-list-name-text-size;
+ color: $callback-list-name-color;
- &:hover {
- color: $callback-list-name-hover-color;
- text-decoration: none;
- }
- }
+ &:hover {
+ color: $callback-list-name-hover-color;
+ text-decoration: none;
+ }
+ }
- &-arrow {
- color: $callback-list-arrow-color;
- position: absolute;
- right: .8em;
- top: 50%;
- > .icon {
- font-size: 35px;
- transform: translateY(-50%);
- }
- }
+ &-arrow {
+ color: $callback-list-arrow-color;
+ position: absolute;
+ right: .8em;
+ top: 50%;
+ > .icon {
+ font-size: 35px;
+ transform: translateY(-50%);
+ }
+ }
+ }
}
diff --git a/app/assets/sass/components/_pagination.scss b/app/assets/sass/components/_pagination.scss
index 13c63bc..78fa41b 100644
--- a/app/assets/sass/components/_pagination.scss
+++ b/app/assets/sass/components/_pagination.scss
@@ -1,6 +1,6 @@
.pagination {
- @extend .nav;
+ @extend .center-block;
margin-top: 1em;
margin-bottom: 1em;
diff --git a/app/assets/sass/layout/_footer.scss b/app/assets/sass/layout/_footer.scss
index 6d6d440..6bf4aa4 100644
--- a/app/assets/sass/layout/_footer.scss
+++ b/app/assets/sass/layout/_footer.scss
@@ -3,6 +3,7 @@
@extend .container;
display: flex;
align-items: center;
+ column-gap: $footer-spacing;
min-height: $footer-height;
a {
@@ -14,22 +15,23 @@
}
}
- &-left,
- &-right {
- @include make-xs-column(5);
- }
-
- &-middle {
- @include make-xs-column(2);
+ &-left {
+ margin-left: $footer-spacing;
+ }
+
+ &-right {
+ display: flex;
+ justify-content: right;
+ margin-right: $footer-spacing;
}
+ &-left,
&-right {
- text-align: right;
+ flex: 1;
}
// Top button
&-button-top {
- @extend .center-block;
@extend .button;
@extend .button-round;
@include button-variant($footer-link-color, white, white);
diff --git a/app/assets/sass/layout/_navigation.scss b/app/assets/sass/layout/_navigation.scss
index 09cb434..d26f20d 100644
--- a/app/assets/sass/layout/_navigation.scss
+++ b/app/assets/sass/layout/_navigation.scss
@@ -6,7 +6,7 @@
.navigation {
// General styling (for all viewport widths)
- @extend .clearfix;
+ @include clearfix();
@extend .container;
min-height: $navbar-height;
@@ -34,9 +34,9 @@
font-size: 24px;
// Hide for larger view-ports.
- @media (min-width: $navbar-breakpoint-min) {
- display: none !important;
- }
+ @include media-breakpoint-up(md) {
+ @include visually-hidden;
+ }
}
// Menu
@@ -47,18 +47,13 @@
> li {
// Inline list for larger viewports.
- @media (min-width: $navbar-breakpoint-min) {
-
+ @include media-breakpoint-up(md) {
display: inline-block;
a {
display: block;
- @include navbar-vertical-align($line-height-computed + ($navbar-link-vertical-spacing * 2));
+ margin: 4px calc($navbar-link-spacing / 2);
padding: $navbar-link-vertical-spacing 10px $navbar-link-vertical-spacing;
- line-height: $line-height-computed;
-
- margin-left: ($navbar-link-spacing / 2);
- margin-right: ($navbar-link-spacing / 2);
&:hover {
color: $navbar-link-hover-color;
@@ -76,7 +71,7 @@
}
// Only for small viewports.
- @media (max-width: $navbar-breakpoint-min) {
+ @include media-breakpoint-down(md) {
margin: 1em 0;
@@ -99,7 +94,8 @@
}
// Always show menu for larger viewport.
- @media (min-width: $navbar-breakpoint-min) {
+
+ @include media-breakpoint-up(md) {
&-menu.collapse {
display: block;
}
@@ -108,7 +104,7 @@
// User Menu
// -------------------
&-user-menu {
- @extend .nav, .pull-right;
+ @extend .nav, .float-end;
margin-top: 10px;
&-login {
@@ -123,7 +119,7 @@
display: inline-block;
padding: .3em .8em;
background: $usermenu-button-bg;
- border-radius: $border-radius-base;
+ border-radius: $border-radius;
&:hover {
background: $usermenu-button-hover-bg;
@@ -131,11 +127,11 @@
}
&-list {
- @extend .dropdown-menu;
- @extend .dropdown-menu-right;
+ @extend .dropdown-menu-end;
vertical-align: middle;
> li > a {
+ @extend .dropdown-item;
display: flex;
align-items: center;
}
diff --git a/app/assets/sass/layout/_sections.scss b/app/assets/sass/layout/_sections.scss
index b53a4cf..a9e6b83 100644
--- a/app/assets/sass/layout/_sections.scss
+++ b/app/assets/sass/layout/_sections.scss
@@ -6,7 +6,7 @@
.head-section {
- background-color: $brand-color;
+ background-color: $primary;
background-image: url(#{$image-path}/header-pattern.jpg);
margin-bottom: 60px;
@@ -23,7 +23,7 @@
.content-section {
@extend .container;
- margin-bottom: $footer-height;
+ flex: 1 0 auto;
}
@@ -33,8 +33,6 @@
.footer-section {
- position: absolute;
- bottom: 0;
width: 100%;
color: $footer-text-color;
border-top: 1px solid #bcbcbc;
diff --git a/app/assets/sass/mixins/_center-block.scss b/app/assets/sass/mixins/_center-block.scss
new file mode 100644
index 0000000..0a0dcb1
--- /dev/null
+++ b/app/assets/sass/mixins/_center-block.scss
@@ -0,0 +1,6 @@
+
+@mixin center-block() {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
diff --git a/app/assets/sass/views/_about.scss b/app/assets/sass/views/_about.scss
index 62579ca..9c41d5f 100644
--- a/app/assets/sass/views/_about.scss
+++ b/app/assets/sass/views/_about.scss
@@ -3,11 +3,16 @@
@extend .row;
&-main {
- @include make-sm-column(8);
+ @include make-col-ready();
+ @include media-breakpoint-up(sm) {
+ @include make-col(8);
+ }
}
&-reference {
- @include make-sm-column(4);
+ @include make-col-ready();
+ @include media-breakpoint-up(sm) {
+ @include make-col(4);
+ }
}
}
-
diff --git a/app/assets/sass/views/_landingpage.scss b/app/assets/sass/views/_landingpage.scss
index 277d5bb..bc3d8e6 100644
--- a/app/assets/sass/views/_landingpage.scss
+++ b/app/assets/sass/views/_landingpage.scss
@@ -11,10 +11,11 @@
}
.steps {
- @extend .row;
+ display: flex;
+ justify-content: center;
+ column-gap: 2rem;
.steps-img {
- @extend .center-block;
width: 270px;
height: 220px;
}
@@ -32,7 +33,9 @@
.steps-step1,
.steps-step2,
.steps-step3 {
- @include make-md-column(4);
+ display: flex;
+ flex-flow: column;
+ align-items: center;
@extend .text-center;
}
}
diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php
index 5c20761..0fb0e47 100644
--- a/app/controllers/AuthController.php
+++ b/app/controllers/AuthController.php
@@ -12,13 +12,6 @@ use App\Controller\ControllerBase,
class AuthController extends ControllerBase
{
- public function initialize()
- {
- // We need event manager here from DI.
- $eventManager = $this->di->get('eventsManager');
- $this->setEventsManager($eventManager);
- }
-
public function indexAction()
{
$form = new LoginForm();
@@ -74,7 +67,7 @@ class AuthController extends ControllerBase
$user->{'set' . $name . 'Id'}($data->getId());
$user->save();
- $this->getEventsManager()->fire('user:onOAuthConnected', $user, $data);
+ $this->eventsManager->fire('user:onOAuthConnected', $user, $data);
$this->flash->message('success', sprintf("OAuth provider %s was connected!", $name));
$this->response->redirect('/settings');
diff --git a/app/controllers/CallbackController.php b/app/controllers/CallbackController.php
index 64354d1..83376ee 100644
--- a/app/controllers/CallbackController.php
+++ b/app/controllers/CallbackController.php
@@ -25,11 +25,11 @@ class CallbackController extends ControllerBase
{
$paginator = CallbackModel::getPaginationList($this->_user->getId(), $page, 10);
- if ($paginator->getPaginate()->current > $paginator->getPaginate()->total_pages) {
+ if ($paginator->paginate()->current > $paginator->paginate()->last) {
$paginator->setCurrentPage(1);
}
- $this->view->page = $paginator->getPaginate();
+ $this->view->page = $paginator->paginate();
$this->view->pagination_url = '/callback/list/';
}
@@ -111,7 +111,7 @@ class CallbackController extends ControllerBase
$paginator = $callback->getRequestPaginator($page, 30);
$this->view->item = $callback;
- $this->view->page = $paginator->getPaginate();
+ $this->view->page = $paginator->paginate();
$this->view->pagination_url = '/callback/show/' . $id . '/';
}
}
diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php
index 436f35e..414f406 100644
--- a/app/controllers/UserController.php
+++ b/app/controllers/UserController.php
@@ -10,13 +10,6 @@ use App\Controller\ControllerBase,
class UserController extends ControllerBase
{
- public function initialize()
- {
- // We need event manager here from DI.
- $eventManager = $this->di->get('eventsManager');
- $this->setEventsManager($eventManager);
- }
-
public function settingsAction()
{
$user = $this->_getAuth()->getUser();
@@ -112,10 +105,10 @@ class UserController extends ControllerBase
$paginator = ActivityLog::getPaginationList($user->getId(), $page);
- $this->view->page = $paginator->getPaginate();
+ $this->view->page = $paginator->paginate();
$this->view->pagination_url = '/user/activity/';
}
-
+
public function oauthDisconnectAction($provider, $last_unlink_confirmed = false)
{
$user = $this->_getAuth()->getUser();
@@ -156,7 +149,7 @@ class UserController extends ControllerBase
$user->{'set' . $provider . 'Id'}(null);
$user->save();
- $this->getEventsManager()->fire('user:onOAuthDisconnect', $user, $provider);
+ $this->eventsManager->fire('user:onOAuthDisconnect', $user, $provider);
$this->flash->message('success', "{$provider} was disconnected
");
diff --git a/app/controllers/backend/LogController.php b/app/controllers/backend/LogController.php
index dcbe8fb..df0dba9 100644
--- a/app/controllers/backend/LogController.php
+++ b/app/controllers/backend/LogController.php
@@ -15,7 +15,7 @@ class LogController extends \Phalcon\Mvc\Controller
{
$paginator = ActivityLog::getAllPaginationList($page);
- $this->view->page = $paginator->getPaginate();
+ $this->view->page = $paginator->paginate();
$this->view->pagination_url = '/admin/log/';
}
}
diff --git a/app/controllers/backend/UserController.php b/app/controllers/backend/UserController.php
index d77cbd8..c1f8206 100644
--- a/app/controllers/backend/UserController.php
+++ b/app/controllers/backend/UserController.php
@@ -20,7 +20,7 @@ class UserController extends \Phalcon\Mvc\Controller
$paginator = User::getPaginationList($page,15);
$this->view->pagination_url = '/admin/user/list/';
- $this->view->page = $paginator->getPaginate();
+ $this->view->page = $paginator->paginate();
}
public function newAction()
diff --git a/app/forms/Registration.php b/app/forms/Registration.php
index 33cad4c..9e8d292 100644
--- a/app/forms/Registration.php
+++ b/app/forms/Registration.php
@@ -10,8 +10,7 @@ use App\Model\Data\User;
/**
* Phalcon Form
*/
-use Httpcb\Form as FormBase,
- Phalcon\Forms\Element as FormElement;
+use Httpcb\Form as FormBase;
/**
* Element types
diff --git a/app/forms/UserSettings.php b/app/forms/UserSettings.php
index 3f54c55..4eae39f 100644
--- a/app/forms/UserSettings.php
+++ b/app/forms/UserSettings.php
@@ -8,10 +8,9 @@ namespace App\Form;
use App\Model\Data\User as UserModel;
/**
- * Phalcon Form
+ * Form
*/
-use Phalcon\Forms\Form as FormBase,
- Phalcon\Forms\Element as FormElement;
+use Httpcb\Form as FormBase;
/**
* Element types
@@ -56,13 +55,16 @@ class UserSettings extends FormBase
// Id
if ($entity && $entity->getId()) {
- $id = new Text('id', array(
- 'class' => 'form-control',
- 'readonly' => '',
- ));
+
+ $id = new Text('id', array(
+ 'class' => 'form-control',
+ 'readonly' => '',
+ 'disabled' => 'disabled',
+ ));
$id->addValidator(new IdenticalValidator([
'accepted' => $entity->getId(),
+ 'allowEmpty' => true
]));
$id->setLabel('ID');
@@ -114,10 +116,12 @@ class UserSettings extends FormBase
'class' => 'form-control',
'placeholder' => 'Email',
'readonly' => '',
+ 'disabled' => 'disabled',
));
$email->addValidator(new IdenticalValidator([
'accepted' => $entity->getEmail(),
+ 'allowEmpty' => true
]));
} else {
$email = new Text('email', array(
@@ -215,63 +219,4 @@ class UserSettings extends FormBase
'with' => 'passwordNew',
]));
}
-
- public function renderDecorated($name, $opt = [])
- {
- $options = [
- 'label-class' => 'control-label',
- 'class' => 'col-sm-10',
- 'message' => ''
- ];
-
- $ele = $this->get($name);
-
- if (isset($opt['label-length'])) {
- $length = (int) $opt['label-length'];
- } else {
- $length = 2;
- }
- $options['label-class'] .= ' col-sm-' . $length;
-
- if (isset($opt['length'])) {
-
- $len = $opt['length'];
-
- if ($len === 'full') {
- $options['class'] = '';
- } else {
- $options['class'] = 'col-sm-' . $opt['length'];
- }
- }
-
- if ($ele->hasMessages()) {
- $options['class'] .= ' has-error';
- $options['message'] = $ele->getMessages()->current();
- }
-
- return $this->_render($ele, $options);
- }
-
- protected function _render(FormElement $ele, $opt)
- {
- $xhtml = '';
-
- if (strlen($ele->getLabel()) > 0) {
-
- $xhtml .= sprintf(
- '',
- $opt['label-class'], $ele->getName(), $ele->getLabel());
- }
-
- $xhtml .= ''
- . $ele->render();
-
- if (strlen($opt['message']) > 0) {
- $xhtml .= '' . $opt['message'] . '';
- }
-
- $xhtml .= '';
-
- return $xhtml;
- }
}
diff --git a/app/library/Acl.php b/app/library/Acl.php
index f00ac8c..cfaada1 100644
--- a/app/library/Acl.php
+++ b/app/library/Acl.php
@@ -3,6 +3,7 @@
namespace Httpcb;
use Phalcon\Config,
+ Phalcon\Acl\Enum,
Phalcon\Acl\Role,
Phalcon\Acl\Adapter\Memory as Adapter;
@@ -21,7 +22,7 @@ class Acl
$this->_adapter = new Adapter();
// Deny access to everything by default.
- $this->_adapter->setDefaultAction(\Phalcon\Acl::DENY);
+ $this->_adapter->setDefaultAction(Enum::DENY);
$this->fromConfig($config);
}
@@ -46,7 +47,7 @@ class Acl
$resource = $wildcard;
}
}
- return $this->_adapter->isAllowed($role, $resource, 'All') == \Phalcon\Acl::ALLOW;
+ return $this->_adapter->isAllowed($role, $resource, 'All') == Enum::ALLOW;
}
/**
@@ -55,7 +56,7 @@ class Acl
*/
public function hasResource($resource)
{
- return $this->_adapter->isResource($resource);
+ return $this->_adapter->isComponent($resource);
}
public function fromConfig(Config $config)
@@ -84,7 +85,7 @@ class Acl
}
foreach($resources as $resource) {
- $this->_adapter->addResource($resource, 'All');
+ $this->_adapter->addComponent($resource, 'All');
}
}
@@ -98,9 +99,12 @@ class Acl
}
foreach($zones as $zone) {
- $resources = (array) $config->zones->get($zone);
+ $resources = $config->zones->get($zone);
+ if (!($resources instanceof Config)) {
+ $resources = new Config([ $resources ]);
+ }
foreach($resources as $resource) {
- $this->_adapter->allow($name, $resource, 'All');
+ $this->_adapter->allow($name, $resource, 'All');
}
}
}
diff --git a/app/library/Auth.php b/app/library/Auth.php
index ade7a70..7c837d0 100644
--- a/app/library/Auth.php
+++ b/app/library/Auth.php
@@ -5,9 +5,9 @@ namespace Httpcb;
use App\Model\Data\User,
Httpcb\OAuth\UserData\UserDataInterface,
Httpcb\Auth\Result,
- Phalcon\Mvc\User\Component;
+ Phalcon\Di\Injectable;
-class Auth extends Component
+class Auth extends Injectable
{
const SESSION_KEY = 'auth';
diff --git a/app/library/Bootstrap.php b/app/library/Bootstrap.php
index d1eaa63..86b89cd 100644
--- a/app/library/Bootstrap.php
+++ b/app/library/Bootstrap.php
@@ -4,7 +4,7 @@ namespace Httpcb;
use Phalcon\Di\FactoryDefault as DiDefault;
use Phalcon\Di\Injectable;
-use Phalcon\DiInterface;
+use Phalcon\Di\DiInterface;
use Phalcon\Mvc\Application;
class Bootstrap extends Injectable
@@ -54,12 +54,16 @@ class Bootstrap extends Injectable
/**
* Runs the application.
- *
- * @return string
*/
- public function run()
+ public function run($uri)
{
$this->_app->setDI($this->getDI());
- return $this->_app->handle()->getContent();
+
+ try {
+ $response = $this->_app->handle($uri);
+ $response->send();
+ } catch(\Exception $ex) {
+ echo $ex->getMessage();
+ }
}
}
diff --git a/app/library/Form.php b/app/library/Form.php
index ebbb8bc..89fe06e 100644
--- a/app/library/Form.php
+++ b/app/library/Form.php
@@ -3,14 +3,14 @@
namespace Httpcb;
use Phalcon\Forms\Form as FormBase,
- Phalcon\Forms\Element as FormElement;
+ Phalcon\Forms\Element\AbstractElement;
class Form extends FormBase
{
public function renderDecorated($name, $opt = [])
{
$options = [
- 'label-class' => 'control-label',
+ 'label-class' => 'col-form-label text-end',
'class' => [ 'col-sm-10' ],
'message' => ''
];
@@ -45,7 +45,7 @@ class Form extends FormBase
return $this->_render($ele, $options);
}
- protected function _render(FormElement $ele, $opt)
+ protected function _render(AbstractElement $ele, $opt)
{
$xhtml = '';
diff --git a/app/library/Mvc/Model/Behavior/RandomId.php b/app/library/Mvc/Model/Behavior/RandomId.php
index 93d3c2a..185c188 100644
--- a/app/library/Mvc/Model/Behavior/RandomId.php
+++ b/app/library/Mvc/Model/Behavior/RandomId.php
@@ -57,11 +57,11 @@ class RandomId extends Behavior implements BehaviorInterface
*/
public function generateId(\Phalcon\Mvc\ModelInterface $model)
{
- $field = $this->_options['field'];
- $len = $this->_options['length'];
+ $field = $this->options['field'];
+ $len = $this->options['length'];
- if (isset($this->_options['expression'])) {
- $expr = 'AND ' . $this->_options['expression'];
+ if (isset($this->options['expression'])) {
+ $expr = 'AND ' . $this->options['expression'];
} else {
$expr = '';
}
diff --git a/app/library/Services.php b/app/library/Services.php
index a6157f5..470623e 100644
--- a/app/library/Services.php
+++ b/app/library/Services.php
@@ -2,23 +2,21 @@
namespace Httpcb;
-use Phalcon\DiInterface,
- Phalcon\Di\FactoryDefault as DiDefault,
+use Phalcon\Di\FactoryDefault as DiDefault,
Phalcon\Config\Adapter\Yaml as Config,
Phalcon\Mvc\View,
Phalcon\Mvc\View\Simple as SimpleView,
Phalcon\Assets\Manager as AssetsManager,
- Phalcon\Mvc\Url as UrlResolver,
+ Phalcon\Url as UrlResolver,
Phalcon\Mvc\View\Engine\Volt as VoltEngine,
Phalcon\Flash\Direct as FlashDirect,
Phalcon\Mvc\Model\Metadata\Memory as MemoryMetaData,
Phalcon\Mvc\Model\MetaData\Apc as ApcMetaData,
+ Phalcon\Mvc\ViewBaseInterface,
Phalcon\Cache\Frontend\Data as FrontendDataCache,
Phalcon\Cache\Backend\Apc as BackendApcCache,
Phalcon\Translate\Adapter\NativeArray as TranslateAdapter,
Phalcon\Logger,
- Phalcon\Logger\Adapter\File as FileLogAdapter,
- Phalcon\Session\Adapter\Files as SessionAdapter,
Phalcon\Mvc\Router;
use Httpcb\Auth,
@@ -155,7 +153,7 @@ class Services extends DiDefault
$eventsManager->attach('db', function ($event, $connection) use ($logger) {
if ($event->getType() == 'beforeQuery') {
- $logger->log($connection->getRealSQLStatement(), Logger::INFO);
+ $logger->info($connection->getRealSQLStatement());
}
});
@@ -190,25 +188,23 @@ class Services extends DiDefault
protected function _initSession()
{
$config = $this->get('config');
+ $session = new \Phalcon\Session\Manager();
if (isset($config->session)) {
$data = $config->session->toArray();
- $adapter = isset($data['adapter']) ? $data['adapter'] : 'Files';
+ $adapter_name = isset($data['adapter']) ? $data['adapter'] : 'Stream';
$options = $data['options'];
- // For "Files": Set session path if defined.
- if ($adapter === 'Files' && isset($options['path'])) {
- session_save_path($config->application->path);
- }
-
- $class = 'Phalcon\Session\Adapter\\' . $adapter;
- $session = new $class($options);
+ $class = 'Phalcon\Session\Adapter\\' . $adapter_name;
+ $adapter = new $class($options);
}
- // Default to File storage
+ // Default to Stream
else {
- $session = new \Phalcon\Session\Adapter\Files();
+ $adapter = new \Phalcon\Session\Adapter\Stream();
}
+ $session->setAdapter($adapter);
+
// Start session.
$session->start();
return $session;
@@ -228,23 +224,23 @@ class Services extends DiDefault
$view->setPartialsDir('_partials/');
$view->registerEngines(array(
- '.volt' => function ($view, $di) use ($config) {
+ '.volt' => function (ViewBaseInterface $view) use ($config) {
- $volt = new VoltEngine($view, $di);
+ $volt = new VoltEngine($view, $this);
$volt->setOptions(array(
- 'compiledPath' => $config->application->viewCacheDir,
- 'compiledSeparator' => '_',
- 'compileAlways' => true,
+ 'path' => $config->application->viewCacheDir,
+ 'separator' => '_',
+ 'always' => true,
));
// Register view helpers
$compiler = $volt->getCompiler();
- $compiler->addExtension(new ViewHelperVoltExtension($di));
+ $compiler->addExtension(new ViewHelperVoltExtension($this));
return $volt;
},
- '.phtml' => 'Phalcon\Mvc\View\Engine\Php'
+ '.phtml' => \Phalcon\Mvc\View\Engine\Php::class
));
// Set default main layout.
@@ -347,9 +343,7 @@ class Services extends DiDefault
protected function _initAuth()
{
- $auth = new Auth($this->get('config'));
- $auth->setEventsManager($this->get('eventsManager'));
- return $auth;
+ return new Auth($this->get('config'));
}
protected function _initAcl()
@@ -359,8 +353,10 @@ class Services extends DiDefault
protected function _initSharedLogger()
{
- $path = $this->get('config')->application->logDir;
- return new FileLogAdapter($path . "app.txt");
+ $path = $this->get('config')->application->logDir;
+ return new \Phalcon\Logger('default', [
+ 'main' => new \Phalcon\Logger\Adapter\Stream($path . 'app.txt')
+ ]);
}
protected function _initTemplate()
@@ -370,17 +366,17 @@ class Services extends DiDefault
$view = new SimpleView();
$view->setViewsDir($config->application->templateDir);
$view->registerEngines([
- '.volt' => function ($view, $di) use ($config) {
- $volt = new VoltEngine($view, $di);
+ '.volt' => function (ViewBaseInterface $view) use ($config) {
+ $volt = new VoltEngine($view, $this);
$volt->setOptions(array(
- 'compiledPath' => $config->application->viewCacheDir,
- 'compiledSeparator' => '_',
+ 'path' => $config->application->viewCacheDir,
+ 'separator' => '_',
));
return $volt;
},
- '.phtml' => 'Phalcon\Mvc\View\Engine\Php'
+ '.phtml' => \Phalcon\Mvc\View\Engine\Php::class,
]);
return $view;
}
diff --git a/app/library/Validation/Validator/Alpha.php b/app/library/Validation/Validator/Alpha.php
index b15cd0d..540766f 100644
--- a/app/library/Validation/Validator/Alpha.php
+++ b/app/library/Validation/Validator/Alpha.php
@@ -3,7 +3,7 @@
namespace Httpcb\Validation\Validator;
use Phalcon\Validation\Message;
-use Phalcon\Validation\Validator as BaseValidator;
+use Phalcon\Validation\AbstractValidator;
/**
* The same as the default Alpha validator shipped with phalcon.
@@ -12,16 +12,16 @@ use Phalcon\Validation\Validator as BaseValidator;
*
* @package Validation\Validator
*/
-class Alpha extends BaseValidator
+class Alpha extends AbstractValidator
{
/**
* Executes the validation
*
* @param mixed $validation
- * @param string $attribute
+ * @param string $field
* @return bool
*/
- public function validate(\Phalcon\Validation $validation, $attribute)
+ public function validate(\Phalcon\Validation $validation, $field) : bool
{
$allowSpace = $this->getOption('allowSpace', false);
@@ -30,13 +30,13 @@ class Alpha extends BaseValidator
$charlist .= '[:space:]';
}
- $value = $validation->getValue($attribute);
+ $value = $validation->getValue($field);
if (preg_match("/[^{$charlist}]/imu", $value)) {
$label = $this->getOption('label');
if (empty($label)) {
- $label = $validation->getLabel($attribute);
+ $label = $validation->getLabel($field);
}
$message = $this->getOption('message');
@@ -48,12 +48,12 @@ class Alpha extends BaseValidator
$code = $this->getOption("code");
if (is_array($code)) {
- $code = $code[$attribute];
+ $code = $code[$field];
}
$message = str_replace(array_keys($replace), $replace, $message);
- $msg = new Message($message, $attribute, "Alpha", $code);
+ $msg = new Message($message, $field, "Alpha", $code);
$validation->appendMessage($msg);
return false;
diff --git a/app/library/ViewHelper/AbstractHelper.php b/app/library/ViewHelper/AbstractHelper.php
index 916f4a2..ff5fe01 100644
--- a/app/library/ViewHelper/AbstractHelper.php
+++ b/app/library/ViewHelper/AbstractHelper.php
@@ -2,7 +2,7 @@
namespace Httpcb\ViewHelper;
-use Phalcon\DiInterface;
+use Phalcon\Di\DiInterface;
use Phalcon\Di\InjectionAwareInterface;
abstract class AbstractHelper implements InjectionAwareInterface
@@ -12,19 +12,19 @@ abstract class AbstractHelper implements InjectionAwareInterface
/**
* Sets the dependency injector
*
- * @param mixed $dependencyInjector
+ * @param DiInterface $container
*/
- public function setDI(DiInterface $dependencyInjector)
+ public function setDI(DiInterface $container) : void
{
- $this->_di = $dependencyInjector;
+ $this->_di = $container;
}
/**
* Returns the internal dependency injector
*
- * @return \Phalcon\DiInterface
+ * @return DiInterface
*/
- public function getDI()
+ public function getDI() : DiInterface
{
return $this->_di;
}
diff --git a/app/library/ViewHelper/Service.php b/app/library/ViewHelper/Service.php
index 2a11d2b..1e20f72 100644
--- a/app/library/ViewHelper/Service.php
+++ b/app/library/ViewHelper/Service.php
@@ -2,7 +2,7 @@
namespace Httpcb\ViewHelper;
-use Phalcon\DiInterface,
+use Phalcon\Di\DiInterface,
Phalcon\Di\InjectionAwareInterface;
class Service implements InjectionAwareInterface
@@ -14,19 +14,19 @@ class Service implements InjectionAwareInterface
/**
* Sets the dependency injector
*
- * @param mixed $dependencyInjector
+ * @param DiInterface $container
*/
- public function setDI(DiInterface $dependencyInjector)
+ public function setDI(DiInterface $container) : void
{
- $this->_di = $dependencyInjector;
+ $this->_di = $container;
}
/**
* Returns the internal dependency injector
*
- * @return \Phalcon\DiInterface
+ * @return DiInterface
*/
- public function getDI()
+ public function getDI() : DiInterface
{
return $this->_di;
}
diff --git a/app/library/ViewHelper/Volt/Extension.php b/app/library/ViewHelper/Volt/Extension.php
index c9f4550..b38eb34 100644
--- a/app/library/ViewHelper/Volt/Extension.php
+++ b/app/library/ViewHelper/Volt/Extension.php
@@ -2,7 +2,7 @@
namespace Httpcb\ViewHelper\Volt;
-use Phalcon\DiInterface,
+use Phalcon\Di\DiInterface,
Phalcon\Di\InjectionAwareInterface;
class Extension implements InjectionAwareInterface
@@ -38,19 +38,19 @@ class Extension implements InjectionAwareInterface
/**
* Sets the dependency injector
*
- * @param mixed $dependencyInjector
+ * @param DiInterface $container
*/
- public function setDI(DiInterface $dependencyInjector)
+ public function setDI(DiInterface $container) : void
{
- $this->_di = $dependencyInjector;
+ $this->_di = $container;
}
/**
* Returns the internal dependency injector
*
- * @return \Phalcon\DiInterface
+ * @return DiInterface
*/
- public function getDI()
+ public function getDI() : DiInterface
{
return $this->_di;
}
diff --git a/app/listeners/AccessListener.php b/app/listeners/AccessListener.php
index e51301c..4f6099a 100644
--- a/app/listeners/AccessListener.php
+++ b/app/listeners/AccessListener.php
@@ -2,14 +2,14 @@
namespace App\Listener;
-use Phalcon\Events\Event,
+use Phalcon\Di\Injectable,
+ Phalcon\Events\Event,
Phalcon\Mvc\Dispatcher,
- Phalcon\Mvc\User\Plugin,
Phalcon\Mvc\Dispatcher\Exception as DispatcherException;
use Httpcb\Acl;
-class AccessListener extends Plugin
+class AccessListener extends Injectable
{
protected $_ignored_resources = [
'index',
diff --git a/app/listeners/ActivityLog.php b/app/listeners/ActivityLog.php
index f7f281e..6bd6a66 100644
--- a/app/listeners/ActivityLog.php
+++ b/app/listeners/ActivityLog.php
@@ -2,20 +2,15 @@
namespace App\Listener;
-use Phalcon\Mvc\User\Plugin,
+use Phalcon\Di\Injectable,
Phalcon\Events\Event,
App\Model\Data\User,
App\Model\Data\ActivityLog as ActivityLogger,
Httpcb\OAuth\UserData\UserDataInterface as OAuthUserDataInterface,
Httpcb\Auth;
-class ActivityLog extends Plugin
+class ActivityLog extends Injectable
{
- /**
- * @var ActivityLogger
- */
- protected $_table = null;
-
/**
* On login event.
*
@@ -74,20 +69,10 @@ class ActivityLog extends Plugin
{
$ip = (new \Phalcon\Http\Request())->getClientAddress();
- $data = [
+ return (new ActivityLogger())->assign([
'user_id' => $user->getId(),
'ip' => $ip,
'message' => $message
- ];
-
- return $this->_getLogger()->create($data);
- }
-
- protected function _getLogger()
- {
- if ($this->_table === null) {
- $this->_table = new ActivityLogger();
- }
- return $this->_table;
+ ])->create();
}
}
diff --git a/app/listeners/DispatchListener.php b/app/listeners/DispatchListener.php
index 1cd9ff1..650c4e3 100644
--- a/app/listeners/DispatchListener.php
+++ b/app/listeners/DispatchListener.php
@@ -4,7 +4,7 @@ namespace App\Listener;
use Exception,
Phalcon\Events\Event,
- Phalcon\Mvc\User\Plugin,
+ Phalcon\Di\Injectable,
Phalcon\Mvc\Dispatcher,
Phalcon\Mvc\Dispatcher\Exception as DispatcherException;
@@ -14,7 +14,7 @@ use Exception,
* Plugin for forwarding user to 404 (not found) page
* if a request could not be dispatched.
*/
-class DispatchListener extends Plugin
+class DispatchListener extends Injectable
{
protected $_route_notfound = array(
'controller' => 'error',
diff --git a/app/models/Data/Base.php b/app/models/Data/Base.php
index 59a92be..ed81300 100644
--- a/app/models/Data/Base.php
+++ b/app/models/Data/Base.php
@@ -18,7 +18,7 @@ class Base extends Model
* @param boolean $allFields
* @return bool
*/
- public function hasChanged($fieldName = null, $allFields = false)
+ public function hasChanged($fieldName = null, bool $allFields = false) : bool
{
return $this->hasSnapshotData() === false
|| parent::hasChanged($fieldName, $allFields);
diff --git a/app/models/Data/Callback.php b/app/models/Data/Callback.php
index e739302..d28c44d 100644
--- a/app/models/Data/Callback.php
+++ b/app/models/Data/Callback.php
@@ -216,6 +216,9 @@ class Callback extends Model
*/
public function initialize()
{
+ // Set table name mapped in the model.
+ $this->setSource('callback');
+
$this->useDynamicUpdate(true);
$this->hasMany('id', RequestMeta::class, 'callbackid', array('foreignKey' => true, 'alias' => 'Requests'));
@@ -227,16 +230,6 @@ class Callback extends Model
)));
}
- /**
- * Returns table name mapped in the model.
- *
- * @return string
- */
- public function getSource()
- {
- return 'callback';
- }
-
public function getRequestPaginator($page = 1, $limit = 30)
{
return RequestMeta::getPaginator($this, $page, $limit);
diff --git a/app/modules/Base.php b/app/modules/Base.php
index 85e1c69..2e2b5a3 100644
--- a/app/modules/Base.php
+++ b/app/modules/Base.php
@@ -3,7 +3,7 @@
namespace App\Module;
use Phalcon\Loader,
- Phalcon\DiInterface,
+ Phalcon\Di\DiInterface,
Phalcon\Mvc\Dispatcher,
Phalcon\Mvc\ModuleDefinitionInterface;
diff --git a/app/views/_common/_components/flash.volt b/app/views/_common/_components/flash.volt
index dec209a..8234515 100644
--- a/app/views/_common/_components/flash.volt
+++ b/app/views/_common/_components/flash.volt
@@ -10,12 +10,9 @@
{% for type, messages in flash.getMessages() %}
{% for message in messages %}
-
-
- {{ type|capitalize }}
-
- {{ message }}
-
+ {{ type|capitalize }}
+ {{ message }}
+
{% endfor%}
{% endfor %}
diff --git a/app/views/_common/_components/footer.volt b/app/views/_common/_components/footer.volt
index 80a71f6..24095ae 100644
--- a/app/views/_common/_components/footer.volt
+++ b/app/views/_common/_components/footer.volt
@@ -1,7 +1,7 @@