diff --git a/bl-kernel/admin/controllers/edit-content.php b/bl-kernel/admin/controllers/edit-content.php index a0e16354..dd693033 100644 --- a/bl-kernel/admin/controllers/edit-content.php +++ b/bl-kernel/admin/controllers/edit-content.php @@ -7,10 +7,10 @@ if (!checkRole(array('admin','moderator'), false)) { $pageKey = isset($_POST['key']) ? $_POST['key'] : $layout['parameters']; $page = buildPage($pageKey); - if (!$page || $page->username()!==$Login->username()) { + if (!$page || $page->username()!==$login->username()) { $syslog->add(array( 'dictionaryKey'=>'access-deny', - 'notes'=>$Login->username() + 'notes'=>$login->username() )); Alert::set($Language->g('You do not have sufficient permissions')); Redirect::page('dashboard'); diff --git a/bl-kernel/admin/controllers/edit-user.php b/bl-kernel/admin/controllers/edit-user.php index ec517029..f2eb865f 100644 --- a/bl-kernel/admin/controllers/edit-user.php +++ b/bl-kernel/admin/controllers/edit-user.php @@ -14,8 +14,8 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { // Prevent non-administrators to change other users - if ($Login->role()!=='admin') { - $_POST['username'] = $Login->username(); + if ($login->role()!=='admin') { + $_POST['username'] = $login->username(); unset($_POST['role']); } @@ -40,8 +40,8 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { // ============================================================================ // Prevent non-administrators to change other users -if ($Login->role()!=='admin') { - $layout['parameters'] = $Login->username(); +if ($login->role()!=='admin') { + $layout['parameters'] = $login->username(); } // Get the user to edit diff --git a/bl-kernel/admin/controllers/login.php b/bl-kernel/admin/controllers/login.php index 716b19df..493280b7 100644 --- a/bl-kernel/admin/controllers/login.php +++ b/bl-kernel/admin/controllers/login.php @@ -11,7 +11,7 @@ function checkLogin($args) { global $Security; - global $Login; + global $login; global $Language; if ($Security->isBlocked()) { @@ -19,9 +19,9 @@ function checkLogin($args) return false; } - if ($Login->verifyUser($_POST['username'], $_POST['password'])) { + if ($login->verifyUser($_POST['username'], $_POST['password'])) { if (isset($_POST['remember'])) { - $Login->setRememberMe($_POST['username']); + $login->setRememberMe($_POST['username']); } // Renew the token. This token will be the same inside the session for multiple forms. $Security->generateTokenCSRF(); @@ -41,13 +41,13 @@ function checkLogin($args) function checkRememberMe() { global $Security; - global $Login; + global $login; if ($Security->isBlocked()) { return false; } - if ($Login->verifyUserByRemember()) { + if ($login->verifyUserByRemember()) { $Security->generateTokenCSRF(); Redirect::page('dashboard'); return true; diff --git a/bl-kernel/admin/controllers/logout.php b/bl-kernel/admin/controllers/logout.php index 8aa4adef..dbb5794e 100644 --- a/bl-kernel/admin/controllers/logout.php +++ b/bl-kernel/admin/controllers/logout.php @@ -20,6 +20,6 @@ // Main after POST // ============================================================================ -if ($Login->logout()) { +if ($login->logout()) { Redirect::home(); } diff --git a/bl-kernel/admin/controllers/user-password.php b/bl-kernel/admin/controllers/user-password.php index 8001b719..326c78e0 100644 --- a/bl-kernel/admin/controllers/user-password.php +++ b/bl-kernel/admin/controllers/user-password.php @@ -29,8 +29,8 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { // ============================================================================ // Prevent non-administrators to change other users -if ($Login->role()!=='admin') { - $layout['parameters'] = $Login->username(); +if ($login->role()!=='admin') { + $layout['parameters'] = $login->username(); } // Get the user to edit diff --git a/bl-kernel/admin/views/dashboard.old.php b/bl-kernel/admin/views/dashboard.old.php deleted file mode 100644 index 6a589ed0..00000000 --- a/bl-kernel/admin/views/dashboard.old.php +++ /dev/null @@ -1,161 +0,0 @@ -
p('Create new content for your site') ?>
-p('Edit or delete content from your site') ?>
-p('Create a new category to organize your content') ?>
-p('Edit or delete your categories') ?>
-p('Invite a friend to collaborate on your site') ?>
-p('Change your language and region settings') ?>
-p('View and edit your profile') ?>
-p('Published') ?> | -getPublishedDB(false)) ?> | -
p('Static') ?> | -getStaticDB(false)) ?> | -p('Users') ?> | -count() ?> | - - -