phpfreechat-svn — Only subversion commit notification will be sent to this list

[Phpfreechat-svn] SF.net SVN: phpfreechat: [592] trunk/testcase

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

Revision: 592
Author:   kerphi
Date:     2006-06-15 13:21:26 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=592&view=rev

Log Message:
-----------
Finish the optimization work on the default file container. All the concerned commands has been updated.

Modified Paths:
--------------
    trunk/src/commands/connect.class.php
    trunk/src/commands/getonlinenick.class.php
    trunk/src/commands/nick.class.php
    trunk/src/commands/send.class.php
    trunk/src/containers/file.class.php
    trunk/testcase/container_generic.php
Modified: trunk/src/commands/connect.class.php
===================================================================
--- trunk/src/commands/connect.class.php	2006-06-15 16:34:28 UTC (rev 591)
+++ trunk/src/commands/connect.class.php	2006-06-15 20:21:26 UTC (rev 592)
@@ -19,7 +19,7 @@
     {
       // check if the user is alone on the server, and give it the admin status if yes
       $users = $container->getOnlineNick(NULL);
-      if (count($users) == 0) $isadmin = true;
+      if (count($users["nickid"]) == 0) $isadmin = true;
     }
     
     // setup some user meta

Modified: trunk/src/commands/getonlinenick.class.php
===================================================================
--- trunk/src/commands/getonlinenick.class.php	2006-06-15 16:34:28 UTC (rev 591)
+++ trunk/src/commands/getonlinenick.class.php	2006-06-15 20:21:26 UTC (rev 592)
@@ -11,10 +11,10 @@
 
     // take care to disconnect timeouted users on this channel
     $disconnected_users = $container->removeObsoleteNick($recipient,$c->timeout);
-    foreach ($disconnected_users as $u)
+    foreach ($disconnected_users["nickid"] as $nid)
     {
       $cmd =& pfcCommand::Factory("notice");
-      $cmd->run($xml_reponse, $clientid, _pfc("%s quit (timeout)",$u["nick"]), $sender, $recipient, $recipientid, 2);
+      $cmd->run($xml_reponse, $clientid, _pfc("%s quit (timeout)",$container->getNickname($nid)), $sender, $recipient, $recipientid, 2);
     }
     
     // get the cached nickname list
@@ -23,26 +23,30 @@
 
     // get the real nickname list
     $users = $container->getOnlineNick($recipient);
-    sort($users);
-    // check if the nickname list must be updated
-    if ($oldnicklist != $users)
+    if ($oldnicklist != $users["nickid"]) // check if the nickname list must be updated on the client side
     {
+      $_SESSION[$nicklist_sid] = $users["nickid"];
+
+      // sort the nicknames
+      $nicklist = array();
+      foreach($users["nickid"] as $nid)
+        $nicklist[] = $container->getNickname($nid);
+      sort($nicklist);
+      
       if ($c->debug)
       {
-        $nicklist = array(); foreach($users as $u) $nicklist[] = $u["nick"]; $nicklist = implode(",",$nicklist);
+        $nicklist = implode(",",$nicklist);
         pxlog("/getonlinenick (nicklist updated - nicklist=".$nicklist.")", "chat", $c->getId());
       }
 
-      $_SESSION[$nicklist_sid] = $users;
-
+      // build and send the nickname list
       $js = "";
-      foreach ($users as $u)
+      foreach ($nicklist as $nick)
       {
-        $nickname = addslashes($u["nick"]); // must escape ' charactere for javascript string
+        $nickname = addslashes($nick); // must escape ' charactere for javascript string
         $js      .= "'".$nickname."',";
       }
-      $js    = substr($js, 0, strlen($js)-1); // remove last ','
-      
+      $js = substr($js, 0, strlen($js)-1); // remove last ','
       $xml_reponse->addScript("pfc.updateNickList('".$recipientid."',Array(".$js."));");
     }
   

Modified: trunk/src/commands/nick.class.php
===================================================================
--- trunk/src/commands/nick.class.php	2006-06-15 16:34:28 UTC (rev 591)
+++ trunk/src/commands/nick.class.php	2006-06-15 20:21:26 UTC (rev 592)
@@ -34,13 +34,13 @@
     // 'BoB' and 'bob' must be considered same nicknames
     $nick_in_use = false;
     $online_users = $container->getOnlineNick(NULL);
-    foreach($online_users as $ou)
+    foreach($online_users["nickid"] as $nid)
     {
-      if (preg_match("/^".preg_quote($ou["nick"])."$/i",$newnick))
+      if (preg_match("/^".preg_quote($container->getNickname($nid))."$/i",$newnick))
       {
         // the nick match
 	// just allow the owner to change his capitalised letters
-        if ($container->getNickId($ou["nick"]) != $oldnickid)
+        if ($nid != $oldnickid)
           $nick_in_use = true;
       }
     }
@@ -55,14 +55,11 @@
           $oldnick != $newnick && $oldnick != "")
       {
         // really change the nick (rename it)
-        $container->changeNick(NULL, $newnick, $oldnick);
-        foreach($u->channels as $chan)
-          $container->changeNick($chan["recipient"], $newnick, $oldnick);
-        foreach( $u->privmsg as $pv )
-          $container->changeNick($pv["recipient"], $newnick, $oldnick);
+        $container->changeNick($newnick, $oldnick);
         $u->nick = $newnick;
         $u->saveInCache();
 
+        // notify all the joined channels/privmsg
         $cmd =& pfcCommand::Factory("notice");
         foreach($u->channels as $id => $chan)
           $cmd->run($xml_reponse, $clientid, _pfc("%s changes his nickname to %s",$oldnick,$newnick), $sender, $chan["recipient"], $id, 1);

Modified: trunk/src/commands/send.class.php
===================================================================
--- trunk/src/commands/send.class.php	2006-06-15 16:34:28 UTC (rev 591)
+++ trunk/src/commands/send.class.php	2006-06-15 20:21:26 UTC (rev 592)
@@ -22,18 +22,15 @@
     $can_send = true;
     if (isset($u->privmsg[$recipientid]))
     {
-      $pvnick = $u->privmsg[$recipientid]["name"];
-      // now check if this user is currently online
       $container =& $c->getContainerInstance();
+      $pvnick   = $u->privmsg[$recipientid]["name"];
+      $pvnickid = $container->getNickId($pvnick);
+      
+      // now check if this user is currently online
       $onlineusers = $container->getOnlineNick(NULL);
-      $uid = 0; $isonline = false;
-      while($uid < count($onlineusers) && !$isonline)
+      if (!in_array($pvnickid, $onlineusers["nickid"]))
       {
-        if ($onlineusers[$uid]["nick"] == $pvnick) $isonline = true;
-        $uid++;
-      }
-      if (!$isonline)
-      {
+        // send an error because the user is not online
         $cmd =& pfcCommand::Factory("error");
         $cmd->run($xml_reponse, $clientid, _pfc("Can't send the message, %s is offline", $pvnick));
         $can_send = false;

Modified: trunk/src/containers/file.class.php
===================================================================
--- trunk/src/containers/file.class.php	2006-06-15 16:34:28 UTC (rev 591)
+++ trunk/src/containers/file.class.php	2006-06-15 20:21:26 UTC (rev 592)
@@ -29,8 +29,8 @@
  */
 class pfcContainer_File extends pfcContainer
 {
-  var $_users = array();
-  var $_cache_nickid = array();
+  var $_users = array("nickid"    => array(),
+                      "timestamp" => array());
 
   function pfcContainer_File(&$config)
   {
@@ -130,8 +130,8 @@
     $_chan = ($chan == NULL) ? "SERVER" : $chan;
     if ($id<0)
     {
-      $this->_users[$_chan][] = array("nickid"    => $nickid,
-                                      "timestamp" => filemtime($nickid_filename));
+      $this->_users[$_chan]["nickid"][]    = $nickid;
+      $this->_users[$_chan]["timestamp"][] = filemtime($nickid_filename);
     }
     
     return true;
@@ -184,7 +184,11 @@
     // remove the nickname from the cache list
     $id = $this->isNickOnline($chan, $nick);
     $_chan = ($chan == NULL) ? "SERVER" : $chan;
-    if ($id >= 0) unset($this->_users[$_chan][$id]);
+    if ($id >= 0)
+    {
+      unset($this->_users[$_chan]["nickid"][$id]);
+      unset($this->_users[$_chan]["timestamp"][$id]);
+    }
     
     return $ok;
   }
@@ -220,13 +224,13 @@
     $id = $this->isNickOnline($chan, $nick);
     if ($id < 0)
     {
-      $this->_users[$_chan][] = array("nickid"    => $nickid,
-                                      "timestamp" => filemtime($nickid_filename));
+      $this->_users[$_chan]["nickid"][]    = $nickid;
+      $this->_users[$_chan]["timestamp"][] = filemtime($nickid_filename);
     }
     else
     {
       // just update the timestamp if the nickname is allready present in the cached list
-      $this->_users[$_chan][$id]["timestamp"] = filemtime($nickid_filename);
+      $this->_users[$_chan]["timestamp"][$id] = filemtime($nickid_filename);
     }
     
     return $there;
@@ -309,7 +313,7 @@
    * Notice: this function must remove all nicknames which are not uptodate from the given channel or from the server
    * @param $chan if NULL then check obsolete nick on the server, otherwise just check obsolete nick on the given channel
    * @param $timeout
-   * @return array("nickid"=>???, "timestamp"=>???) contains all disconnected nickids and there timestamp
+   * @return array("nickid"=>array("nickid1", ...),"timestamp"=>array(timestamp1, ...)) contains all disconnected nickids and there timestamp
    */
   function removeObsoleteNick($chan, $timeout)
   {
@@ -322,7 +326,7 @@
     $errors = @test_writable_dir($nick_dir, $chan."/nicknames");
     
     $deleted_user = array();
-    $users = array();
+    $online_user  = array();
     $dir_handle = opendir($nick_dir);
     while (false !== ($file = readdir($dir_handle)))
     {
@@ -330,31 +334,31 @@
       $f_time = filemtime($nick_dir."/".$file);
       if (time() > ($f_time+$timeout/1000) ) // user will be disconnected after 'timeout' secondes of inactivity
       {
-        $deleted_user[] = array("nickid"    => $file,
-                                "timestamp" => $f_time);
+        $deleted_user["nickid"][]    = $file;
+        $deleted_user["timestamp"][] = $f_time;
         @unlink($nick_dir."/".$file); // disconnect expired user
       }
       else
       {
         // optimisation: cache user list for next getOnlineNick call
-        $users[] = array("nickid"    => $file,
-                         "timestamp" => $f_time);
+        $online_user["nickid"][]    = $file;
+        $online_user["timestamp"][] = $f_time;
       }
     }
 
     // remove the user metadata if he is disconnected from the server
-    if ($chan == NULL)
+    if ($chan == NULL && isset($deleted_user["nickid"]))
     {
-      foreach($deleted_user as $du)
+      foreach($deleted_user["nickid"] as $du_nid)
       {
-        $this->rmMeta("nickid", "fromnickname", $this->getNickname($du["nickid"]));
-        $this->rmMeta("nickname", "fromnickid", $du["nickid"]);
+        $this->rmMeta("nickid",   "fromnickname", $this->getNickname($du_nid));
+        $this->rmMeta("nickname", "fromnickid",   $du_nid);
       }
     }
     
     // cache the updated user list
     $_chan = ($chan == NULL) ? "SERVER" : $chan;
-    $this->_users[$_chan] =& $users;
+    $this->_users[$_chan] =& $online_user;
     
     return $deleted_user;
   }
@@ -362,7 +366,7 @@
   /**
    * Returns the nickname list on the given channel or on the whole server
    * @param $chan if NULL then returns all connected user, otherwise just returns the channel nicknames
-   * @return array(array("nickid"=>???,"timestamp"=>???) contains the nickid list with the associated timestamp (laste update time)
+   * @return array("nickid"=>array("nickid1", ...),"timestamp"=>array(timestamp1, ...)) contains the nickid list with the associated timestamp (laste update time)
    */
   function getOnlineNick($chan)
   {
@@ -378,17 +382,17 @@
       $c->container_cfg_server_dir."/nicknames";
     if (!is_dir($nick_dir)) mkdir_r($nick_dir);
     
-    $users = array();
+    $online_user = array();
     $dir_handle = opendir($nick_dir);
     while (false !== ($file = readdir($dir_handle)))
     {
       if ($file == "." || $file == "..") continue; // skip . and .. generic files
-      $users[] = array("nickid"    => $file,
-                       "timestamp" => filemtime($nick_dir."/".$file));
+      $online_user["nickid"][]    = $file;
+      $online_user["timestamp"][] = filemtime($nick_dir."/".$file);
     }
 
     // cache the user list
-    $this->_users[$_chan] =& $users;
+    $this->_users[$_chan] =& $online_user;
 
     return $this->_users[$_chan];
   }
@@ -412,16 +416,19 @@
 
     return file_exists($nick_dir."/".$nickid);
     */
+
+    $nickid = $this->getNickId($nick);
     
     // get the nickname list
     $_chan = ($chan == NULL) ? "SERVER" : $chan;
-    $online_users = isset($this->_users[$_chan]) ? $this->_users[$_chan] : $this->getOnlineNick($chan);
-
+    $online_user = isset($this->_users[$_chan]) ? $this->_users[$_chan] : $this->getOnlineNick($chan);
+    
     $uid = 0;
     $isonline = false;
-    while($uid < count($online_users) && !$isonline)
+    if (!isset($online_user["nickid"])) return -1;
+    while($uid < count($online_user["nickid"]) && !$isonline)
     {
-      if ($online_users[$uid]["nick"] == $nick)
+      if ($online_user["nickid"][$uid] == $nickid)
         $isonline = true;
       else
         $uid++;

Modified: trunk/testcase/container_generic.php
===================================================================
--- trunk/testcase/container_generic.php	2006-06-15 16:34:28 UTC (rev 591)
+++ trunk/testcase/container_generic.php	2006-06-15 20:21:26 UTC (rev 592)
@@ -112,7 +112,7 @@
     $this->ct->createNick($chan, $nick, $nickid);
     sleep(2);
     $ret = $this->ct->removeObsoleteNick($chan, 1000);
-    $this->assertEquals(count($ret), 1, "1 nickname should be obsolete");
+    $this->assertEquals(count($ret["nickid"]), 1, "1 nickname should be obsolete");
     $isonline = ($this->ct->isNickOnline($chan, $nick) >= 0);
     $this->assertFalse($isonline, "nickname shouldn't be online anymore");
     
@@ -121,7 +121,7 @@
     $this->ct->createNick($chan, $nick, $nickid);
     sleep(2);
     $ret = $this->ct->removeObsoleteNick($chan, 1000);
-    $this->assertEquals(count($ret), 1, "1 nickname should be obsolete");
+    $this->assertEquals(count($ret["nickid"]), 1, "1 nickname should be obsolete");
     $isonline = ($this->ct->isNickOnline($chan, $nick) >= 0);
     $this->assertFalse($isonline, "nickname shouldn't be online anymore");
   }


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [591] trunk/testcase

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

Revision: 591
Author:   kerphi
Date:     2006-06-15 09:34:28 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=591&view=rev

Log Message:
-----------
Work in progress (this version doesn't work with pfc commands): Optimizations work on file container, it also touches the generic interface.

Modified Paths:
--------------
    trunk/src/containers/file.class.php
    trunk/testcase/container_file.php
    trunk/testcase/container_generic.php
Modified: trunk/src/containers/file.class.php
===================================================================
--- trunk/src/containers/file.class.php	2006-06-15 14:50:17 UTC (rev 590)
+++ trunk/src/containers/file.class.php	2006-06-15 16:34:28 UTC (rev 591)
@@ -89,6 +89,10 @@
    */
   function createNick($chan, $nick, $nickid)
   {
+    // store nickid -> nickname and nickname -> nickid correspondance
+    $this->setMeta($nick, "nickname", "fromnickid", $nickid);
+    $this->setMeta($nickid, "nickid", "fromnickname", $nick);
+
     $c =& $this->c;
     $nick_dir = ($chan != NULL) ?
       $c->container_cfg_channel_dir."/".$this->_encode($chan)."/nicknames" :
@@ -99,10 +103,10 @@
     if ($c->debug)
     {
       if (count($errors)>0)
-        pxlog("createNick(".$nick.", ".$nickid.") - Error: ".var_export($errors), "chat", $c->getId());
+        pxlog("createNick(".$nick.", ".$nickid.") - Error: ".var_export($errors,true), "chat", $c->getId());
     }
     
-    $nick_filename = $nick_dir."/".$this->_encode($nick);
+    $nickid_filename = $nick_dir."/".$nickid; //$this->_encode($nick);
 
     // check the if the file exists only in debug mode!
     if ($c->debug)
@@ -112,19 +116,22 @@
     }
     
     // trust the caller : this nick is not used
-    $fp = fopen($nick_filename, "w");
+    touch($nickid_filename);
+    /*
+    $fp = fopen($nickid_filename, "w");
     flock ($fp, LOCK_EX); // lock
     fwrite($fp, $nickid);
     flock ($fp, LOCK_UN); // unlock
     fclose($fp);
-
+    */
+    
     // append the nickname to the cached nickname list
     $id = $this->isNickOnline($chan, $nick);
     $_chan = ($chan == NULL) ? "SERVER" : $chan;
     if ($id<0)
     {
-      $this->_users[$_chan][] = array("nick"      => $nick,
-                                      "timestamp" => filemtime($nick_filename));
+      $this->_users[$_chan][] = array("nickid"    => $nickid,
+                                      "timestamp" => filemtime($nickid_filename));
     }
     
     return true;
@@ -139,27 +146,38 @@
    */
   function removeNick($chan, $nick)
   {
+    // retrive the nickid to remove
+    $nickid = $this->getNickId($nick);
+    if ($nickid == "undefined") return false;
+
     $c =& $this->c;
     $nick_dir = ($chan != NULL) ?
       $c->container_cfg_channel_dir."/".$this->_encode($chan)."/nicknames" :
       $c->container_cfg_server_dir."/nicknames";
-    $nick_filename = $nick_dir."/".$this->_encode($nick);
+    $nickid_filename = $nick_dir."/".$nickid; //$this->_encode($nick);
 
     if ($c->debug)
     {
       // @todo: check if the removed nick is mine in debug mode!
       
       // check the nickname file really exists
-      if (!file_exists($nick_filename))
+      if (!file_exists($nickid_filename))
         pxlog("removeNick(".$nick.") - Error: the nickname data file to remove doesn't exists", "chat", $c->getId());
     }
 
-    $ok = @unlink($nick_filename);
+    $ok = @unlink($nickid_filename);
 
+    // remove the user metadata if he is disconnected from the server
+    if ($chan == NULL)
+    {
+      $this->rmMeta("nickid", "fromnickname", $nick);
+      $this->rmMeta("nickname", "fromnickid", $nickid);
+    }
+    
     if ($c->debug)
     {
       // check the nickname file is correctly deleted
-      if (file_exists($nick_filename))
+      if (file_exists($nickid_filename))
         pxlog("removeNick(".$nick.") - Error: the nickname data file yet exists", "chat", $c->getId());
     }
 
@@ -179,6 +197,10 @@
    */
   function updateNick($chan, $nick)
   {
+    // retrive the nickid to update
+    $nickid = $this->getNickId($nick);
+    if ($nickid == "undefined") return false;
+    
     $c =& $this->c;
     $there = false;
     
@@ -188,23 +210,23 @@
     if (!is_dir($nick_dir)) mkdir_r($nick_dir);
     
     // update my online status file
-    $nick_filename = $nick_dir."/".$this->_encode($nick);
-    if (file_exists($nick_filename)) $there = true;
-    @touch($nick_filename);
-    @chmod($nick_filename, 0700); 
+    $nickid_filename = $nick_dir."/".$nickid; //$this->_encode($nick);
+    if (file_exists($nickid_filename)) $there = true;
+    @touch($nickid_filename);
+    @chmod($nickid_filename, 0700); 
 
     // append the nickname to the cache list
     $_chan = ($chan == NULL) ? "SERVER" : $chan;
     $id = $this->isNickOnline($chan, $nick);
     if ($id < 0)
     {
-      $this->_users[$_chan][] = array("nick"      => $nick,
-                                      "timestamp" => filemtime($nick_filename));
+      $this->_users[$_chan][] = array("nickid"    => $nickid,
+                                      "timestamp" => filemtime($nickid_filename));
     }
     else
     {
       // just update the timestamp if the nickname is allready present in the cached list
-      $this->_users[$_chan][$id]["timestamp"] = filemtime($nick_filename);
+      $this->_users[$_chan][$id]["timestamp"] = filemtime($nickid_filename);
     }
     
     return $there;
@@ -212,25 +234,37 @@
 
   /**
    * Change the user' nickname
-   * Notice: this call must take care to update all channels the user joined
-   * @param $chan where to update the nick, if null then update the server nick
+   * Notice: the caller will just call this function one time, this function must take care to update if necessary all channels the user joined
    * @param $newnick
    * @param $oldnick
+   * @return true on success, false on failure
    */
-  function changeNick($chan, $newnick, $oldnick)
+  function changeNick($newnick, $oldnick)
   {
+    $oldnickid = $this->getNickId($oldnick);
+    $newnickid = $this->getNickId($newnick);
+    if ($oldnickid == "undefined") return false; // the oldnick must be connected
+    if ($newnickid != "undefined") return false; // the newnick must not be inuse
+
+    $this->rmMeta("nickid", "fromnickname", $oldnick); // remove the oldnickname -> oldnickid association
+    $this->setMeta($newnick, "nickname", "fromnickid", $oldnickid);
+    $this->setMeta($oldnickid, "nickid", "fromnickname", $newnick);
+
+    /*
     $c =& $this->c;
-
     $nick_dir = ($chan != NULL) ?
       $c->container_cfg_channel_dir."/".$this->_encode($chan)."/nicknames" :
       $c->container_cfg_server_dir."/nicknames";
-    $newnick_filename = $nick_dir."/".$this->_encode($newnick);
-    $oldnick_filename = $nick_dir."/".$this->_encode($oldnick);
-
+    //    $newnickid_filename = $nick_dir."/".$this->_encode($newnick);
+    $oldnickid_filename = $nick_dir."/".$oldnickid; //$this->_encode($oldnick);
+        
     $ok = @rename($oldnick_filename, $newnick_filename);
+    */
 
     // update the nick cache list
-    if($ok)
+    
+    //if($ok)
+    /*
     {
       $_chan = ($chan == NULL) ? "SERVER" : $chan;
       $id = $this->isNickOnline($chan, $oldnick);
@@ -240,49 +274,42 @@
         $this->_users[$_chan][$id]["timestamp"] = filemtime($newnick_filename);
       }
     }
-    
-    return $ok;
+    */
+
+    return true;
   }
 
   /**
-   * Returns the nickid, this is a unique id used to identify a user (taken from session)
-   * By default this nickid is just stored into the user' metadata, same as :->getNickMeta("nickid")
+   * Returns the nickid corresponding to the given nickname
+   * The nickid is a unique id used to identify a user (generated from the browser sessionid)
    * @param $nick
    * @return string the nick id
    */
-  function getNickId($nickname)
+  function getNickId($nick)
   {
-    if (!isset($this->_cache_nickid[$nickname]))
-    {
-      $c =& $this->c;
-      $nickid = "undefined";
-      
-      $nick_dir = $c->container_cfg_server_dir."/nicknames";
-      $nick_filename = $nick_dir."/".$this->_encode($nickname);
-      
-      if (file_exists($nick_filename))
-      {
-        $fsize = filesize($nick_filename);
-        if ($fsize>0)
-        {
-          // write the nickid into the new nickname file
-          $fp = fopen($nick_filename, "r");
-          $nickid = fread($fp, $fsize);
-          if ($nickid == "") $nickid = "undefined";
-          fclose($fp);
-        }
-      }
-      $this->_cache_nickid[$nickname] = $nickid;
-    }
-    return $this->_cache_nickid[$nickname];
+    $nickid = $this->getMeta("nickid", "fromnickname", $nick);
+    if ($nickid == NULL) $nickid = "undefined";
+    return $nickid;
   }
 
   /**
+   * Returns the nickname corresponding the the given nickid
+   * @param $nickid
+   * @return string the corresponding nickname
+   */
+  function getNickname($nickid)
+  {
+    $nick = $this->getMeta("nickname", "fromnickid", $nickid);
+    if ($nick == NULL) $nick = "";
+    return $nick;
+  }
+
+  /**
    * Remove (disconnect/quit) the timeouted nickname from the server or from a channel
    * Notice: this function must remove all nicknames which are not uptodate from the given channel or from the server
    * @param $chan if NULL then check obsolete nick on the server, otherwise just check obsolete nick on the given channel
    * @param $timeout
-   * @return array("nick"=>???, "timestamp"=>???) contains all disconnected nicknames and there timestamp
+   * @return array("nickid"=>???, "timestamp"=>???) contains all disconnected nickids and there timestamp
    */
   function removeObsoleteNick($chan, $timeout)
   {
@@ -303,18 +330,28 @@
       $f_time = filemtime($nick_dir."/".$file);
       if (time() > ($f_time+$timeout/1000) ) // user will be disconnected after 'timeout' secondes of inactivity
       {
-        $deleted_user[] = array("nick"      => $this->_decode($file),
+        $deleted_user[] = array("nickid"    => $file,
                                 "timestamp" => $f_time);
         @unlink($nick_dir."/".$file); // disconnect expired user
       }
       else
       {
         // optimisation: cache user list for next getOnlineNick call
-        $users[] = array("nick"      => $this->_decode($file),
+        $users[] = array("nickid"    => $file,
                          "timestamp" => $f_time);
       }
     }
 
+    // remove the user metadata if he is disconnected from the server
+    if ($chan == NULL)
+    {
+      foreach($deleted_user as $du)
+      {
+        $this->rmMeta("nickid", "fromnickname", $this->getNickname($du["nickid"]));
+        $this->rmMeta("nickname", "fromnickid", $du["nickid"]);
+      }
+    }
+    
     // cache the updated user list
     $_chan = ($chan == NULL) ? "SERVER" : $chan;
     $this->_users[$_chan] =& $users;
@@ -325,7 +362,7 @@
   /**
    * Returns the nickname list on the given channel or on the whole server
    * @param $chan if NULL then returns all connected user, otherwise just returns the channel nicknames
-   * @return array(array("nick"=>???,"timestamp"=>???) contains the nickname list with the associated timestamp (laste update time)
+   * @return array(array("nickid"=>???,"timestamp"=>???) contains the nickid list with the associated timestamp (laste update time)
    */
   function getOnlineNick($chan)
   {
@@ -346,7 +383,7 @@
     while (false !== ($file = readdir($dir_handle)))
     {
       if ($file == "." || $file == "..") continue; // skip . and .. generic files
-      $users[] = array("nick"      => $this->_decode($file),
+      $users[] = array("nickid"    => $file,
                        "timestamp" => filemtime($nick_dir."/".$file));
     }
 
@@ -363,6 +400,19 @@
    */
   function isNickOnline($chan, $nick)
   {
+    // @todo optimise with this piece of code
+    /*
+    $nickid = $this->getNickId($nick);
+    if ($nickid == "undefined") return false;
+
+    $nick_dir = ($chan != NULL) ?
+      $c->container_cfg_channel_dir."/".$this->_encode($chan)."/nicknames" :
+      $c->container_cfg_server_dir."/nicknames";
+    if (!is_dir($nick_dir)) mkdir_r($nick_dir);
+
+    return file_exists($nick_dir."/".$nickid);
+    */
+    
     // get the nickname list
     $_chan = ($chan == NULL) ? "SERVER" : $chan;
     $online_users = isset($this->_users[$_chan]) ? $this->_users[$_chan] : $this->getOnlineNick($chan);

Modified: trunk/testcase/container_file.php
===================================================================
--- trunk/testcase/container_file.php	2006-06-15 14:50:17 UTC (rev 590)
+++ trunk/testcase/container_file.php	2006-06-15 16:34:28 UTC (rev 591)
@@ -25,25 +25,7 @@
   function tearDown()
   {
     pfcContainerTestcase::tearDown();   
-  }
-  
-  // this is a specific test for the File container
-  function testCreateNick_File()
-  {
-    $c  =& $this->c;
-    $ct =& $this->ct;
-    $nick   = $this->nick;
-    $nickid = $this->nickid;
-    $chan   = $this->chan;
-
-    $ct->createNick($chan, $nick, $nickid);
-    
-    $nick_dir = ($chan != NULL) ? $c->container_cfg_channel_dir."/".$ct->_encode($chan)."/nicknames" : $c->container_cfg_server_dir."/nicknames";  
-    $nick_filename = $nick_dir."/".$ct->_encode($nick);
-
-    $this->assertTrue(file_exists($nick_filename), "nickname file doesn't exists");
-    $this->assertEquals(file_get_contents($nick_filename), $nickid, "nickname file doesn't contains correct nickid");
-  }
+  }  
 }
 
 // on desactive le timeout car se script peut mettre bcp de temps a s'executer

Modified: trunk/testcase/container_generic.php
===================================================================
--- trunk/testcase/container_generic.php	2006-06-15 14:50:17 UTC (rev 590)
+++ trunk/testcase/container_generic.php	2006-06-15 16:34:28 UTC (rev 591)
@@ -111,7 +111,7 @@
     // on the channel
     $this->ct->createNick($chan, $nick, $nickid);
     sleep(2);
-    $ret = $this->ct->removeObsoleteNick($chan, "1000");
+    $ret = $this->ct->removeObsoleteNick($chan, 1000);
     $this->assertEquals(count($ret), 1, "1 nickname should be obsolete");
     $isonline = ($this->ct->isNickOnline($chan, $nick) >= 0);
     $this->assertFalse($isonline, "nickname shouldn't be online anymore");
@@ -120,7 +120,7 @@
     $chan = NULL;
     $this->ct->createNick($chan, $nick, $nickid);
     sleep(2);
-    $ret = $this->ct->removeObsoleteNick($chan, "1000");
+    $ret = $this->ct->removeObsoleteNick($chan, 1000);
     $this->assertEquals(count($ret), 1, "1 nickname should be obsolete");
     $isonline = ($this->ct->isNickOnline($chan, $nick) >= 0);
     $this->assertFalse($isonline, "nickname shouldn't be online anymore");
@@ -171,7 +171,7 @@
     sleep(2);
     $ret = $this->ct->updateNick($chan, $nick);
     $this->assertTrue($ret, "nickname should be correctly updated");
-    $ret = $this->ct->removeObsoleteNick($chan, "1000");
+    $ret = $this->ct->removeObsoleteNick($chan, 1000);
     $this->assertFalse(in_array($nick, $ret), "nickname shouldn't be removed because it has been updated");
     $isonline = ($this->ct->isNickOnline($chan, $nick) >= 0);
     $this->assertTrue($isonline, "nickname should be online");
@@ -182,7 +182,7 @@
     sleep(2);
     $ret = $this->ct->updateNick($chan, $nick);
     $this->assertTrue($ret, "nickname should be correctly updated");
-    $ret = $this->ct->removeObsoleteNick($chan, "1000");
+    $ret = $this->ct->removeObsoleteNick($chan, 1000);
     $this->assertFalse(in_array($nick, $ret), "nickname shouldn't be removed because it has been updated");
     $isonline = ($this->ct->isNickOnline($chan, $nick) >= 0);
     $this->assertTrue($isonline, "nickname should be online");
@@ -197,24 +197,14 @@
     $nickid = $this->nickid;
     $chan   = $this->chan;
 
-    // create on the channel
+    // create a nick on a channel and change it
     $this->ct->createNick($chan, $nick1, $nickid);
-    $ret = $this->ct->changeNick($chan, $nick2, $nick1);
+    $ret = $this->ct->changeNick($nick2, $nick1);
     $this->assertTrue($ret, "nickname change function should returns true (success)");
     $isonline1 = ($this->ct->isNickOnline($chan, $nick1) >= 0);
     $isonline2 = ($this->ct->isNickOnline($chan, $nick2) >= 0);
     $this->assertFalse($isonline1, "nickname shouldn't be online");
     $this->assertTrue($isonline2, "nickname shouldn't be online");
-      
-    // create on the server
-    $chan = NULL;
-    $this->ct->createNick($chan, $nick1, $nickid);
-    $ret = $this->ct->changeNick($chan, $nick2, $nick1);
-    $this->assertTrue($ret, "nickname change function should returns true (success)");
-    $isonline1 = ($this->ct->isNickOnline($chan, $nick1) >= 0);
-    $isonline2 = ($this->ct->isNickOnline($chan, $nick2) >= 0);
-    $this->assertFalse($isonline1, "nickname shouldn't be online");
-    $this->assertTrue($isonline2, "nickname shouldn't be online");
   }
   
   function testwrite_Generic()


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [590] trunk/src/commands/connect.class.php

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

Revision: 590
Author:   kerphi
Date:     2006-06-15 07:50:17 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=590&view=rev

Log Message:
-----------
Now the first connected user gets automatically the server admin rights.

Modified Paths:
--------------
    trunk/src/commands/connect.class.php
Modified: trunk/src/commands/connect.class.php
===================================================================
--- trunk/src/commands/connect.class.php	2006-06-15 14:34:07 UTC (rev 589)
+++ trunk/src/commands/connect.class.php	2006-06-15 14:50:17 UTC (rev 590)
@@ -14,12 +14,20 @@
     $container =& $c->getContainerInstance();
     $disconnected_users = $container->removeObsoleteNick(NULL, $c->timeout);
 
+    $isadmin = $c->isadmin;
+    if (!$isadmin)
+    {
+      // check if the user is alone on the server, and give it the admin status if yes
+      $users = $container->getOnlineNick(NULL);
+      if (count($users) == 0) $isadmin = true;
+    }
+    
     // setup some user meta
     $nickid = $u->nickid;
     // store the user ip
     $container->setMeta($_SERVER["REMOTE_ADDR"], "ip", "nickname", $nickid);
     // store the admin flag
-    $container->setMeta($c->isadmin, "isadmin", "nickname", $nickid);
+    $container->setMeta($isadmin, "isadmin", "nickname", $nickid);
     // connect to the server
     $xml_reponse->addScript("pfc.handleResponse('connect', 'ok', '');");
         


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [589] trunk/themes/default/templates/style.css.tpl.php

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

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

Log Message:
-----------
Remove the crosshair cursor from the default theme. (thanks to mkoch for the suggestion)

Modified Paths:
--------------
    trunk/themes/default/templates/style.css.tpl.php
Modified: trunk/themes/default/templates/style.css.tpl.php
===================================================================
--- trunk/themes/default/templates/style.css.tpl.php	2006-06-15 13:18:55 UTC (rev 588)
+++ trunk/themes/default/templates/style.css.tpl.php	2006-06-15 14:34:07 UTC (rev 589)
@@ -241,7 +241,6 @@
 
 .<?php echo $prefix; ?>nickmarker {
   white-space: pre;
-  cursor: crosshair;
 }
 
 div#<?php echo $prefix; ?>smileys {


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

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

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

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

Log Message:
-----------
Remove the corresponding cache lock file when the cache is destroyed.

Modified Paths:
--------------
    trunk/src/pfcglobalconfig.class.php
    trunk/testcase/container_generic.php
Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2006-06-15 12:32:11 UTC (rev 587)
+++ trunk/src/pfcglobalconfig.class.php	2006-06-15 13:18:55 UTC (rev 588)
@@ -376,6 +376,10 @@
     if (!file_exists($cachefile))
       return false;
     $this->is_init = false;
+    // destroy the cache lock file
+    $cachefile_lock = $cachefile."_lock";
+    if (file_exists($cachefile_lock)) @unlink($cachefile_lock);
+    // destroy the cache file
     return @unlink($cachefile);
   }
   

Modified: trunk/testcase/container_generic.php
===================================================================
--- trunk/testcase/container_generic.php	2006-06-15 12:32:11 UTC (rev 587)
+++ trunk/testcase/container_generic.php	2006-06-15 13:18:55 UTC (rev 588)
@@ -41,9 +41,8 @@
   // here
   function tearDown()
   {
-    $ct =& $this->ct;
-    // remove the created files and directories
-    $this->ct->clear();    
+    $this->ct->clear();
+    $this->c->destroyCache();
   }
 
   function testCreateNick_Generic()


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

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

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

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

Log Message:
-----------
Simply and optimize the code (about nickid)

Modified Paths:
--------------
    trunk/src/commands/privmsg.class.php
    trunk/src/phpfreechat.class.php
    trunk/src/proxys/auth.class.php
    trunk/src/proxys/noflood.class.php
Modified: trunk/src/commands/privmsg.class.php
===================================================================
--- trunk/src/commands/privmsg.class.php	2006-06-15 12:23:54 UTC (rev 586)
+++ trunk/src/commands/privmsg.class.php	2006-06-15 12:32:11 UTC (rev 587)
@@ -14,7 +14,7 @@
     // check the pvname exists on the server
     $container =& $c->getContainerInstance();
     $pvnickid = $container->getNickId($pvname);
-    $nickid   = $container->getNickId($u->nick);
+    $nickid   = $u->nickid;
 
     // error: can't speak to myself
     if ($pvnickid == $nickid)

Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php	2006-06-15 12:23:54 UTC (rev 586)
+++ trunk/src/phpfreechat.class.php	2006-06-15 12:32:11 UTC (rev 587)
@@ -360,7 +360,7 @@
     // before playing the wanted command
     // play the found commands into the meta 'cmdtoplay'
     $container =& $c->getContainerInstance();
-    $nickid = $container->getNickId($u->nick);
+    $nickid = $u->nickid;
     $morecmd = true;
     while($morecmd)
     {

Modified: trunk/src/proxys/auth.class.php
===================================================================
--- trunk/src/proxys/auth.class.php	2006-06-15 12:23:54 UTC (rev 586)
+++ trunk/src/proxys/auth.class.php	2006-06-15 12:32:11 UTC (rev 587)
@@ -40,15 +40,15 @@
     if ( in_array($this->name, $admincmd) )
     {
       $container =& $c->getContainerInstance();
-      $nickid = $container->getNickId($sender);
+      $nickid = $u->nickid;
       $isadmin = $container->getMeta("isadmin", "nickname", $nickid);
       if (!$isadmin)
       {
         $xml_reponse->addScript("alert('".addslashes(_pfc("You are not allowed to run '%s' command", $this->name))."');");
         return;
       }
-    }
-
+    }    
+    
     // channels protection
     if ($this->name == "join")
     {
@@ -59,7 +59,7 @@
       $chanid      = pfcCommand_join::GetRecipientId($channame);
       $banlist     = $container->getMeta("banlist_nickid", "channel", $chanid);
       if ($banlist == NULL) $banlist = array(); else $banlist = unserialize($banlist);
-      $nickid = $container->getNickId($u->nick);
+      $nickid = $u->nickid;
       if (in_array($nickid,$banlist))
       {
         // the user is banished, show a message and don't forward the /join command

Modified: trunk/src/proxys/noflood.class.php
===================================================================
--- trunk/src/proxys/noflood.class.php	2006-06-15 12:23:54 UTC (rev 586)
+++ trunk/src/proxys/noflood.class.php	2006-06-15 12:32:11 UTC (rev 587)
@@ -39,7 +39,7 @@
     if ( in_array($this->name, $cmdtocheck) )
     {
       $container =& $c->getContainerInstance();
-      $nickid        = $container->getNickId($sender);
+      $nickid        = $u->nickid;
       $isadmin       = $container->getMeta("isadmin", "nickname", $nickid);
       $lastfloodtime = $container->getMeta("floodtime", "nickname", $nickid);
       $nbflood       = $container->getMeta("nbflood", "nickname", $nickid);


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [586] trunk/src/commands/connect.class.php

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

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

Log Message:
-----------
Simplify and optimize the code

Modified Paths:
--------------
    trunk/src/commands/connect.class.php
Modified: trunk/src/commands/connect.class.php
===================================================================
--- trunk/src/commands/connect.class.php	2006-06-15 12:10:24 UTC (rev 585)
+++ trunk/src/commands/connect.class.php	2006-06-15 12:23:54 UTC (rev 586)
@@ -14,9 +14,8 @@
     $container =& $c->getContainerInstance();
     $disconnected_users = $container->removeObsoleteNick(NULL, $c->timeout);
 
-
     // setup some user meta
-    $nickid = $container->getNickId($u->nick);
+    $nickid = $u->nickid;
     // store the user ip
     $container->setMeta($_SERVER["REMOTE_ADDR"], "ip", "nickname", $nickid);
     // store the admin flag


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

[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.

[Phpfreechat-svn] SF.net SVN: phpfreechat: [584] trunk/themes/default/templates/pfcclient.js.tpl.php

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

Revision: 584
Author:   kerphi
Date:     2006-06-15 04:56:43 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=584&view=rev

Log Message:
-----------
Bug fix: when reloading the page, the previously joined channels were not joined again as expected. (second try)

Modified Paths:
--------------
    trunk/themes/default/templates/pfcclient.js.tpl.php
Modified: trunk/themes/default/templates/pfcclient.js.tpl.php
===================================================================
--- trunk/themes/default/templates/pfcclient.js.tpl.php	2006-06-15 11:50:12 UTC (rev 583)
+++ trunk/themes/default/templates/pfcclient.js.tpl.php	2006-06-15 11:56:43 UTC (rev 584)
@@ -302,11 +302,13 @@
             echo "this.sendRequest('".$cmd."', '".addslashes($ch)."');\n";
           }
         // the last joined channel must be the last entry in the parameter list
-        for($i=0; $i<count($u->channels); $i++)
+        $i = 0;
+        foreach($u->channels as $ch)
         {
-          $ch = $u->channels[$i]["name"];
+          $ch = $ch["name"];
           $cmd = $i < count($u->channels)-1 ? "/join2" : "/join";
           echo "this.sendRequest('".$cmd."', '".addslashes($ch)."');\n";
+          $i++;
         }
         foreach($u->privmsg as $pv)
           echo "this.sendRequest('/privmsg', '".addslashes($pv["name"])."');\n";


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

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

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

Revision: 583
Author:   kerphi
Date:     2006-06-15 04:50:12 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=583&view=rev

Log Message:
-----------
Bug fix: the /rehash command was not correctly fixed because the themepath was altered into the pfcglobalconfig init step.

Modified Paths:
--------------
    trunk/src/commands/rehash.class.php
    trunk/src/pfcglobalconfig.class.php
Modified: trunk/src/commands/rehash.class.php
===================================================================
--- trunk/src/commands/rehash.class.php	2006-06-15 10:09:09 UTC (rev 582)
+++ trunk/src/commands/rehash.class.php	2006-06-15 11:50:12 UTC (rev 583)
@@ -14,7 +14,7 @@
   function run(&$xml_reponse, $clientid, $param, $sender, $recipient, $recipientid)
   {
     $c =& $this->c;
-    $destroyed = $c->destroy();
+    $destroyed = $c->destroyCache();    
     $synchro   = $c->synchronizeWithCache();
 
     if ($destroyed && $synchro)

Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2006-06-15 10:09:09 UTC (rev 582)
+++ trunk/src/pfcglobalconfig.class.php	2006-06-15 11:50:12 UTC (rev 583)
@@ -263,9 +263,6 @@
     // copy the themes into the public directory
     $this->errors = array_merge($this->errors, @install_dir($this->themepath_default, $this->data_public_path."/themes"));
     $this->errors = array_merge($this->errors, @install_dir($this->themepath,         $this->data_public_path."/themes"));
-    // now it's copied, so update the themepath parameters to the new location
-    $this->themepath_default = $this->data_public_path."/themes";
-    $this->themepath         = $this->data_public_path."/themes";
     // calculate the corresponding theme url
     if ($this->themeurl_default == "")
       $this->themeurl_default = relativePath($this->client_script_path, $this->data_public_path."/themes");
@@ -377,7 +374,7 @@
     return $this->data_private_path."/cache/pfcglobalconfig_".$this->getId();
   }
   
-  function destroy()
+  function destroyCache()
   {
     $cachefile = $this->_getCacheFile();
     if (!file_exists($cachefile))


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [582] trunk/themes/default/templates/pfcclient.js.tpl.php

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

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

Log Message:
-----------
Bug fix: when reloading the page, the previously joined channels were not joined again as expected.

Modified Paths:
--------------
    trunk/themes/default/templates/pfcclient.js.tpl.php
Modified: trunk/themes/default/templates/pfcclient.js.tpl.php
===================================================================
--- trunk/themes/default/templates/pfcclient.js.tpl.php	2006-06-15 09:45:32 UTC (rev 581)
+++ trunk/themes/default/templates/pfcclient.js.tpl.php	2006-06-15 10:09:09 UTC (rev 582)
@@ -304,7 +304,7 @@
         // the last joined channel must be the last entry in the parameter list
         for($i=0; $i<count($u->channels); $i++)
         {
-          $ch = $u->channels[$i];
+          $ch = $u->channels[$i]["name"];
           $cmd = $i < count($u->channels)-1 ? "/join2" : "/join";
           echo "this.sendRequest('".$cmd."', '".addslashes($ch)."');\n";
         }


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

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

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

Revision: 581
Author:   kerphi
Date:     2006-06-15 02:45:32 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=581&view=rev

Log Message:
-----------
Bug fix: add a lock process when running the /rehash command in order to avoid run simultaneously two global config init step.

Modified Paths:
--------------
    trunk/src/pfcglobalconfig.class.php
    trunk/src/pfctools.php
Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2006-06-14 16:48:57 UTC (rev 580)
+++ trunk/src/pfcglobalconfig.class.php	2006-06-15 09:45:32 UTC (rev 581)
@@ -372,9 +372,14 @@
     return $this->serverid;
   }  
 
+  function _getCacheFile()
+  {
+    return $this->data_private_path."/cache/pfcglobalconfig_".$this->getId();
+  }
+  
   function destroy()
   {
-    $cachefile = $this->data_private_path."/cache/pfcglobalconfig_".$this->getId();
+    $cachefile = $this->_getCacheFile();
     if (!file_exists($cachefile))
       return false;
     $this->is_init = false;
@@ -382,15 +387,19 @@
   }
   
   /**
-   * save the pfcConfig object into cache if it doesn't exists yet
+   * Save the pfcConfig object into cache if it doesn't exists yet
    * else restore the old pfcConfig object
    */
   function synchronizeWithCache()
   {
-    $cachefile = $this->data_private_path."/cache/pfcglobalconfig_".$this->getId();
-
+    $cachefile = $this->_getCacheFile();
+    $cachefile_lock = $cachefile."_lock";
+    
     if (file_exists($cachefile))
     {
+      // if a cache file exists, remove the lock file because config has been succesfully stored
+      if (file_exists($cachefile_lock)) @unlink($cachefile_lock);
+
       $pfc_configvar = unserialize(file_get_contents($cachefile));
       foreach($pfc_configvar as $key => $val)
 	$this->$key = $val;
@@ -398,6 +407,11 @@
     }
     else
     {
+      if (file_exists($cachefile_lock))
+        return false; // do nothing if the lock file exists
+      else
+        @touch($cachefile_lock); // create the lockfile
+      
       if (!$this->isInit())
         $this->init();
       $errors =& $this->getErrors();
@@ -413,7 +427,7 @@
   }
   function saveInCache()
   {
-    $cachefile = $this->data_private_path."/cache/pfcglobalconfig_".$this->getId();
+    $cachefile = $this->_getCacheFile();
     file_put_contents($cachefile, serialize(get_object_vars($this)));
     if ($this->debug) pxlog("pfcGlobalConfig::saveInCache()", "chatconfig", $this->getId());
   }

Modified: trunk/src/pfctools.php
===================================================================
--- trunk/src/pfctools.php	2006-06-14 16:48:57 UTC (rev 580)
+++ trunk/src/pfctools.php	2006-06-15 09:45:32 UTC (rev 581)
@@ -132,7 +132,6 @@
  * Copy a file, or recursively copy a folder and its contents
  *
  * @author      Aidan Lister <ai...@ph...>
- * @version     1.0.1
  * @link        http://aidanlister.com/repos/v/function.copyr.php
  * @param       string   $source    Source path
  * @param       string   $dest      Destination path
@@ -143,7 +142,7 @@
   // Simple copy for a file
   if (is_file($source)) {
     $ret = copy($source, $dest);
-    @chmod($dest, $mode);
+    chmod($dest, $mode);
     return $ret;
   }
 
@@ -163,8 +162,8 @@
   // Loop through the folder
   foreach ($entries as $e)
   {
-    // Skip pointers
-    if ($e == '.' || $e == '..') continue;
+    // Skip pointers and subversion directories
+    if ($e == '.' || $e == '..' || $e == '.svn') continue;
     // Deep copy directories
     if ($dest !== $source . DIRECTORY_SEPARATOR . $e)
       copyr($source . DIRECTORY_SEPARATOR . $e, $dest . DIRECTORY_SEPARATOR . $e, $mode);
@@ -283,7 +282,6 @@
  * @package     PHP_Compat
  * @link        http://php.net/function.file_put_contents
  * @author      Aidan Lister <ai...@ph...>
- * @version     $Revision: 1.25 $
  * @internal    resource_context is not supported
  * @since       PHP 5
  * @require     PHP 4.0.0 (user_error)


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [580] trunk/themes/default/templates/pfcclient.js.tpl.php

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

Revision: 580
Author:   kerphi
Date:     2006-06-14 09:48:57 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=580&view=rev

Log Message:
-----------
Bug fix: the /me and /notice display italic style was broken

Modified Paths:
--------------
    trunk/themes/default/templates/pfcclient.js.tpl.php
Modified: trunk/themes/default/templates/pfcclient.js.tpl.php
===================================================================
--- trunk/themes/default/templates/pfcclient.js.tpl.php	2006-06-14 16:38:26 UTC (rev 579)
+++ trunk/themes/default/templates/pfcclient.js.tpl.php	2006-06-14 16:48:57 UTC (rev 580)
@@ -672,7 +672,7 @@
       
       // format and post message
       var line = '';
-      line += '<div id="<?php echo $prefix; ?>msg'+ id +'" class="<?php echo $prefix; ?>'+ cmd +' <?php echo $prefix; ?>message';
+      line += '<div id="<?php echo $prefix; ?>msg'+ id +'" class="<?php echo $prefix; ?>cmd_'+ cmd +' <?php echo $prefix; ?>message';
       if (oldmsg == 1) line += ' <?php echo $prefix; ?>oldmsg';
       line += '">';
       line += '<span class="<?php echo $prefix; ?>date';


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [579] trunk/src/commands/me.class.php

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

Revision: 579
Author:   kerphi
Date:     2006-06-14 09:38:26 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=579&view=rev

Log Message:
-----------
Bug fix: the /me command was broken (thanks to Eury)

Modified Paths:
--------------
    trunk/src/commands/me.class.php
Modified: trunk/src/commands/me.class.php
===================================================================
--- trunk/src/commands/me.class.php	2006-06-14 16:27:46 UTC (rev 578)
+++ trunk/src/commands/me.class.php	2006-06-14 16:38:26 UTC (rev 579)
@@ -4,14 +4,15 @@
 
 class pfcCommand_me extends pfcCommand
 {
-  function run(&$xml_reponse, $clientid, $msg)
+  function run(&$xml_reponse, $clientid, $param, $sender, $recipient, $recipientid)
   {
     $c =& $this->c;
     $u =& $this->u;
 
     $container =& $c->getContainerInstance();
-    $msg = phpFreeChat::PreFilterMsg($msg);
-    $container->writeMsg("*me*", $u->nick." ".$msg);
+    $msg = phpFreeChat::PreFilterMsg($param);
+    $container->write($recipient, "*me*", $this->name, $u->nick." ".$msg);
+    
     if ($c->debug) pxlog("/me ".$msg, "chat", $c->getId());
   }
 }


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [578] trunk/themes/default/templates/pfcclient.js.tpl.php

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

Revision: 578
Author:   kerphi
Date:     2006-06-14 09:27:46 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=578&view=rev

Log Message:
-----------
Bug fix: channels were not joined in the correct order (last channel in the parameter array mus be the last joined channel and the active one)

Modified Paths:
--------------
    trunk/themes/default/templates/pfcclient.js.tpl.php
Modified: trunk/themes/default/templates/pfcclient.js.tpl.php
===================================================================
--- trunk/themes/default/templates/pfcclient.js.tpl.php	2006-06-14 15:40:38 UTC (rev 577)
+++ trunk/themes/default/templates/pfcclient.js.tpl.php	2006-06-14 16:27:46 UTC (rev 578)
@@ -157,18 +157,6 @@
         else
         {
           this.sendRequest('/nick', this.nickname);
-
-          // now join channels comming from sessions
-          // or the default one
-          <?php
-          if (count($u->channels) == 0)
-            foreach($c->channels as $ch)
-              echo "this.sendRequest('/join', '".addslashes($ch)."');\n";
-          foreach($u->channels as $ch)
-            echo "this.sendRequest('/join', '".addslashes($ch["name"])."');\n";
-          foreach($u->privmsg as $pv)
-            echo "this.sendRequest('/privmsg', '".addslashes($pv["name"])."');\n";
-          ?>
         }
         
         // give focus the the input text box if wanted
@@ -300,16 +288,26 @@
     }
     else if (cmd == "nick")
     {
-      if (resp == "connected")
+      if (resp == "connected" || resp == "notchanged")
       {
         // now join channels comming from sessions
         // or the default one
         <?php
         if (count($u->channels) == 0)
-          foreach($c->channels as $ch)
-            echo "this.sendRequest('/join', '".addslashes($ch)."');\n";
-        foreach($u->channels as $ch)
-          echo "this.sendRequest('/join', '".addslashes($ch["name"])."');\n";
+          // the last joined channel must be the last entry in the parameter list
+          for($i=0; $i<count($c->channels); $i++)
+          {
+            $ch = $c->channels[$i];
+            $cmd = $i < count($c->channels)-1 ? "/join2" : "/join";
+            echo "this.sendRequest('".$cmd."', '".addslashes($ch)."');\n";
+          }
+        // the last joined channel must be the last entry in the parameter list
+        for($i=0; $i<count($u->channels); $i++)
+        {
+          $ch = $u->channels[$i];
+          $cmd = $i < count($u->channels)-1 ? "/join2" : "/join";
+          echo "this.sendRequest('".$cmd."', '".addslashes($ch)."');\n";
+        }
         foreach($u->privmsg as $pv)
           echo "this.sendRequest('/privmsg', '".addslashes($pv["name"])."');\n";
         ?>


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [577] tags/1.0-beta/

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

Revision: 577
Author:   kerphi
Date:     2006-06-14 08:40:38 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=577&view=rev

Log Message:
-----------
1.0-beta release

Added Paths:
-----------
    tags/1.0-beta/
Copied: tags/1.0-beta (from rev 576, trunk)


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [576] trunk/i18n/zh_TW

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

Revision: 576
Author:   kerphi
Date:     2006-06-14 06:41:11 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=576&view=rev

Log Message:
-----------
add empty string to translate

Modified Paths:
--------------
    trunk/i18n/ar_LB/main.php
    trunk/i18n/ba_BA/main.php
    trunk/i18n/bg_BG/main.php
    trunk/i18n/de_DE-formal/main.php
    trunk/i18n/de_DE-informal/main.php
    trunk/i18n/el_GR/main.php
    trunk/i18n/es_ES/main.php
    trunk/i18n/id_ID/main.php
    trunk/i18n/it_IT/main.php
    trunk/i18n/ja_JP/main.php
    trunk/i18n/nb_NO/main.php
    trunk/i18n/nl_NL/main.php
    trunk/i18n/pt_BR/main.php
    trunk/i18n/pt_PT/main.php
    trunk/i18n/ru_RU/main.php
    trunk/i18n/sr_CS/main.php
    trunk/i18n/sv_SE/main.php
    trunk/i18n/tr_TR/main.php
    trunk/i18n/ua_UA/main.php
    trunk/i18n/zh_CN/main.php
    trunk/i18n/zh_TW/main.php
Modified: trunk/i18n/ar_LB/main.php
===================================================================
--- trunk/i18n/ar_LB/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/ar_LB/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -174,4 +174,70 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "";
 
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/ba_BA/main.php
===================================================================
--- trunk/i18n/ba_BA/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/ba_BA/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -176,4 +176,71 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "'%s' parametar nije dozvoljen. Dozvoljeni parametri su: '%s'";
 
-?>
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
+?>
\ No newline at end of file

Modified: trunk/i18n/bg_BG/main.php
===================================================================
--- trunk/i18n/bg_BG/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/bg_BG/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -172,4 +172,70 @@
 
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "'%s' параметър не е валиден. Възможните стойности са: '%s'";
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/de_DE-formal/main.php
===================================================================
--- trunk/i18n/de_DE-formal/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/de_DE-formal/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -177,4 +177,70 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "";
 
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/de_DE-informal/main.php
===================================================================
--- trunk/i18n/de_DE-informal/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/de_DE-informal/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -177,4 +177,70 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "";
 
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/el_GR/main.php
===================================================================
--- trunk/i18n/el_GR/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/el_GR/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -118,4 +118,125 @@
 
 // line 24 in chat.html.tpl.php
 $GLOBALS["i18n"]["Enter your nickname here"] = "Εισάγετε το ψευδώνυμο σας εδώ";
-?>
+
+// line 59 in pfcproxycommand.class.php
+$GLOBALS["i18n"]["%s must be implemented"] = "";
+
+// line 126 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["Error: undefined or obsolete parameter '%s', please correct or remove this parameter"] = "";
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 289 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter is mandatory by default use '%s' value"] = "";
+
+// line 309 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a positive number"] = "";
+
+// line 314 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "";
+
+// line 440 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["Error: '%s' could not be found, please check your themepath '%s' and your theme '%s' are correct"] = "";
+
+// line 48 in pfctemplate.class.php
+$GLOBALS["i18n"]["%s template could not be found"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 29 in chat.html.tpl.php
+$GLOBALS["i18n"]["Bold"] = "";
+
+// line 30 in chat.html.tpl.php
+$GLOBALS["i18n"]["Italics"] = "";
+
+// line 31 in chat.html.tpl.php
+$GLOBALS["i18n"]["Underline"] = "";
+
+// line 32 in chat.html.tpl.php
+$GLOBALS["i18n"]["Delete"] = "";
+
+// line 33 in chat.html.tpl.php
+$GLOBALS["i18n"]["Pre"] = "";
+
+// line 34 in chat.html.tpl.php
+$GLOBALS["i18n"]["Mail"] = "";
+
+// line 35 in chat.html.tpl.php
+$GLOBALS["i18n"]["Color"] = "";
+
+// line 104 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Hide smiley box"] = "";
+
+// line 105 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Show smiley box"] = "";
+
+// line 106 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Hide online users box"] = "";
+
+// line 107 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Show online users box"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
+?>
\ No newline at end of file

Modified: trunk/i18n/es_ES/main.php
===================================================================
--- trunk/i18n/es_ES/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/es_ES/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -172,4 +172,71 @@
 
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "El parametro '%s' no es válido. Los valores posibles son : '%s'";
-?>
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
+?>
\ No newline at end of file

Modified: trunk/i18n/id_ID/main.php
===================================================================
--- trunk/i18n/id_ID/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/id_ID/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -177,4 +177,70 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "";
 
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/it_IT/main.php
===================================================================
--- trunk/i18n/it_IT/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/it_IT/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -172,4 +172,71 @@
 
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "Il parametro '%s' non è valido. I valori disponibili sono : '%s'";
-?>
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
+?>
\ No newline at end of file

Modified: trunk/i18n/ja_JP/main.php
===================================================================
--- trunk/i18n/ja_JP/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/ja_JP/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -177,4 +177,70 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "";
 
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/nb_NO/main.php
===================================================================
--- trunk/i18n/nb_NO/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/nb_NO/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -173,4 +173,71 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "'%s' parameter er ikke gyldig. Gyldige verdier er : '%s'";
 
-?>
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
+?>
\ No newline at end of file

Modified: trunk/i18n/nl_NL/main.php
===================================================================
--- trunk/i18n/nl_NL/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/nl_NL/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -174,4 +174,71 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "'%s' parameter is niet geldig. Beschikbare waarden zijn: '%s'";
 
-?>
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
+?>
\ No newline at end of file

Modified: trunk/i18n/pt_BR/main.php
===================================================================
--- trunk/i18n/pt_BR/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/pt_BR/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -177,4 +177,70 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "";
 
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/pt_PT/main.php
===================================================================
--- trunk/i18n/pt_PT/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/pt_PT/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -175,4 +175,70 @@
 // line 86 in pfcclient.js.tpl.php
 $GLOBALS["i18n"]["Show online users box"] = "";
 
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/ru_RU/main.php
===================================================================
--- trunk/i18n/ru_RU/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/ru_RU/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -177,4 +177,70 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "";
 
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/sr_CS/main.php
===================================================================
--- trunk/i18n/sr_CS/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/sr_CS/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -177,4 +177,70 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "";
 
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/sv_SE/main.php
===================================================================
--- trunk/i18n/sv_SE/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/sv_SE/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -177,4 +177,70 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "";
 
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/tr_TR/main.php
===================================================================
--- trunk/i18n/tr_TR/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/tr_TR/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -172,4 +172,71 @@
 
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "'%s' parametresi geçerli değil. Geçerli değerler: '%s'";
-?>
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
+?>
\ No newline at end of file

Modified: trunk/i18n/ua_UA/main.php
===================================================================
--- trunk/i18n/ua_UA/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/ua_UA/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -173,4 +173,71 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "'%s' параметр є невірним. Доступні значення : '%s'";
 
-?>
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
+?>
\ No newline at end of file

Modified: trunk/i18n/zh_CN/main.php
===================================================================
--- trunk/i18n/zh_CN/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/zh_CN/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -178,4 +178,70 @@
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "";
 
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
 ?>
\ No newline at end of file

Modified: trunk/i18n/zh_TW/main.php
===================================================================
--- trunk/i18n/zh_TW/main.php	2006-06-14 13:32:17 UTC (rev 575)
+++ trunk/i18n/zh_TW/main.php	2006-06-14 13:41:11 UTC (rev 576)
@@ -173,4 +173,71 @@
 
 // line 386 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "參數 '%s' 不合法，適用的值有：'%s'";
-?>
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+
+?>
\ No newline at end of file


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [575] trunk/i18n/fr_FR

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

Revision: 575
Author:   kerphi
Date:     2006-06-14 06:32:17 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=575&view=rev

Log Message:
-----------
add a new string

Modified Paths:
--------------
    trunk/i18n/en_US/main.php
    trunk/i18n/fr_FR/main.php
Modified: trunk/i18n/en_US/main.php
===================================================================
--- trunk/i18n/en_US/main.php	2006-06-14 13:24:02 UTC (rev 574)
+++ trunk/i18n/en_US/main.php	2006-06-14 13:32:17 UTC (rev 575)
@@ -237,4 +237,7 @@
 // line 76 in auth.class.php
 $GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "Can't join %s because the channels list is restricted";
 
-?>
\ No newline at end of file
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "Please don't post so many message, flood is not tolerated";
+
+?>

Modified: trunk/i18n/fr_FR/main.php
===================================================================
--- trunk/i18n/fr_FR/main.php	2006-06-14 13:24:02 UTC (rev 574)
+++ trunk/i18n/fr_FR/main.php	2006-06-14 13:32:17 UTC (rev 575)
@@ -237,4 +237,7 @@
 // line 76 in auth.class.php
 $GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "Vous ne pouvez pas rejoindre %s car il n'est pas dans la liste des salons autorisés";
 
-?>
\ No newline at end of file
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "Svp, ne postez pas autant de messages à la suite, le flood n'est pas toléré";
+
+?>


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [571] trunk/themes/blune

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

Revision: 571
Author:   kerphi
Date:     2006-06-14 05:53:27 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=571&view=rev

Log Message:
-----------
replace <? wrong pi by <?php

Modified Paths:
--------------
    trunk/themes/blune/info.php
    trunk/themes/cerutti/info.php
    trunk/themes/default/info.php
Modified: trunk/themes/blune/info.php
===================================================================
--- trunk/themes/blune/info.php	2006-06-14 12:45:21 UTC (rev 570)
+++ trunk/themes/blune/info.php	2006-06-14 12:53:27 UTC (rev 571)
@@ -1,4 +1,4 @@
-<?
+<?php
 $author = "Nemako";
 $website = "http://www.nemako.net";
 $screenshot = "http://img111.imageshack.us/img111/1681/blune1xe.png";

Modified: trunk/themes/cerutti/info.php
===================================================================
--- trunk/themes/cerutti/info.php	2006-06-14 12:45:21 UTC (rev 570)
+++ trunk/themes/cerutti/info.php	2006-06-14 12:53:27 UTC (rev 571)
@@ -1,3 +1,3 @@
-<?
+<?php
 $author = "Victor Cerutti";
 ?>
\ No newline at end of file

Modified: trunk/themes/default/info.php
===================================================================
--- trunk/themes/default/info.php	2006-06-14 12:45:21 UTC (rev 570)
+++ trunk/themes/default/info.php	2006-06-14 12:53:27 UTC (rev 571)
@@ -1,4 +1,4 @@
-<?
+<?php
 $author = "kerphi";
 $website = "http://www.phpfreechat.net";
 ?>
\ No newline at end of file


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [572] trunk/themes/green/info.php

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

Revision: 572
Author:   kerphi
Date:     2006-06-14 05:55:32 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=572&view=rev

Log Message:
-----------
add a info.php file to the green theme

Added Paths:
-----------
    trunk/themes/green/info.php
Added: trunk/themes/green/info.php
===================================================================
--- trunk/themes/green/info.php	                        (rev 0)
+++ trunk/themes/green/info.php	2006-06-14 12:55:32 UTC (rev 572)
@@ -0,0 +1,4 @@
+<?php
+$author = "kerphi";
+$website = "http://www.phpfreechat.net";
+?>
\ No newline at end of file


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [573] trunk

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

Revision: 573
Author:   kerphi
Date:     2006-06-14 06:03:59 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=573&view=rev

Log Message:
-----------
fix some XHTML errors

Modified Paths:
--------------
    trunk/demo/index.php
    trunk/index.php
    trunk/themes/default/templates/chat.html.tpl.php
Modified: trunk/demo/index.php
===================================================================
--- trunk/demo/index.php	2006-06-14 12:55:32 UTC (rev 572)
+++ trunk/demo/index.php	2006-06-14 13:03:59 UTC (rev 573)
@@ -46,7 +46,7 @@
       </p>
       <div class="rating">
         <form action="http://www.hotscripts.com/rate/56184.html" method="get">
-          <input type="hidden" name="RID" value="N452772"/>
+          <p><input type="hidden" name="RID" value="N452772"/></p>
           <table>
             <tbody>
               <tr>

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2006-06-14 12:55:32 UTC (rev 572)
+++ trunk/index.php	2006-06-14 13:03:59 UTC (rev 573)
@@ -64,7 +64,7 @@
       
       <div class="rating">
         <form action="http://www.hotscripts.com/rate/56184.html" method="get">
-          <input type="hidden" name="RID" value="N452772"/>
+          <p><input type="hidden" name="RID" value="N452772" /></p>
           <table>
             <tbody>
               <tr>

Modified: trunk/themes/default/templates/chat.html.tpl.php
===================================================================
--- trunk/themes/default/templates/chat.html.tpl.php	2006-06-14 12:55:32 UTC (rev 572)
+++ trunk/themes/default/templates/chat.html.tpl.php	2006-06-14 13:03:59 UTC (rev 573)
@@ -5,7 +5,7 @@
   <div id="<?php echo $prefix; ?>content_expandable">                
 
   <div id="<?php echo $prefix; ?>channels">
-    <ul id="<?php echo $prefix; ?>channels_list"></ul>
+    <ul id="<?php echo $prefix; ?>channels_list"><li></li></ul>
     <div id="<?php echo $prefix; ?>channels_content"></div>
   </div>
 


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [574] trunk/src/proxys/noflood.class.php

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

Revision: 574
Author:   kerphi
Date:     2006-06-14 06:24:02 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=574&view=rev

Log Message:
-----------
Write a more explicite message when the flooder is warnned

Modified Paths:
--------------
    trunk/src/proxys/noflood.class.php
Modified: trunk/src/proxys/noflood.class.php
===================================================================
--- trunk/src/proxys/noflood.class.php	2006-06-14 13:03:59 UTC (rev 573)
+++ trunk/src/proxys/noflood.class.php	2006-06-14 13:24:02 UTC (rev 574)
@@ -53,8 +53,9 @@
       if ($nbflood>$c->proxys_cfg[$this->proxyname]["limit"])
       {
         // kick the flooder
-        $msg = _pfc("you are a flooder");
+        $msg = _pfc("Please don't post so many message, flood is not tolerated");
         $xml_reponse->addScript("alert('".addslashes($msg)."');");
+	// @todo kick the user
         return;
       }
 
@@ -68,4 +69,4 @@
   }
 }
 
-?>
\ No newline at end of file
+?>


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [570] trunk

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

Revision: 570
Author:   kerphi
Date:     2006-06-14 05:45:21 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=570&view=rev

Log Message:
-----------
Add the rating box to the demo index

Modified Paths:
--------------
    trunk/demo/index.php
    trunk/index.php
Modified: trunk/demo/index.php
===================================================================
--- trunk/demo/index.php	2006-06-14 12:35:26 UTC (rev 569)
+++ trunk/demo/index.php	2006-06-14 12:45:21 UTC (rev 570)
@@ -1,19 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
  <head>
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
   <title>phpFreeChat Demos</title>
-  <link rel="stylesheet" title="classic" type="text/css" href="../style/generic.css">
-  <link rel="stylesheet" title="classic" type="text/css" href="../style/header.css">
-  <link rel="stylesheet" title="classic" type="text/css" href="../style/footer.css">
-  <link rel="stylesheet" title="classic" type="text/css" href="../style/menu.css">
-  <link rel="stylesheet" title="classic" type="text/css" href="../style/content.css">   
+  <link rel="stylesheet" title="classic" type="text/css" href="../style/generic.css" />
+  <link rel="stylesheet" title="classic" type="text/css" href="../style/header.css" />
+  <link rel="stylesheet" title="classic" type="text/css" href="../style/footer.css" />
+  <link rel="stylesheet" title="classic" type="text/css" href="../style/menu.css" />
+  <link rel="stylesheet" title="classic" type="text/css" href="../style/content.css" />   
  </head>
  <body>
 
 <div class="header">
       <h1>phpFreeChat - Demos</h1>
-      <img alt="logo bulle" src="../style/bulle.png" class="logo2">
+      <img alt="logo bulle" src="../style/bulle.png" class="logo2" />
 </div>
 
 <div class="menu">
@@ -30,25 +30,58 @@
         <li>
           <ul class="sub">
             <li class="item">
-              <a href="#Miscellaneous">Miscellaneous</a>
+              <a href="#demo-misc">Miscellaneous</a>
             </li>
             <li class="item">
-              <a href="#Themes">Themes</a>
+              <a href="#demo-themes">Themes</a>
             </li>
             <li class="item">
-              <a href="#Translations">Translations</a>
+              <a href="#demo-translations">Translations</a>
             </li>
           </ul>
         </li>
       </ul>
       <p class="partner">
-        <a href="http://www.phpfreechat.net"><img alt="logo big" src="../style/logo_88x31.gif"></a>
+        <a href="http://www.phpfreechat.net"><img alt="logo big" src="../style/logo_88x31.gif" /></a>
       </p>
+      <div class="rating">
+        <form action="http://www.hotscripts.com/rate/56184.html" method="get">
+          <input type="hidden" name="RID" value="N452772"/>
+          <table>
+            <tbody>
+              <tr>
+                <td>
+                  <table>
+                    <tbody>
+                      <tr>
+                        <td>If you like our script, please rate it! <input type="hidden" name="external" value="1"/>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>
+                          <select name="rate" size="1">
+                            <option value="5" selected="selected">Excellent!</option>
+                            <option value="4">Very Good</option>
+                            <option value="3">Good</option>
+                            <option value="2">Fair</option>
+                            <option value="1">Poor</option>
+                          </select>
+                          <input type="submit" name="submit" value="Cast My Vote!"/>
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </form>
+      </div>
 </div>
 
 <div class="content">
 
-<h2>Miscellaneous</h2>
+<h2 id="demo-misc">Miscellaneous</h2>
 
 <ul>
       <li><a href="demo1_simple.php">demo1 - demo with default parameters</a></li>
@@ -73,7 +106,7 @@
 </ul>
 
 
-<h2>Themes</h2>
+<h2 id="demo-themes">Themes</h2>
 
 <ul>
       <li><a href="demo11_famfamfam_smiley_theme.php">demo11 - A chat with a customized smiley theme (famfamfam theme)</a></li>
@@ -85,7 +118,7 @@
       <li><a href="demo44_green_theme.php">demo44 - use a customized theme (green)</a></li>
 </ul>
 
-<h2>Translations</h2>
+<h2 id="demo-translations">Translations</h2>
     <ul>
       <li><a href="demo6_in_french.php">demo6 - french translation of the chat</a></li>
       <li><a href="demo7_in_english.php">demo7 - english translation of the chat</a></li>
@@ -123,6 +156,6 @@
           <img alt="Valid CSS!" src="../style/valid-css.png">
         </a>
       </div>
-      <p>\xA92006 phpFreeChat</p>
+      <p>@2006 phpFreeChat</p>
     </div>
-</body></html>
\ No newline at end of file
+</body></html>

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2006-06-14 12:35:26 UTC (rev 569)
+++ trunk/index.php	2006-06-14 12:45:21 UTC (rev 570)
@@ -61,6 +61,40 @@
       <p class="partner">
         <a href="http://www.phpfreechat.net"><img alt="logo big" src="style/logo_88x31.gif" /></a>
       </p>
+      
+      <div class="rating">
+        <form action="http://www.hotscripts.com/rate/56184.html" method="get">
+          <input type="hidden" name="RID" value="N452772"/>
+          <table>
+            <tbody>
+              <tr>
+                <td>
+                  <table>
+                    <tbody>
+                      <tr>
+                        <td>If you like our script, please rate it! <input type="hidden" name="external" value="1"/>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>
+                          <select name="rate" size="1">
+                            <option value="5" selected="selected">Excellent!</option>
+                            <option value="4">Very Good</option>
+                            <option value="3">Good</option>
+                            <option value="2">Fair</option>
+                            <option value="1">Poor</option>
+                          </select>
+                          <input type="submit" name="submit" value="Cast My Vote!"/>
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </form>
+      </div>
 </div>
 
 <div class="content">
@@ -78,6 +112,6 @@
           <img alt="Valid CSS!" src="style/valid-css.png" />
         </a>
       </div>
-      <p>\xA92006 phpFreeChat</p>
+      <p>@2006 phpFreeChat</p>
     </div>
 </body></html>


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [569] trunk

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

Revision: 569
Author:   kerphi
Date:     2006-06-14 05:35:26 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=569&view=rev

Log Message:
-----------
add the checkmd5 call into the index.php file

Modified Paths:
--------------
    trunk/index.php
    trunk/misc/checkmd5
Modified: trunk/index.php
===================================================================
--- trunk/index.php	2006-06-14 12:25:31 UTC (rev 568)
+++ trunk/index.php	2006-06-14 12:35:26 UTC (rev 569)
@@ -66,6 +66,7 @@
 <div class="content">
   <h2>See the quick demo</h2>
   <?php $chat->printChat(); ?>
+  <?php if (file_exists(dirname(__FILE__)."/checkmd5.php")) require_once dirname(__FILE__)."/checkmd5.php"; ?>
 </div>
 
 <div class="footer">
@@ -79,4 +80,4 @@
       </div>
       <p>\xA92006 phpFreeChat</p>
     </div>
-</body></html>
\ No newline at end of file
+</body></html>

Modified: trunk/misc/checkmd5
===================================================================
--- trunk/misc/checkmd5	2006-06-14 12:25:31 UTC (rev 568)
+++ trunk/misc/checkmd5	2006-06-14 12:35:26 UTC (rev 569)
@@ -27,7 +27,7 @@
 
 cd $PFC_PATH
 echo "<?php" > $TMP
-echo 'echo "<h1>Checking phpfreechat files validity</h1>";' >> $TMP
+echo 'echo "<h2>Checking phpfreechat files validity</h2>";' >> $TMP
 echo 'echo "<pre>\n";' >> $TMP
 for f in `find . -type f`
 do


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [568] trunk/misc

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

Revision: 568
Author:   kerphi
Date:     2006-06-14 05:25:31 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=568&view=rev

Log Message:
-----------
Add the ckeckmd5.php script to the tar/zip archive

Modified Paths:
--------------
    trunk/misc/checkmd5
    trunk/misc/tarSource
Modified: trunk/misc/checkmd5
===================================================================
--- trunk/misc/checkmd5	2006-06-13 20:15:32 UTC (rev 567)
+++ trunk/misc/checkmd5	2006-06-14 12:25:31 UTC (rev 568)
@@ -1,12 +1,46 @@
-cd ..
-echo "<?php"
-for f in `find . -name "*.php"`
+#!/bin/sh
+
+if [ $# -le 1 ]
+then
+  echo "Usage: `basename $0` phpfreechat_path checkmd5_output_filename"
+  echo "exempel: `basename $0` ~/pfc/misc/phpfreechat ~/pfc/misc/phpfreechat/checkmd5.php"
+  exit;
+fi
+
+PFC_PATH=$1
+DST=$2
+TMP=/tmp/checkmd5.php
+
+if ( test -f $DST )
+then
+  echo "$DST should not exist. Please delete this file."
+  exit;
+fi
+
+if ( test ! -f $PFC_PATH/version  )
+then
+  echo "$PFC_PATH/version doesn't exist."
+  exit;
+fi
+    
+echo "--> Creating $DST"
+
+cd $PFC_PATH
+echo "<?php" > $TMP
+echo 'echo "<h1>Checking phpfreechat files validity</h1>";' >> $TMP
+echo 'echo "<pre>\n";' >> $TMP
+for f in `find . -type f`
 do
   sum=`md5sum $f | sed "s/\s.*$//g"`
-  echo 'if (md5(file_get_contents("'$f'")) == "'$sum'")'
-  echo '  echo "ok - '$f'\n";'
-  echo 'else'
-  echo '  echo "corrupted - '$f' (please replace this file by a correct one)\n";'
+  echo 'if (md5(file_get_contents("'$f'")) == "'$sum'")' >> $TMP
+  echo '  echo "<span style=\"color:#3A3\">ok - '$f'</span>\n";' >> $TMP
+  echo 'else' >> $TMP
+  echo '  echo "<span style=\"color:#F33\">corrupted - '$f' (please replace this file by a correct one)</span>\n";' >> $TMP
 done
-echo "?>"
-cd -
+echo 'echo "</pre>\n";' >> $TMP
+echo "?>" >> $TMP
+cd - >/dev/null
+
+cp $TMP $DST
+
+echo "---> Done, $DST created"

Modified: trunk/misc/tarSource
===================================================================
--- trunk/misc/tarSource	2006-06-13 20:15:32 UTC (rev 567)
+++ trunk/misc/tarSource	2006-06-14 12:25:31 UTC (rev 568)
@@ -1,13 +1,17 @@
 #!/bin/sh
 
-echo "-- creating archive --"
+NAME=phpfreechat-`cat ../version`
+
+echo "-- creating archive $NAME --"
 echo "-> copying files"
-rm -rf phpfreechat-`cat ../version`
-svn export .. ./phpfreechat-`cat ../version`
+rm -rf ./$NAME
+svn export .. ./$NAME
+echo "-> creating checkmd5.php file"
+./checkmd5 ./$NAME ./$NAME/checkmd5.php
 echo "-> creating .tar.gz"
-tar czfp phpfreechat-`cat ../version`.tar.gz phpfreechat-`cat ../version`/ 
+tar czfp $NAME.tar.gz ./$NAME 
 echo "-> creating .zip"
-zip -Tq9r phpfreechat-`cat ../version`.zip phpfreechat-`cat ../version`/
+zip -Tq9r $NAME.zip ./$NAME
 echo "-> removing temporary files"
-rm -rf phpfreechat-`cat ../version`
-echo "-- creating archive, done --"
+rm -rf ./$NAME
+echo "-- creating archive $NAME, done --"


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