All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Добавил работу с нестатическими контроллерами, убрал немного мусора

This commit is contained in:
Krivchikov Dmitry 2015-11-27 13:23:30 +03:00
parent 9c5744a7a4
commit 491c250665
3 changed files with 27 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ground/app.php
View File

@ -82,13 +82,12 @@ class App
self::fillRequest(); self::fillRequest();
if (method_exists($controller, $action)) { if (method_exists($controller, $action)) {
if (method_exists($controller, '__construct')) {
$class = new self::$controller();
$class->$action();
} else {
$controller::$action(); $controller::$action();
// if (method_exists($controller, '__construct')) { }
// $class = new $controller();
// $class->$action();
// } else {
// $controller::$action();
// }
} else { } else {
self::error404(); self::error404();
} }

13
ground/controllers/PageController.php
View File

@ -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() static function actionVkpoint()
{ {
$pointId = (int) App::getParam('id'); $pointId = (int) App::getParam('id');

52
ground/controllers/UserController.php
View File

@ -2,7 +2,24 @@
class UserController extends Controller 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::getParam('id')) {
if (App::$user) { 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'); $id = (int) App::getParam('id');
$user = User::model()->getByPK($id); $user = User::model()->getByPK($id);
@ -23,21 +42,6 @@ class UserController extends Controller
App::error404(); 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) { if (!App::$user) {
self::addScript('//ulogin.ru/js/ulogin.js'); self::addScript('//ulogin.ru/js/ulogin.js');
} }
@ -64,26 +68,12 @@ class UserController extends Controller
)); ));
} }
static function actionNotifications() function actionNotifications()
{ {
if (!App::$user) { if (!App::$user) {
App::redirect('/'); 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( $notifications = Notifications::model()->getAll(array(
'where' => '`userId` = '.App::$user->id, 'where' => '`userId` = '.App::$user->id,
'order' => 'readed ASC, date DESC' 'order' => 'readed ASC, date DESC'