[phplib-dev] cvs commit From: uw (phplib-dev <email protected>)
Date: 05/30/01

From: uw
Date: Wed May 30 15:15:43 2001
Modified files:
      php-lib/php/session/session4.inc
      php-lib/php/session/session4_custom.inc

Log message:
- continued the work on Maxim's user4
- tried to do some clean up

Index: php-lib/php/session/session4.inc
diff -u php-lib/php/session/session4.inc:1.9 php-lib/php/session/session4.inc:1.10
--- php-lib/php/session/session4.inc:1.9 Wed May 30 13:27:21 2001
+++ php-lib/php/session/session4.inc Wed May 30 15:15:12 2001
@@ -7,14 +7,22 @@
 *  <email protected> 1998,1999 NetUSE AG, Boris Erdmann, Kristian Koehntopp
 * 2000 Teodor Cimpoesu <teo <email protected>>
 *  <email protected> Teodor Cimpoesu <teo <email protected>>, Ulf Wendel <uw <email protected>>
-*  <email protected> $Id: session4.inc,v 1.9 2001/05/30 11:27:21 uw Exp $
+*  <email protected> $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $
 *  <email protected> public
 *  <email protected> PHPLib
 */
-class Session4 {
+class Session {
 
-
+
   /**
+ * Session name
+ *
+ *  <email protected> $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $s
+ */
+ var $classname = "Session";
+
+
+ /**
   * Name of the autoinit-File, if any.
   *
   *  <email protected> string
@@ -87,7 +95,7 @@
   /**
   *
   *  <email protected> string
- *  <email protected> $Id: session4.inc,v 1.9 2001/05/30 11:27:21 uw Exp $
+ *  <email protected> $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $
   */
   var $fallback_mode;
   
@@ -179,6 +187,9 @@
   */
   function id($sid = '') {
     
+ if (!$sid)
+ $sid = ("" == $this->cookiename) ? $this->classname : $this->cookiename;
+
     if ($sid = (string)$sid) {
     
       $this->id = $sid;
@@ -196,7 +207,7 @@
   
   /**
   *  <email protected> id()
- *  <email protected> $Id: session4.inc,v 1.9 2001/05/30 11:27:21 uw Exp $
+ *  <email protected> $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $
   *  <email protected> public
   */
   function get_id($sid = '') {
@@ -256,7 +267,7 @@
   * doesn't seem to do (looking @ the session.c:940)
   * uw: yes we should keep it to remain the same interface, but deprec.
   *
- *  <email protected> $Id: session4.inc,v 1.9 2001/05/30 11:27:21 uw Exp $
+ *  <email protected> $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $
   *  <email protected> public
   *  <email protected> $HTTP_COOKIE_VARS
   */
@@ -298,7 +309,7 @@
   *  <email protected> string rewritten url with session id included
   *  <email protected> $trans_id_enabled
   *  <email protected> $HTTP_COOKIE_VARS
- *  <email protected> $Id: session4.inc,v 1.9 2001/05/30 11:27:21 uw Exp $
+ *  <email protected> $Id: session4.inc,v 1.10 2001/05/30 13:15:12 uw Exp $
   *  <email protected> public
   */
   function url($url) {
Index: php-lib/php/session/session4_custom.inc
diff -u php-lib/php/session/session4_custom.inc:1.13 php-lib/php/session/session4_custom.inc:1.14
--- php-lib/php/session/session4_custom.inc:1.13 Wed May 30 13:27:22 2001
+++ php-lib/php/session/session4_custom.inc Wed May 30 15:15:12 2001
@@ -8,12 +8,12 @@
 * 2000 Teodor Cimpoesu <teo <email protected>>
 *  <email protected> Maxim Derkachev <kot <email protected>>, Teodor Cimpoesu <teo <email protected>>,
 * Ulf Wendel <uw <email protected>>
-*  <email protected> $Id: session4_custom.inc,v 1.13 2001/05/30 11:27:22 uw Exp $
+*  <email protected> $Id: session4_custom.inc,v 1.14 2001/05/30 13:15:12 uw Exp $
 *  <email protected> PHPLib
 *  <email protected> public
 */
 
-class Session4_Custom extends Session4 {
+class Session_Custom extends Session {
 
 
   /**
@@ -100,7 +100,7 @@
   /**
   * Delete callback
   */
- function del () {
+ function del() {
     
     if ($this->module == 'user') {
       $this->that->ac_delete($this->id, $this->name);

---------------------------------------------------------------------
To unsubscribe, e-mail: phplib-dev-unsubscribe <email protected>
For additional commands, e-mail: phplib-dev-help <email protected>