aboutsummaryrefslogtreecommitdiffstats
path: root/admin/cat_perm.php
diff options
context:
space:
mode:
authorgweltas <gweltas@piwigo.org>2004-02-02 00:55:18 +0000
committergweltas <gweltas@piwigo.org>2004-02-02 00:55:18 +0000
commitbef4b3e3aa8e3d54cbf8b4962b9b5d4a89b55429 (patch)
tree647b2cf07ee8451a9314e1e8aebd11d9396cb32b /admin/cat_perm.php
parenteea989f019f21fbd7ae4aa8e2f4a1503992c23bf (diff)
Merge of the 1.3.1 release
Creation of an unique include file (common.php) Creation of an unique define file (include/constants.php) Modification of the installation procedure git-svn-id: http://piwigo.org/svn/trunk@345 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/cat_perm.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/admin/cat_perm.php b/admin/cat_perm.php
index 81d9f9945..09767c19b 100644
--- a/admin/cat_perm.php
+++ b/admin/cat_perm.php
@@ -83,6 +83,8 @@ if ( isset( $_POST['submit'] ) )
}
check_favorites( $row['id'] );
}
+ // resynchronize all users
+ synchronize_all_users();
}
//---------------------------------------------------------------------- groups
$query = 'SELECT id,name';
@@ -149,7 +151,7 @@ while ( $row = mysql_fetch_array( $result ) )
// for color of user : (red means access forbidden, green authorized) we
// ask all forbidden categories, including the groups rights
- $restrictions = get_restrictions( $row['id'], $row['status'], false );
+ $restrictions = get_user_restrictions( $row['id'], $row['status'], false );
$is_user_allowed = is_user_allowed( $page['cat'], $restrictions );
if ( $is_user_allowed == 0 )
{
@@ -161,7 +163,7 @@ while ( $row = mysql_fetch_array( $result ) )
}
// for permission update button, we only ask forbidden categories for the
// user, not taking into account the groups the user belongs to
- $restrictions = get_restrictions( $row['id'], $row['status'], false, false );
+ $restrictions = get_user_restrictions($row['id'],$row['status'],false,false);
$is_user_allowed = is_user_allowed( $page['cat'], $restrictions );
if ( $is_user_allowed == 2 )
{