[Phpfreechat-svn] SF.net SVN: phpfreechat: [585] trunk/src

[<ke...@us...>]

Revision: 585
Author:   kerphi
Date:     2006-06-15 05:10:24 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=585&view=rev

Log Message:
-----------
Refactoring: rename sessionid user parameter to a more explicit nickid

Modified Paths:
--------------
    trunk/src/commands/nick.class.php
    trunk/src/pfcglobalconfig.class.php
    trunk/src/pfcuserconfig.class.php
Modified: trunk/src/commands/nick.class.php
===================================================================
--- trunk/src/commands/nick.class.php	2006-06-15 11:56:43 UTC (rev 584)
+++ trunk/src/commands/nick.class.php	2006-06-15 12:10:24 UTC (rev 585)
@@ -51,7 +51,7 @@
       // current nickname (oldnick) is mine and
       // oldnick is different from new nick
       // -> this is a nickname change
-      if ($oldnickid == $u->sessionid &&
+      if ($oldnickid == $u->nickid &&
           $oldnick != $newnick && $oldnick != "")
       {
         // really change the nick (rename it)
@@ -75,14 +75,14 @@
       // new nickname is undefined (not used) and
       // current nickname (oldnick) is not mine or is undefined
       // -> this is a first connection
-      if ($oldnickid != $u->sessionid)
+      if ($oldnickid != $u->nickid)
       {
         // this is a first connection (create the nickname)
-        $container->createNick(NULL, $newnick, $u->sessionid);
+        $container->createNick(NULL, $newnick, $u->nickid);
         foreach($u->channels as $chan)
-          $container->createNick($chan["recipient"], $newnick, $u->sessionid);
+          $container->createNick($chan["recipient"], $newnick, $u->nickid);
         foreach($u->privmsg as $pv)
-          $container->createNick($pv["recipient"], $newnick, $u->sessionid);
+          $container->createNick($pv["recipient"], $newnick, $u->nickid);
         $u->nick   = $newnick;
         $u->active = true;
         $u->saveInCache();
@@ -108,7 +108,7 @@
       //$xml_reponse->addScript("$('".$c->prefix."words').focus();");
       
     }
-    else if ($newnickid == $u->sessionid)
+    else if ($newnickid == $u->nickid)
     {
       // user didn't change his nickname
       //$xml_reponse->addAssign($c->prefix."handle", "value", $newnick);

Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2006-06-15 11:56:43 UTC (rev 584)
+++ trunk/src/pfcglobalconfig.class.php	2006-06-15 12:10:24 UTC (rev 585)
@@ -90,18 +90,14 @@
   var $smileys             = array();
   var $errors              = array();
   var $prefix              = "pfc_";
-  //  var $active              = false; // used internaly
   var $is_init             = false; // used internaly to know if the chat config is initialized
   var $version             = ""; // the phpfreechat version: taken from the 'version' file content
-  //  var $sessionid           = 0; // the client sessionid, this is automatically set by phpfreechat instance
   var $debugurl            = "";
   var $debug               = false;
   var $debugxajax          = false;
   
   function pfcGlobalConfig( $params = array() )
   {
-    //    $params["sessionid"] = session_id();
-
     // setup the local for translated messages
     pfcI18N::Init(isset($params["language"]) ? $params["language"] : "");
 

Modified: trunk/src/pfcuserconfig.class.php
===================================================================
--- trunk/src/pfcuserconfig.class.php	2006-06-15 11:56:43 UTC (rev 584)
+++ trunk/src/pfcuserconfig.class.php	2006-06-15 12:10:24 UTC (rev 585)
@@ -10,7 +10,7 @@
   var $active;
   
   var $timeout;
-  var $sessionid;
+  var $nickid;
   
   //  var $is_init = false; // used internaly to know if the chat config is initialized
   //  var $errors = array();
@@ -25,7 +25,7 @@
     
     //    echo "pfcUserConfig()<br>";
 
-    $this->sessionid = session_id();
+    $this->nickid = session_id();
 
     // user parameters are cached in sessions
     $this->_getParam("nick");
@@ -43,10 +43,10 @@
     if (!isset($this->$p))
     {
       $c =& pfcGlobalConfig::Instance();
-      $sessionid       = "pfcuserconfig_".$c->getId();
-      $sessionid_param = $sessionid."_".$p;
-      if (isset($_SESSION[$sessionid_param]))
-        $this->$p = $_SESSION[$sessionid_param];
+      $nickid       = "pfcuserconfig_".$c->getId();
+      $nickid_param = $nickid."_".$p;
+      if (isset($_SESSION[$nickid_param]))
+        $this->$p = $_SESSION[$nickid_param];
     }
     return $this->$p;
   }
@@ -54,18 +54,18 @@
   function _setParam($p, $v)
   {
     $c =& pfcGlobalConfig::Instance();
-    $sessionid       = "pfcuserconfig_".$c->getId();
-    $sessionid_param = $sessionid."_".$p;
-    $_SESSION[$sessionid_param] = $v;
+    $nickid       = "pfcuserconfig_".$c->getId();
+    $nickid_param = $nickid."_".$p;
+    $_SESSION[$nickid_param] = $v;
     $this->$p = $v;
   }
 
   function _rmParam($p)
   {
     $c =& pfcGlobalConfig::Instance();
-    $sessionid       = "pfcuserconfig_".$c->getId();
-    $sessionid_param = $sessionid."_".$p;
-    unset($_SESSION[$sessionid_param]);
+    $nickid       = "pfcuserconfig_".$c->getId();
+    $nickid_param = $nickid."_".$p;
+    unset($_SESSION[$nickid_param]);
     unset($this->$p);
   }
   
@@ -182,11 +182,11 @@
       /*
 
       // save nickname and active status into sessions
-      $sessionid        = $c->prefix."pfcuserconfig_".$c->getId();
-      $sessionid_nick   = $sessionid."_nick";
-      $sessionid_active = $sessionid."_active";
-      $_SESSION[$sessionid_nick] = $this->nick;
-      $_SESSION[$sessionid_active] = $this->active;
+      $nickid        = $c->prefix."pfcuserconfig_".$c->getId();
+      $nickid_nick   = $nickid."_nick";
+      $nickid_active = $nickid."_active";
+      $_SESSION[$nickid_nick] = $this->nick;
+      $_SESSION[$nickid_active] = $this->active;
       */
       
       


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.