Changeset 808 for trunk/include/functions_session.inc.php

Timestamp:

Aug 8, 2005, 10:52:19 PM (19 years ago)

Author:

plg

Message:

• new : external authentication in another users table. Previous users table is divided between users (common properties with any web application) and user_infos (phpwebgallery specific informations). External table and fields can be configured.

• modification : profile.php is not reachable through administration anymore (not useful).

• modification : in profile.php, current password is mandatory only if user tries to change his password. Username can't be changed.

• deletion : of obsolete functions get_user_restrictions, update_user_restrictions, get_user_all_restrictions, is_user_allowed, update_user

• modification : $userforbidden_categories equals at least "-1" so that category_id NOT IN ($userforbidden_categories) can always be used.

• modification : user_forbidden table becomes user_cache so that not only restriction informations can be stored in this table.

File:

• trunk/include/functions_session.inc.php (modified) (1 diff)

trunk/include/functions_session.inc.php

@@ -110 +110 @@
   global $page, $user, $conf;
 
-  if ( $user['has_cookie'] or $conf['apache_authentication']) return $url;
+  if ($user['is_the_guest']
+      or $user['has_cookie']
+      or $conf['apache_authentication'])
+  {
+    return $url;
+  }
 
-  $amp = '&';
-  if ( $redirect )
+  if (preg_match('/\.php\?/', $url))
   {
-    $amp = '&';
-  }
-  if ( !$user['is_the_guest'] )
-  {
-    if ( preg_match( '/\.php\?/',$url ) )
-    {
-      return $url.$amp.'id='.$page['session_id'];
-    }
-    else
-    {
-      return $url.'?id='.$page['session_id'];
-    }
+    $separator = $redirect ? '&' : '&';
   }
   else
   {
-    return $url;
+    $separator = '?';
   }
+
+  return $url.$separator.'id='.$page['session_id'];
 }