- deletion of calculated permissions when deleting a user

- taking into account locked categories during permissions calculation


git-svn-id: http://piwigo.org/svn/trunk@680 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2005-01-08 11:23:52 +00:00
parent baf609b26a
commit 971d0c5a95
3 changed files with 29 additions and 3 deletions

View file

@ -267,9 +267,10 @@ DELETE FROM '.FAVORITES_TABLE.'
* belongs to minus the categories directly authorized to the user
*
* @param int user_id
* @param string user_status
* @return string forbidden_categories
*/
function calculate_permissions($user_id)
function calculate_permissions($user_id, $user_status)
{
$private_array = array();
$authorized_array = array();
@ -284,6 +285,23 @@ SELECT id
{
array_push($private_array, $row['id']);
}
// if user is not an admin, locked categories can be considered as private$
if ($user_status != 'admin')
{
$query = '
SELECT id
FROM '.CATEGORIES_TABLE.'
WHERE visible = \'false\'
;';
$result = pwg_query($query);
while ($row = mysql_fetch_array($result))
{
array_push($private_array, $row['id']);
}
$private_array = array_unique($private_array);
}
// retrieve category ids directly authorized to the user
$query = '