adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-10 18:53:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

- improvement : in admin/user_perm, already authorized categories thanks to

Browse Source 
group associations are displayed and not taken into account for user
  specific permissions.


git-svn-id: http://piwigo.org/svn/trunk@818 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2005-08-17 15:25:32 +00:00
parent 20f0541697
commit 3cf427b4d6
4 changed files with 82 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/user_perm.php
+50 -1
View File
@@ -141,12 +141,56 @@ $template->assign_vars(
)
);
// retrieve category ids authorized to the groups the user belongs to
$group_authorized = array();
$query = '
SELECT DISTINCT cat_id, c.uppercats, c.global_rank
FROM '.USER_GROUP_TABLE.' AS ug
INNER JOIN '.GROUP_ACCESS_TABLE.' AS ga
ON ug.group_id = ga.group_id
INNER JOIN '.CATEGORIES_TABLE.' AS c
ON c.id = ga.cat_id
WHERE ug.user_id = '.$page['user'].'
;';
$result = pwg_query($query);
if (mysql_num_rows($result) > 0)
{
$template->assign_block_vars('groups', array());
$cats = array();
while ($row = mysql_fetch_array($result))
{
array_push($cats, $row);
array_push($group_authorized, $row['cat_id']);
}
usort($cats, 'global_rank_compare');
foreach ($cats as $category)
{
$template->assign_block_vars(
'groups.category',
array(
'NAME' => get_cat_display_name_cache($category['uppercats'], '', false)
)
);
}
}
// only private categories are listed
$query_true = '
SELECT id,name,uppercats,global_rank
FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_ACCESS_TABLE.' ON cat_id = id
WHERE status = \'private\'
AND user_id = '.$page['user'].'
AND user_id = '.$page['user'];
if (count($group_authorized) > 0)
{
$query_true.= '
AND cat_id NOT IN ('.implode(',', $group_authorized).')';
}
$query_true.= '
;';
display_select_cat_wrapper($query_true,array(),'category_option_true');
@@ -166,6 +210,11 @@ if (count($authorized_ids) > 0)
$query_false.= '
AND id NOT IN ('.implode(',', $authorized_ids).')';
}
if (count($group_authorized) > 0)
{
$query_false.= '
AND id NOT IN ('.implode(',', $group_authorized).')';
}
$query_false.= '
;';
display_select_cat_wrapper($query_false,array(),'category_option_false');