[phplib-dev] cvs commit

[max]

From: max
Date: Wed May 30 16:12:11 2001
Modified files:
      php-lib/php/session/session4.inc

Log message:
Some sanity checks in register(), is_registered() and unregister()

Index: php-lib/php/session/session4.inc
diff -u php-lib/php/session/session4.inc:1.10 php-lib/php/session/session4.inc:1.11
--- php-lib/php/session/session4.inc:1.10       Wed May 30 15:15:12 2001
+++ php-lib/php/session/session4.inc    Wed May 30 16:11:40 2001
@@ -6,8 +6,8 @@
 *
 * @copyright 1998,1999 NetUSE AG, Boris Erdmann, Kristian Koehntopp
 *            2000 Teodor Cimpoesu <[EMAIL PROTECTED]>
-* @author    Teodor Cimpoesu <[EMAIL PROTECTED]>, Ulf Wendel <[EMAIL PROTECTED]>
-* @version   $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $
+* @author    Teodor Cimpoesu <[EMAIL PROTECTED]>, Ulf Wendel <[EMAIL PROTECTED]>, Maxim 
+Derkachev <[EMAIL PROTECTED]
+* @version   $Id: session4.inc,v 1.11 2001/05/30 14:11:40 max Exp $
 * @access    public
 * @package   PHPLib
 */ 
@@ -17,7 +17,7 @@
   /**
   * Session name 
   * 
-  * @deprec $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $s
+  * @deprec $Id: session4.inc,v 1.11 2001/05/30 14:11:40 max Exp $s
   */
   var $classname = "Session";
 
@@ -95,7 +95,7 @@
   /**
   *
   * @var    string  
-  * @deprec $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $
+  * @deprec $Id: session4.inc,v 1.11 2001/05/30 14:11:40 max Exp $
   */
   var $fallback_mode;
   
@@ -207,7 +207,7 @@
   
   /**
   * @brother id()
-  * @deprec  $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $
+  * @deprec  $Id: session4.inc,v 1.11 2001/05/30 14:11:40 max Exp $
   * @access public  
   */  
   function get_id($sid = '') {
@@ -224,7 +224,15 @@
   * @access public  
   */
   function register ($var_names) {
-    return session_register(explode (',', $var_names));
+    if (!is_array($var_names)) {
+       
+      // spaces spoil everything
+      $var_names = trim($var_names);
+      return session_register( preg_split('/\s*,\s*/', $var_names) );
+    
+    }
+    
+    return session_register($var_names); 
   } // end func register
 
   /**
@@ -235,6 +243,7 @@
   * @access public   
   */
   function is_registered ($var_name) {
+    $var_name = trim($var_name);  // to be sure
     return session_is_registered($var_name);
   } // end func is_registered
        
@@ -251,7 +260,7 @@
     
     $ok = true;
     foreach (explode (',', $var_names) as $var_name) {
-      $ok = $ok && session_unregister ($var_name);
+      $ok = $ok && session_unregister ( trim($var_name) );
     }
     
     return $ok;
@@ -267,7 +276,7 @@
   *             doesn't seem to do (looking @ the session.c:940)
   * uw: yes we should keep it to remain the same interface, but deprec. 
   *
-  * @deprec $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $
+  * @deprec $Id: session4.inc,v 1.11 2001/05/30 14:11:40 max Exp $
   * @access public  
   * @global $HTTP_COOKIE_VARS
   */
@@ -309,7 +318,7 @@
   * @return string  rewritten url with session id included
   * @see    $trans_id_enabled
   * @global $HTTP_COOKIE_VARS
-  * @deprec $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $
+  * @deprec $Id: session4.inc,v 1.11 2001/05/30 14:11:40 max Exp $
   * @access public  
   */
   function url($url) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]