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
This commit is contained in:
parent
eea989f019
commit
bef4b3e3aa
78 changed files with 7173 additions and 2101 deletions
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue