Changeset 1554

Timestamp:

Oct 4, 2006, 10:50:20 PM (18 years ago)

Author:

nikrou

Message:

Fix bug 451: Auto login does not work properly
svn merge r1492:1493 from trunk
svn merge r1510:1511 from trunk
svn merge r1521:1522 from trunk
svn merge r1523:1524 from trunk
svn merge r1525:1526 from trunk
auto_login key add to users table:

• add update script
• update upgrade_1.5.0.php script

(related to svn:1553)

Location:

branches/branch-1_6

Files:

• identification.php (modified) (2 diffs)
• include/config_default.inc.php (modified) (1 diff)
• include/functions_session.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (1 diff)
• include/menubar.inc.php (modified) (1 diff)
• include/user.inc.php (modified) (2 diffs)
• install/db/22.7-database.php (added)
• install/phpwebgallery_structure.sql (modified) (2 diffs)
• install/upgrade_1.5.0.php (modified) (1 diff)

branches/branch-1_6/identification.php

@@ -64 +64 @@
       $remember_me = true;
     }
-    log_user( $row['id'], $remember_me);
+    log_user($row['id'], $remember_me);
     redirect(empty($redirect_to) ? make_index_url() : $redirect_to);
   }
@@ -71 +71 @@
     array_push( $errors, $lang['invalid_pwd'] );
   }
+}
+elseif (!empty($_COOKIE[$conf['remember_me_name']]))
+{
+  auto_login();
 }
 //----------------------------------------------------- template initialization

branches/branch-1_6/include/config_default.inc.php

@@ -319 +319 @@
 $conf['authorize_remembering'] = true;
 
+// remember_me_name: specifies the name of the cookie used to stay logged
+$conf['remember_me_name'] = 'pwg_remember';
+
 // remember_me_length : time of validity for "remember me" cookies, in
 // seconds.
 $conf['remember_me_length'] = 31536000;
-
-// session_length : time of validity for normal session, in seconds.
-$conf['session_length'] = 3600;
 
 // +-----------------------------------------------------------------------+

branches/branch-1_6/include/functions_session.inc.php

@@ -72 +72 @@
     ini_set('session.use_trans_sid', intval($conf['session_use_trans_sid']));
   }
-  session_name( $conf['session_name'] );
-  session_set_cookie_params(
-      ini_get('session.cookie_lifetime'),
-      cookie_path()
-    );
+  session_name($conf['session_name']);
+  session_set_cookie_params(0, cookie_path());
 }
 

branches/branch-1_6/include/functions_user.inc.php

@@ -551 +551 @@
 function log_user($user_id, $remember_me)
 {
-  global $conf;
-  $session_length = $conf['session_length'];
+  global $conf, $user;
+
   if ($remember_me)
   {
-    $session_length = $conf['remember_me_length'];
-  }
-  session_set_cookie_params($session_length);
+    // search for an existing auto_login_key
+    $query = '
+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)) 
+    {
+      $auto_login_key = base64_encode(md5(uniqid(rand(), true)));
+      $query = '
+UPDATE '.USERS_TABLE.'
+  SET auto_login_key=\''.$auto_login_key.'\'
+  WHERE '.$conf['user_fields']['id'].' = '.$user_id.'
+;';
+      pwg_query($query);
+    }
+    $cookie = array('id' => $user_id, 'key' => $auto_login_key);
+    setcookie($conf['remember_me_name'],
+              serialize($cookie), 
+              time()+$conf['remember_me_length'],
+              cookie_path()
+              );
+  }
   session_start();
   $_SESSION['pwg_uid'] = $user_id;
