adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-20 00:23:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Jump to category icon is removed on user forbidden categories (previously check_restrictions was leading administrators to the access denied page).

Browse Source 
git-svn-id: http://piwigo.org/svn/branches/2.0@2776 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
vdigital
2008-10-19 15:37:43 +00:00
parent a48c2e5281
commit aa1a71488f
4 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/cat_modify.php
+1
View File
@@ -235,6 +235,7 @@ if (!empty($category['id_uppercat']))
$template->assign(
array(
'CATEGORIES_NAV' => $navigation,
'CAT_ID' => $category['id'],
'CAT_NAME' => @htmlspecialchars($category['name']),
'CAT_COMMENT' => @htmlspecialchars($category['comment']),
admin/include/functions.php
+23
View File
@@ -1899,4 +1899,27 @@ SELECT id
);
}
}
/**
* Is the category accessible to the (Admin) user ?
*
* Note : if the user is not authorized to see this category, category jump
* will be replaced by admin cat_modify page
*
* @param int category id to verify
* @return bool
*/
function cat_admin_access($category_id)
{
global $user;
// $filter['visible_categories'] and $filter['visible_images']
// are not used because it's not necessary (filter <> restriction)
if (in_array($category_id, explode(',', $user['forbidden_categories'])))
{
return false;
}
return true;
}
?>
admin/template/goto/cat_list.tpl
+2
View File
@@ -48,7 +48,9 @@
<li class="categoryLi{if $category.IS_VIRTUAL} virtual_cat{/if}" id="cat_{$category.ID}">
<!-- category {$category.ID} -->
<ul class="categoryActions">
{if cat_admin_access($category.ID)}
<li><a href="{$category.U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li>
{/if}
<li><a href="{$category.U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"/></a></li>
{if isset($category.U_MANAGE_ELEMENTS) }
<li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li>
admin/template/goto/cat_modify.tpl
+2
View File
@@ -10,7 +10,9 @@
<h3>{$CATEGORIES_NAV}</h3>
<ul class="categoryActions">
{if cat_admin_access($CAT_ID)}
<li><a href="{$U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li>
{/if}
{if isset($U_MANAGE_ELEMENTS) }
<li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li>
<li><a href="{$U_MANAGE_RANKS}" title="{'manage image ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}" /></a></li>