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

Timestamp:

Oct 19, 2006, 11:53:18 PM (18 years ago)

Author:

rvelices

Message:

put back the redirect function as it was in branch 1.6 (still not working perfectly with the auto_login)

File:

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

trunk/include/functions_user.inc.php

@@ -459 +459 @@
     $status = 'normal';
   }
-  
+
   $insert =
     array(
@@ -523 +523 @@
   global $user, $conf;
 
-  $directories =
-    array(
-      PHPWG_ROOT_PATH.'language/'.$user['language'],
-      PHPWG_ROOT_PATH.'language/'.$conf['default_language'],
-      PHPWG_ROOT_PATH.'language/'.PHPWG_DEFAULT_LANGUAGE
-      );
+  $directories = array();
+  if ( isset($user['language']) )
+  {
+    $directories[] = PHPWG_ROOT_PATH.'language/'.$user['language'];
+  }
+  $directories[] = PHPWG_ROOT_PATH.'language/'.$conf['default_language'];
+  $directories[] = PHPWG_ROOT_PATH.'language/'.PHPWG_DEFAULT_LANGUAGE;
 
   foreach ($directories as $directory)
@@ -557 +558 @@
     // search for an existing auto_login_key
     $query = '
-SELECT auto_login_key 
+SELECT auto_login_key
   FROM '.USERS_TABLE.'
   WHERE '.$conf['user_fields']['id'].' = '.$user_id.'
 ;';
- 
+
     $auto_login_key = current(mysql_fetch_assoc(pwg_query($query)));
-    if (empty($auto_login_key)) 
+    if (empty($auto_login_key))
     {
       $auto_login_key = base64_encode(md5(uniqid(rand(), true)));
@@ -575 +576 @@
     $cookie = array('id' => $user_id, 'key' => $auto_login_key);
     setcookie($conf['remember_me_name'],
-              serialize($cookie), 
+              serialize($cookie),
               time()+$conf['remember_me_length'],
               cookie_path()
@@ -591 +592 @@
  * @return void
 */
-function auto_login() { 
+function auto_login() {
   global $conf;
 
@@ -613 +614 @@
     setcookie($conf['remember_me_name'], '', 0, cookie_path());
     redirect(make_index_url());
-  } 
+  }
 }