+
+  $user['id'] = $_SESSION['pwg_uid'];
+  $user['is_the_guest'] = false;
+}
+
+/*
+ * Performs auto-connexion when cookie remember_me exists
+ * @return void
+*/
+function auto_login() { 
+  global $conf;
+
+  // must remove slash added in include/common.inc.php
+  $cookie = unserialize(stripslashes($_COOKIE[$conf['remember_me_name']]));
+
+  $query = '
+SELECT auto_login_key
+  FROM '.USERS_TABLE.'
+  WHERE '.$conf['user_fields']['id'].' = '.$cookie['id'].'
+;';
+
+  $auto_login_key = current(mysql_fetch_assoc(pwg_query($query)));
+  if ($auto_login_key == $cookie['key'])
+  {
+    log_user($cookie['id'], false);
+    redirect(make_index_url());
+  }
+  else
+  {
+    setcookie($conf['remember_me_name'], '', 0, cookie_path());
+    redirect(make_index_url());
+  } 
 }
 

branches/branch-1_6/include/menubar.inc.php

@@ -45 +45 @@
     'U_REGISTER' => get_root_url().'register.php',
     'U_LOST_PASSWORD' => get_root_url().'password.php',
-    'U_LOGOUT' => add_url_params(make_index_url(), array('act'=>'logout') ),
+    'U_LOGOUT' => get_root_url().'?act=logout',
     'U_ADMIN'=> get_root_url().'admin.php',
     'U_PROFILE'=> get_root_url().'profile.php',

branches/branch-1_6/include/user.inc.php

@@ -26 +26 @@
 // +-----------------------------------------------------------------------+
 
-// retrieving connected user informations
 if (isset($_COOKIE[session_name()])) 
 {
- session_start();
- if (isset($_SESSION['pwg_uid']))
- {
-   $user['id'] = $_SESSION['pwg_uid'];
-   $user['is_the_guest'] = false;
- }
- else 
- {
-   // session timeout
-   $user['id'] = $conf['guest_id'];
-   $user['is_the_guest'] = true;
- }
+  session_start();
+  if (isset($_GET['act']) and $_GET['act'] == 'logout')
+  {
+    // logout
+    $_SESSION = array();
+    session_unset();
+    session_destroy();
+    setcookie(session_name(),'',0,
+              ini_get('session.cookie_path'), 
+              ini_get('session.cookie_domain') 
+              );
+    setcookie($conf['remember_me_name'], '', 0, cookie_path());
+    redirect(make_index_url());
+  } 
+  elseif (empty($_SESSION['pwg_uid'])) 
+  {
+    // timeout
+    setcookie(session_name(),'',0,
+              ini_get('session.cookie_path'), 
+              ini_get('session.cookie_domain') 
+              );
+  }
+  else
+  {
+    $user['id'] = $_SESSION['pwg_uid'];
+    $user['is_the_guest'] = false;
+  }
+}
+elseif (!empty($_COOKIE[$conf['remember_me_name']]))
+{
+  auto_login();
 } 
-else 
+else
 {
- $user['id'] = $conf['guest_id'];
- $user['is_the_guest'] = true;
+  $user['id'] = $conf['guest_id'];
+  $user['is_the_guest'] = true;
+}
+
+if ($user['is_the_guest'] and !$conf['guest_access'] 
+    and (basename($_SERVER['PHP_SELF'])!='identification.php')
+    and (basename($_SERVER['PHP_SELF'])!='password.php')
+    and (basename($_SERVER['PHP_SELF'])!='register.php'))
+{
+  redirect (get_root_url().'identification.php');
 }
 
@@ -59 +85 @@
   $user['is_the_guest'] = false;
 }
+
 $user = array_merge(
   $user,

branches/branch-1_6/install/phpwebgallery_structure.sql

@@ -1 @@
--- MySQL dump 9.11
+1-- MySQL dump 9.11
 --
 -- Host: localhost    Database: pwg-1_6
@@ -346 +346 @@
   `password` varchar(32) default NULL,
   `mail_address` varchar(255) default NULL,
+  `auto_login_key` varchar(64) default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `users_ui1` (`username`)

branches/branch-1_6/install/upgrade_1.5.0.php

@@ -469 +469 @@
 }
 
+$query = '
+ALTER TABLE '.PREFIX_TABLE.'users
+  ADD auto_login_key varchar(64) NOT NULL
+;';
+pwg_query($query);
 ?>