phpmp-commits

[Brian R. <hei...@us...>]

Update of /cvsroot/phpmp/phpMP/includes
In directory usw-pr-cvs1:/tmp/cvs-serv26391/includes

Modified Files:
	auth.php sessions.php 
Log Message:
Removed two error reports in the MySQL DBA that shouldn't have been there.
Subsequently, this fixed the problem with the new session routines.  Go figure.

Index: auth.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/auth.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** auth.php	27 Jul 2002 05:35:59 -0000	1.13
--- auth.php	27 Jul 2002 10:44:08 -0000	1.14
***************
*** 46,52 ****
      session_start();
      
!     if (empty($_REQUEST['PHPSESSID'])) { 
!      SetCookie("PHPSESSID", session_id(), (time() + (315360000)), "", "", 0); 
!     }
      
      global $MPCONF, $DBA, $HTTP_POST_VARS;
--- 46,52 ----
      session_start();
      
!     //if (empty($_REQUEST['PHPSESSID'])) { 
!      //SetCookie("PHPSESSID", session_id(), (time() + (315360000)), "", "", 0); 
!     //}
      
      global $MPCONF, $DBA, $HTTP_POST_VARS;
***************
*** 138,142 ****
      global $MPCONF, $DBA;
      
!     session_unregister('user_array');
      $DBA->query('DELETE FROM ' . $MPCONF['DB']['table_prefix'] . 'sessions WHERE sesskey = "' . session_id() . '"');
      
--- 138,142 ----
      global $MPCONF, $DBA;
      
!     unset($_SESSION['user_array']);
      $DBA->query('DELETE FROM ' . $MPCONF['DB']['table_prefix'] . 'sessions WHERE sesskey = "' . session_id() . '"');
      

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/sessions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** sessions.php	27 Jul 2002 05:35:59 -0000	1.1
--- sessions.php	27 Jul 2002 10:44:08 -0000	1.2
***************
*** 41,107 ****
      ini_set ( "session.save_handler", "user");
  
!     function mysql_session_open ($save_path, $session_name) { 
          return true; 
      } 
  
!     function mysql_session_close() { 
          return true; 
      } 
  
!     function mysql_session_read ($sesskey) { 
          global $MPCONF, $DBA;
  
!         $SessionID = addslashes($sesskey); 
! 
!         $session_data = $DBA->query("SELECT * FROM " . $MPCONF['DB']['table_prefix'] . "sessions WHERE sesskey = '$sesskey'") or die(db_error_message()); 
!         if ($DBA->num_rows($session_data) == 1) { 
!             return $DBA->result($session_data, 0); 
          } else { 
!             return false; 
          } 
      } 
  
!     function mysql_session_write ($sesskey, $val) { 
!         global $MPCONF, $DBA; 
! 
!         $sesskey = addslashes($sesskey); 
!         $val = addslashes($val); 
! 
!         $sess_exists = $DBA->result($DBA->query("SELECT COUNT(*) FROM " . $MPCONF['DB']['table_prefix'] . "sessions WHERE sesskey = '$sesskey'"), 0); 
! 
!         if ($sess_exists == 0) { 
!             $retval = $DBA->query("INSERT INTO " . $MPCONF['DB']['table_prefix'] . "sessions (sesskey, expiretime, data) VALUES ('$sesskey', '" . time() . "', '$val')"); 
!         } else { 
!             $retval = $DBA->query("UPDATE " . $MPCONF['DB']['table_prefix'] . "sessions SET data = '$val', expiretime = '" . time() . "' WHERE sesskey = '$sesskey'"); 
!             if ($DBA->affected_rows() < 0) { 
!                 error_log("unable to update session data for session $sesskey"); 
!             } 
!         } 
  
          return $retval; 
      } 
  
!     function mysql_session_destroy ($sesskey) { 
          global $MPCONF, $DBA; 
  
-         $sesskey = addslashes($sesskey); 
- 
          $retval = $DBA->query("DELETE FROM " . $MPCONF['DB']['table_prefix'] . "sessions WHERE sesskey = '$sesskey'"); 
          return $retval; 
      } 
  
!     function mysql_session_gc ($maxlifetime = 300) { 
!         global $MPCONF, $DBA; 
          $retval = mysql_query("DELETE FROM " . $MPCONF['DB']['table_prefix'] . "sessions WHERE expiretime < " . time()); 
!         return $retval; 
      } 
  
      session_set_save_handler ( 
!         'mysql_session_open', 
!         'mysql_session_close', 
!         'mysql_session_read', 
!         'mysql_session_write', 
!         'mysql_session_destroy', 
!         'mysql_session_gc' 
      );
      
--- 41,100 ----
      ini_set ( "session.save_handler", "user");
  
!     function sess_open ($save_path, $session_name) { 
          return true; 
      } 
  
!     function sess_close() { 
          return true; 
      } 
  
!     function sess_read ($sesskey) { 
          global $MPCONF, $DBA;
  
!         $session_data = $DBA->query("SELECT data FROM " . $MPCONF['DB']['table_prefix'] . "sessions WHERE sesskey = '$sesskey' and expiretime > " . time()) or die(db_error_message()); 
!         if (list($value) = $DBA->fetch_row($session_data)) {
! 		      return $value;
          } else { 
!           return ''; 
          } 
      } 
  
!     function sess_write ($sesskey, $val) { 
!         global $MPCONF, $DBA;
!         
!         $expiry = time() + $MPCONF['SES']['session_length'];
!         $value = addslashes($val);
! 
!         $retval = $DBA->query("INSERT INTO " . $MPCONF['DB']['table_prefix'] . "sessions (sesskey, expiretime, data) VALUES ('$sesskey', '" . $expiry . "', '$value')"); 
!         
!         if(!($retval)) {
!           $retval = $DBA->query("UPDATE " . $MPCONF['DB']['table_prefix'] . "sessions SET data = '$val', expiretime = '" . $expiry . "' WHERE sesskey = '$sesskey'"); 
!         }
  
          return $retval; 
      } 
  
!     function sess_destroy ($sesskey) { 
          global $MPCONF, $DBA; 
  
          $retval = $DBA->query("DELETE FROM " . $MPCONF['DB']['table_prefix'] . "sessions WHERE sesskey = '$sesskey'"); 
          return $retval; 
      } 
  
!     function sess_gc ($maxlifetime) { 
!         global $MPCONF, $DBA;
!         
          $retval = mysql_query("DELETE FROM " . $MPCONF['DB']['table_prefix'] . "sessions WHERE expiretime < " . time()); 
!         
!         return $DBA->affected_rows(); 
      } 
  
      session_set_save_handler ( 
!         'sess_open', 
!         'sess_close', 
!         'sess_read', 
!         'sess_write', 
!         'sess_destroy', 
!         'sess_gc' 
      );