Changeset 1511

Timestamp:

Jul 28, 2006, 11:34:27 AM (18 years ago)

Author:

nikrou

Message:

Fix bug 451: improvement
small problem with reconnexion after session timeout
add auto-login function
all staff for session (connexion, auto-login and logout)
is now in include/user.inc.php

Location:

trunk

Files:

• identification.php (modified) (2 diffs)
• include/functions_user.inc.php (modified) (2 diffs)
• include/menubar.inc.php (modified) (1 diff)
• include/user.inc.php (modified) (2 diffs)
• index.php (modified) (1 diff)

trunk/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);
   }
@@ -74 +74 @@
 elseif (!empty($_COOKIE[$conf['remember_me_name']]))
 {
-  $cookie = unserialize(pwg_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(empty($redirect_to) ? make_index_url() : $redirect_to);
-  }
-  else
-  {
-    setcookie($conf['remember_me_name'], '', 0, cookie_path());
-    redirect(empty($redirect_to) ? make_index_url() : $redirect_to);
-  }
+  auto_login();
 }
 //----------------------------------------------------- template initialization

trunk/include/functions_user.inc.php

@@ -551 +551 @@
 function log_user($user_id, $remember_me)
 {
-  global $conf;
+  global $conf, $user;
 
   if ($remember_me)
@@ -582 +582 @@
   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;
+
+  $cookie = unserialize(pwg_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());
+  } 
 }
 

trunk/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',

trunk/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
 {
- $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'])
+{
+  redirect (get_root_url().'identification.php');
 }
 
@@ -59 +82 @@
   $user['is_the_guest'] = false;
 }
+
 $user = array_merge(
   $user,

trunk/index.php

@@ -36 +36 @@
 check_status(ACCESS_GUEST);
 
-//---------------------------------------------------------------------- logout
-if ( isset( $_GET['act'] )
-     and $_GET['act'] == 'logout'
-     and isset( $_COOKIE[session_name()] ) )
-{
-  // cookie deletion if exists
-  $_SESSION = array();
-  session_unset();
-  session_destroy();
-  setcookie(session_name(),'',0,
-      ini_get('session.cookie_path'), ini_get('session.cookie_domain') );
-  redirect( make_index_url() );
-}
-if ($user['is_the_guest'] and !$conf['guest_access'])
-{
-  redirect (get_root_url().'identification.php');
-}
-
 //---------------------------------------------- change of image display order
 if (isset($_GET['image_order']))