o Proposition: improved display of 'x images in y sub-categories' or 'x images in this category' for cases when categories contain both images and sub-categories

  o Good idea of this new way for way conf['guest_access'], but I kept last implementation for access methods (Could be useful on future development)

git-svn-id: http://piwigo.org/svn/trunk@1851 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 23 insertions, 17 deletions

diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 57e609eab..6b0b110c8 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -435,7 +435,7 @@ SELECT cat_id
   $forbidden_array = array_diff($private_array, $authorized_array);
 
   // if user is not an admin, locked categories are forbidden
-  if ( $user_status!='administrator' and $user_status!='webmaster' )
+  if (!is_admin($user_status))
   {
     $query = '
 SELECT id
@@ -981,7 +981,7 @@ SELECT '.$conf['user_fields']['id'].' AS id,
 */
 function get_access_type_status($user_status='')
 {
-  global $user;
+  global $user, $conf;
 
   if ($user_status == '' and isset($user['status']) )
   {
@@ -992,6 +992,21 @@ function get_access_type_status($user_status='')
   switch ($user_status)
   {
     case 'guest':
+    {
+      if
+        (
+          !isset($user) or
+          ($user['id']==$conf['guest_id'] and !$conf['guest_access'])
+        )
+      {
+        $access_type_status = ACCESS_NONE;
+      }
+      else
+      {
+        $access_type_status = ACCESS_GUEST;
+      }
+      break;
+    }
     case 'generic':
     {
       $access_type_status = ACCESS_GUEST;
@@ -1022,18 +1037,9 @@ function get_access_type_status($user_status='')
  * Test does with user status
  * @return bool
 */
-function is_autorize_status($access_type)
+function is_autorize_status($access_type, $user_status = '')
 {
-  global $user, $conf;
-  if (
-      !isset($user) or
-      ($user['id']==$conf['guest_id'] and $conf['guest_access']==false)
-    )
-  {
-    return ACCESS_NONE>=$access_type;
-  }
-
-  return (get_access_type_status() >= $access_type);
+  return (get_access_type_status($user_status) >= $access_type);
 }
 
 /*
@@ -1042,9 +1048,9 @@ function is_autorize_status($access_type)
  * Test does with user status
  * @return none
 */
-function check_status( $access_type )
+function check_status($access_type, $user_status = '')
 {
-  if (!is_autorize_status($access_type) )
+  if (!is_autorize_status($access_type, $user_status))
   {
     access_denied();
   }
@@ -1054,9 +1060,9 @@ function check_status( $access_type )
  * Return if user is an administrator
  * @return bool
 */
-function is_admin()
+ function is_admin($user_status = '')
 {
-  return is_autorize_status(ACCESS_ADMINISTRATOR);
+  return is_autorize_status(ACCESS_ADMINISTRATOR, $user_status);
 }
 
 /*