diff --git a/ground/app.php b/ground/app.php index 40d8887..0767131 100644 --- a/ground/app.php +++ b/ground/app.php @@ -82,13 +82,12 @@ class App self::fillRequest(); if (method_exists($controller, $action)) { - $controller::$action(); -// if (method_exists($controller, '__construct')) { -// $class = new $controller(); -// $class->$action(); -// } else { -// $controller::$action(); -// } + if (method_exists($controller, '__construct')) { + $class = new self::$controller(); + $class->$action(); + } else { + $controller::$action(); + } } else { self::error404(); } diff --git a/ground/controllers/PageController.php b/ground/controllers/PageController.php index 621561b..5c95b62 100644 --- a/ground/controllers/PageController.php +++ b/ground/controllers/PageController.php @@ -139,19 +139,6 @@ class PageController extends Controller } } - static function actionMyprofile() - { - $userId = App::$user ? App::$user->id : 0; - - die($userId); - } - -// static function actionProfile() -// { -// $userId = (int) App::getParam('user'); -// -// } - static function actionVkpoint() { $pointId = (int) App::getParam('id'); diff --git a/ground/controllers/UserController.php b/ground/controllers/UserController.php index 954d32f..44c0d86 100644 --- a/ground/controllers/UserController.php +++ b/ground/controllers/UserController.php @@ -2,7 +2,24 @@ class UserController extends Controller { - static function actionIndex() + function __construct() + { + self::$layout = 'layouts/page.php'; + self::addScript('/js/jquery-2.1.0.min.js'); + self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); + self::addScript('/js/bootstrap.min.js'); + self::addScript('/js/leaflet-0.7.3.js'); + self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); + self::addScript('/js/app.js?ver=' . App::getConfig('version')); + + self::addStyle('/css/style.css?ver=' . App::getConfig('version')); + self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); + self::addStyle('/css/bootstrap.min.css'); + self::addStyle('/css/bootstrap-theme.min.css'); + self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); + } + + function actionIndex() { if (!App::getParam('id')) { if (App::$user) { @@ -16,6 +33,8 @@ class UserController extends Controller } } + self::addStyle('/css/user.css?ver=' . App::getConfig('version')); + $id = (int) App::getParam('id'); $user = User::model()->getByPK($id); @@ -23,21 +42,6 @@ class UserController extends Controller App::error404(); } - self::$layout = 'layouts/page.php'; - self::addScript('/js/jquery-2.1.0.min.js'); - self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); - self::addScript('/js/bootstrap.min.js'); - self::addScript('/js/leaflet-0.7.3.js'); - self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); - self::addScript('/js/app.js?ver=' . App::getConfig('version')); - - self::addStyle('/css/style.css?ver=' . App::getConfig('version')); - self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); - self::addStyle('/css/user.css?ver=' . App::getConfig('version')); - self::addStyle('/css/bootstrap.min.css'); - self::addStyle('/css/bootstrap-theme.min.css'); - self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); - if (!App::$user) { self::addScript('//ulogin.ru/js/ulogin.js'); } @@ -64,26 +68,12 @@ class UserController extends Controller )); } - static function actionNotifications() + function actionNotifications() { if (!App::$user) { App::redirect('/'); } - self::$layout = 'layouts/page.php'; - self::addScript('/js/jquery-2.1.0.min.js'); - self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); - self::addScript('/js/bootstrap.min.js'); - self::addScript('/js/leaflet-0.7.3.js'); - self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); - self::addScript('/js/app.js?ver=' . App::getConfig('version')); - - self::addStyle('/css/style.css?ver=' . App::getConfig('version')); - self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); - self::addStyle('/css/bootstrap.min.css'); - self::addStyle('/css/bootstrap-theme.min.css'); - self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); - $notifications = Notifications::model()->getAll(array( 'where' => '`userId` = '.App::$user->id, 'order' => 'readed ASC, date DESC'