From 9e2a7bc23b0b134af97f85f1a2daaf8c02abcb87 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 23 Nov 2013 15:19:12 +0400 Subject: [PATCH 1/3] #158 deleting users - fixed by Oleg Gatseluk --- plugins/box/users/users.admin.php | 2 +- plugins/box/users/views/backend/index.view.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/box/users/users.admin.php b/plugins/box/users/users.admin.php index fd1fa6c..e073ca7 100755 --- a/plugins/box/users/users.admin.php +++ b/plugins/box/users/users.admin.php @@ -185,7 +185,7 @@ class UsersAdmin extends Backend // ------------------------------------- case "delete": - if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) { + if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin')) && (int)$_SESSION['user_id'] != (int)Request::get('user_id')) { if (Security::check(Request::get('token'))) { diff --git a/plugins/box/users/views/backend/index.view.php b/plugins/box/users/views/backend/index.view.php index 1347e77..be800b5 100755 --- a/plugins/box/users/views/backend/index.view.php +++ b/plugins/box/users/views/backend/index.view.php @@ -44,9 +44,12 @@
'btn btn-small')); ?> - 'btn btn-small', 'onclick' => "return confirmDelete('".__('Delete user: :user', 'users', array(':user' => Html::toText($user['login'])))."')")); + } ?>
From eaeff17cb95bb916d5d815daaf812eb248e4f823 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 23 Nov 2013 15:35:53 +0400 Subject: [PATCH 2/3] #123 General method getPages() created --- plugins/box/pages/pages.plugin.php | 53 ++++++++++++++++++++++++ plugins/box/sitemap/sitemap.plugin.php | 56 +------------------------- 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/plugins/box/pages/pages.plugin.php b/plugins/box/pages/pages.plugin.php index b70edf8..0c3cde9 100644 --- a/plugins/box/pages/pages.plugin.php +++ b/plugins/box/pages/pages.plugin.php @@ -314,6 +314,59 @@ class Pages extends Frontend return Pages::$page['keywords']; } + + /** + * Get pages + */ + public static function getPages() + { + // Init vars + $pages_array = array(); + $count = 0; + + // Get pages table + $pages = new Table('pages'); + + // Get Pages List + $pages_list = $pages->select('[slug!="error404" and status="published"]'); + + foreach ($pages_list as $page) { + + $pages_array[$count]['title'] = Html::toText($page['title']); + $pages_array[$count]['parent'] = $page['parent']; + $pages_array[$count]['date'] = $page['date']; + $pages_array[$count]['author'] = $page['author']; + $pages_array[$count]['slug'] = ($page['slug'] == Option::get('defaultpage')) ? '' : $page['slug'] ; + + if (isset($page['parent'])) { + $c_p = $page['parent']; + } else { + $c_p = ''; + } + + if ($c_p != '') { + $_page = $pages->select('[slug="'.$page['parent'].'"]', null); + + if (isset($_page['title'])) { + $_title = $_page['title']; + } else { + $_title = ''; + } + $pages_array[$count]['sort'] = $_title . ' ' . $page['title']; + } else { + $pages_array[$count]['sort'] = $page['title']; + } + $_title = ''; + $count++; + } + + // Sort pages + $_pages_list = Arr::subvalSort($pages_array, 'sort'); + + // return + return $_pages_list; + } + } /** diff --git a/plugins/box/sitemap/sitemap.plugin.php b/plugins/box/sitemap/sitemap.plugin.php index ef7653e..9634ffc 100644 --- a/plugins/box/sitemap/sitemap.plugin.php +++ b/plugins/box/sitemap/sitemap.plugin.php @@ -64,7 +64,7 @@ class Sitemap extends Frontend { // Display view return View::factory('box/sitemap/views/frontend/index') - ->assign('pages_list', Sitemap::getPages()) + ->assign('pages_list', Pages::getPages()) ->assign('components', Sitemap::getComponents()) ->render(); } @@ -75,7 +75,7 @@ class Sitemap extends Frontend public static function create() { // Get pages list - $pages_list = Sitemap::getPages(); + $pages_list = Pages::getPages(); // Create sitemap content $map = ''."\n"; @@ -102,58 +102,6 @@ class Sitemap extends Frontend return File::setContent(ROOT . DS . 'sitemap.xml', $map); } - /** - * Get pages - */ - protected static function getPages() - { - // Init vars - $pages_array = array(); - $count = 0; - - // Get pages table - $pages = new Table('pages'); - - // Get Pages List - $pages_list = $pages->select('[slug!="error404" and status="published"]'); - - foreach ($pages_list as $page) { - - $pages_array[$count]['title'] = Html::toText($page['title']); - $pages_array[$count]['parent'] = $page['parent']; - $pages_array[$count]['date'] = $page['date']; - $pages_array[$count]['author'] = $page['author']; - $pages_array[$count]['slug'] = ($page['slug'] == Option::get('defaultpage')) ? '' : $page['slug'] ; - - if (isset($page['parent'])) { - $c_p = $page['parent']; - } else { - $c_p = ''; - } - - if ($c_p != '') { - $_page = $pages->select('[slug="'.$page['parent'].'"]', null); - - if (isset($_page['title'])) { - $_title = $_page['title']; - } else { - $_title = ''; - } - $pages_array[$count]['sort'] = $_title . ' ' . $page['title']; - } else { - $pages_array[$count]['sort'] = $page['title']; - } - $_title = ''; - $count++; - } - - // Sort pages - $_pages_list = Arr::subvalSort($pages_array, 'sort'); - - // return - return $_pages_list; - } - /** * Get components */ From d1a5a9c0e29944ed73bce3bb58909c775d8ef306 Mon Sep 17 00:00:00 2001 From: bernte Date: Sat, 23 Nov 2013 15:58:54 +0100 Subject: [PATCH 3/3] Update de.lang.php --- plugins/box/system/languages/de.lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/box/system/languages/de.lang.php b/plugins/box/system/languages/de.lang.php index dabb592..0b9e313 100644 --- a/plugins/box/system/languages/de.lang.php +++ b/plugins/box/system/languages/de.lang.php @@ -77,5 +77,6 @@ 'Main .htaccess file not writable' => 'Haupt .htaccess-Datei ist nicht beschreibbar', 'Official Support Forum' => 'Offizielles Support Forum', 'Documentation' => 'Dokumentation', + 'Your changes have been saved.' => 'Änderungen wurden gespeichert.', ) );