Changeset 1851 for trunk/include/functions_user.inc.php

Timestamp:

Feb 22, 2007, 9:20:30 PM (17 years ago)

Author:

rub

Message:

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 confguest_access, but I kept last implementation for access methods (Could be useful on future development)

File:

• trunk/include/functions_user.inc.php (modified) (6 diffs)

trunk/include/functions_user.inc.php

@@ -436 +436 @@
 
   // if user is not an admin, locked categories are forbidden
-  if ( $user_status!='administrator' and $user_status!='webmaster' )
+  if (!is_admin($user_status))
   {
     $query = '
@@ -982 +982 @@
 function get_access_type_status($user_status='')
 {
-  global $user;
+  global $user, $conf;
 
   if ($user_status == '' and isset($user['status']) )
@@ -993 +993 @@
   {
     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':
     {
@@ -1023 +1038 @@
  * @return bool
 */
-function is_autorize_status($access_type)
-{
-  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);
+function is_autorize_status($access_type, $user_status = '')
+{
+  return (get_access_type_status($user_status) >= $access_type);
 }
 
@@ -1043 +1049 @@
  * @return none
 */
-function check_status( $access_type )
-{
-  if (!is_autorize_status($access_type) )
+function check_status($access_type, $user_status = '')
+{
+  if (!is_autorize_status($access_type, $user_status))
   {
     access_denied();
@@ -1055 +1061 @@
  * @return bool
 */
-function is_admin()
-{
-  return is_autorize_status(ACCESS_ADMINISTRATOR);
+ function is_admin($user_status = '')
+{
+  return is_autorize_status(ACCESS_ADMINISTRATOR, $user_status);
 }