Changeset 1068

Timestamp:

Mar 7, 2006, 2:20:02 AM (18 years ago)

Author:

rvelices

Message:

bug fix: call to undefined session_create in register.php (added function
log_user called from identification and register)

bug fix: empty line at the beginning of functions.php disallowed cookies
(and hence logging in)

Location:

trunk

Files:

• admin/include/functions.php (modified) (26 diffs)
• identification.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (15 diffs)
• register.php (modified) (3 diffs)

trunk/admin/include/functions.php

@@ -1 @@
-
 <?php
 // +-----------------------------------------------------------------------+
@@ -188 +187 @@
 ;';
   pwg_query($query);
-  
+
   $query = '
 DELETE FROM '.GROUP_ACCESS_TABLE.'
@@ -206 +205 @@
 
   $sources_of = array();
-  
+
   while ($row = mysql_fetch_array($result))
   {
@@ -446 +445 @@
   {
     array_push($query_ids, $row['category_id']);
-    
+
     array_push(
       $datas,
@@ -1350 +1349 @@
 {
   $images_of = array();
-  
+
   $query = '
 SELECT category_id, image_id
@@ -1369 +1368 @@
       );
   }
-  
+
   $fulldirs = get_fulldirs(
     array_keys($images_of)
@@ -1619 +1618 @@
 
   $destinations_of = array();
-  
+
   while ($row = mysql_fetch_array($result))
   {
@@ -1639 +1638 @@
     // let's suppose we only need a single turn
     $need_new_turn = false;
-    
+
     foreach ($destinations_of as $source => $destinations)
     {
@@ -1656 +1655 @@
             array($source) // no cyclic link
             );
-          
+
           if (count($missing_destinations) > 0)
           {
@@ -1685 +1684 @@
       $filtered_destinations_of[$category] = array();
     }
-    
+
     foreach ($destinations_of as $source => $destinations)
     {
@@ -1713 +1712 @@
 
   $sources_of = array();
-  
+
   foreach ($destinations_of as $source => $destinations)
   {
@@ -1726 +1725 @@
     }
   }
-  
+
   // eventually, filter
   if (is_array($categories))
@@ -1738 +1737 @@
       $filtered_sources_of[$category] = array();
     }
-    
+
     foreach ($sources_of as $destination => $sources)
     {
@@ -1784 +1783 @@
     }
   }
-  
+
   $query = '
 SELECT image_id, category_id
@@ -1803 +1802 @@
 
   $inserts = array();
-  
+
   foreach ($sources_of as $destination => $sources)
   {
     // merge all images from the sources of this destination
     $sources_images = array();
-    
+
     foreach ($sources as $source)
     {
@@ -1875 +1874 @@
  *
  * Warning: only virtual links can be removed, physical links are protected.
- * 
+ *
  * @param int destination
  * @param array sources
@@ -1894 +1893 @@
 ;';
   pwg_query($query);
-  
+
   // The strategy is the following:
   //
@@ -1928 +1927 @@
     $destinations_of[$destination]
     );
-  
+
   // unlink sources images from destinations
   $query = '
@@ -1949 +1948 @@
 
   $request_random = array();
-  
+
   while ($row = mysql_fetch_array($result))
   {
@@ -1979 +1978 @@
 {
   global $conf;
-  
+
   // is the given category name only containing blank spaces ?
   if (preg_match('/^\s*$/', $category_name))
@@ -1985 +1984 @@
     return array('error' => l10n('cat_error_name'));
   }
-        
+
   $parent_id = !empty($parent_id) ? $parent_id : 'NULL';
 
@@ -1994 +1993 @@
 ;';
   list($current_rank) = mysql_fetch_array(pwg_query($query));
-  
+
   $insert = array(
     'name' => $category_name,
@@ -2001 +2000 @@
     'uploadable' => 'false',
     );
-    
+
   if ($parent_id != 'NULL')
   {
@@ -2013 +2012 @@
     $insert{'id_uppercat'} = $parent{'id'};
     $insert{'global_rank'} = $parent{'global_rank'}.'.'.$insert{'rank'};
-    
+
     // at creation, must a category be visible or not ? Warning : if the
     // parent category is invisible, the category is automatically create
@@ -2025 +2024 @@
       $insert{'visible'} = $conf['newcat_default_visible'];
     }
-    
+
     // at creation, must a category be public or private ? Warning : if the
     // parent category is private, the category is automatically create
@@ -2067 +2066 @@
 ;';
   pwg_query($query);
-  
+
   return array(
     'info' => l10n('cat_virtual_added'),

trunk/identification.php

@@ -57 +57 @@
   if ($row['password'] == $conf['pass_convert']($_POST['password']))
   {
-    $session_length = $conf['session_length'];
+    $remember_me = false;
     if ($conf['authorize_remembering']
         and isset($_POST['remember_me'])
         and $_POST['remember_me'] == 1)
     {
-      $session_length = $conf['remember_me_length'];
+      $remember_me = true;
     }
-    session_set_cookie_params($session_length);
-    session_start();
-    $_SESSION['id'] = $row['id'];
+    log_user( $row['id'], $remember_me);
     redirect(empty($redirect_to) ? 'category.php' : $redirect_to);
   }

trunk/include/functions_user.inc.php

@@ -83 +83 @@
 ;';
     list($next_id) = mysql_fetch_array(pwg_query($query));
-    
+
     $insert =
       array(
@@ -94 +94 @@
     include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
     mass_inserts(USERS_TABLE, array_keys($insert), array($insert));
-    
+
     create_user_infos($next_id);
   }
@@ -118 +118 @@
 
   $userdata = array();
-  
+
   $query = '
 SELECT ';
@@ -139 +139 @@
   WHERE '.$conf['user_fields']['id'].' = \''.$user_id.'\'
 ;';
-  
+
   $row = mysql_fetch_array(pwg_query($query));
 
@@ -160 +160 @@
     }
   }
-  
+
   $row = array_merge($row, mysql_fetch_array($result));
-  
+
   foreach ($row as $key => $value)
   {
@@ -195 +195 @@
 ;';
       pwg_query($query);
-  
+
       $query = '
 INSERT INTO '.USER_CACHE_TABLE.'
@@ -308 +308 @@
     $private_array = array_unique($private_array);
   }
-  
+
   // retrieve category ids directly authorized to the user
   $query = '
@@ -341 +341 @@
   // true.
   array_push($forbidden_array, '-1');
-  
+
   return implode(',', $forbidden_array);
 }
@@ -354 +354 @@
 {
   global $conf;
-  
+
   $query = '
 SELECT '.$conf['user_fields']['username'].'
@@ -369 +369 @@
     return false;
   }
-  
+
   return $username;
 }
@@ -434 +434 @@
 {
   global $conf;
-  
+
   list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
 
@@ -480 +480 @@
     return false;
   }
-  
+
   return $groupname;
 }
