Changeset 1231 for trunk/include/user.inc.php

Timestamp:

Apr 21, 2006, 4:11:29 AM (18 years ago)

Author:

rvelices

Message:

merge r1230 from branch-1_6 into trunk

bugs 344 and 308: broken user id in $_SESSION due to php.ini register_globals

File:

• trunk/include/user.inc.php (modified) (3 diffs)

trunk/include/user.inc.php

@@ -27 +27 @@
 
 // retrieving connected user informations
-if (isset($_COOKIE[session_name()])) 
+if (isset($_COOKIE[session_name()]))
 {
  session_start();
- if (isset($_SESSION['id'])) 
+ if (isset($_SESSION['pwg_uid']))
  {
-   $user['id'] = $_SESSION['id'];    
+   $user['id'] = $_SESSION['pwg_uid'];
    $user['is_the_guest'] = false;
  }
- else 
+ else
  {
    // session timeout
@@ -41 +41 @@
    $user['is_the_guest'] = true;
  }
-} 
-else 
+}
+else
 {
  $user['id'] = $conf['guest_id'];
@@ -56 +56 @@
     $user['id'] = get_userid($_SERVER['REMOTE_USER']);
   }
-  
+
   $user['is_the_guest'] = false;
 }