mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 04:09:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

feature:2418

Browse source 
adding an option to apply permission of users to sub-albums
changing the name of vars $private_uppercats->$private_cats

git-svn-id: http://piwigo.org/svn/trunk@12019 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
flop25 2011-08-31 15:12:14 +00:00
parent a867fe1e85
commit ded83a19da
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
admin/include/functions.php
View file

@ -2143,24 +2143,25 @@ function add_permission_on_category($category_ids, $user_ids)
return;
}
// make sure categories are private and select uppercats
// make sure categories are private and select uppercats or subcats
$cat_ids = (isset($_POST['apply_on_sub'])) ? implode(',', get_subcat_ids($category_ids)).",".implode(',', get_uppercat_ids($category_ids)) : implode(',', get_uppercat_ids($category_ids));
$query = '
SELECT
id
FROM '.CATEGORIES_TABLE.'
WHERE id IN ('.implode(',', get_uppercat_ids($category_ids)).')
WHERE id IN ('.$cat_ids.')
AND status = \'private\'
;';
$private_uppercats = array_from_query($query, 'id');
$private_cats = array_from_query($query, 'id');
if (count($private_uppercats) == 0)
if (count($private_cats) == 0)
{
return;
}
// We must not reinsert already existing lines in user_access table
$granteds = array();
foreach ($private_uppercats as $cat_id)
foreach ($private_cats as $cat_id)
{
$granteds[$cat_id] = array();
}
@ -2170,7 +2171,7 @@ SELECT
user_id,
cat_id
FROM '.USER_ACCESS_TABLE.'
WHERE cat_id IN ('.implode(',', $private_uppercats).')
WHERE cat_id IN ('.implode(',', $private_cats).')
AND user_id IN ('.implode(',', $user_ids).')
;';
$result = pwg_query($query);
@ -2181,7 +2182,7 @@ SELECT
$inserts = array();
foreach ($private_uppercats as $cat_id)
foreach ($private_cats as $cat_id)
{
$grant_to_users = array_diff($user_ids, $granteds[$cat_id]);