@@ -497 +497 @@
 {
   global $user, $conf;
-  
+
   $directories =
     array(
@@ -508 +508 @@
   {
     $filepath = $directory.'/'.$filename;
-    
+
     if (file_exists($filepath))
     {
@@ -514 +514 @@
     }
   }
-  
+
   return false;
 }
+
+/*
+ * Performs all required actions for user login
+ * @param int user_id
+ * @param bool remember_me
+ * @return void
+*/
+function log_user($user_id, $remember_me)
+{
+  global $conf;
+  $session_length = $conf['session_length'];
+  if ($remember_me)
+  {
+    $session_length = $conf['remember_me_length'];
+  }
+  session_set_cookie_params($session_length);
+  session_start();
+  $_SESSION['id'] = $user_id;
+}
+
 ?>

trunk/register.php

@@ -37 +37 @@
     array_push($errors, $lang['reg_err_pass']);
   }
-  
+
   $errors =
     array_merge(
@@ -45 +45 @@
                     $_POST['mail_address'])
       );
-  
+
   if (count($errors) == 0)
   {
     $user_id = get_userid($_POST['login']);
-    $session_id = session_create($user_id, $conf['session_length']);
-    $url = 'category.php?id='.$session_id;
-    redirect($url);
+    log_user( $user_id, false);
+    redirect('category.php');
   }
 }
@@ -77 +76 @@
 
   'U_HOME' => PHPWG_ROOT_PATH.'category.php',
-  
+
   'F_ACTION' => 'register.php',
   'F_LOGIN' => $login,