diff --git a/bl-kernel/admin/controllers/about.php b/bl-kernel/admin/controllers/about.php index 6b0c40e0..cac5222a 100644 --- a/bl-kernel/admin/controllers/about.php +++ b/bl-kernel/admin/controllers/about.php @@ -1,4 +1,4 @@ g('About'); \ No newline at end of file +$layout['title'] = $Language->g('About') . ' - ' . $layout['title']; \ No newline at end of file diff --git a/bl-kernel/admin/controllers/categories.php b/bl-kernel/admin/controllers/categories.php index 0071384c..0fef0285 100644 --- a/bl-kernel/admin/controllers/categories.php +++ b/bl-kernel/admin/controllers/categories.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/configure-plugin.php b/bl-kernel/admin/controllers/configure-plugin.php index 42c6d11b..38477457 100644 --- a/bl-kernel/admin/controllers/configure-plugin.php +++ b/bl-kernel/admin/controllers/configure-plugin.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions @@ -20,15 +17,14 @@ $plugin = false; $pluginClassName = $layout['parameters']; // Check if the plugin exists -if( isset($plugins['all'][$pluginClassName]) ) { +if (isset($plugins['all'][$pluginClassName])) { $plugin = $plugins['all'][$pluginClassName]; -} -else { +} else { Redirect::page('plugins'); } // Check if the plugin has the method form() -if( !method_exists($plugin, 'form') ) { +if (!method_exists($plugin, 'form')) { Redirect::page('plugins'); } @@ -36,8 +32,7 @@ if( !method_exists($plugin, 'form') ) { // POST Method // ============================================================================ -if( $_SERVER['REQUEST_METHOD'] == 'POST' ) -{ +if ($_SERVER['REQUEST_METHOD'] == 'POST') { // Add to syslog $Syslog->add(array( 'dictionaryKey'=>'plugin-configured', @@ -45,13 +40,10 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' ) )); // Call the method post of the plugin - if( $plugin->post() ) { - // Create an alert + if ($plugin->post()) { Alert::set( $Language->g('The changes have been saved') ); Redirect::page('configure-plugin/'.$plugin->className()); - } - else { - // Create an alert + } else { Alert::set( $Language->g('Complete all fields') ); } } @@ -61,4 +53,4 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' ) // ============================================================================ // Title of the page -$layout['title'] .= ' - '.$Language->g('Plugin').' - '.$plugin->name(); \ No newline at end of file +$layout['title'] = $Language->g('Plugin').' - '.$plugin->name().' - '.$layout['title']; \ No newline at end of file diff --git a/bl-kernel/admin/controllers/content.php b/bl-kernel/admin/controllers/content.php index dc505093..1853b404 100644 --- a/bl-kernel/admin/controllers/content.php +++ b/bl-kernel/admin/controllers/content.php @@ -4,6 +4,8 @@ // Check role // ============================================================================ +checkRole(array('admin', 'moderator')); + // ============================================================================ // Functions // ============================================================================ diff --git a/bl-kernel/admin/controllers/developers.php b/bl-kernel/admin/controllers/developers.php index 8750639f..9eaa7be8 100644 --- a/bl-kernel/admin/controllers/developers.php +++ b/bl-kernel/admin/controllers/developers.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/edit-category.php b/bl-kernel/admin/controllers/edit-category.php index b0f133be..5c507aba 100644 --- a/bl-kernel/admin/controllers/edit-category.php +++ b/bl-kernel/admin/controllers/edit-category.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/edit-content.php b/bl-kernel/admin/controllers/edit-content.php index 4294d973..d5dfb2d0 100644 --- a/bl-kernel/admin/controllers/edit-content.php +++ b/bl-kernel/admin/controllers/edit-content.php @@ -4,6 +4,19 @@ // Check role // ============================================================================ +if (!checkRole(array('admin','moderator'), false)) { + $pageKey = isset($_POST['key']) ? $_POST['key'] : $layout['parameters']; + $page = buildPage($pageKey); + if (!$page || $page->username()!==$Login->username()) { + $Syslog->add(array( + 'dictionaryKey'=>'access-deny', + 'notes'=>$Login->username() + )); + Alert::set($Language->g('You do not have sufficient permissions')); + Redirect::page('dashboard'); + } +} + // ============================================================================ // Functions // ============================================================================ diff --git a/bl-kernel/admin/controllers/install-plugin.php b/bl-kernel/admin/controllers/install-plugin.php index c8e1eef8..afcbe2f8 100644 --- a/bl-kernel/admin/controllers/install-plugin.php +++ b/bl-kernel/admin/controllers/install-plugin.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/install-theme.php b/bl-kernel/admin/controllers/install-theme.php index 1c80c08a..370fc684 100644 --- a/bl-kernel/admin/controllers/install-theme.php +++ b/bl-kernel/admin/controllers/install-theme.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/new-category.php b/bl-kernel/admin/controllers/new-category.php index 6199222c..725a2760 100644 --- a/bl-kernel/admin/controllers/new-category.php +++ b/bl-kernel/admin/controllers/new-category.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/new-user.php b/bl-kernel/admin/controllers/new-user.php index 159c8193..df2b76f5 100644 --- a/bl-kernel/admin/controllers/new-user.php +++ b/bl-kernel/admin/controllers/new-user.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/plugins-position.php b/bl-kernel/admin/controllers/plugins-position.php index cad0096c..cbc12b5d 100644 --- a/bl-kernel/admin/controllers/plugins-position.php +++ b/bl-kernel/admin/controllers/plugins-position.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/plugins.php b/bl-kernel/admin/controllers/plugins.php index 75833f08..e9450ef3 100644 --- a/bl-kernel/admin/controllers/plugins.php +++ b/bl-kernel/admin/controllers/plugins.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/settings-general.php b/bl-kernel/admin/controllers/settings-general.php index 6608286c..83f84682 100644 --- a/bl-kernel/admin/controllers/settings-general.php +++ b/bl-kernel/admin/controllers/settings-general.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/settings-regional.php b/bl-kernel/admin/controllers/settings-regional.php index 2085e82f..24c66eae 100644 --- a/bl-kernel/admin/controllers/settings-regional.php +++ b/bl-kernel/admin/controllers/settings-regional.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/settings.php b/bl-kernel/admin/controllers/settings.php index 46e41738..94b2f289 100644 --- a/bl-kernel/admin/controllers/settings.php +++ b/bl-kernel/admin/controllers/settings.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/themes.php b/bl-kernel/admin/controllers/themes.php index ce4341fc..b8147818 100644 --- a/bl-kernel/admin/controllers/themes.php +++ b/bl-kernel/admin/controllers/themes.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Main after POST diff --git a/bl-kernel/admin/controllers/uninstall-plugin.php b/bl-kernel/admin/controllers/uninstall-plugin.php index 1a694a57..16d865c7 100644 --- a/bl-kernel/admin/controllers/uninstall-plugin.php +++ b/bl-kernel/admin/controllers/uninstall-plugin.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/controllers/users.php b/bl-kernel/admin/controllers/users.php index 8fa9ab28..fd49ba5c 100644 --- a/bl-kernel/admin/controllers/users.php +++ b/bl-kernel/admin/controllers/users.php @@ -4,10 +4,7 @@ // Check role // ============================================================================ -if ($Login->role()!=='admin') { - Alert::set($Language->g('You do not have sufficient permissions')); - Redirect::page('dashboard'); -} +checkRole(array('admin')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/views/dashboard.old.php b/bl-kernel/admin/views/dashboard.old.php new file mode 100644 index 00000000..bac0fd49 --- /dev/null +++ b/bl-kernel/admin/views/dashboard.old.php @@ -0,0 +1,161 @@ + + +
+ +
+ +
+

