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

Timestamp:

Feb 22, 2007, 6:31:08 AM (17 years ago)

Author:

rvelices

Message:

• change the way confguest_access is handled so that web services work correctly (and also nbm.php and feed.php)

File:

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

trunk/include/functions_user.inc.php

@@ -393 +393 @@
 function calculate_permissions($user_id, $user_status)
 {
-  global $user;
-
   $private_array = array();
   $authorized_array = array();
@@ -438 +436 @@
 
   // if user is not an admin, locked categories are forbidden
-  if (!is_admin($user_status))
+  if ( $user_status!='administrator' and $user_status!='webmaster' )
   {
     $query = '
@@ -982 +980 @@
  * @return bool
 */
-function get_access_type_status($user_status = '')
+function get_access_type_status($user_status='')
 {
   global $user;
 
-  if (($user_status == '') and isset($user['status']))
+  if ($user_status == '' and isset($user['status']) )
   {
     $user_status = $user['status'];
@@ -1025 +1023 @@
  * @return bool
 */
-function is_autorize_status($access_type, $user_status = '')
-{
-  return (get_access_type_status($user_status) >= $access_type);
+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);
 }
 
@@ -1036 +1043 @@
  * @return none
 */
-function check_status($access_type, $user_status = '')
-{
-  if (!is_autorize_status($access_type, $user_status))
+function check_status( $access_type )
+{
+  if (!is_autorize_status($access_type) )
   {
     access_denied();
@@ -1048 +1055 @@
  * @return bool
 */
-function is_admin($user_status = '')
-{
-  return is_autorize_status(ACCESS_ADMINISTRATOR, $user_status);
+function is_admin()
+{
+  return is_autorize_status(ACCESS_ADMINISTRATOR);
 }