mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-06 21:26:58 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
Awilum
2013-11-23 23:26:40 +04:00
parent d1c4f58c2e b2ef78b556
commit 489f7017d1
5 changed files with 61 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
plugins/box/pages/pages.plugin.php
View File

@@ -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;
}
}
/**

56
plugins/box/sitemap/sitemap.plugin.php
View File

@@ -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 = '<?xml version="1.0" encoding="UTF-8"?>'."\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
*/

1
plugins/box/system/languages/de.lang.php
View File

@@ -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.',
)
);

2
plugins/box/users/users.admin.php
View File

@@ -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'))) {

5
plugins/box/users/views/backend/index.view.php
View File

@@ -44,9 +44,12 @@
<td>
<div class="pull-right">
<?php echo Html::anchor(__('Edit', 'users'), 'index.php?id=users&action=edit&user_id='.$user['id'], array('class' => 'btn btn-small')); ?>
<?php echo Html::anchor(__('Delete', 'users'),
<?php
if ((int)$user['id'] != (int)$_SESSION['user_id']) {
echo Html::anchor(__('Delete', 'users'),
'index.php?id=users&action=delete&user_id='.$user['id'].'&token='.Security::token(),
array('class' => 'btn btn-small', 'onclick' => "return confirmDelete('".__('Delete user: :user', 'users', array(':user' => Html::toText($user['login'])))."')"));
}
?>
</div>
</td>