p('Notifications') ?>

+
    + db, 0, NOTIFICATIONS_AMOUNT); + foreach($logs as $log) { + $dict = $L->g($log['dictionaryKey']); + echo '
  • '; + echo $dict; + if( !empty($log['notes'])) { + echo ' « '.$log['notes'].' »'; + } + echo '
    '; + echo Date::format($log['date'], DB_DATE_FORMAT, NOTIFICATIONS_DATE_FORMAT); + echo ' - by '.$log['username']; + echo ''; + echo '
  • '; + } + ?> +
+
+ +
+ +
+ + '; + echo '

'.$SimpleStats->getValue('label').'

'; + echo $SimpleStats->dashboard(); + echo '
'; + } + ?> + + +
+

p('Statistics') ?>

+ + + + + + + + + + + + + + +
p('Published') ?>getPublishedDB(false)) ?>
p('Static') ?>getStaticDB(false)) ?>
p('Users') ?>count() ?>
+
+ +
+ +
+ +
+

p('Scheduled content') ?>

+ +
+ +
+

p('Draft content') ?>

+ +
+ +
+ + diff --git a/bl-kernel/admin/views/dashboard.php b/bl-kernel/admin/views/dashboard.php index bac0fd49..571f28e0 100644 --- a/bl-kernel/admin/views/dashboard.php +++ b/bl-kernel/admin/views/dashboard.php @@ -1,78 +1,19 @@ -