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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [1004] trunk/i18n/it_IT/main.php

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

Revision: 1004
          http://svn.sourceforge.net/phpfreechat/?rev=1004&view=rev
Author:   kerphi
Date:     2007-03-20 01:51:29 -0700 (Tue, 20 Mar 2007)

Log Message:
-----------
Italian translation update (thanks to Mqaximo)

Modified Paths:
--------------
    trunk/i18n/it_IT/main.php

Modified: trunk/i18n/it_IT/main.php
===================================================================
--- trunk/i18n/it_IT/main.php	2007-03-20 08:48:20 UTC (rev 1003)
+++ trunk/i18n/it_IT/main.php	2007-03-20 08:51:29 UTC (rev 1004)
@@ -24,6 +24,7 @@
  * Italian translation of the messages (utf8 encoded!)
  *
  * @author bellakioma
+ * @author Mqaximo
  */
 
 // line 45 in phpfreechatconfig.class.php
@@ -305,83 +306,82 @@
 // line 88 in chat.js.tpl.php
 $GLOBALS["i18n"]["Send"] = "Invia";
 
-
 // line 302 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["'%s' parameter must be a charatere string"] = "";
+$GLOBALS["i18n"]["'%s' parameter must be a charatere string"] = "Il parametro '%s' deve essere un carattere valido";
 
 // line 86 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: connect error"] = "";
+$GLOBALS["i18n"]["Mysql container: connect error"] = "Mysql container: errore di connessione";
 
 // line 101 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "";
+$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "Mysql container: errore nella creazione del database '%s'";
 
 // line 112 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "";
+$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "Mysql container: errore nella creazione della tabella '%s'";
 
 // line 80 in chat.js.tpl.php
-$GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "";
+$GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Non puoi parlare con te stesso!";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "";
+$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Il nickname scelto non è valido";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Enable sound notifications"] = "";
+$GLOBALS["i18n"]["Enable sound notifications"] = "Abilita la notifica sonora";
 
 // line 84 in chat.js.tpl.php
-$GLOBALS["i18n"]["Disable sound notifications"] = "";
+$GLOBALS["i18n"]["Disable sound notifications"] = "Disabilita la notifica sonora";
 
 // line 23 in kick.class.php
-$GLOBALS["i18n"]["no reason"] = "";
+$GLOBALS["i18n"]["no reason"] = "motivo non specificato";
 
 // line 24 in banlist.class.php
-$GLOBALS["i18n"]["The banished user list is:"] = "";
+$GLOBALS["i18n"]["The banished user list is:"] = "La lista degli utenti bannati è:";
 
 // line 39 in banlist.class.php
-$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "";
+$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "'/unban {nickname}' leverà il ban all'utente con nick: {nickname}";
 
 // line 43 in kick.class.php
-$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "";
+$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "Sei stato cacciato da %s da %s - perchè: %s";
 
 // line 20 in quit.class.php
-$GLOBALS["i18n"]["%s quit (%s)"] = "";
+$GLOBALS["i18n"]["%s quit (%s)"] = "%s esce (%s)";
 
 // line 124 in chat.js.tpl.php
-$GLOBALS["i18n"]["Chat loading ..."] = "";
+$GLOBALS["i18n"]["Chat loading ..."] = "Caricamento della chat in corso...";
 
 // line 124 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please wait"] = "";
+$GLOBALS["i18n"]["Please wait"] = "Attendere prego...";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "";
+$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "%s pare sia disabilitata o non supportata dal tuo browser.";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["This web application requires %s to work properly."] = "";
+$GLOBALS["i18n"]["This web application requires %s to work properly."] = "Questa applicazione richiede %s per poter funzionare.";
 
 // line 135 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "";
+$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "Gentilmente abilita %s nelle impostazioni del tuo browser oppure aggiornalo ad una versione più recente con il supporto di %s e prova di nuovo.";
 
 // line 137 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "";
+$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "Gentilmente provvedi ad un aggiornamento del browser che supporti %s e prova di nuovo.";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "";
+$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "Nelle versioni di Internet Explorer precedenti la versione 7.0, Ajax è implementato usando gli ActiveX. Per favore abilita ActiveX nelle impostazioni di sicurezza del tuo browser, oppure aggiorna il browser ad una versione che abbia il pieno supporto di Ajax e riprova.";
 
 // line 359 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "";
+$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "%s non esiste, data_public_path non può essere installata";
 
 // line 73 in invite.class.php
-$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "";
+$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "Devi entrare in %s per invitare utenti in questo canale";
 
 // line 47 in chat.html.tpl.php
-$GLOBALS["i18n"]["Ping"] = "";
+$GLOBALS["i18n"]["Ping"] = "Ping";
 
 // line 477 in phpfreechat.class.php
-$GLOBALS["i18n"]["Input Required"] = "";
+$GLOBALS["i18n"]["Input Required"] = "Input richiesto";
 
 // line 478 in phpfreechat.class.php
-$GLOBALS["i18n"]["OK"] = "";
+$GLOBALS["i18n"]["OK"] = "OK";
 
 // line 479 in phpfreechat.class.php
-$GLOBALS["i18n"]["Cancel"] = "";
+$GLOBALS["i18n"]["Cancel"] = "Annulla";
 
-?>
\ 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: [1003] trunk/src/commands/connect.class.php

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

Revision: 1003
          http://svn.sourceforge.net/phpfreechat/?rev=1003&view=rev
Author:   kerphi
Date:     2007-03-20 01:48:20 -0700 (Tue, 20 Mar 2007)

Log Message:
-----------
give the right ip when the chat is behind a reverse proxy

Modified Paths:
--------------
    trunk/src/commands/connect.class.php

Modified: trunk/src/commands/connect.class.php
===================================================================
--- trunk/src/commands/connect.class.php	2007-03-19 19:23:11 UTC (rev 1002)
+++ trunk/src/commands/connect.class.php	2007-03-20 08:48:20 UTC (rev 1003)
@@ -85,7 +85,7 @@
     //    $u->saveInCache();
                                         
     // store the user ip
-    $ip = $_SERVER["REMOTE_ADDR"];
+    $ip = isset($_SERVER["HTTP_X_FORWARDED_FOR"]) ? $_SERVER["HTTP_X_FORWARDED_FOR"] : $_SERVER["REMOTE_ADDR"];
     if ($ip == "::1") $ip = "127.0.0.1"; // fix for konqueror & localhost
     $ct->setUserMeta($nickid, 'ip', $ip);
     // 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: [1002] trunk

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

Revision: 1002
          http://svn.sourceforge.net/phpfreechat/?rev=1002&view=rev
Author:   kerphi
Date:     2007-03-19 12:23:11 -0700 (Mon, 19 Mar 2007)

Log Message:
-----------
[en] Tidy up the whois box elements [1h00]
[fr] R?\195?\169ordonne les elements de la boite d'info whois [1h00]

Modified Paths:
--------------
    trunk/data/public/js/pfcclient.js
    trunk/themes/default/images/close-whoisbox.gif
    trunk/themes/default/style.css.php

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-03-16 08:14:25 UTC (rev 1001)
+++ trunk/data/public/js/pfcclient.js	2007-03-19 19:23:11 UTC (rev 1002)
@@ -1049,72 +1049,43 @@
 
   updateNickWhoisBox: function(nickid)
   {
+    var usermeta = this.getAllUserMeta(nickid);
+
     var div  = document.createElement('div');
     div.setAttribute('class',     'pfc_nickwhois');
     div.setAttribute('className', 'pfc_nickwhois'); // for IE6
 
-    var ul = document.createElement('ul');
-    div.appendChild(ul);
+    var p = document.createElement('p');
+    p.setAttribute('class',     'pfc_nickwhois_header');
+    p.setAttribute('className', 'pfc_nickwhois_header'); // for IE6
+    div.appendChild(p);
 
     // add the close button
-    var li = document.createElement('li');
-    li.setAttribute('class',     'pfc_nickwhois_close');
-    li.setAttribute('className', 'pfc_nickwhois_close'); // for IE6
-    ul.appendChild(li);
-    var a = document.createElement('a');
-    a.setAttribute('href', '');
-    a.pfc_parent = div;
-    a.onclick = function(evt){
+    var img = document.createElement('img');
+    img.setAttribute('class',     'pfc_nickwhois_close');
+    img.setAttribute('className', 'pfc_nickwhois_close'); // for IE6
+    img.pfc_parent = div;
+    img.onclick = function(evt){
       this.pfc_parent.style.display = 'none';
       return false;
     }
-    var img = document.createElement('img');
     img.setAttribute('src', this.res.getFileUrl('images/close-whoisbox.gif'));
-    img.alt = document.createTextNode(this.res.getLabel('Close'));
-    a.appendChild(img);
-    li.appendChild(a);
+    img.alt = this.res.getLabel('Close');
+    p.appendChild(img);
+    p.appendChild(document.createTextNode(usermeta['nick'])); // append the nickname text in the title
 
-    // add the privmsg link (do not add it if this button is yourself)
-    if (pfc.getUserMeta(nickid,'nick') != this.nickname)
-    {
-      var li = document.createElement('li');
-      li.setAttribute('class',     'pfc_nickwhois_pv');
-      li.setAttribute('className', 'pfc_nickwhois_pv'); // for IE6
-      ul.appendChild(li);
-      var a = document.createElement('a');
-      a.setAttribute('href', '');
-      a.pfc_nickid = nickid;
-      a.pfc_parent = div;
-      a.onclick = function(evt){
-        var nick = pfc.getUserMeta(this.pfc_nickid,'nick');
-        pfc.sendRequest('/privmsg "'+nick+'"');
-        this.pfc_parent.style.display = 'none';
-        return false;
-      }
-      var img = document.createElement('img');
-      img.setAttribute('src', this.res.getFileUrl('images/openpv.gif'));
-      img.alt = document.createTextNode(this.res.getLabel('Private message'));
-      a.appendChild(img);
-      a.appendChild(document.createTextNode(this.res.getLabel('Private message')));
-      li.appendChild(a);
-    }
-
-
     // add the whois information table
     var table = document.createElement('table');
-//    table.setAttribute('cellspacing',0);
-//    table.setAttribute('cellpadding',0);
-//    table.setAttribute('border',0);
     var tbody = document.createElement('tbody');
     table.appendChild(tbody);
-    var um = this.getAllUserMeta(nickid);
-    var um_keys = um.keys();
+    var um_keys = usermeta.keys();
     var msg = '';
     for (var i=0; i<um_keys.length; i++)
     {
       var k = um_keys[i];
-      var v = um[k];
+      var v = usermeta[k];
       if (v && k != 'nickid'
+            && k != 'nick' // useless because it is displayed in the box title
             && k != 'isadmin' // useless because of the gold shield icon
             && k != 'floodtime'
             && k != 'flood_nbmsg'
@@ -1137,6 +1108,31 @@
     }
     div.appendChild(table);
 
+    // add the privmsg link (do not add it if this button is yourself)
+    if (pfc.getUserMeta(nickid,'nick') != this.nickname)
+    {
+      var p = document.createElement('p');
+      p.setAttribute('class',     'pfc_nickwhois_pv');
+      p.setAttribute('className', 'pfc_nickwhois_pv'); // for IE6
+      var a = document.createElement('a');
+      a.setAttribute('href', '');
+      a.pfc_nickid = nickid;
+      a.pfc_parent = div;
+      a.onclick = function(evt){
+        var nick = pfc.getUserMeta(this.pfc_nickid,'nick');
+        pfc.sendRequest('/privmsg "'+nick+'"');
+        this.pfc_parent.style.display = 'none';
+        return false;
+      }
+      var img = document.createElement('img');
+      img.setAttribute('src', this.res.getFileUrl('images/openpv.gif'));
+      img.alt = document.createTextNode(this.res.getLabel('Private message'));
+      a.appendChild(img);
+      a.appendChild(document.createTextNode(this.res.getLabel('Private message')));
+      p.appendChild(a);
+      div.appendChild(p);
+    }
+
     this.nickwhoisbox[nickid] = div;
   },
 
@@ -1158,8 +1154,8 @@
       d.style.display = 'block';
       d.style.zIndex = '400';
       d.style.position = 'absolute';
-      d.style.left = (mousePosX(evt)-5)+'px';
-      d.style.top  = (mousePosY(evt)-5)+'px';
+      d.style.left = (mousePosX(evt)-7)+'px';
+      d.style.top  = (mousePosY(evt)-7)+'px';
       return false;
     }
     li.appendChild(a);

Modified: trunk/themes/default/images/close-whoisbox.gif
===================================================================
(Binary files differ)

Modified: trunk/themes/default/style.css.php
===================================================================
--- trunk/themes/default/style.css.php	2007-03-16 08:14:25 UTC (rev 1001)
+++ trunk/themes/default/style.css.php	2007-03-19 19:23:11 UTC (rev 1002)
@@ -351,31 +351,35 @@
   vertical-align: middle;
 }
 
-div.pfc_nickwhois * { padding: 0; margin: 0; }
+div.pfc_nickwhois { padding: 0; margin: 0; }
 div.pfc_nickwhois a img { border: none; }
 div.pfc_nickwhois {
   border: 1px solid #444;
   background-color: #FFF;
   font-size: 75%;
 }
-div.pfc_nickwhois ul {
-  list-style-type: none;
+.pfc_nickwhois_header {
   background-color: #EEE;
   border-bottom: 1px solid #444;
+  text-align: center;
+  font-weight: bold;
+  vertical-align: middle;
 }
-div.pfc_nickwhois li {
-  display: inline;
-  margin-right: 4px;
-  padding: 2px;
+.pfc_nickwhois_header img {
+  float: left;
+  cursor: pointer;
+  vertical-align: middle;
+  margin: 3px 0 3px 2px;
 }
+div.pfc_nickwhois table {
+  width: 120px;
+}
 td.pfc_nickwhois_c1 {
   font-weight: bold;
 }
-li.pfc_nickwhois_pv {
-  padding-left: 2px;
-  border-left: 1px solid #444;
+td.pfc_nickwhois_c2 {
 }
-li.pfc_nickwhois_pv a {
+.pfc_nickwhois_pv a {
   text-decoration: none;
 }
 


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [1001] trunk/i18n/en_US/main.php

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

Revision: 1001
          http://svn.sourceforge.net/phpfreechat/?rev=1001&view=rev
Author:   kerphi
Date:     2007-03-16 01:14:25 -0700 (Fri, 16 Mar 2007)

Log Message:
-----------
misspelling (1681854 sf bug)

Modified Paths:
--------------
    trunk/i18n/en_US/main.php

Modified: trunk/i18n/en_US/main.php
===================================================================
--- trunk/i18n/en_US/main.php	2007-03-13 13:00:51 UTC (rev 1000)
+++ trunk/i18n/en_US/main.php	2007-03-16 08:14:25 UTC (rev 1001)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "A problem occurs during rehash";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Choosen nickname is allready used";
+$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Chosen nickname is already in use";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat current version is %s";
@@ -381,4 +381,4 @@
 // line 479 in phpfreechat.class.php
 $GLOBALS["i18n"]["Cancel"] = "Cancel";
 
-?>
\ 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: [1000] trunk/misc/checkmd5

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

Revision: 1000
          http://svn.sourceforge.net/phpfreechat/?rev=1000&view=rev
Author:   kerphi
Date:     2007-03-13 06:00:51 -0700 (Tue, 13 Mar 2007)

Log Message:
-----------
rename version to version.txt

Modified Paths:
--------------
    trunk/misc/checkmd5

Modified: trunk/misc/checkmd5
===================================================================
--- trunk/misc/checkmd5	2007-03-13 13:00:11 UTC (rev 999)
+++ trunk/misc/checkmd5	2007-03-13 13:00:51 UTC (rev 1000)
@@ -17,9 +17,9 @@
   exit;
 fi
 
-if ( test ! -f $PFC_PATH/version  )
+if ( test ! -f $PFC_PATH/version.txt  )
 then
-  echo "$PFC_PATH/version doesn't exist."
+  echo "$PFC_PATH/version.txt doesn't exist."
   exit;
 fi
     


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

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

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

Revision: 999
          http://svn.sourceforge.net/phpfreechat/?rev=999&view=rev
Author:   kerphi
Date:     2007-03-13 06:00:11 -0700 (Tue, 13 Mar 2007)

Log Message:
-----------
rename version to version.txt

Modified Paths:
--------------
    trunk/misc/tarSource

Modified: trunk/misc/tarSource
===================================================================
--- trunk/misc/tarSource	2007-03-13 12:58:51 UTC (rev 998)
+++ trunk/misc/tarSource	2007-03-13 13:00:11 UTC (rev 999)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-NAME=phpfreechat-`cat ../version`
-PFCSETUPNAME=pfcsetup-`cat ../version`
+NAME=phpfreechat-`cat ../version.txt`
+PFCSETUPNAME=pfcsetup-`cat ../version.txt`
 
 echo "-- creating archive $NAME --"
 echo "-> copying files"
@@ -34,7 +34,7 @@
 echo "-> creating $NAME.zip"
 zip -Tq9r $NAME.zip ./$NAME
 echo "-> creating $NAME-setup.php"
-php ./createwebinstaller.php `cat ../version` > /dev/null
+php ./createwebinstaller.php `cat ../version.txt` > /dev/null
 
 #echo "-> creating $PFCSETUPNAME.tar.gz"
 #rm -rf ./$PFCSETUPNAME


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [998] trunk/version.txt

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

Revision: 998
          http://svn.sourceforge.net/phpfreechat/?rev=998&view=rev
Author:   kerphi
Date:     2007-03-13 05:58:51 -0700 (Tue, 13 Mar 2007)

Log Message:
-----------
1.0-beta10-pre

Modified Paths:
--------------
    trunk/version.txt

Modified: trunk/version.txt
===================================================================
--- trunk/version.txt	2007-03-11 13:45:33 UTC (rev 997)
+++ trunk/version.txt	2007-03-13 12:58:51 UTC (rev 998)
@@ -1 +1 @@
-1.0-beta10
\ No newline at end of file
+1.0-beta10-pre


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [997] trunk/src/pfcglobalconfig.class.php

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

Revision: 997
          http://svn.sourceforge.net/phpfreechat/?rev=997&view=rev
Author:   kerphi
Date:     2007-03-11 06:45:33 -0700 (Sun, 11 Mar 2007)

Log Message:
-----------
fix a problem with dynamic parameters

Modified Paths:
--------------
    trunk/src/pfcglobalconfig.class.php

Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2007-03-11 12:41:53 UTC (rev 996)
+++ trunk/src/pfcglobalconfig.class.php	2007-03-11 13:45:33 UTC (rev 997)
@@ -549,18 +549,10 @@
 
       include $cachefile;
       foreach($pfc_conf as $key => $val)
-        $this->$key = $val;
-
-      /*
-      $pfc_configvar = unserialize(file_get_contents($cachefile));
-      foreach($pfc_configvar as $key => $val)
-      {
         // the dynamics parameters must not be cached
         if (!in_array($key,$this->_dyn_params))
           $this->$key = $val;
-      }
-      */
-      
+
       return true; // synchronized
     }
     else
@@ -668,4 +660,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: [996] trunk/i18n/uk_UA/main.php

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

Revision: 996
          http://svn.sourceforge.net/phpfreechat/?rev=996&view=rev
Author:   kerphi
Date:     2007-03-11 05:41:53 -0700 (Sun, 11 Mar 2007)

Log Message:
-----------
Ukrainian translation update (thanks to X-MAN)

Modified Paths:
--------------
    trunk/i18n/uk_UA/main.php

Modified: trunk/i18n/uk_UA/main.php
===================================================================
--- trunk/i18n/uk_UA/main.php	2007-03-11 12:37:38 UTC (rev 995)
+++ trunk/i18n/uk_UA/main.php	2007-03-11 12:41:53 UTC (rev 996)
@@ -1,6 +1,6 @@
 <?php
 /**
- * i18n/ua_UA/main.php
+ * i18n/uk_UA/main.php
  *
  * Copyright © 2006 Stephane Gully <ste...@gm...>
  *
@@ -23,7 +23,7 @@
 /**
  * Ukrainian translation of the messages (utf8 encoded!)
  *
- * @author Ivan Kravets aka X-MAN <Ad...@re...> (http://www.relax-info.com)
+ * @author Ivan Kravets aka X-MAN <ad...@re...> (http://www.relax-info.com)
  */
 
 // line 45 in phpfreechatconfig.class.php
@@ -93,7 +93,7 @@
 $GLOBALS["i18n"]["Hide nickname marker"] = "Сховати кольори ніків";
 
 // line 304 in javascript1.js.tpl.php
-$GLOBALS["i18n"]["Show nickname marker"] = "Показавть кольори ніків";
+$GLOBALS["i18n"]["Show nickname marker"] = "Показувати кольори ніків";
 
 // line 389 in javascript1.js.tpl.php
 $GLOBALS["i18n"]["Disconnect"] = "Відключитись";
@@ -175,210 +175,209 @@
 
 
 // line 186 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["My room"] = "";
+$GLOBALS["i18n"]["My room"] = "Моя кімната";
 
 // line 19 in unban.class.php
-$GLOBALS["i18n"]["Missing parameter"] = "";
+$GLOBALS["i18n"]["Missing parameter"] = "Невірний параметр";
 
 // line 38 in ban.class.php
-$GLOBALS["i18n"]["banished from %s by %s"] = "";
+$GLOBALS["i18n"]["banished from %s by %s"] = "Заблокований з %s до %s";
 
 // line 23 in banlist.class.php
-$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+$GLOBALS["i18n"]["The banished user's id list is:"] = "Список заблокованих користувачів";
 
 // line 32 in banlist.class.php
-$GLOBALS["i18n"]["Empty"] = "";
+$GLOBALS["i18n"]["Empty"] = "Пусто";
 
 // line 34 in banlist.class.php
-$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "'/unban {id}' розблокувати користувача по {id}";
 
 // line 35 in banlist.class.php
-$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "";
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "'/unban all'  розблокувати всіх користувачів в кімнаті";
 
 // line 24 in update.class.php
-$GLOBALS["i18n"]["%s quit (timeout)"] = "";
+$GLOBALS["i18n"]["%s quit (timeout)"] = "%s вийшов (timeout)";
 
 // line 46 in join.class.php
-$GLOBALS["i18n"]["%s joins %s"] = "";
+$GLOBALS["i18n"]["%s joins %s"] = "%s ввійшов в %s";
 
 // line 31 in kick.class.php
-$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+$GLOBALS["i18n"]["kicked from %s by %s"] = "видалений з %s до %s";
 
 // line 38 in send.class.php
-$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "";
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "Неможливо відправити повідомлення, %s в оффлайн";
 
 // line 27 in unban.class.php
-$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "Ніхто не був розблокований";
 
 // line 42 in unban.class.php
-$GLOBALS["i18n"]["%s has been unbanished"] = "";
+$GLOBALS["i18n"]["%s has been unbanished"] = "%s був розблокований";
 
 // line 49 in unban.class.php
-$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+$GLOBALS["i18n"]["%s users have been unbanished"] = "%s користувачі були розблоковані";
 
 // line 47 in auth.class.php
-$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "";
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "Вам не дозволено використовувати команди '%s'";
 
 // line 66 in auth.class.php
-$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "Неможливо ввійти %s тому що Ви заблоковані";
 
 // line 76 in auth.class.php
-$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "Неможу ввійти в кімнату %s, так як список кімнат обмежений";
 
 // line 89 in auth.class.php
-$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "";
+$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"] = "";
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "Будь ласка, не присилайте мені багато повідомлень, флуд не дозволяється";
 
 // line 109 in pfcclient.js.tpl.php
-$GLOBALS["i18n"]["Private message"] = "";
+$GLOBALS["i18n"]["Private message"] = "Особисте повідомлення";
 
 // line 110 in pfcclient.js.tpl.php
-$GLOBALS["i18n"]["Close this tab"] = "";
+$GLOBALS["i18n"]["Close this tab"] = "Закрити вкладку";
 
 // line 199 in pfcgui.js.tpl.php
-$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "";
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "Ви дійсно бажаєте покинути цю кімнату?";
 
 // line 169 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["Error: '%s' is a private parameter, you are not allowed to change it"] = "";
+$GLOBALS["i18n"]["Error: '%s' is a private parameter, you are not allowed to change it"] = "Помилка: '%s' це особистий параметрр, Вам заборонено його змінювати";
 
 // line 253 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["'%s' parameter must be an array"] = "";
+$GLOBALS["i18n"]["'%s' parameter must be an array"] = "'%s' параметр повинен бути масивом";
 
 // line 265 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["'%s' parameter must be a boolean"] = "";
+$GLOBALS["i18n"]["'%s' parameter must be a boolean"] = "'%s' параметр повинен бути булевим";
 
 // line 271 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["'%s' parameter must be a charatere string"] = "";
+$GLOBALS["i18n"]["'%s' parameter must be a charatere string"] = "'%s' параметр повинен бути символьною строкою";
 
 // line 395 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["'%s' must be writable"] = "";
+$GLOBALS["i18n"]["'%s' must be writable"] = "'%s' повинен бути перезаписуючий";
 
 // line 425 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["'%s' directory doesn't exist"] = "";
+$GLOBALS["i18n"]["'%s' directory doesn't exist"] = "'%s' директорія не існує";
 
 // line 544 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["Please correct these errors"] = "";
+$GLOBALS["i18n"]["Please correct these errors"] = "Будь ласка, виправте ці помилки";
 
 // line 21 in pfcinfo.class.php
-$GLOBALS["i18n"]["Error: the cached config file doesn't exists"] = "";
+$GLOBALS["i18n"]["Error: the cached config file doesn't exists"] = "Помилка: закешований файл конфігурації не існує";
 
 // line 190 in phpfreechat.class.php
-$GLOBALS["i18n"]["Error: the chat cannot be loaded! two possibilities: your browser doesn't support javascript or you didn't setup correctly the server directories rights - don't hesitate to ask some help on the forum"] = "";
+$GLOBALS["i18n"]["Error: the chat cannot be loaded! two possibilities: your browser doesn't support javascript or you didn't setup correctly the server directories rights - don't hesitate to ask some help on the forum"] = "Помилка: неможливо загрузити чат! Можливі дві причини: Ваш браузер не підтримує JavaScript або Ви не налаштували правильно права доступу до директорій сервера - не хвилюйтесь і запитайте допомоги на форумі";
 
 // line 31 in help.class.php
-$GLOBALS["i18n"]["Here is the command list:"] = "";
+$GLOBALS["i18n"]["Here is the command list:"] = "Тут наведений список команд";
 
 // line 63 in identify.class.php
-$GLOBALS["i18n"]["Succesfully identified"] = "";
+$GLOBALS["i18n"]["Succesfully identified"] = "Ідентифікація відбулась успішно";
 
 // line 68 in identify.class.php
-$GLOBALS["i18n"]["Identification failure"] = "";
+$GLOBALS["i18n"]["Identification failure"] = "Вас неможливо ідентифікувати";
 
 // line 25 in send.class.php
-$GLOBALS["i18n"]["Your must be connected to send a message"] = "";
+$GLOBALS["i18n"]["Your must be connected to send a message"] = "Ви повинні бути підключені для відправки повідомлення";
 
 // line 87 in chat.js.tpl.php
-$GLOBALS["i18n"]["Click here to send your message"] = "";
+$GLOBALS["i18n"]["Click here to send your message"] = "Натисність тут для відправки повідомлення";
 
 // line 80 in chat.js.tpl.php
-$GLOBALS["i18n"]["Enter the text to format"] = "";
+$GLOBALS["i18n"]["Enter the text to format"] = "Введіть текст для форматування";
 
 // line 81 in chat.js.tpl.php
-$GLOBALS["i18n"]["Configuration has been rehashed"] = "";
+$GLOBALS["i18n"]["Configuration has been rehashed"] = "Конфігурація була перехешована";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["A problem occurs during rehash"] = "";
+$GLOBALS["i18n"]["A problem occurs during rehash"] = "Виникла помилка при перехешуванні";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "";
+$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Вибраний нік уже використовується";
 
 // line 84 in chat.js.tpl.php
-$GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
+$GLOBALS["i18n"]["phpfreechat current version is %s"] = "Поточна версія phpfreechat - %s";
 
 // line 85 in chat.js.tpl.php
-$GLOBALS["i18n"]["Maximum number of joined channels has been reached"] = "";
+$GLOBALS["i18n"]["Maximum number of joined channels has been reached"] = "Було досягнуто максимальну кількість підключених кімнат";
 
 // line 86 in chat.js.tpl.php
-$GLOBALS["i18n"]["Maximum number of private chat has been reached"] = "";
+$GLOBALS["i18n"]["Maximum number of private chat has been reached"] = "Було досягнуто максимальну кількість можливих особистих повідомлень чата";
 
 // line 88 in chat.js.tpl.php
-$GLOBALS["i18n"]["Send"] = "";
+$GLOBALS["i18n"]["Send"] = "Відправити";
 
 // line 86 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: connect error"] = "";
+$GLOBALS["i18n"]["Mysql container: connect error"] = "Mysql контейнер: помилка з'єднання";
 
 // line 101 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "";
+$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "Mysql контейнер: помилка при створенні бази даних '%s'";
 
 // line 112 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "";
+$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "Mysql контейнер: помилка при створенні таблиці '%s'";
 
 // line 80 in chat.js.tpl.php
-$GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "";
+$GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Ви не можете спілкуватися з самим собою";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "";
+$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Вибраний нік заборонений";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Enable sound notifications"] = "";
+$GLOBALS["i18n"]["Enable sound notifications"] = "Включити звукові повідомлення";
 
 // line 84 in chat.js.tpl.php
-$GLOBALS["i18n"]["Disable sound notifications"] = "";
+$GLOBALS["i18n"]["Disable sound notifications"] = "Виключити звукові повідомлення";
 
 // line 23 in kick.class.php
-$GLOBALS["i18n"]["no reason"] = "";
+$GLOBALS["i18n"]["no reason"] = "без причин";
 
 // line 24 in banlist.class.php
-$GLOBALS["i18n"]["The banished user list is:"] = "";
+$GLOBALS["i18n"]["The banished user list is:"] = "Заблоковані користувачі:";
 
 // line 39 in banlist.class.php
-$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "";
+$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "'/unban {nickname}' розблокує користувача {nickname}";
 
 // line 43 in kick.class.php
-$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "";
+$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "видалений із %s адміном %s - причина: %s";
 
 // line 20 in quit.class.php
-$GLOBALS["i18n"]["%s quit (%s)"] = "";
+$GLOBALS["i18n"]["%s quit (%s)"] = "%s вийшов (%s)";
 
 // line 124 in chat.js.tpl.php
-$GLOBALS["i18n"]["Chat loading ..."] = "";
+$GLOBALS["i18n"]["Chat loading ..."] = "Чат завантажується...";
 
 // line 124 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please wait"] = "";
+$GLOBALS["i18n"]["Please wait"] = "Будь ласка, почекайте";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "";
+$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "%s відключено або не підтримується Вашим браузером.";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["This web application requires %s to work properly."] = "";
+$GLOBALS["i18n"]["This web application requires %s to work properly."] = "Для коректної работи необхідно %s";
 
 // line 135 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "";
+$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "Будь ласка, включіть %s в настройках браузера, або замініть браузер на такий, що підтримує %s.";
 
 // line 137 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "";
+$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "Будь ласка, замініть браузер на такий, що підтримує %s.";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "";
+$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "В Internet Explorer до версіїї 7.0, AJAX реалізовано через ActiveX. Будь ласка, включіть ActiveX в настройках браузера, або замініть браузер на такий, що підтримує AJAX.";
 
 // line 359 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "";
+$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "%s не існує, data_public_path не може бути встановлений";
 
 // line 73 in invite.class.php
-$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "";
+$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "Ви повинні ввійти в канал %s для того щоб запросити інших користувачів сюди";
 
 // line 47 in chat.html.tpl.php
-$GLOBALS["i18n"]["Ping"] = "";
+$GLOBALS["i18n"]["Ping"] = "Пінг";
 
 // line 477 in phpfreechat.class.php
-$GLOBALS["i18n"]["Input Required"] = "";
+$GLOBALS["i18n"]["Input Required"] = "Введення даних";
 
 // line 478 in phpfreechat.class.php
-$GLOBALS["i18n"]["OK"] = "";
+$GLOBALS["i18n"]["OK"] = "OK";
 
 // line 479 in phpfreechat.class.php
-$GLOBALS["i18n"]["Cancel"] = "";
-
-?>
\ No newline at end of file
+$GLOBALS["i18n"]["Cancel"] = "Відміна";
+?>


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

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

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

Revision: 995
          http://svn.sourceforge.net/phpfreechat/?rev=995&view=rev
Author:   kerphi
Date:     2007-03-11 05:37:38 -0700 (Sun, 11 Mar 2007)

Log Message:
-----------
Bug fix: it was possible to connect with an existing nickname [1h30]

Modified Paths:
--------------
    trunk/data/public/js/pfcclient.js
    trunk/src/commands/connect.class.php
    trunk/src/commands/nick.class.php
    trunk/src/proxies/auth.class.php
    trunk/src/proxies/censor.class.php
    trunk/src/proxies/checknickchange.class.php
    trunk/src/proxies/checktimeout.class.php
    trunk/src/proxies/lock.class.php
    trunk/src/proxies/log.class.php
    trunk/src/proxies/noflood.class.php

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/data/public/js/pfcclient.js	2007-03-11 12:37:38 UTC (rev 995)
@@ -132,7 +132,7 @@
   /**
    * Show a popup dialog to ask user to choose a nickname
    */
-  askNick: function(nickname)
+  askNick: function(nickname,error_text)
   {
     // ask to choose a nickname
     if (nickname == '' || nickname == undefined) nickname = this.nickname;
@@ -140,7 +140,7 @@
     // build a dhtml prompt box
     var pfcp = this.getPrompt();//new pfcPrompt($('pfc_container'));
     pfcp.callback = function(v) { pfc.askNickResponse(v); }
-    pfcp.prompt(this.res.getLabel('Please enter your nickname'), nickname);
+    pfcp.prompt((error_text != undefined ? '<span style="color:red">'+error_text+'</span><br/>' : '')+this.res.getLabel('Please enter your nickname'), nickname);
     pfcp.focus();
   },
   askNickResponse: function(newnick)
@@ -389,7 +389,7 @@
       else if (resp == "isused")
       {
         this.setError(this.res.getLabel('Choosen nickname is allready used'), Array());
-        this.askNick(param);        
+        this.askNick(param,this.res.getLabel('Choosen nickname is allready used'));
       }
       else if (resp == "notallowed")
       {

Modified: trunk/src/commands/connect.class.php
===================================================================
--- trunk/src/commands/connect.class.php	2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/commands/connect.class.php	2007-03-11 12:37:38 UTC (rev 995)
@@ -79,10 +79,6 @@
 
     // create the nickid
     $ct->joinChan($nickid, NULL); // join the server
-    $ct->createNick($nickid, $nick);
-
-    $u->nick = $nick;
-    $u->saveInCache();
     
     // setup the active flag in user session
     //    $u->active = true;
@@ -98,8 +94,20 @@
     foreach($c->nickmeta as $k => $v)
       $ct->setUserMeta($nickid, $k, $v);
 
-    // connect to the server
-    $xml_reponse->script("pfc.handleResponse('connect', 'ok', Array('".addslashes($nick)."'));");
+    // run the /nick command to assign the user nick
+    $cmdp = array();
+    $cmdp["param"] = $nick;
+    $cmd =& pfcCommand::Factory('nick');
+    $ret = $cmd->run($xml_reponse, $cmdp);
+
+    if ($ret)
+    {
+      $xml_reponse->script("pfc.handleResponse('".$this->name."', 'ok', Array('".addslashes($nick)."'));");
+    }
+    else
+    {
+      $xml_reponse->script("pfc.handleResponse('".$this->name."', 'ko', Array('".addslashes($nick)."'));");      
+    }
   }
 }
 

Modified: trunk/src/commands/nick.class.php
===================================================================
--- trunk/src/commands/nick.class.php	2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/commands/nick.class.php	2007-03-11 12:37:38 UTC (rev 995)
@@ -18,7 +18,7 @@
     $u  =& pfcUserConfig::Instance();
     $ct =& pfcContainer::Instance();
 
-    if (trim($param) == "")
+    if (trim($param) == '')
     {
       // error
       $cmdp = $p;
@@ -26,7 +26,7 @@
       $cmdp["param"] .= " (".$this->usage.")";
       $cmd =& pfcCommand::Factory("error");
       $cmd->run($xml_reponse, $cmdp);
-      return;
+      return false;
     }
     
     $newnick = phpFreeChat::FilterNickname($param);
@@ -41,8 +41,7 @@
     // current nickname (oldnick) is mine and
     // oldnick is different from new nick
     // -> this is a nickname change
-    if ($oldnickid == $u->nickid &&
-        $oldnick != $newnick &&
+    if ($oldnick != $newnick &&
         $oldnick != '')
     {
       // really change the nick (rename it)
@@ -69,35 +68,28 @@
         $cmd->run($xml_reponse, $cmdp);
       }
       $xml_reponse->script("pfc.handleResponse('nick', 'changed', '".addslashes($newnick)."');");
-      return;
+      return true;
     }
 
-    /*
-    // new nickname is undefined (not used) and
-    // current nickname (oldnick) is not mine or is undefined
-    // -> this is a first connection
-    if ($newnickid == '' &&
-        $oldnickid != $u->nickid)
+    // new nickname is undefined (not used)
+    // -> this is a first connection (this piece of code is called by /connect command)
+    if ($newnickid == '')
     {
       // this is a first connection : create the nickname on the server
-      //      $container->createNick(NULL, $newnick, $u->nickid);
-      $container->createNick($u->nickid, $newnick);
-
-      //$u->nick   = $newnick;
-      //      $u->active = true;
-      //$u->saveInCache();
+      $ct->createNick($u->nickid, $newnick);
+      $u->nick = $nick;
+      $u->saveInCache();
+      
       $this->forceWhoisReload($u->nickid);
 
       $xml_reponse->script("pfc.handleResponse('nick', 'connected', '".addslashes($newnick)."');");
     
       if ($c->debug)
         pxlog("/nick ".$newnick." (first connection, oldnick=".$oldnick.")", "chat", $c->getId());
-      return;
+      return true;
     }
-    */
 
-    //    $ct->createNick($u->nickid, $newnick);
-    
+    return false;
   }
 }
 

Modified: trunk/src/proxies/auth.class.php
===================================================================
--- trunk/src/proxies/auth.class.php	2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/auth.class.php	2007-03-11 12:37:38 UTC (rev 995)
@@ -51,7 +51,7 @@
       $cmdp["param"] = _pfc("Your must be connected to send a message");
       $cmd =& pfcCommand::Factory("error");
       $cmd->run($xml_reponse, $cmdp);
-      return;
+      return false;
     }
 
     
@@ -65,7 +65,7 @@
       if (!$isadmin)
       {
         $xml_reponse->script("alert('".addslashes(_pfc("You are not allowed to run '%s' command", $this->name))."');");
-        return;
+        return false;
       }
     }    
     
@@ -87,7 +87,7 @@
         // the user is banished, show a message and don't forward the /join command
         $msg = _pfc("Can't join %s because you are banished", $param);
         $xml_reponse->script("pfc.handleResponse('".$this->proxyname."', 'ban', '".addslashes($msg)."');");
-        return;
+        return false;
       }
 
       if (count($c->frozen_channels)>0)
@@ -97,7 +97,7 @@
           // the user is banished, show a message and don't forward the /join command
           $msg = _pfc("Can't join %s because the channels list is restricted", $param);
           $xml_reponse->script("pfc.handleResponse('".$this->proxyname."', 'frozen', '".addslashes($msg)."');");
-          return;
+          return false;
         }
       }
     }
@@ -108,7 +108,7 @@
     $p["sender"]      = $sender;
     $p["recipient"]   = $recipient;
     $p["recipientid"] = $recipientid;
-    $this->next->run($xml_reponse, $p);
+    return $this->next->run($xml_reponse, $p);
   }
 }
 

Modified: trunk/src/proxies/censor.class.php
===================================================================
--- trunk/src/proxies/censor.class.php	2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/censor.class.php	2007-03-11 12:37:38 UTC (rev 995)
@@ -74,7 +74,7 @@
     $p["sender"]      = $sender;
     $p["recipient"]   = $recipient;
     $p["recipientid"] = $recipientid;
-    $this->next->run($xml_reponse, $p);
+    return $this->next->run($xml_reponse, $p);
   }
 }
 

Modified: trunk/src/proxies/checknickchange.class.php
===================================================================
--- trunk/src/proxies/checknickchange.class.php	2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/checknickchange.class.php	2007-03-11 12:37:38 UTC (rev 995)
@@ -58,7 +58,7 @@
       {
           $msg = _pfc("You are not allowed to change your nickname");
           $xml_reponse->script("pfc.handleResponse('".$this->proxyname."', 'nick', '".addslashes($msg)."');");
-          return;      
+          return false;      
       }
 
       $newnickid = $ct->getNickId($newnick);
@@ -70,7 +70,7 @@
         $xml_reponse->script("pfc.handleResponse('".$this->name."', 'notchanged', '".addslashes($newnick)."');");
         if ($c->debug)
           pxlog("/nick ".$newnick." (user just reloded the page so let him keep his nickname without any warnings)", "chat", $c->getId());
-        return;
+        return true;
       }
 
       // now check the nickname is not yet used (unsensitive case)
@@ -84,7 +84,7 @@
           $xml_reponse->script("pfc.handleResponse('nick', 'isused', '".addslashes($newnick)."');");
         if ($c->debug)
           pxlog("/nick ".$newnick." (wanted nick is allready in use -> wantednickid=".$newnickid.")", "chat", $c->getId());
-        return;
+        return false;
       }
     }
     
@@ -100,12 +100,11 @@
       $cmdp["param"] = $c->nick;
       $cmdp["owner"] = $this->proxyname;
       $cmd =& pfcCommand::Factory("nick");
-      $cmd->run($xml_reponse, $cmdp);
-      return;
+      return $cmd->run($xml_reponse, $cmdp);
     }
 
     // forward the command to the next proxy or to the final command
-    $this->next->run($xml_reponse, $p);
+    return $this->next->run($xml_reponse, $p);
   }
 
   function _checkNickIsUsed($newnick, $oldnickid)

Modified: trunk/src/proxies/checktimeout.class.php
===================================================================
--- trunk/src/proxies/checktimeout.class.php	2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/checktimeout.class.php	2007-03-11 12:37:38 UTC (rev 995)
@@ -70,7 +70,7 @@
     }
     
     // forward the command to the next proxy or to the final command
-    $this->next->run($xml_reponse, $p);
+    return $this->next->run($xml_reponse, $p);
   }
 }
 

Modified: trunk/src/proxies/lock.class.php
===================================================================
--- trunk/src/proxies/lock.class.php	2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/lock.class.php	2007-03-11 12:37:38 UTC (rev 995)
@@ -45,6 +45,7 @@
     if ($c->islocked)
     {
       $xml_reponse->addRedirect($c->lockurl);
+      return false;
     }
     else
     {
@@ -54,7 +55,7 @@
       $p["sender"]      = $sender;
       $p["recipient"]   = $recipient;
       $p["recipientid"] = $recipientid;
-      $this->next->run($xml_reponse, $p);      
+      return $this->next->run($xml_reponse, $p);      
     }
   }
 }

Modified: trunk/src/proxies/log.class.php
===================================================================
--- trunk/src/proxies/log.class.php	2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/log.class.php	2007-03-11 12:37:38 UTC (rev 995)
@@ -69,7 +69,7 @@
     }
 
     // forward the command to the next proxy or to the final command
-    $this->next->run($xml_reponse, $p);
+    return $this->next->run($xml_reponse, $p);
   }
 }
 

Modified: trunk/src/proxies/noflood.class.php
===================================================================
--- trunk/src/proxies/noflood.class.php	2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/noflood.class.php	2007-03-11 12:37:38 UTC (rev 995)
@@ -81,7 +81,7 @@
         $cmdp["param"] .=_pfc("kicked from %s by %s", $u->channels[$recipientid]["name"], "noflood");
         $cmd =& pfcCommand::Factory("leave");
         $cmd->run($xml_reponse, $cmdp);
-        return;
+        return false;
       }
 
       if ($flood_nbmsg == 0)
@@ -96,7 +96,7 @@
     $p["sender"]      = $sender;
     $p["recipient"]   = $recipient;
     $p["recipientid"] = $recipientid;
-    $this->next->run($xml_reponse, $p);
+    return $this->next->run($xml_reponse, $p);
   }
 }
 


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [994] trunk/src/pfcjson.class.php

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

Revision: 994
          http://svn.sourceforge.net/phpfreechat/?rev=994&view=rev
Author:   kerphi
Date:     2007-03-10 03:30:38 -0800 (Sat, 10 Mar 2007)

Log Message:
-----------
check that Services_JSON is not already defined by an external program

Modified Paths:
--------------
    trunk/src/pfcjson.class.php

Modified: trunk/src/pfcjson.class.php
===================================================================
--- trunk/src/pfcjson.class.php	2007-03-08 16:55:03 UTC (rev 993)
+++ trunk/src/pfcjson.class.php	2007-03-10 11:30:38 UTC (rev 994)
@@ -28,7 +28,8 @@
   {
     // if the php5-json module is not available, use a software json implementation
     if (!function_exists('json_encode')) {
-      require_once(dirname(__FILE__)."/../lib/json/JSON.php");
+      if (!class_exists('Services_JSON'))
+        require_once(dirname(__FILE__)."/../lib/json/JSON.php");
       $this->json = new Services_JSON();
     }
   }


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [993] trunk/src/containers/mysql.class.php

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

Revision: 993
          http://svn.sourceforge.net/phpfreechat/?rev=993&view=rev
Author:   kerphi
Date:     2007-03-08 08:55:03 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
fix the 1672102 sourceforge bug

Modified Paths:
--------------
    trunk/src/containers/mysql.class.php

Modified: trunk/src/containers/mysql.class.php
===================================================================
--- trunk/src/containers/mysql.class.php	2007-03-08 14:53:41 UTC (rev 992)
+++ trunk/src/containers/mysql.class.php	2007-03-08 16:55:03 UTC (rev 993)
@@ -84,7 +84,7 @@
     // advanced parameters (don't touch if you don't know what your are doing)
     $cfg["mysql_fieldtype_server"] = 'varchar(32)';
     $cfg["mysql_fieldtype_group"] = 'varchar(64)';
-    $cfg["mysql_fieldtype_subgroup"] = 'varchar(64)';
+    $cfg["mysql_fieldtype_subgroup"] = 'varchar(128)';
     $cfg["mysql_fieldtype_leaf"] = 'varchar(128)';
     $cfg["mysql_fieldtype_leafvalue"] = 'text';
     $cfg["mysql_fieldtype_timestamp"] = 'int(11)';


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

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

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

Revision: 992
          http://svn.sourceforge.net/phpfreechat/?rev=992&view=rev
Author:   kerphi
Date:     2007-03-08 06:53:41 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
New Norwegian Nynorsk translation (thanks to Yngve Spjeld Landro)

Modified Paths:
--------------
    trunk/demo/index.php
    trunk/src/pfci18n.class.php

Added Paths:
-----------
    trunk/demo/demo59_in_norwegian_nynorsk.php
    trunk/i18n/nn_NO/
    trunk/i18n/nn_NO/main.php

Added: trunk/demo/demo59_in_norwegian_nynorsk.php
===================================================================
--- trunk/demo/demo59_in_norwegian_nynorsk.php	                        (rev 0)
+++ trunk/demo/demo59_in_norwegian_nynorsk.php	2007-03-08 14:53:41 UTC (rev 992)
@@ -0,0 +1,36 @@
+<?php
+
+require_once dirname(__FILE__)."/../src/phpfreechat.class.php";
+
+$params["serverid"]      = md5(__FILE__); // calculate a unique id for this chat
+$params["language"]      = "nn_NO";
+$chat = new phpFreeChat( $params );
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <title>phpFreeChat demo</title>
+
+    <?php $chat->printJavascript(); ?>
+    <?php $chat->printStyle(); ?>
+
+  </head>
+
+  <body>
+    <?php $chat->printChat(); ?>
+
+<?php
+  // print the current file
+  echo "<h2>The source code</h2>";
+  $filename = __FILE__;
+  echo "<p><code>".$filename."</code></p>";
+  echo "<pre style=\"margin: 0 50px 0 50px; padding: 10px; background-color: #DDD;\">";
+  $content = file_get_contents($filename);
+  echo htmlentities($content);
+  echo "</pre>";
+?>
+
+  </body>
+</html>

Modified: trunk/demo/index.php
===================================================================
--- trunk/demo/index.php	2007-03-08 14:47:32 UTC (rev 991)
+++ trunk/demo/index.php	2007-03-08 14:53:41 UTC (rev 992)
@@ -124,6 +124,7 @@
       <li><a href="demo56_in_romanian.php">demo56 - Romanian translation of the chat</a></li>
       <li><a href="demo57_in_korean.php">demo57 - Korean translation of the chat</a></li>
       <li><a href="demo58_in_danish.php">demo58 - Danish translation of the chat</a></li>
+      <li><a href="demo59_in_norwegian_nynorsk.php">demo58 - Norwegian Nynorsk translation of the chat</a></li>
     </ul>
 
 </div>

Added: trunk/i18n/nn_NO/main.php
===================================================================
--- trunk/i18n/nn_NO/main.php	                        (rev 0)
+++ trunk/i18n/nn_NO/main.php	2007-03-08 14:53:41 UTC (rev 992)
@@ -0,0 +1,384 @@
+<?php
+/**
+ * i18n/nn_NO/main.php
+ *
+ * Copyright © 2006 Stephane Gully <ste...@gm...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+/**
+ * Norwegian (Nynorsk) translation of the messages (utf8 encoded!)
+ *
+ * @author Yngve Spjeld Landro <nynorsk[ at ]strilen.net>
+ */
+
+// line 45 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["My Chat"] = "Praten min";
+
+// line 201 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s not found, %s library can't be found."] = "fann ikkje %s, finn ikkje biblioteksfila %s.";
+
+// line 355 in phpfreechat.class.php
+$GLOBALS["i18n"]["Please enter your nickname"] = "Skriv kallenamnet ditt";
+
+// line 565 in phpfreechat.class.php
+$GLOBALS["i18n"]["Text cannot be empty"] = "Tekststrengen kan ikkje vera tom";
+
+// line 392 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s changes his nickname to %s"] = "%s endrar kallenamnet sitt til %s";
+
+// line 398 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s is connected"] = "%s er tilkopla";
+
+// line 452 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s quit"] = "%s forlét praten";
+
+// line 468 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s disconnected (timeout)"] = "%s fråkopla (tidsavbrot)";
+
+// line 262 in phpfreechat.class.php
+$GLOBALS["i18n"]["Unknown command [%s]"] = "Ukjent kommando [%s]";
+
+// line 149 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist: %s"] = "%s finst ikkje: %s";
+
+// line 180 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["You need %s"] = "Du treng %s";
+
+// line 241 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist, %s library can't be found"] = "%s finst ikkje, finn ikkje biblioteksfila %";
+
+// line 280 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist"] = "%s finst ikkje";
+
+// line 433 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s directory must be specified"] = "ein må oppgje %s-katalogen";
+
+// line 439 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s must be a directory"] = "%s må vera ein filkatalog";
+
+// line 446 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s can't be created"] = "%s kan ikkje lagast";
+
+// line 451 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not writeable"] = "kan ikkje skriva til %s";
+
+// line 496 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not readable"] = "kan ikkje lesa %s";
+
+// line 469 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not a file"] = "%s er ikkje ei fil";
+
+// line 491 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not a directory"] = "%s er ikkje een filkatalog";
+
+// line 23 in chat.html.tpl.php
+$GLOBALS["i18n"]["PHP FREE CHAT [powered by phpFreeChat-%s]"] = "PHP FREE CHAT [driven av phpFreeChat-%s]";
+
+// line 296 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Hide nickname marker"] = "Skjul kallenamnfarge";
+
+// line 304 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Show nickname marker"] = "Vis kallenamnfarge";
+
+// line 389 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Disconnect"] = "Kopla frå";
+
+// line 395 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Connect"] = "Kopla til";
+
+// line 427 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Magnify"] = "Gjer større";
+
+// line 434 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Cut down"] = "Avgrens";
+
+// line 345 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Hide dates and hours"] = "Skjul datoar og timar";
+
+// line 353 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Show dates and hours"] = "Vis datoar og timar";
+
+// line 21 in chat.html.tpl.php
+$GLOBALS["i18n"]["Enter your message here"] = "Skriv meldinga di her";
+
+// line 24 in chat.html.tpl.php
+$GLOBALS["i18n"]["Enter your nickname here"] = "Før opp kallenamnet ditt";
+
+// line 93 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["Error: undefined or obsolete parameter '%s', please correct or remove this parameter"] = "Feil: parameteren '%s' er ikkje definert, eller er forelda. Korriger eller fjern parameteren";
+
+// line 48 in phpfreechattemplate.class.php
+$GLOBALS["i18n"]["%s template could not be found"] = "fann ikkje %s-malen";
+
+// line 512 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["Error: '%s' could not be found, please check your themepath '%s' and your theme '%s' are correct"] = "Feil: Fann ikkje '%s'. Sjå etter om temabana '%s' og temaet ditt '%s' er rette";
+
+// line 33 in chat.html.tpl.php
+$GLOBALS["i18n"]["Bold"] = "Feit";
+
+// line 34 in chat.html.tpl.php
+$GLOBALS["i18n"]["Italics"] = "Kursiv";
+
+// line 35 in chat.html.tpl.php
+$GLOBALS["i18n"]["Underline"] = "Understrek";
+
+// line 36 in chat.html.tpl.php
+$GLOBALS["i18n"]["Delete"] = "Slett";
+
+// line 37 in chat.html.tpl.php
+$GLOBALS["i18n"]["Pre"] = "Pre";
+
+// line 38 in chat.html.tpl.php
+$GLOBALS["i18n"]["Mail"] = "E-post";
+
+// line 39 in chat.html.tpl.php
+$GLOBALS["i18n"]["Color"] = "Farge";
+
+// line 86 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Hide smiley box"] = "Skjul smilefjesvindauge";
+
+// line 87 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Show smiley box"] = "Vis smilefjesvindauge";
+
+// line 88 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Hide online users box"] = "Skjul tilkopla brukarar";
+
+// line 89 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Show online users box"] = "Vis tilkopla brukarar";
+
+// line 75 in pfccommand.class.php
+$GLOBALS["i18n"]["%s must be implemented"] = "%s må vera brukt";
+
+// line 343 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter is mandatory by default use '%s' value"] = "'%s'-parameteren er obligatorisk. Bruk '%s' som standardverdi";
+
+// line 378 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a positive number"] = "Parameteren '%s' må større enn null";
+
+// line 386 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "Parameteren '%s' er ikkje gyldig. Tilgjengelege verdiar er : '%s'";
+
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "Rommet mitt";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "Manglande parameter";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "bortvist frå %s av %s";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "Den bortviste brukaren si ID-liste er:";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "Tom";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "'/unban {id}' vil oppheva bortvisinga av brukaren med ID-en {id}";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "'/unban all' vil oppheva bortvisinga av alle brukarane på denne kanalen";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "%s slutt (tidsavbrot)";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "%s blir med i %s";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "sparka ut frå %s av %s";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "Klarer ikkje senda meldinga - %s er ikkje tilkopla";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "Ingen er blitt bortviste";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "Bortvisinga av %s er oppheva";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "%s brukarar har fått bortvisinga oppheva";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "Du har ikkje lov til å kjøra kommandoen '%s'";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "Kan ikkje bli med i %s fordi du er bortvist";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "Kan ikkje bli med i %s sia tilgangen til kanallista er avgrensa";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "Du har ikkje lov til å endra kallenamnet ditt";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "Send ikkje så mange meldingar. Fløyming blir ikkje godteke";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "Privat melding";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "Lukk denne fana";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "Vil du verkeleg forlata dette rommet?";
+
+// line 169 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["Error: '%s' is a private parameter, you are not allowed to change it"] = "Feil: '%s' er ein privat parameter. Du har ikkje lov til å endra han.";
+
+// line 253 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be an array"] = "'%s'-parameteren må vera ein tabell";
+
+// line 265 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a boolean"] = "'%s'-parameteren må vera boolsk";
+
+// line 271 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a charatere string"] = "'%s'-parameteren må vera ein teiknstreng";
+
+// line 395 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' must be writable"] = "Ein må kunna skriva til '%s'";
+
+// line 425 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' directory doesn't exist"] = "'%s'-katalogen finst ikkje";
+
+// line 544 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["Please correct these errors"] = "Rett desse feila";
+
+// line 21 in pfcinfo.class.php
+$GLOBALS["i18n"]["Error: the cached config file doesn't exists"] = "Feil: den mellomlagra innstillingsfila finst ikkje";
+
+// line 190 in phpfreechat.class.php
+$GLOBALS["i18n"]["Error: the chat cannot be loaded! two possibilities: your browser doesn't support javascript or you didn't setup correctly the server directories rights - don't hesitate to ask some help on the forum"] = "Feil: praten kan ikkje lastast. Det kan vera to grunnar til dette: nettlesaren din støttar ikkje JavaScript, eller det er feil i tilgangsrettane på tenarmappene. Spør om hjelp i forumet";
+
+// line 31 in help.class.php
+$GLOBALS["i18n"]["Here is the command list:"] = "Her er kommandolista:";
+
+// line 63 in identify.class.php
+$GLOBALS["i18n"]["Succesfully identified"] = "Rett identifisert";
+
+// line 68 in identify.class.php
+$GLOBALS["i18n"]["Identification failure"] = "Identifiseringsfeil";
+
+// line 25 in send.class.php
+$GLOBALS["i18n"]["Your must be connected to send a message"] = "Du må vera tilkopla for å kunna senda ei melding";
+
+// line 87 in chat.js.tpl.php
+$GLOBALS["i18n"]["Click here to send your message"] = "Klikk her for å senda meldinga di";
+
+// line 80 in chat.js.tpl.php
+$GLOBALS["i18n"]["Enter the text to format"] = "Skriv inn teksten som skal formaterast";
+
+// line 81 in chat.js.tpl.php
+$GLOBALS["i18n"]["Configuration has been rehashed"] = "Innstillingane er blitt oppdatert";
+
+// line 82 in chat.js.tpl.php
+$GLOBALS["i18n"]["A problem occurs during rehash"] = "Det oppstod eit problem under oppdateringa";
+
+// line 83 in chat.js.tpl.php
+$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Kallenamnet er allereie i bruk";
+
+// line 84 in chat.js.tpl.php
+$GLOBALS["i18n"]["phpfreechat current version is %s"] = "Gjeldande versjon av phpfreechat er %s";
+
+// line 85 in chat.js.tpl.php
+$GLOBALS["i18n"]["Maximum number of joined channels has been reached"] = "Har nådd grensa for tilkopla kanalar";
+
+// line 86 in chat.js.tpl.php
+$GLOBALS["i18n"]["Maximum number of private chat has been reached"] = "Har nådd grensa for private samtaler";
+
+// line 88 in chat.js.tpl.php
+$GLOBALS["i18n"]["Send"] = "Send";
+
+// line 86 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: connect error"] = "Mysql container: tilkoplingsfeil";
+
+// line 101 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "Mysql container: databaseopprettingsfeil '%s'";
+
+// line 112 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "Mysql container: tabellopprettingsfeil '%s'";
+
+// line 80 in chat.js.tpl.php
+$GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Du kan ikkje tala med deg sjølv";
+
+// line 82 in chat.js.tpl.php
+$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Du har ikkje lov til ta det valde kallenamnet";
+
+// line 83 in chat.js.tpl.php
+$GLOBALS["i18n"]["Enable sound notifications"] = "Bruk meldingslydar";
+
+// line 84 in chat.js.tpl.php
+$GLOBALS["i18n"]["Disable sound notifications"] = "Slå av meldingslydar";
+
+// line 23 in kick.class.php
+$GLOBALS["i18n"]["no reason"] = "utan grunn";
+
+// line 24 in banlist.class.php
+$GLOBALS["i18n"]["The banished user list is:"] = "Bortvistbrukarlista er:";
+
+// line 39 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "'/unban {kallenamn}' vil oppheva bortvisinga av brukaren med {kallenamn}";
+
+// line 43 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "sparka ut frå %s av %s. Årsak: %s";
+
+// line 20 in quit.class.php
+$GLOBALS["i18n"]["%s quit (%s)"] = "%s avslutta (%s)";
+
+// line 124 in chat.js.tpl.php
+$GLOBALS["i18n"]["Chat loading ..."] = "Lastar praten …";
+
+// line 124 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please wait"] = "Vent";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "%s er anten ikkje i bruk eller er ikkje støtta av nettlesaren din.";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["This web application requires %s to work properly."] = "Denne nettapplikasjonen treng %s for å kunna brukast skikkeleg.";
+
+// line 135 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "Slå på %s i nettlesarinnstillingane, eller oppgrader til ein nettlesar med støtte for %s og prøv igjen.";
+
+// line 137 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "Oppgrader til ein nettlesar med støtte for %s og prøv igjen.";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "I Internet Explorer-utgåvene før 7.0 var Ajax teken i bruk gjennom ActiveX. Slå på ActiveX i nettlesaren din, eller oppgrader til ein nettlesar med Ajax-støtte og prøv igjen.";
+
+// line 359 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "%s finst ikkje. Klarer ikkje installera data_public_path";
+
+// line 73 in invite.class.php
+$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "Du må vera med i %s for å kunna invitera brukarar til kanalen";
+
+// line 47 in chat.html.tpl.php
+$GLOBALS["i18n"]["Ping"] = "Ping";
+
+// line 477 in phpfreechat.class.php
+$GLOBALS["i18n"]["Input Required"] = "Inndata er påkravd";
+
+// line 478 in phpfreechat.class.php
+$GLOBALS["i18n"]["OK"] = "OK";
+
+// line 479 in phpfreechat.class.php
+$GLOBALS["i18n"]["Cancel"] = "Avbryt";
+
+?>

Modified: trunk/src/pfci18n.class.php
===================================================================
--- trunk/src/pfci18n.class.php	2007-03-08 14:47:32 UTC (rev 991)
+++ trunk/src/pfci18n.class.php	2007-03-08 14:53:41 UTC (rev 992)
@@ -97,7 +97,7 @@
    */
   function GetAcceptedLanguage($type="main")
   {
-    return /*<GetAcceptedLanguage>*/array('ar_LB','sv_SE','ja_JP','ba_BA','pt_PT','el_GR','tr_TR','hy_AM','nb_NO','zh_TW','ru_RU','fr_FR','es_ES','bg_BG','zh_CN','nl_NL','de_DE-informal','pl_PL','pt_BR','it_IT','id_ID','hu_HU','en_US','sr_CS','de_DE-formal','eo','bn_BD','uk_UA','uk_RO','ko_KR','da_DK');/*</GetAcceptedLanguage>*/
+    return /*<GetAcceptedLanguage>*/array('ar_LB','sv_SE','ja_JP','ba_BA','pt_PT','el_GR','tr_TR','hy_AM','nb_NO','zh_TW','ru_RU','fr_FR','es_ES','bg_BG','zh_CN','nl_NL','de_DE-informal','pl_PL','pt_BR','it_IT','id_ID','hu_HU','en_US','sr_CS','de_DE-formal','eo','bn_BD','uk_UA','uk_RO','ko_KR','da_DK','nn_NO');/*</GetAcceptedLanguage>*/
   }
   
   /**


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [991] trunk/i18n/ru_RU/main.php

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

Revision: 991
          http://svn.sourceforge.net/phpfreechat/?rev=991&view=rev
Author:   kerphi
Date:     2007-03-08 06:47:32 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
Russion translation update (thanks to datacompboy)

Modified Paths:
--------------
    trunk/i18n/ru_RU/main.php

Modified: trunk/i18n/ru_RU/main.php
===================================================================
--- trunk/i18n/ru_RU/main.php	2007-03-08 14:42:46 UTC (rev 990)
+++ trunk/i18n/ru_RU/main.php	2007-03-08 14:47:32 UTC (rev 991)
@@ -26,6 +26,7 @@
  * @author Stanislav Kondratyuk <an...@gm...>
  * @author Kamashev Maim <m.k...@gm...>
  * @author Fromme
+ * @author datacompboy
  */
 
 // line 45 in phpfreechatconfig.class.php
@@ -310,80 +311,79 @@
 // line 88 in chat.js.tpl.php
 $GLOBALS["i18n"]["Send"] = "Послать";
 
-
 // line 86 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: connect error"] = "";
+$GLOBALS["i18n"]["Mysql container: connect error"] = "Mysql контаейнер: ошибка соединения";
 
 // line 101 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "";
+$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "Mysql контаейнер: ошибка создания базы данных '%s'";
 
 // line 112 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "";
+$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "Mysql контаейнер: ошибка создания таблицы '%s'";
 
 // line 80 in chat.js.tpl.php
-$GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "";
+$GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Вы не можете разговаривать с самим собой";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "";
+$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Выбранный ник запрещен";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Enable sound notifications"] = "";
+$GLOBALS["i18n"]["Enable sound notifications"] = "Включить звуковые оповещения";
 
 // line 84 in chat.js.tpl.php
-$GLOBALS["i18n"]["Disable sound notifications"] = "";
+$GLOBALS["i18n"]["Disable sound notifications"] = "Выключить звуковые оповещения";
 
 // line 23 in kick.class.php
-$GLOBALS["i18n"]["no reason"] = "";
+$GLOBALS["i18n"]["no reason"] = "без указания причин";
 
 // line 24 in banlist.class.php
-$GLOBALS["i18n"]["The banished user list is:"] = "";
+$GLOBALS["i18n"]["The banished user list is:"] = "Заблокированные пользователи:";
 
 // line 39 in banlist.class.php
-$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "";
+$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "'/unban {nickname}' разблокирует пользователя {nickname}";
 
 // line 43 in kick.class.php
-$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "";
+$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "выпнут из %s админом %s - причина: %s";
 
 // line 20 in quit.class.php
-$GLOBALS["i18n"]["%s quit (%s)"] = "";
+$GLOBALS["i18n"]["%s quit (%s)"] = "%s вышел (%s)";
 
 // line 124 in chat.js.tpl.php
-$GLOBALS["i18n"]["Chat loading ..."] = "";
+$GLOBALS["i18n"]["Chat loading ..."] = "Чат загружается...";
 
 // line 124 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please wait"] = "";
+$GLOBALS["i18n"]["Please wait"] = "Пожалуйста, подождите";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "";
+$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "%s отключено или не поддерживается вашим браузером.";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["This web application requires %s to work properly."] = "";
+$GLOBALS["i18n"]["This web application requires %s to work properly."] = "Для корректной работы необходимо %s";
 
 // line 135 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "";
+$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "Пожалуйста, включите %s в настройках браузера, или смените браузер на поддерживающий %s.";
 
 // line 137 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "";
+$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "Пожалуйста, смените браузер на поддерживающий %s.";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "";
+$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "В Internet Explorer ранее версии 7.0, AJAX реализовано через ActiveX. Пожалуйста, включите ActiveX в настройках браузера, или смените на браузер с поддержкой AJAX.";
 
 // line 359 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "";
+$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "%s не существует, data_public_path не может быть установлено";
 
 // line 73 in invite.class.php
-$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "";
+$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "Вы должны войти в канал %s для приглашения других в него";
 
 // line 47 in chat.html.tpl.php
-$GLOBALS["i18n"]["Ping"] = "";
+$GLOBALS["i18n"]["Ping"] = "Пинг";
 
 // line 477 in phpfreechat.class.php
-$GLOBALS["i18n"]["Input Required"] = "";
+$GLOBALS["i18n"]["Input Required"] = "Введите:";
 
 // line 478 in phpfreechat.class.php
-$GLOBALS["i18n"]["OK"] = "";
+$GLOBALS["i18n"]["OK"] = "ОК";
 
 // line 479 in phpfreechat.class.php
-$GLOBALS["i18n"]["Cancel"] = "";
+$GLOBALS["i18n"]["Cancel"] = "Отмена";
 
-?>
\ 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: [990] trunk/i18n/ko_KR/main.php

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

Revision: 990
          http://svn.sourceforge.net/phpfreechat/?rev=990&view=rev
Author:   kerphi
Date:     2007-03-08 06:42:46 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
Korean translation update (thanks to fkiller)

Modified Paths:
--------------
    trunk/i18n/ko_KR/main.php

Modified: trunk/i18n/ko_KR/main.php
===================================================================
--- trunk/i18n/ko_KR/main.php	2007-03-08 14:28:09 UTC (rev 989)
+++ trunk/i18n/ko_KR/main.php	2007-03-08 14:42:46 UTC (rev 990)
@@ -27,7 +27,7 @@
  */
 
 // line 45 in phpfreechatconfig.class.php
-$GLOBALS["i18n"]["My Chat"] = "내 채팅방";
+$GLOBALS["i18n"]["My Chat"] = "나의 채팅방";
 
 // line 201 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["%s not found, %s library can't be found."] = "%s 를 찾을 수 없습니다, %s 라이브러리가 로드되지 않았습니다.";
@@ -36,19 +36,19 @@
 $GLOBALS["i18n"]["Please enter your nickname"] = "사용할 닉네임을 입력하세요";
 
 // line 565 in phpfreechat.class.php
-$GLOBALS["i18n"]["Text cannot be empty"] = "빈칸을 입력하실 순 없습니다.";
+$GLOBALS["i18n"]["Text cannot be empty"] = "빈칸을 입력하실 수 없습니다.";
 
 // line 392 in phpfreechat.class.php
 $GLOBALS["i18n"]["%s changes his nickname to %s"] = "%s 님께서 %s로 닉을 바꾸셨습니다.";
 
 // line 398 in phpfreechat.class.php
-$GLOBALS["i18n"]["%s is connected"] = "%s 님 반갑습니다. 즐거운 시간 되세요.";
+$GLOBALS["i18n"]["%s is connected"] = "%s 님 이 연결되었습니다.";
 
 // line 452 in phpfreechat.class.php
 $GLOBALS["i18n"]["%s quit"] = "%s 님께서 나가셨습니다.";
 
 // line 468 in phpfreechat.class.php
-$GLOBALS["i18n"]["%s disconnected (timeout)"] = "%s 님의 연결이 끊겼습니다 (타임아웃)";
+$GLOBALS["i18n"]["%s disconnected (timeout)"] = "%s 님의 연결이 끊겼습니다 (시간초과)";
 
 // line 262 in phpfreechat.class.php
 $GLOBALS["i18n"]["Unknown command [%s]"] = "존재하지 않는 명령입니다. [%s]";
@@ -66,7 +66,7 @@
 $GLOBALS["i18n"]["%s doesn't exist"] = "%s 는 존재하지 않습니다.";
 
 // line 433 in phpfreechatconfig.class.php
-$GLOBALS["i18n"]["%s directory must be specified"] = "%s 디렉토리는 선택되어야만 합니다.";
+$GLOBALS["i18n"]["%s directory must be specified"] = "%s 디렉토리가 지정되지 않았습니다.";
 
 // line 439 in phpfreechatconfig.class.php
 $GLOBALS["i18n"]["%s must be a directory"] = "%s 는 디렉토리 이어야만 합니다.";
@@ -120,7 +120,7 @@
 $GLOBALS["i18n"]["Enter your nickname here"] = "여기에 별명을 입력하세요";
 
 // line 93 in phpfreechatconfig.class.php
-$GLOBALS["i18n"]["Error: undefined or obsolete parameter '%s', please correct or remove this parameter"] = "오류 : '%s'는 정의되지 않거나 사용할 수 없는 피라메터 입니다, 이 피라메터를 없애거나 수정하세요..";
+$GLOBALS["i18n"]["Error: undefined or obsolete parameter '%s', please correct or remove this parameter"] = "오류 : '%s'는 정의되지 않거나 사용할 수 없는 매개변수 입니다, 이 매개변수를 없애거나 수정하세요.";
 
 // line 86 in pfcclient.js.tpl.php
 $GLOBALS["i18n"]["Hide smiley box"] = "이모티콘 숨기기";
@@ -166,16 +166,16 @@
 
 
 // line 343 in phpfreechatconfig.class.php
-$GLOBALS["i18n"]["'%s' parameter is mandatory by default use '%s' value"] = "'%s' 피라메터는 필수적으로 요구됩니다. '%s' 값을 사용하기 위해...";
+$GLOBALS["i18n"]["'%s' parameter is mandatory by default use '%s' value"] = "'%s' 매개변수는 '%s' 값을 사용하기 위해 필수적으로 요구됩니다.";
 
 // line 378 in phpfreechatconfig.class.php
-$GLOBALS["i18n"]["'%s' parameter must be a positive number"] = "'%s' 피라메터는 양수 이어야 합니다.";
+$GLOBALS["i18n"]["'%s' parameter must be a positive number"] = "'%s' 매개변수는 양수 이어야 합니다.";
 
 // line 386 in phpfreechatconfig.class.php
-$GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "'%s' 피라메터는 유효하지 않습니다. 사용가능한 목록 : '%s'";
+$GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "'%s' 매개변수는 유효하지 않습니다. 사용가능한 목록 : '%s'";
 
 // line 185 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["My room"] = "내 방";
+$GLOBALS["i18n"]["My room"] = "나의 방";
 
 // line 109 in pfcclient.js.tpl.php
 $GLOBALS["i18n"]["Private message"] = "개인 메세지";
@@ -190,7 +190,7 @@
 $GLOBALS["i18n"]["Missing parameter"] = "피라미터를 찾을수 없습니다.";
 
 // line 38 in ban.class.php
-$GLOBALS["i18n"]["banished from %s by %s"] = "%s 로 부터 강퇴되었습니다. %s에 의해..";
+$GLOBALS["i18n"]["banished from %s by %s"] = "%s 로 부터 %s에 의해 강퇴되었습니다.";
 
 // line 23 in banlist.class.php
 $GLOBALS["i18n"]["The banished user's id list is:"] = "접근 금지자 목록:";
@@ -199,25 +199,25 @@
 $GLOBALS["i18n"]["Empty"] = "비어있음";
 
 // line 34 in banlist.class.php
-$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "'/unban {id}' 명령은 {id}로 식별되는 사용자를 추방한걸 취소합니다.";
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "'/unban {id}' 명령은 {id}로 식별되는 사용자를 추방한것을 취소합니다.";
 
 // line 35 in banlist.class.php
-$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "'/unban all' 명령은 이 채널에 있는 모든 사용자를 추방한걸 취소합니다.";
+$GLOBALS["i18n"]["'/unban all'  will unban all the users on this channel"] = "'/unban all' 명령은 이 채널에 있는 모든 사용자를 추방한것을 취소합니다.";
 
 // line 24 in update.class.php
-$GLOBALS["i18n"]["%s quit (timeout)"] = "%s 님께서 나갔습니다. (타임아웃)";
+$GLOBALS["i18n"]["%s quit (timeout)"] = "%s 님께서 나갔습니다. (시간초과)";
 
 // line 46 in join.class.php
 $GLOBALS["i18n"]["%s joins %s"] = "%s 님께서 %s 에 들어오셨습니다.";
 
 // line 31 in kick.class.php
-$GLOBALS["i18n"]["kicked from %s by %s"] = "%s 로 부터 퇴장 되었습니다. %s에 의해";
+$GLOBALS["i18n"]["kicked from %s by %s"] = "%s 로 부터 %s에 의해 퇴장 되었습니다.";
 
 // line 38 in send.class.php
 $GLOBALS["i18n"]["Can't send the message, %s is offline"] = "메시지를 보낼 수 없습니다, %s 님은 오프라인 상태 입니다.";
 
 // line 27 in unban.class.php
-$GLOBALS["i18n"]["Nobody has been unbanished"] = "아무도 추방 취소되지 않았습니다.";
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "누구의 추방도 취소되지 않았습니다.";
 
 // line 42 in unban.class.php
 $GLOBALS["i18n"]["%s has been unbanished"] = "%s 님의 추방을 취소했습니다.";
@@ -238,19 +238,19 @@
 $GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "%s 에 참여할 수 없습니다(제한된 채널)";
 
 // line 56 in noflood.class.php
-$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "도배 하지 마세요...";
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "도배 하지 마세요.";
 
 // line 169 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["Error: '%s' is a private parameter, you are not allowed to change it"] = "Error: '%s' 는 개인 피라메터 입니다. 수정하실 수 없습니다.";
+$GLOBALS["i18n"]["Error: '%s' is a private parameter, you are not allowed to change it"] = "Error: '%s' 는 개인 매개변수 입니다. 수정하실 수 없습니다.";
 
 // line 253 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["'%s' parameter must be an array"] = "'%s' 피라메터는 어레이로 처리되어야 합니다.";
+$GLOBALS["i18n"]["'%s' parameter must be an array"] = "'%s' 매개변수는 배열로 처리되어야 합니다.";
 
 // line 265 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["'%s' parameter must be a boolean"] = "'%s' 피라메터는 부울값으로 있어야 합니다.";
+$GLOBALS["i18n"]["'%s' parameter must be a boolean"] = "'%s' 매개변수는 부울값으로 있어야 합니다.";
 
 // line 271 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["'%s' parameter must be a charatere string"] = "'%s' 피라메터는 글자이어야 합니다.";
+$GLOBALS["i18n"]["'%s' parameter must be a charatere string"] = "'%s' 매개변수는 글자이어야 합니다.";
 
 // line 395 in pfcglobalconfig.class.php
 $GLOBALS["i18n"]["'%s' must be writable"] = "'%s' 에 쓸 수 있어야 합니다.";
@@ -304,82 +304,82 @@
 $GLOBALS["i18n"]["Maximum number of private chat has been reached"] = "최대 개인채팅수에 도달하였습니다.";
 
 // line 88 in chat.js.tpl.php
-$GLOBALS["i18n"]["Send"] = "입력";
+$GLOBALS["i18n"]["Send"] = "전송";
 
 
 // line 359 in pfcglobalconfig.class.php
-$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "";
+$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "%s가 존재하지 않습니다. data_public_path은 설치될 수 없습니다.";
 
 // line 489 in phpfreechat.class.php
-$GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "";
+$GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "자기 자신에게 말할 수 없습니다.";
 
 // line 491 in phpfreechat.class.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "";
+$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "지정한 닉네임은 허가되지 않았습니다.";
 
 // line 492 in phpfreechat.class.php
-$GLOBALS["i18n"]["Enable sound notifications"] = "";
+$GLOBALS["i18n"]["Enable sound notifications"] = "음성 알림 켜기";
 
 // line 493 in phpfreechat.class.php
-$GLOBALS["i18n"]["Disable sound notifications"] = "";
+$GLOBALS["i18n"]["Disable sound notifications"] = "음성 알림 중지";
 
 // line 23 in kick.class.php
-$GLOBALS["i18n"]["no reason"] = "";
+$GLOBALS["i18n"]["no reason"] = "이유 없음";
 
 // line 24 in banlist.class.php
-$GLOBALS["i18n"]["The banished user list is:"] = "";
+$GLOBALS["i18n"]["The banished user list is:"] = "추방된 사용자 목록";
 
 // line 39 in banlist.class.php
-$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "";
+$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "'/unban {nickname}'은 {nickname}로 식별되는 사용자를 추방한 것을 취소합니다.";
 
 // line 44 in kick.class.php
-$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "";
+$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "%s로 부터 %s에 의해 추방되었습니다. 이유 : %s";
 
 // line 20 in quit.class.php
-$GLOBALS["i18n"]["%s quit (%s)"] = "";
+$GLOBALS["i18n"]["%s quit (%s)"] = "%s님 께서 나가셨습니다. (%s)";
 
 // line 86 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: connect error"] = "";
+$GLOBALS["i18n"]["Mysql container: connect error"] = "Mysql 연결자 : 연결 오류";
 
 // line 101 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "";
+$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "Mysql 연결자 : DB생성 오류 '%s'";
 
 // line 112 in mysql.class.php
-$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "";
+$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "Mysql 연결자 : 테이블 생성 오류 '%s'";
 
 // line 124 in chat.js.tpl.php
-$GLOBALS["i18n"]["Chat loading ..."] = "";
+$GLOBALS["i18n"]["Chat loading ..."] = "채팅 로드중.....";
 
 // line 124 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please wait"] = "";
+$GLOBALS["i18n"]["Please wait"] = "기다려 주십시오.";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "";
+$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "%s는 당신의 브라우저에 의해 사용금지 되거나 지원되지 않고 있습니다.";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["This web application requires %s to work properly."] = "";
+$GLOBALS["i18n"]["This web application requires %s to work properly."] = "이 웹 프로그램은 %s가 있어야 정상적으로 동작합니다.";
 
 // line 135 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "";
+$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "당신의 브라우저 설정에서 %s를 사용하게 하십시오, 또는 %s가 지원되는 브라우저로 업그레이드 하신 후 다시 시도해 보십시오.";
 
 // line 137 in chat.js.tpl.php
-$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "";
+$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "%s가 지원되는 브라우저로 업그레이드 하고 다시 시도해 보십시오.";
 
 // line 139 in chat.js.tpl.php
-$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "";
+$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "인터넷 익스플로어 7.0 이전의 버전에서는 Ajax는 ActiveX의 도구로 이용됩니다. 브라우저 보안설정에서 ActiveX를 사용가능하게 하시거나,  Ajax가 지원되는 브라우저로 업그레이드 한 후 다시 시도해 보시기 바랍니다.";
 
 // line 73 in invite.class.php
-$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "";
+$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "사용자를 초대하기 위해선 %s채널에 참여해 있어야 합니다.";
 
 // line 47 in chat.html.tpl.php
-$GLOBALS["i18n"]["Ping"] = "";
+$GLOBALS["i18n"]["Ping"] = "핑";
 
 // line 477 in phpfreechat.class.php
-$GLOBALS["i18n"]["Input Required"] = "";
+$GLOBALS["i18n"]["Input Required"] = "입력 필요";
 
 // line 478 in phpfreechat.class.php
-$GLOBALS["i18n"]["OK"] = "";
+$GLOBALS["i18n"]["OK"] = "확인";
 
 // line 479 in phpfreechat.class.php
-$GLOBALS["i18n"]["Cancel"] = "";
+$GLOBALS["i18n"]["Cancel"] = "취소";
 
-?>
\ 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: [989] trunk/version.txt

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

Revision: 989
          http://svn.sourceforge.net/phpfreechat/?rev=989&view=rev
Author:   kerphi
Date:     2007-03-08 06:28:09 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
prepare 1.0-beta10

Modified Paths:
--------------
    trunk/version.txt

Modified: trunk/version.txt
===================================================================
--- trunk/version.txt	2007-03-08 14:27:07 UTC (rev 988)
+++ trunk/version.txt	2007-03-08 14:28:09 UTC (rev 989)
@@ -1 +1 @@
-1.0-beta9
\ No newline at end of file
+1.0-beta10
\ 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: [988] trunk

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

Revision: 988
          http://svn.sourceforge.net/phpfreechat/?rev=988&view=rev
Author:   kerphi
Date:     2007-03-08 06:27:07 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
rename files without extentions (doesn't allowed on few servers)

Modified Paths:
--------------
    trunk/src/pfcglobalconfig.class.php

Added Paths:
-----------
    trunk/AUTHORS.txt
    trunk/COPYING.txt
    trunk/themes/cerutti/smileys/theme.txt
    trunk/themes/default/smileys/theme.txt
    trunk/themes/msn/smileys/theme.txt
    trunk/themes/phoenity/smileys/theme.txt
    trunk/themes/phpbb2/smileys/theme.txt
    trunk/version.txt

Removed Paths:
-------------
    trunk/AUTHORS
    trunk/COPYING
    trunk/themes/cerutti/smileys/theme
    trunk/themes/default/smileys/theme
    trunk/themes/msn/smileys/theme
    trunk/themes/phoenity/smileys/theme
    trunk/themes/phpbb2/smileys/theme
    trunk/version

Deleted: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/AUTHORS	2007-03-08 14:27:07 UTC (rev 988)
@@ -1 +0,0 @@
-Stephane Gully <ste...@gm...>

Copied: trunk/AUTHORS.txt (from rev 985, trunk/AUTHORS)
===================================================================
--- trunk/AUTHORS.txt	                        (rev 0)
+++ trunk/AUTHORS.txt	2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1 @@
+Stephane Gully <ste...@gm...>

Deleted: trunk/COPYING
===================================================================
--- trunk/COPYING	2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/COPYING	2007-03-08 14:27:07 UTC (rev 988)
@@ -1,17 +0,0 @@
-phpFreeChat a simple, fast, and customizable chat server.
-Copyright \xA9 2006 Stephane Gully <ste...@gm...>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful, 
-but WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details. 
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the
-Free Software Foundation, 51 Franklin St, Fifth Floor,
-Boston, MA  02110-1301  USA
\ No newline at end of file

Copied: trunk/COPYING.txt (from rev 985, trunk/COPYING)
===================================================================
--- trunk/COPYING.txt	                        (rev 0)
+++ trunk/COPYING.txt	2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,17 @@
+phpFreeChat a simple, fast, and customizable chat server.
+Copyright \xA9 2006 Stephane Gully <ste...@gm...>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details. 
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the
+Free Software Foundation, 51 Franklin St, Fifth Floor,
+Boston, MA  02110-1301  USA
\ No newline at end of file

Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/src/pfcglobalconfig.class.php	2007-03-08 14:27:07 UTC (rev 988)
@@ -462,7 +462,7 @@
     $this->loadSmileyTheme();
     
     // load version number from file
-    $this->version = trim(file_get_contents(dirname(__FILE__)."/../version"));
+    $this->version = trim(file_get_contents(dirname(__FILE__)."/../version.txt"));
     
     $this->is_init = (count($this->errors) == 0);
   }
@@ -479,7 +479,7 @@
 
   function loadSmileyTheme()
   {
-    $theme = file($this->getFilePathFromTheme("smileys/theme"));
+    $theme = file($this->getFilePathFromTheme("smileys/theme.txt"));
     $result = array();
     foreach($theme as $line)
     {

Deleted: trunk/themes/cerutti/smileys/theme
===================================================================
--- trunk/themes/cerutti/smileys/theme	2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/themes/cerutti/smileys/theme	2007-03-08 14:27:07 UTC (rev 988)
@@ -1,11 +0,0 @@
-smile.png     :-) :)
-happy.png     ^_^ ^^
-wink.png      ;-) ;)
-confused.png  :-/ :/
-neutral.png   :-| :|
-lol.png       :-D :D
-sad.png       :( :-(
-omg.png       :-o :-0 :0 :0
-dizzy.png     o_O O_o o_o O_O
-cry.png       ;-( :'( ;(
-tongue.png    :P :p :-p :-P
\ No newline at end of file

Copied: trunk/themes/cerutti/smileys/theme.txt (from rev 985, trunk/themes/cerutti/smileys/theme)
===================================================================
--- trunk/themes/cerutti/smileys/theme.txt	                        (rev 0)
+++ trunk/themes/cerutti/smileys/theme.txt	2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,11 @@
+smile.png     :-) :)
+happy.png     ^_^ ^^
+wink.png      ;-) ;)
+confused.png  :-/ :/
+neutral.png   :-| :|
+lol.png       :-D :D
+sad.png       :( :-(
+omg.png       :-o :-0 :0 :0
+dizzy.png     o_O O_o o_o O_O
+cry.png       ;-( :'( ;(
+tongue.png    :P :p :-p :-P
\ No newline at end of file

Deleted: trunk/themes/default/smileys/theme
===================================================================
--- trunk/themes/default/smileys/theme	2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/themes/default/smileys/theme	2007-03-08 14:27:07 UTC (rev 988)
@@ -1,27 +0,0 @@
-# This theme set based on the icons at
-# http://www.famfamfam.com/lab/icons/silk/
-#
-# Ported to PHPFreeChat by Robin Monks
-#
-# These icons are under a Creative Commons Attribution 2.5 
-# License http://creativecommons.org/licenses/by/2.5/
-
-emoticon_smile.png	 :-) ^_^ :)
-emoticon_evilgrin.png	 >(
-emoticon_surprised.png   :S :s :-S :-s :-/
-emoticon_grin.png        :-D :D
-emoticon_unhappy.png     :'( :-( :o( :-< :(
-emoticon_happy.png       :lol:
-emoticon_waii.png	 :{} :-{} :razz: :} :-}
-emoticon_wink.png	 ;-) ;o) ;)
-emoticon_tongue.png      :P :-P :-p :p
-weather_rain.png         /// \\\ ||| :rain: :drizzle:
-weather_snow.png         :***:
-weather_sun.png          >O<
-weather_clouds.png       :""": :cloud: :clouds: 
-weather_cloudy.png       :"O": :cloudly:
-weather_lightning.png    :$:
-arrow_right.png		 => -> --> ==> >>>
-arrow_left.png		 <= <- <-- <== <<<
-exclamation.png		 :!:		
-lightbulb.png		 *) 0=

Copied: trunk/themes/default/smileys/theme.txt (from rev 985, trunk/themes/default/smileys/theme)
===================================================================
--- trunk/themes/default/smileys/theme.txt	                        (rev 0)
+++ trunk/themes/default/smileys/theme.txt	2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,27 @@
+# This theme set based on the icons at
+# http://www.famfamfam.com/lab/icons/silk/
+#
+# Ported to PHPFreeChat by Robin Monks
+#
+# These icons are under a Creative Commons Attribution 2.5 
+# License http://creativecommons.org/licenses/by/2.5/
+
+emoticon_smile.png	 :-) ^_^ :)
+emoticon_evilgrin.png	 >(
+emoticon_surprised.png   :S :s :-S :-s :-/
+emoticon_grin.png        :-D :D
+emoticon_unhappy.png     :'( :-( :o( :-< :(
+emoticon_happy.png       :lol:
+emoticon_waii.png	 :{} :-{} :razz: :} :-}
+emoticon_wink.png	 ;-) ;o) ;)
+emoticon_tongue.png      :P :-P :-p :p
+weather_rain.png         /// \\\ ||| :rain: :drizzle:
+weather_snow.png         :***:
+weather_sun.png          >O<
+weather_clouds.png       :""": :cloud: :clouds: 
+weather_cloudy.png       :"O": :cloudly:
+weather_lightning.png    :$:
+arrow_right.png		 => -> --> ==> >>>
+arrow_left.png		 <= <- <-- <== <<<
+exclamation.png		 :!:		
+lightbulb.png		 *) 0=

Deleted: trunk/themes/msn/smileys/theme
===================================================================
--- trunk/themes/msn/smileys/theme	2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/themes/msn/smileys/theme	2007-03-08 14:27:07 UTC (rev 988)
@@ -1,82 +0,0 @@
-msn_smiley.gif		:-)	:)
-msn_sad.gif			:-(	:(	:-<
-msn_laugh.gif		:-D	:-d	:d	:D	:->	:>
-msn_tongue.gif		:-P	:P	:-p	:p
-msn_wink.gif		;)	;-)
-msn_cry.gif			:'(
-msn_hot.gif			(H)	(h)
-msn_ooooh.gif		:-o
-msn_angry.gif		:-@	:@
-msn_nerd.gif		8-|
-msn_neutral.gif		:-|	:|
-msn_dontknow.gif	:^)
-msn_donttell.gif	:-#
-msn_eyeroll.gif		8-)
-msn_weird.gif		:-S	:-s	:s	:S
-msn_teeth.gif		8o|
-msn_think.gif		*-)
-msn_sarcastic.gif	^o)
-msn_sleepy.gif		|-)
-msn_brb.gif			(brb)
-msn_angel.gif		(a)	(A)
-msn_embarrassed.gif	:$	:-$
-msn_party.gif		<:o)
-msn_secret.gif		:-*
-msn_sick.gif		+o(
-msn_devil.gif		(6)
-tux1.gif                (tux1)
-tux2.gif                (tux2)
-gnu.gif                 (gnu)
-msn_bat.gif			:-[	:[
-msn_cat.gif			(@)
-msn_sheep.gif		(bah)
-msn_snail.gif		(sn)
-msn_turtle.gif		(tu)
-msn_dog.gif		(dog)
-msn_beer.gif		(B)	(b)
-msn_bowl.gif		(||)
-msn_boy.gif			(Z)	(z)
-msn_brheart.gif		(U)	(u)
-msn_cake.gif		(^)
-msn_car.gif			(au)
-msn_cellphone.gif	(mp)
-msn_cigarette.gif	(ci)
-msn_clock.gif		(o)	(O)
-msn_coffee.gif		(C)	(c)
-msn_coins.gif		(mo)
-msn_computer.gif	(co)
-msn_deadflower.gif	(W)	(w)
-msn_drink.gif		(D)	(d)
-msn_email.gif		(e)	(E)
-msn_film.gif		(~)
-msn_fingerscrossed.gif	(yn)
-msn_flower.gif		(F)	(f)
-msn_gift.gif		(g)	(G)
-msn_girl.gif		(X)	(x)
-msn_handcuffs.gif	(%)
-msn_heart.gif		(L)	(l)
-msn_highfive.gif	(h5)
-msn_icon.gif		(M)	(m)
-msn_idea.gif		(I)	(i)
-msn_island.gif		(ip)
-msn_kiss.gif		(K)	(k)
-msn_lightning.gif	(li)
-msn_note.gif		(8)
-msn_phone.gif		(T)	(t)
-msn_photo.gif		(P)	(p)
-msn_pizza.gif		(pi)
-msn_plane.gif		(ap)
-msn_plate.gif		(pl)
-msn_question.gif	(?)
-msn_rainbow.gif		(r)	(R)
-msn_run.gif			({)
-msn_runback.gif		(})
-msn_sleep.gif		(S)
-msn_soccer.gif		(so)
-msn_star.gif		(*)
-msn_stormy.gif		(st)
-msn_sun.gif			(#)
-msn_thumbdown.gif	(N)	(n)
-msn_thumbup.gif		(Y)	(y)
-msn_umbrella.gif	(um)
-msn_xbox.gif		(xx)

Copied: trunk/themes/msn/smileys/theme.txt (from rev 985, trunk/themes/msn/smileys/theme)
===================================================================
--- trunk/themes/msn/smileys/theme.txt	                        (rev 0)
+++ trunk/themes/msn/smileys/theme.txt	2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,82 @@
+msn_smiley.gif		:-)	:)
+msn_sad.gif			:-(	:(	:-<
+msn_laugh.gif		:-D	:-d	:d	:D	:->	:>
+msn_tongue.gif		:-P	:P	:-p	:p
+msn_wink.gif		;)	;-)
+msn_cry.gif			:'(
+msn_hot.gif			(H)	(h)
+msn_ooooh.gif		:-o
+msn_angry.gif		:-@	:@
+msn_nerd.gif		8-|
+msn_neutral.gif		:-|	:|
+msn_dontknow.gif	:^)
+msn_donttell.gif	:-#
+msn_eyeroll.gif		8-)
+msn_weird.gif		:-S	:-s	:s	:S
+msn_teeth.gif		8o|
+msn_think.gif		*-)
+msn_sarcastic.gif	^o)
+msn_sleepy.gif		|-)
+msn_brb.gif			(brb)
+msn_angel.gif		(a)	(A)
+msn_embarrassed.gif	:$	:-$
+msn_party.gif		<:o)
+msn_secret.gif		:-*
+msn_sick.gif		+o(
+msn_devil.gif		(6)
+tux1.gif                (tux1)
+tux2.gif                (tux2)
+gnu.gif                 (gnu)
+msn_bat.gif			:-[	:[
+msn_cat.gif			(@)
+msn_sheep.gif		(bah)
+msn_snail.gif		(sn)
+msn_turtle.gif		(tu)
+msn_dog.gif		(dog)
+msn_beer.gif		(B)	(b)
+msn_bowl.gif		(||)
+msn_boy.gif			(Z)	(z)
+msn_brheart.gif		(U)	(u)
+msn_cake.gif		(^)
+msn_car.gif			(au)
+msn_cellphone.gif	(mp)
+msn_cigarette.gif	(ci)
+msn_clock.gif		(o)	(O)
+msn_coffee.gif		(C)	(c)
+msn_coins.gif		(mo)
+msn_computer.gif	(co)
+msn_deadflower.gif	(W)	(w)
+msn_drink.gif		(D)	(d)
+msn_email.gif		(e)	(E)
+msn_film.gif		(~)
+msn_fingerscrossed.gif	(yn)
+msn_flower.gif		(F)	(f)
+msn_gift.gif		(g)	(G)
+msn_girl.gif		(X)	(x)
+msn_handcuffs.gif	(%)
+msn_heart.gif		(L)	(l)
+msn_highfive.gif	(h5)
+msn_icon.gif		(M)	(m)
+msn_idea.gif		(I)	(i)
+msn_island.gif		(ip)
+msn_kiss.gif		(K)	(k)
+msn_lightning.gif	(li)
+msn_note.gif		(8)
+msn_phone.gif		(T)	(t)
+msn_photo.gif		(P)	(p)
+msn_pizza.gif		(pi)
+msn_plane.gif		(ap)
+msn_plate.gif		(pl)
+msn_question.gif	(?)
+msn_rainbow.gif		(r)	(R)
+msn_run.gif			({)
+msn_runback.gif		(})
+msn_sleep.gif		(S)
+msn_soccer.gif		(so)
+msn_star.gif		(*)
+msn_stormy.gif		(st)
+msn_sun.gif			(#)
+msn_thumbdown.gif	(N)	(n)
+msn_thumbup.gif		(Y)	(y)
+msn_umbrella.gif	(um)
+msn_xbox.gif		(xx)

Deleted: trunk/themes/phoenity/smileys/theme
===================================================================
--- trunk/themes/phoenity/smileys/theme	2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/themes/phoenity/smileys/theme	2007-03-08 14:27:07 UTC (rev 988)
@@ -1,23 +0,0 @@
-smile.gif		:-) :) :} ^_^
-alien.gif 		o) o-) O) O-) O> o>
-evil.gif		>(
-arrow.gif		=> -> --> ==> >>>
-confused.gif		:S :s :-S :-s :/ :-/ :\ :-\
-cool.gif		8) 8-) B) B-) o-o O-O 0-0
-cry.gif			:'( :"(
-dizzy.gif		O_o o_O Oo oO
-eek.gif 		O_O o_o 0.0 O.O OO 00 o.o
-angry.gif		:-@ :@
-exclam.gif		(!) [!] :!:
-idea.gif		*)
-laugh.gif		:-D :D 
-lol.gif			:lol:
-mrgreen.gif		:green: +o( +( +-(
-normal.gif		:| :-| |-: |: :o|  
-question.gif		:? :-? :o? [?] (?) :?:
-razz.gif		:{} :-{} :razz:
-redface.gif		:-# :# :o# :$	:-$ :o$
-rolleyes.gif		9_9 ^o) ^-)
-sad.gif			:( :-( :o( :-< :-{
-surprised.gif		:o :O :-o :-O :!?!: :?!?:
-wink.gif		;-) ;) ;o) *_- o_- -_o
\ No newline at end of file

Copied: trunk/themes/phoenity/smileys/theme.txt (from rev 985, trunk/themes/phoenity/smileys/theme)
===================================================================
--- trunk/themes/phoenity/smileys/theme.txt	                        (rev 0)
+++ trunk/themes/phoenity/smileys/theme.txt	2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,23 @@
+smile.gif		:-) :) :} ^_^
+alien.gif 		o) o-) O) O-) O> o>
+evil.gif		>(
+arrow.gif		=> -> --> ==> >>>
+confused.gif		:S :s :-S :-s :/ :-/ :\ :-\
+cool.gif		8) 8-) B) B-) o-o O-O 0-0
+cry.gif			:'( :"(
+dizzy.gif		O_o o_O Oo oO
+eek.gif 		O_O o_o 0.0 O.O OO 00 o.o
+angry.gif		:-@ :@
+exclam.gif		(!) [!] :!:
+idea.gif		*)
+laugh.gif		:-D :D 
+lol.gif			:lol:
+mrgreen.gif		:green: +o( +( +-(
+normal.gif		:| :-| |-: |: :o|  
+question.gif		:? :-? :o? [?] (?) :?:
+razz.gif		:{} :-{} :razz:
+redface.gif		:-# :# :o# :$	:-$ :o$
+rolleyes.gif		9_9 ^o) ^-)
+sad.gif			:( :-( :o( :-< :-{
+surprised.gif		:o :O :-o :-O :!?!: :?!?:
+wink.gif		;-) ;) ;o) *_- o_- -_o
\ No newline at end of file

Deleted: trunk/themes/phpbb2/smileys/theme
===================================================================
--- trunk/themes/phpbb2/smileys/theme	2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/themes/phpbb2/smileys/theme	2007-03-08 14:27:07 UTC (rev 988)
@@ -1,37 +0,0 @@
-icon_biggrin.gif		:-D	:grin:	:D
-icon_smile.gif		:smile:	:-)	:)
-icon_sad.gif		:(	:-(	:sad:
-icon_surprised.gif		:o	:-o	:eek:
-icon_eek.gif		:shock:
-icon_confused.gif		:-?
-icon_cool.gif		:cool:	8)	8-)
-icon_lol.gif		:lol:
-icon_mad.gif		:x	:-x	:mad:
-icon_razz.gif		:P	:-P	:razz:
-icon_redface.gif		<oops>
-icon_cry.gif		:cry:
-icon_evil.gif		:evil:
-icon_twisted.gif		:twisted:
-icon_rolleyes.gif		:roll:
-icon_wink.gif		:wink:	;)	;-)
-icon_exclaim.gif		:!:
-icon_question.gif		:?:
-icon_idea.gif		:idea:
-icon_arrow.gif		:arrow:
-icon_neutral.gif		:|	:-|	:neutral:
-icon_mrgreen.gif		:mrgreen:
-eusa_liar.gif		:---)	:^o
-eusa_clap.gif		=D<
-eusa_doh.gif		#-o
-eusa_drool.gif		=P~
-eusa_hand.gif		=;
-eusa_sick.gif		:-&
-eusa_boohoo.gif		:boohoo:
-eusa_dance.gif		\\:D/
-eusa_silenced.gif		:-#
-eusa_whistle.gif		:-"
-eusa_wall.gif		](*,)
-eusa_think.gif		:-k
-eusa_shifty.gif		8-[
-eusa_pray.gif		[-o>
-eusa_naughty.gif		[-X
\ No newline at end of file

Copied: trunk/themes/phpbb2/smileys/theme.txt (from rev 985, trunk/themes/phpbb2/smileys/theme)
===================================================================
--- trunk/themes/phpbb2/smileys/theme.txt	                        (rev 0)
+++ trunk/themes/phpbb2/smileys/theme.txt	2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,37 @@
+icon_biggrin.gif		:-D	:grin:	:D
+icon_smile.gif		:smile:	:-)	:)
+icon_sad.gif		:(	:-(	:sad:
+icon_surprised.gif		:o	:-o	:eek:
+icon_eek.gif		:shock:
+icon_confused.gif		:-?
+icon_cool.gif		:cool:	8)	8-)
+icon_lol.gif		:lol:
+icon_mad.gif		:x	:-x	:mad:
+icon_razz.gif		:P	:-P	:razz:
+icon_redface.gif		<oops>
+icon_cry.gif		:cry:
+icon_evil.gif		:evil:
+icon_twisted.gif		:twisted:
+icon_rolleyes.gif		:roll:
+icon_wink.gif		:wink:	;)	;-)
+icon_exclaim.gif		:!:
+icon_question.gif		:?:
+icon_idea.gif		:idea:
+icon_arrow.gif		:arrow:
+icon_neutral.gif		:|	:-|	:neutral:
+icon_mrgreen.gif		:mrgreen:
+eusa_liar.gif		:---)	:^o
+eusa_clap.gif		=D<
+eusa_doh.gif		#-o
+eusa_drool.gif		=P~
+eusa_hand.gif		=;
+eusa_sick.gif		:-&
+eusa_boohoo.gif		:boohoo:
+eusa_dance.gif		\\:D/
+eusa_silenced.gif		:-#
+eusa_whistle.gif		:-"
+eusa_wall.gif		](*,)
+eusa_think.gif		:-k
+eusa_shifty.gif		8-[
+eusa_pray.gif		[-o>
+eusa_naughty.gif		[-X
\ No newline at end of file

Deleted: trunk/version
===================================================================
--- trunk/version	2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/version	2007-03-08 14:27:07 UTC (rev 988)
@@ -1 +0,0 @@
-1.0-beta9
\ No newline at end of file

Copied: trunk/version.txt (from rev 985, trunk/version)
===================================================================
--- trunk/version.txt	                        (rev 0)
+++ trunk/version.txt	2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1 @@
+1.0-beta9
\ 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: [987] trunk/i18n/en_US/main.php

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

Revision: 987
          http://svn.sourceforge.net/phpfreechat/?rev=987&view=rev
Author:   kerphi
Date:     2007-03-08 06:16:59 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
typo

Modified Paths:
--------------
    trunk/i18n/en_US/main.php

Modified: trunk/i18n/en_US/main.php
===================================================================
--- trunk/i18n/en_US/main.php	2007-03-08 14:16:31 UTC (rev 986)
+++ trunk/i18n/en_US/main.php	2007-03-08 14:16:59 UTC (rev 987)
@@ -277,7 +277,7 @@
 $GLOBALS["i18n"]["Identification failure"] = "Identification failure";
 
 // line 25 in send.class.php
-$GLOBALS["i18n"]["Your must be connected to send a message"] = "Your must be connected to send a message";
+$GLOBALS["i18n"]["Your must be connected to send a message"] = "You must be connected to send a message";
 
 // line 87 in chat.js.tpl.php
 $GLOBALS["i18n"]["Click here to send your message"] = "Click here to send your message";


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [986] trunk/src/proxies/checktimeout.class.php

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

Revision: 986
          http://svn.sourceforge.net/phpfreechat/?rev=986&view=rev
Author:   kerphi
Date:     2007-03-08 06:16:31 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
typo

Modified Paths:
--------------
    trunk/src/proxies/checktimeout.class.php

Modified: trunk/src/proxies/checktimeout.class.php
===================================================================
--- trunk/src/proxies/checktimeout.class.php	2007-03-08 13:59:52 UTC (rev 985)
+++ trunk/src/proxies/checktimeout.class.php	2007-03-08 14:16:31 UTC (rev 986)
@@ -26,7 +26,7 @@
 /**
  * pfcProxyCommand_checktimeout
  * this command disconnect obsolete users (timouted)
- * an obsolete user is an user which didn't update his stats since more than 20 seconds (timeout value)
+ * an obsolete user is an user which didn't update his stats since more than 20 seconds (default timeout value)
  * @author Stephane Gully <ste...@gm...>
  */
 class pfcProxyCommand_checktimeout extends pfcProxyCommand
@@ -41,35 +41,34 @@
 
     if ($this->name == 'update')
     {
-    $c  =& pfcGlobalConfig::Instance();
-    $u  =& pfcUserConfig::Instance();
-    $ct =& pfcContainer::Instance();
-
-    // disconnect users from specific channels
-    $disconnected_users = $ct->removeObsoleteNick($c->timeout);
-    for($i=0; $i<count($disconnected_users["nick"]); $i++)
-    {
-      $nick = $disconnected_users["nick"][$i];
-      for($j=0; $j<count($disconnected_users["channels"][$i]); $j++)
+      $c  =& pfcGlobalConfig::Instance();
+      $u  =& pfcUserConfig::Instance();
+      $ct =& pfcContainer::Instance();
+      
+      // disconnect users from channels when they timeout
+      $disconnected_users = $ct->removeObsoleteNick($c->timeout);
+      for($i=0; $i<count($disconnected_users["nick"]); $i++)
       {
-        file_put_contents('/tmp/disco',var_export($disconnected_users,true), FILE_APPEND);
-        $chan = $disconnected_users["channels"][$i][$j];
-        $online_users = $ct->getOnlineNick($chan);
-        if ($chan != 'SERVER' &&
-            count($online_users['nickid']))
+        $nick = $disconnected_users["nick"][$i];
+        for($j=0; $j<count($disconnected_users["channels"][$i]); $j++)
         {
-          $cmdp = $p;
-          $cmdp["param"] = _pfc("%s quit (timeout)", $nick);
-          $cmdp["flag"] = 2;
-          $cmdp["recipient"] = $chan;
-          $cmdp["recipientid"] = md5($chan); // @todo: clean the recipient/recipientid notion
-          $cmd =& pfcCommand::Factory("notice");
-          $cmd->run($xml_reponse, $cmdp);
-        }
-      }      
+          $chan = $disconnected_users["channels"][$i][$j];
+          $online_users = $ct->getOnlineNick($chan);
+          if ($chan != 'SERVER' &&
+              count($online_users['nickid']))
+          {
+            $cmdp = $p;
+            $cmdp["param"] = _pfc("%s quit (timeout)", $nick);
+            $cmdp["flag"] = 2;
+            $cmdp["recipient"] = $chan;
+            $cmdp["recipientid"] = md5($chan); // @todo: clean the recipient/recipientid notion
+            $cmd =& pfcCommand::Factory("notice");
+            $cmd->run($xml_reponse, $cmdp);
+          }
+        }      
+      }
     }
-    }
-
+    
     // forward the command to the next proxy or to the final command
     $this->next->run($xml_reponse, $p);
   }


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

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

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

Revision: 985
          http://svn.sourceforge.net/phpfreechat/?rev=985&view=rev
Author:   kerphi
Date:     2007-03-08 05:59:52 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
should fix the "You must be connected" problem

Modified Paths:
--------------
    trunk/src/pfccontainer.class.php
    trunk/src/proxies/checktimeout.class.php

Modified: trunk/src/pfccontainer.class.php
===================================================================
--- trunk/src/pfccontainer.class.php	2007-03-07 19:14:11 UTC (rev 984)
+++ trunk/src/pfccontainer.class.php	2007-03-08 13:59:52 UTC (rev 985)
@@ -147,13 +147,15 @@
   function removeNick($chan, $nickid)
   {
     $c =& pfcGlobalConfig::Instance();
-
+    
     if ($chan == NULL) $chan = 'SERVER';
 
     $deleted_user = array();
     $deleted_user["nick"]      = array();
     $deleted_user["nickid"]    = array();
     $deleted_user["timestamp"] = array();
+    
+    if (!$nickid) return $deleted_user;
 
     $timestamp = $this->getMeta("channelid-to-nickid", $this->encode('SERVER'), $nickid);
     if (count($timestamp["timestamp"]) == 0) return $deleted_user;
@@ -162,7 +164,7 @@
     $deleted_user["nick"][]      = $this->getNickname($nickid);
     $deleted_user["nickid"][]    = $nickid;
     $deleted_user["timestamp"][] = $timestamp;
-
+        
     // remove the nickid from the channel list
     $this->rmMeta('channelid-to-nickid', $this->encode($chan), $nickid);
     $this->rmMeta('nickid-to-channelid', $nickid, $this->encode($chan));
@@ -284,7 +286,7 @@
     {
       $timestamp = $ret['timestamp'][$i];
       $nickid    = $ret['value'][$i];
-      if (time() > ($timestamp+$timeout/1000) ) // user will be disconnected after 'timeout' secondes of inactivity
+      if (time() > ($timestamp+$timeout/1000) && $nickid) // user will be disconnected after 'timeout' secondes of inactivity
       {
         // get the current user's channels list
         $channels = array();
@@ -733,4 +735,4 @@
   }    
 }
 
-?>
\ No newline at end of file
+?>

Modified: trunk/src/proxies/checktimeout.class.php
===================================================================
--- trunk/src/proxies/checktimeout.class.php	2007-03-07 19:14:11 UTC (rev 984)
+++ trunk/src/proxies/checktimeout.class.php	2007-03-08 13:59:52 UTC (rev 985)
@@ -39,6 +39,8 @@
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
+    if ($this->name == 'update')
+    {
     $c  =& pfcGlobalConfig::Instance();
     $u  =& pfcUserConfig::Instance();
     $ct =& pfcContainer::Instance();
@@ -50,6 +52,7 @@
       $nick = $disconnected_users["nick"][$i];
       for($j=0; $j<count($disconnected_users["channels"][$i]); $j++)
       {
+        file_put_contents('/tmp/disco',var_export($disconnected_users,true), FILE_APPEND);
         $chan = $disconnected_users["channels"][$i][$j];
         $online_users = $ct->getOnlineNick($chan);
         if ($chan != 'SERVER' &&
@@ -65,10 +68,11 @@
         }
       }      
     }
+    }
 
     // forward the command to the next proxy or to the final command
     $this->next->run($xml_reponse, $p);
   }
 }
 
-?>
\ 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: [984] trunk

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

Revision: 984
          http://svn.sourceforge.net/phpfreechat/?rev=984&view=rev
Author:   kerphi
Date:     2007-03-07 11:14:11 -0800 (Wed, 07 Mar 2007)

Log Message:
-----------
work on simplifications

Modified Paths:
--------------
    trunk/data/public/js/pfcclient.js
    trunk/src/commands/ban.class.php
    trunk/src/commands/connect.class.php
    trunk/src/commands/deop.class.php
    trunk/src/commands/identify.class.php
    trunk/src/commands/join.class.php
    trunk/src/commands/leave.class.php
    trunk/src/commands/me.class.php
    trunk/src/commands/nick.class.php
    trunk/src/commands/notice.class.php
    trunk/src/commands/op.class.php
    trunk/src/commands/privmsg.class.php
    trunk/src/commands/quit.class.php
    trunk/src/commands/send.class.php
    trunk/src/commands/update.class.php
    trunk/src/commands/whois.class.php
    trunk/src/pfccommand.class.php
    trunk/src/pfccontainer.class.php
    trunk/src/pfcglobalconfig.class.php
    trunk/src/pfcuserconfig.class.php
    trunk/src/phpfreechat.class.php
    trunk/src/proxies/auth.class.php
    trunk/src/proxies/checknickchange.class.php
    trunk/src/proxies/checktimeout.class.php
    trunk/themes/default/chat.js.tpl.php

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/data/public/js/pfcclient.js	2007-03-07 19:14:11 UTC (rev 984)
@@ -39,11 +39,12 @@
     this.privmsgs      = Array();
     this.privmsgids    = Array();
     
-    this.timeout       = null;
-    this.refresh_delay = pfc_refresh_delay;
-    this.max_refresh_delay = pfc_max_refresh_delay;
+    this.timeout            = null;
+    this.refresh_delay      = pfc_refresh_delay;
+    this.max_refresh_delay  = pfc_max_refresh_delay;
     this.last_response_time = new Date().getTime();
     this.last_request_time  = new Date().getTime();
+    this.canupdatenexttime  = true;
 
     /* unique client id for each windows used to identify a open window
      * this id is passed every time the JS communicate with server
@@ -145,7 +146,12 @@
   askNickResponse: function(newnick)
   {
     if (newnick)
-      this.sendRequest('/nick "'+newnick+'"');
+    {
+      if (this.isconnected)
+        this.sendRequest('/nick "'+newnick+'"');
+      else
+        this.sendRequest('/connect '+newnick);
+    }
   },
 
   /**
@@ -167,7 +173,10 @@
     {
       //alert(cmd + "-"+resp+"-"+param);
       if (resp == "ok")
-      {                
+      {
+        this.nickname = param[0]; 
+        this.sendRequest('/nick "'+this.nickname+'"');
+/*
         if (this.nickname == '')
           // ask to choose a nickname
           this.askNick(this.nickname);
@@ -175,9 +184,59 @@
         {
           this.sendRequest('/nick "'+this.nickname+'"');
         }
-        
+*/        
         this.isconnected = true;
 
+/*
+        // join the default channels comming from the parameter list
+	// and the user's channels comming from the
+	var ch = pfc_defaultchan;
+        for (var i=0; i<pfc_userchan.length; i++)
+        {
+          if (indexOf(ch,pfc_userchan[i]) == -1)
+            ch.push(pfc_userchan[i]);
+        }
+*/
+        // join the default channels comming from the parameter list
+        if (pfc_userchan.length == 0)
+          for (var i=0; i<pfc_defaultchan.length; i++)
+          {
+            if (i<pfc_defaultchan.length-1)
+              cmd = '/join2';
+            else
+              cmd = '/join';
+            cmd += ' "'+pfc_defaultchan[i]+'"';
+            this.sendRequest(cmd);
+          }
+        else
+          // join channels comming from user sessions
+          for (var i=0; i<pfc_userchan.length; i++)
+          {
+            if (i<pfc_userchan.length-1)
+              cmd = '/join2';
+            else
+              cmd = '/join';
+            cmd += ' "'+pfc_userchan[i]+'"'; 
+            this.sendRequest(cmd);
+          }
+
+        // join the default privmsg comming from the parameter list
+        for (var i=0; i<pfc_defaultprivmsg.length; i++)
+        {
+          if (i<pfc_defaultprivmsg.length-1)
+            cmd = '/privmsg2';
+          else
+            cmd = '/privmsg';
+          cmd += ' "'+pfc_defaultprivmsg[i]+'"'; 
+          this.sendRequest(cmd);
+        }
+        // now join privmsg comming from the sessions
+        for (var i=0; i<pfc_userprivmsg.length; i++)
+        {
+          this.sendRequest('/privmsg "'+pfc_userprivmsg[i]+'"');
+        }
+
+
         // start the polling system
         this.updateChat(true);
       }
@@ -277,6 +336,7 @@
       {
         cmd = '';
 
+/*
         // join the default channels comming from the parameter list
         for (var i=0; i<pfc_defaultchan.length; i++)
         {
@@ -313,6 +373,7 @@
         {
           this.sendRequest('/privmsg "'+pfc_userprivmsg[i]+'"');
         }
+*/
       }
 
       if (resp == "ok" || resp == "notchanged" || resp == "changed" || resp == "connected")
@@ -473,7 +534,7 @@
           var nickid = meta['users']['nickid'][i];
           var nick   = meta['users']['nick'][i];
           var um = this.getAllUserMeta(nickid);  
-          if (!um) this.sendRequest('/whois2 "'+nick+'"');
+          if (!um) this.sendRequest('/whois2 "'+nickid+'"');
         }
 
         // update the nick list display on the current channel
@@ -504,6 +565,9 @@
         this.handleComingRequest(param);
       }
     }
+    else if (cmd == "send")
+    {
+    }
     else
       alert(cmd + "-"+resp+"-"+param);
   },
@@ -1462,7 +1526,12 @@
     if (this.isconnected)
       this.sendRequest('/quit');
     else
-      this.sendRequest('/connect');
+    {
+      if (this.nickname == '')
+        this.askNick();
+      else
+        this.sendRequest('/connect '+this.nickname);
+    }
   },
   refresh_loginlogout: function()
   {

Modified: trunk/src/commands/ban.class.php
===================================================================
--- trunk/src/commands/ban.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/ban.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -39,7 +39,7 @@
     
     // notify all the channel
     $cmdp = $p;
-    $cmdp["param"] = _pfc("banished from %s by %s", $channame, $sender);
+    $cmdp["param"] = _pfc("%s banished from %s by %s", $nick, $channame, $sender);
     $cmdp["flag"]  = 1;
     $cmd =& pfcCommand::Factory("notice");
     $cmd->run($xml_reponse, $cmdp);

Modified: trunk/src/commands/connect.class.php
===================================================================
--- trunk/src/commands/connect.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/connect.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -8,13 +8,17 @@
   {
     $clientid    = $p["clientid"];
     $param       = $p["param"];
+    $params      = $p["params"];
     $sender      = $p["sender"];
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
     $getoldmsg   = isset($p["getoldmsg"]) ? $p["getoldmsg"] : true;
-    
-    $c =& pfcGlobalConfig::Instance();
-    $u =& pfcUserConfig::Instance();
+
+    // nickname must be given to be able to connect to the chat
+    $nick = $params[0];
+
+    $c  =& pfcGlobalConfig::Instance();
+    $u  =& pfcUserConfig::Instance();
     $ct =& pfcContainer::Instance();
 
     // reset the message id indicator (see getnewmsg.class.php)
@@ -69,9 +73,21 @@
           (count($users["nickid"]) == 0 || (count($users["nickid"]) == 1 && $users["nickid"][0] == $u->nickid)))
         $isadmin = true;
     }
-    
+
     // setup some user meta
     $nickid = $u->nickid;
+
+    // create the nickid
+    $ct->joinChan($nickid, NULL); // join the server
+    $ct->createNick($nickid, $nick);
+
+    $u->nick = $nick;
+    $u->saveInCache();
+    
+    // setup the active flag in user session
+    //    $u->active = true;
+    //    $u->saveInCache();
+                                        
     // store the user ip
     $ip = $_SERVER["REMOTE_ADDR"];
     if ($ip == "::1") $ip = "127.0.0.1"; // fix for konqueror & localhost
@@ -83,7 +99,7 @@
       $ct->setUserMeta($nickid, $k, $v);
 
     // connect to the server
-    $xml_reponse->script("pfc.handleResponse('connect', 'ok', '');");
+    $xml_reponse->script("pfc.handleResponse('connect', 'ok', Array('".addslashes($nick)."'));");
   }
 }
 

Modified: trunk/src/commands/deop.class.php
===================================================================
--- trunk/src/commands/deop.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/deop.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -8,8 +8,9 @@
   
   function run(&$xml_reponse, $p)
   {
-    $c =& pfcGlobalConfig::Instance();
-    $u =& pfcUserConfig::Instance();
+    $c  =& pfcGlobalConfig::Instance();
+    $u  =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
 
     if (trim($p["param"]) == "")
     {
@@ -24,11 +25,10 @@
 
     // just change the "isadmin" meta flag
     $nicktodeop   = trim($p["param"]);
-    $container  =& pfcContainer::Instance();
-    $nicktodeopid = $container->getNickId($nicktodeop);
-    $container->setUserMeta($nicktodeopid, 'isadmin', false);
+    $nicktodeopid = $ct->getNickId($nicktodeop);
+    $ct->setUserMeta($nicktodeopid, 'isadmin', false);
 
-    $this->forceWhoisReload($nicktodeop);
+    $this->forceWhoisReload($nicktodeopid);
   }
 }
 

Modified: trunk/src/commands/identify.class.php
===================================================================
--- trunk/src/commands/identify.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/identify.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -59,7 +59,7 @@
       // ok the current user is an admin, just save the isadmin flag in the metadata
       $ct =& pfcContainer::Instance();
       $ct->setUserMeta($u->nickid, 'isadmin', $isadmin);
-      $this->forceWhoisReload($u->nick);
+      $this->forceWhoisReload($u->nickid);
       
       $msg .= _pfc("Succesfully identified");
       $xml_reponse->script("pfc.handleResponse('".$this->name."', 'ok', '".$msg."');");

Modified: trunk/src/commands/join.class.php
===================================================================
--- trunk/src/commands/join.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/join.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -46,7 +46,7 @@
       
       // show a join message
       $cmdp = $p;
-      $cmdp["param"] = _pfc("%s joins %s",$u->nick, $channame);
+      $cmdp["param"] = _pfc("%s joins %s",$u->getNickname(), $channame);
       $cmdp["recipient"] = $chanrecip;
       $cmdp["recipientid"] = $chanid;
       $cmdp["flag"] = 2;
@@ -56,8 +56,9 @@
 
     // register the user (and his metadata) in the channel
     $ct =& pfcContainer::Instance();
-    $ct->createNick($chanrecip, $u->nick, $u->nickid);
-    $this->forceWhoisReload($u->nick);
+    //    $ct->createNick($chanrecip, $u->nick, $u->nickid);
+    $ct->joinChan($u->nickid, $chanrecip);
+    $this->forceWhoisReload($u->nickid);
     
     // return ok to the client
     // then the client will create a new tab

Modified: trunk/src/commands/leave.class.php
===================================================================
--- trunk/src/commands/leave.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/leave.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -67,7 +67,7 @@
     $leave_recip = '';
     $leave_id    = '';
 
-    // check into channels
+    // save the new channel list in the session
     if ( isset($u->channels[$id]) )
     {
       $leave_recip = $u->channels[$id]["recipient"];
@@ -77,7 +77,7 @@
       $leavech = true;
     }
 
-    // check into private messages
+    // save the new private messages list in the session
     if ( isset($u->privmsg[$id]) )
     {
       $leave_recip = $u->privmsg[$id]["recipient"];
@@ -89,14 +89,14 @@
 
     if($leavepv || $leavech)
     {
-      if ($leavech)
+      //      if ($leavech)
       {
         // show a leave message with the showing the reason if present
         $cmdp = $p;
         $cmdp["recipient"]   = $leave_recip;
         $cmdp["recipientid"] = $leave_id;
         $cmdp["flag"]        = 2;
-        $cmdp["param"] = _pfc("%s quit",$u->nick);
+        $cmdp["param"] = _pfc("%s quit",$u->getNickname());
         if ($reason != "") $cmdp["param"] .= " (".$reason.")";
         $cmd =& pfcCommand::Factory("notice");
         $cmd->run($xml_reponse, $cmdp);

Modified: trunk/src/commands/me.class.php
===================================================================
--- trunk/src/commands/me.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/me.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -14,8 +14,9 @@
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
     
-    $c =& pfcGlobalConfig::Instance();
-    $u =& pfcUserConfig::Instance();
+    $c  =& pfcGlobalConfig::Instance();
+    $u  =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
 
     if (trim($param) == "")
     {
@@ -28,9 +29,8 @@
       return;
     }
 
-    $container =& pfcContainer::Instance();
     $msg = phpFreeChat::PreFilterMsg($param);
-    $container->write($recipient, "*me*", $this->name, $u->nick." ".$msg);
+    $ct->write($recipient, "*me*", $this->name, $u->getNickname()." ".$msg);
     
     if ($c->debug) pxlog("/me ".$msg, "chat", $c->getId());
   }

Modified: trunk/src/commands/nick.class.php
===================================================================
--- trunk/src/commands/nick.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/nick.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -14,8 +14,9 @@
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& pfcGlobalConfig::Instance();
-    $u =& pfcUserConfig::Instance();
+    $c  =& pfcGlobalConfig::Instance();
+    $u  =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
 
     if (trim($param) == "")
     {
@@ -29,11 +30,10 @@
     }
     
     $newnick = phpFreeChat::FilterNickname($param);
-    $oldnick = $u->nick;
+    $oldnick = $ct->getNickname($u->nickid);
 
-    $container =& pfcContainer::Instance();
-    $newnickid = $container->getNickId($newnick);
-    $oldnickid = $container->getNickId($oldnick);
+    $newnickid = $ct->getNickId($newnick);
+    $oldnickid = $u->nickid;
 
     if ($c->debug) pxlog("/nick ".$newnick, "chat", $c->getId());
 
@@ -42,13 +42,14 @@
     // oldnick is different from new nick
     // -> this is a nickname change
     if ($oldnickid == $u->nickid &&
-        $oldnick != $newnick && $oldnick != "")
+        $oldnick != $newnick &&
+        $oldnick != '')
     {
       // really change the nick (rename it)
-      $container->changeNick($newnick, $oldnick);
+      $ct->changeNick($newnick, $oldnick);
       $u->nick = $newnick;
       $u->saveInCache();
-      $this->forceWhoisReload($u->nick);
+      $this->forceWhoisReload($u->nickid);
 
       // notify all the joined channels/privmsg
       $cmdp = $p;
@@ -68,8 +69,10 @@
         $cmd->run($xml_reponse, $cmdp);
       }
       $xml_reponse->script("pfc.handleResponse('nick', 'changed', '".addslashes($newnick)."');");
+      return;
     }
-    
+
+    /*
     // new nickname is undefined (not used) and
     // current nickname (oldnick) is not mine or is undefined
     // -> this is a first connection
@@ -77,24 +80,24 @@
         $oldnickid != $u->nickid)
     {
       // this is a first connection : create the nickname on the server
-      $container->createNick(NULL, $newnick, $u->nickid);
-      /*
-      // useless code, it's done in updatemynick command
-      foreach($u->channels as $chan)
-        $container->createNick($chan["recipient"], $newnick, $u->nickid);
-      foreach($u->privmsg as $pv)
-        $container->createNick($pv["recipient"], $newnick, $u->nickid);
-      */
-      $u->nick   = $newnick;
-      $u->active = true;
-      $u->saveInCache();
-      $this->forceWhoisReload($u->nick);
+      //      $container->createNick(NULL, $newnick, $u->nickid);
+      $container->createNick($u->nickid, $newnick);
 
+      //$u->nick   = $newnick;
+      //      $u->active = true;
+      //$u->saveInCache();
+      $this->forceWhoisReload($u->nickid);
+
       $xml_reponse->script("pfc.handleResponse('nick', 'connected', '".addslashes($newnick)."');");
     
       if ($c->debug)
         pxlog("/nick ".$newnick." (first connection, oldnick=".$oldnick.")", "chat", $c->getId());
+      return;
     }
+    */
+
+    //    $ct->createNick($u->nickid, $newnick);
+    
   }
 }
 

Modified: trunk/src/commands/notice.class.php
===================================================================
--- trunk/src/commands/notice.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/notice.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -13,15 +13,16 @@
     $recipientid = $p["recipientid"];
     $flag        = isset($p["flag"]) ? $p["flag"] : 3;
     
-    $c =& pfcGlobalConfig::Instance();
-    $u =& pfcUserConfig::Instance();
+    $c  =& pfcGlobalConfig::Instance();
+    $u  =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
 
     if ($c->shownotice > 0 &&
         ($c->shownotice & $flag) == $flag)
     {
-      $container =& pfcContainer::Instance();
       $msg = phpFreeChat::FilterSpecialChar($msg);
-      $res = $container->write($recipient, $u->nick, "notice", $msg);
+      $nick = $ct->getNickname($u->nickid);
+      $res = $ct->write($recipient, $nick, "notice", $msg);
       if (is_array($res))
       {
         $cmdp = $p;

Modified: trunk/src/commands/op.class.php
===================================================================
--- trunk/src/commands/op.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/op.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -14,8 +14,9 @@
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& pfcGlobalConfig::Instance();
-    $u =& pfcUserConfig::Instance();
+    $c  =& pfcGlobalConfig::Instance();
+    $u  =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
 
     if (trim($param) == "")
     {
@@ -30,11 +31,10 @@
 
     // just change the "isadmin" meta flag
     $nicktoop   = trim($param);
-    $container  =& pfcContainer::Instance();
-    $nicktoopid = $container->getNickId($nicktoop);
-    $container->setUserMeta($nicktoopid, 'isadmin', true);
+    $nicktoopid = $ct->getNickId($nicktoop);
+    $ct->setUserMeta($nicktoopid, 'isadmin', true);
 
-    $this->forceWhoisReload($nicktoop);
+    $this->forceWhoisReload($nicktoopid);
   }
 }
 

Modified: trunk/src/commands/privmsg.class.php
===================================================================
--- trunk/src/commands/privmsg.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/privmsg.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -14,13 +14,23 @@
     
     $c =& pfcGlobalConfig::Instance();
     $u =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
     
-    $pvname = $param;
-    
     // check the pvname exists on the server
-    $container =& pfcContainer::Instance();
-    $pvnickid = $container->getNickId($pvname);
+    $pvname = '';
+    $pvnickid = '';
+    if ($this->name == 'privmsg2')
+    {
+      $pvnickid = $ct->getNickId($param);
+      $pvname   = $ct->getNickname($pvnickid);
+    }
+    else
+    {
+      $pvname   = $param;
+      $pvnickid = $ct->getNickId($pvname);
+    }
     $nickid   = $u->nickid;
+    $nick     = $ct->getNickname($u->nickid);
 
     // error: can't speak to myself
     if ($pvnickid == $nickid)
@@ -78,14 +88,14 @@
       // reset the message id indicator
       // i.e. be ready to re-get all last posted messages
       $from_id_sid = "pfc_from_id_".$c->getId()."_".$clientid."_".$pvrecipientid;
-      $from_id     = $container->getLastId($pvrecipient)-$c->max_msg-1;
+      $from_id     = $ct->getLastId($pvrecipient)-$c->max_msg-1;
       $_SESSION[$from_id_sid] = ($from_id<0) ? 0 : $from_id;
     }
 
     // register the user (and his metadata) in this pv
-    $ct =& pfcContainer::Instance();
-    $ct->createNick($pvrecipient, $u->nick, $u->nickid);
-    $this->forceWhoisReload($u->nick);
+    //    $ct->createNick($pvrecipient, $u->nick, $u->nickid);
+    $ct->joinChan($nickid, $pvrecipient);
+    $this->forceWhoisReload($nickid);
     
     // return ok to the client
     // then the client will create a new tab

Modified: trunk/src/commands/quit.class.php
===================================================================
--- trunk/src/commands/quit.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/quit.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -12,14 +12,13 @@
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
     
-    $c =& pfcGlobalConfig::Instance();
-    $u =& pfcUserConfig::Instance();
+    $c  =& pfcGlobalConfig::Instance();
+    $u  =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
 
-    // then remove the nickname file
-    $ct =& pfcContainer::Instance();
-    $quitmsg = $param == "" ? _pfc("%s quit", $u->nick) : _pfc("%s quit (%s)", $u->nick, $param);
+    $nick = $ct->getNickname($u->nickid);
     
-    // from the channels
+    // leave the channels
     foreach( $u->channels as $id => $chandetail )
       if ($ct->removeNick($chandetail["recipient"], $u->nickid))
       {
@@ -30,7 +29,7 @@
         $cmd =& pfcCommand::Factory("leave");
         $cmd->run($xml_reponse, $cmdp);
       }
-    // from the private messages
+    // leave the private messages
     foreach( $u->privmsg as $id => $pvdetail )
       if ($ct->removeNick($pvdetail["recipient"], $u->nickid))
       {
@@ -41,16 +40,18 @@
         $cmd =& pfcCommand::Factory("leave");
         $cmd->run($xml_reponse, $cmdp);
       }
-    // from the server
+    // leave the server
     $ct->removeNick(NULL, $u->nickid);
 
+    /*
     // then set the chat inactive
     $u->active = false;
     $u->saveInCache();
+    */
     
     $xml_reponse->script("pfc.handleResponse('quit', 'ok', '');");
 
-    if ($c->debug) pxlog("/quit (a user just quit -> nick=".$u->nick.")", "chat", $c->getId());
+    if ($c->debug) pxlog("/quit (a user just quit -> nick=".$nick.")", "chat", $c->getId());
   }
 }
 

Modified: trunk/src/commands/send.class.php
===================================================================
--- trunk/src/commands/send.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/send.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -12,23 +12,13 @@
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
     
-    $c =& pfcGlobalConfig::Instance();
-    $u =& pfcUserConfig::Instance();
-    $nick = phpFreeChat::FilterSpecialChar($sender);
+    $c  =& pfcGlobalConfig::Instance();
+    $u  =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
+    
+    $nick = $ct->getNickname($u->nickid); //phpFreeChat::FilterSpecialChar($sender);
     $text = phpFreeChat::PreFilterMsg($param);
 
-
-    // send an error because the current user is not connected
-    if (!$u->active)
-    {
-      $cmdp = $p;
-      $cmdp["param"] = _pfc("Your must be connected to send a message");
-      $cmd =& pfcCommand::Factory("error");
-      $cmd->run($xml_reponse, $cmdp);
-      return;
-    }
-
-
     //        $offline = $container->getMeta("offline", "nickname", $u->privmsg[$recipientid]["name"]);        
     
     // if this channel is a pv (one to one channel),
@@ -37,12 +27,12 @@
     $can_send = true;
     if (isset($u->privmsg[$recipientid]))
     {
-      $container =& pfcContainer::Instance();
-      $pvnick   = $u->privmsg[$recipientid]["name"];
-      $pvnickid = $container->getNickId($pvnick);
+      $pvnickid = $u->privmsg[$recipientid]["pvnickid"];
+      $pvnick   = $ct->getNickname($pvnickid);//$u->privmsg[$recipientid]["name"];
+      //      $pvnickid = $ct->getNickId($pvnick);
       
       // now check if this user is currently online
-      $onlineusers = $container->getOnlineNick(NULL);
+      $onlineusers = $ct->getOnlineNick(NULL);
       if (!in_array($pvnickid, $onlineusers["nickid"]))
       {
         // send an error because the user is not online
@@ -63,7 +53,7 @@
     {
       // an error occured, just ignore the message and display errors
       foreach($errors as $e)
-        if ($c->debug) pxlog("error /send, user can't send a message -> nick=".$u->nick." err=".$e, "chat", $c->getId());
+        if ($c->debug) pxlog("error /send, user can't send a message -> nick=".$nick." err=".$e, "chat", $c->getId());
       $cmdp = $p;
       $cmdp["param"] = $errors;
       $cmd =& pfcCommand::Factory("error");
@@ -77,8 +67,7 @@
     // Now send the message if there is no errors
     if ($can_send)
     {
-      $container =& pfcContainer::Instance();
-      $msgid = $container->write($recipient, $nick, "send", $text);
+      $msgid = $ct->write($recipient, $nick, "send", $text);
       if (is_array($msgid))
       {
         $cmdp = $p;
@@ -87,14 +76,17 @@
         $cmd->run($xml_reponse, $cmdp);
         return;
       }
-      if ($c->debug) pxlog("/send ".$text." (a user just sent a message -> nick=".$u->nick.")", "chat", $c->getId());
+      if ($c->debug) pxlog("/send ".$text." (a user just sent a message -> nick=".$nick.")", "chat", $c->getId());
       
       // a message has been posted so :
       // - clear errors
       // - give focus to "words" field
+      // @todo move this code in the handleResponse function
       $xml_reponse->script("pfc.clearError(Array('pfc_words"."','pfc_handle"."'));");
       $xml_reponse->script("$('pfc_words').focus();");
     }
+    
+    $xml_reponse->script("pfc.handleResponse('".$this->name."', 'ok', '');");
   }
 }
 

Modified: trunk/src/commands/update.class.php
===================================================================
--- trunk/src/commands/update.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/update.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -16,7 +16,7 @@
     $u =& pfcUserConfig::Instance();
     
     // do not update if user isn't active (didn't connect)
-    if ($u->active)
+    if ($u->isOnline())
     {
       // check the user has not been disconnected from the server by timeout
       // if I found he has been disconnected, then I reconnect him with /connect command
@@ -52,7 +52,7 @@
         $cmdp["recipientid"] = $id;
         $cmdp["param"] = ''; // don't forward the parameter because it will be interpreted as a channel name
         $cmd->run($xml_reponse, $cmdp);
-      }      
+      }
 
       // get new message posted on each channels
       $cmd =& pfcCommand::Factory("getnewmsg");

Modified: trunk/src/commands/whois.class.php
===================================================================
--- trunk/src/commands/whois.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/whois.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -30,6 +30,7 @@
   {
     $clientid    = $p["clientid"];
     $param       = $p["param"];
+    $params      = $p["params"];
     $sender      = $p["sender"];
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
@@ -38,7 +39,17 @@
     $u =& pfcUserConfig::Instance();
     $ct =& pfcContainer::Instance();
 
-    $nickid = $ct->getNickId($param);
+    //    $xml_reponse->script("trace('".implode(',',$params)."');");
+    //    return;
+    
+    // get the nickid from the parameters
+    // if the run command is whois2 then the parameter is a nickid
+    $nickid = '';
+    if ($this->name == 'whois2')
+      $nickid = $params[0];
+    else
+      $nickid = $ct->getNickId($params[0]);
+    
     if ($nickid)
     {
       $usermeta = $ct->getAllUserMeta($nickid);
@@ -67,4 +78,4 @@
   }
 }
 
-?>
+?>
\ No newline at end of file

Modified: trunk/src/pfccommand.class.php
===================================================================
--- trunk/src/pfccommand.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/pfccommand.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -73,9 +73,9 @@
       
     // instanciate the proxies chaine
     $firstproxy =& $cmd;
-    for($i = count($c->_proxies)-1; $i >= 0; $i--)
+    for($i = count($c->proxies)-1; $i >= 0; $i--)
     {
-      $proxy_name      = $c->_proxies[$i];
+      $proxy_name      = $c->proxies[$i];
       $proxy_classname = "pfcProxyCommand_" . $proxy_name;
 
       // try to include the proxy class file from the default path or from the customized path
@@ -131,15 +131,13 @@
   /**
    * Force whois reloading
    */
-  function forceWhoisReload($nicktorewhois)
+  function forceWhoisReload($nickid)
   {
     $c =& pfcGlobalConfig::Instance();
     $u =& pfcUserConfig::Instance();
     $ct =& pfcContainer::Instance();
 
-    $nickid = $ct->getNickid($nicktorewhois);
-
-    // get the user who have $nicktorewhois in their list
+    // list the users in the same channel as $nickid
     $channels = $ct->getMeta("nickid-to-channelid", $nickid);
     $channels = $channels['value'];
     $channels = array_diff($channels, array('SERVER'));
@@ -150,12 +148,12 @@
       $otherids = array_merge($otherids, $ret['nickid']);
     }
     
-    // alert them that $nicktorewhois user info just changed
+    // alert them that $nickid user info just changed
     foreach($otherids as $otherid)
     {
       $cmdstr = 'whois2';
       $cmdp = array();
-      $cmdp['param'] = $nicktorewhois;
+      $cmdp['params'] = array($nickid);
       pfcCommand::AppendCmdToPlay($otherid, $cmdstr, $cmdp);
       
       /*

Modified: trunk/src/pfccontainer.class.php
===================================================================
--- trunk/src/pfccontainer.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/pfccontainer.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -75,6 +75,7 @@
    * @param $nick the nickname to create
    * @param $nickid is the corresponding nickname id (taken from session)
    */
+  /*
   function createNick($chan, $nick, $nickid)
   {
     $c =& pfcGlobalConfig::Instance();
@@ -97,7 +98,44 @@
     
     return true;
   }
+  */
+  
+  function createNick($nickid, $nick)
+  {
+    $c =& pfcGlobalConfig::Instance();
 
+    if ($nick == '')
+      user_error('pfcContainer::createNick nick is empty', E_USER_ERROR);      
+    if ($nickid == '')
+      user_error('pfcContainer::createNick nickid is empty', E_USER_ERROR);      
+    
+    $this->setMeta("nickid-to-metadata",  $nickid, 'nick', $nick);
+    $this->setMeta("metadata-to-nickid",  'nick', $this->encode($nick), $nickid);
+    
+    return true;
+  }
+  
+  
+  function joinChan($nickid, $chan)
+  {
+    $c =& pfcGlobalConfig::Instance();
+
+    if ($nickid == '')
+      user_error('pfcContainer::joinChan nickid is empty', E_USER_ERROR);      
+
+    if ($chan == NULL) $chan = 'SERVER';
+
+    $this->setMeta("nickid-to-channelid", $nickid, $this->encode($chan));
+    $this->setMeta("channelid-to-nickid", $this->encode($chan), $nickid);
+
+    // update the SERVER channel
+    if ($chan != 'SERVER') $this->updateNick($nickid);
+    
+    return true;
+  }
+
+
+  
   /**
    * Remove (disconnect/quit) the nickname from the server or from a channel
    * Notice: when a user quit, the caller must take care removeNick from each channels ('SERVER' included)

Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/pfcglobalconfig.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -49,6 +49,7 @@
   var $skip_proxies         = array(); // these proxies will be skiped. ex: append "censor" to the list to disable words censoring
   var $post_proxies         = array(); // these proxies will be handled just before to process commands and just after system proxies
   var $pre_proxies          = array(); // these proxies will be handled before system proxies (at begining)
+  var $proxies              = array(); // will contains proxies to execute on each command (filled in the init step) this parameter could not be overridden
   var $proxies_cfg          = array("auth"    => array(),
                                     "noflood" => array("charlimit" => 450,
                                                        "msglimit"  => 10,
@@ -133,7 +134,6 @@
   
   // private parameters
   var $_sys_proxies         = array("lock", "checktimeout", "checknickchange", "auth", "noflood", "censor", "log");
-  var $_proxies             = array(); // will contains proxies to execute on each command (filled in the init step)
   var $_dyn_params          = array("nick","isadmin","islocked","admins","frozen_channels", "channels", "privmsg", "nickmeta","baseurl");
   var $_params_type         = array();
   var $_query_string        = '';
@@ -428,23 +428,23 @@
       $this->errors[] = _pfc("'%s' parameter is not valid. Available values are : '%s'", "language", implode(", ", $lg_list));
 
     // calculate the proxies chaine
-    $this->_proxies = array();
+    $this->proxies = array();
     foreach($this->pre_proxies as $px)
     {
-      if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->_proxies))
-        $this->_proxies[] = $px;
+      if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->proxies))
+        $this->proxies[] = $px;
         
     }
     foreach($this->_sys_proxies as $px)
     {
-      if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->_proxies))
-        $this->_proxies[] = $px;
+      if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->proxies))
+        $this->proxies[] = $px;
         
     }
     foreach($this->post_proxies as $px)
     {
-      if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->_proxies))
-        $this->_proxies[] = $px;
+      if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->proxies))
+        $this->proxies[] = $px;
         
     }
     // save the proxies path
@@ -452,10 +452,12 @@
     // check the customized proxies path
     if ($this->proxies_path != '' && !is_dir($this->proxies_path))
       $this->errors[] = _pfc("'%s' directory doesn't exist", $this->proxies_path);
+    if ($this->proxies_path == '') $this->proxies_path = $this->proxies_path_default;
     
     // save the commands path
     $this->cmd_path_default = dirname(__FILE__).'/commands';
-
+    if ($this->cmd_path == '') $this->cmd_path = $this->cmd_path_default;
+        
     // load smileys from file
     $this->loadSmileyTheme();
     
@@ -513,9 +515,9 @@
   
   function _GetCacheFile($serverid = "", $data_private_path = "")
   {
-    if ($serverid == "")          $serverid = $this->getId();
-    if ($data_private_path == "") $data_private_path = $this->data_private_path;
-    return $data_private_path."/cache/pfcglobalconfig_".$serverid;
+    if ($serverid == '')          $serverid = $this->getId();
+    if ($data_private_path == '') $data_private_path = $this->data_private_path;
+    return $data_private_path.'/cache/'.$serverid.'.php';
   }
   
   function destroyCache()
@@ -545,6 +547,11 @@
       // if a cache file exists, remove the lock file because config has been succesfully stored
       if (file_exists($cachefile_lock)) @unlink($cachefile_lock);
 
+      include $cachefile;
+      foreach($pfc_conf as $key => $val)
+        $this->$key = $val;
+
+      /*
       $pfc_configvar = unserialize(file_get_contents($cachefile));
       foreach($pfc_configvar as $key => $val)
       {
@@ -552,6 +559,7 @@
         if (!in_array($key,$this->_dyn_params))
           $this->$key = $val;
       }
+      */
       
       return true; // synchronized
     }
@@ -586,7 +594,22 @@
   function saveInCache()
   {
     $cachefile = $this->_GetCacheFile();
-    file_put_contents($cachefile, serialize(get_object_vars($this)));
+    $data = '<?php ';
+
+    $conf = get_object_vars($this);
+    $keys = array_keys($conf);
+    foreach($keys as $k)
+      if (preg_match('/^_.*/',$k))
+        unset($conf[$k]);
+
+    // remove dynamic parameters
+    foreach($this->_dyn_params as $k)
+      unset($conf[$k]);
+
+    $data .= '$pfc_conf = '.var_export($conf,true).";\n";
+    $data .= '?>';
+    
+    file_put_contents($cachefile, $data/*serialize(get_object_vars($this))*/);
     if ($this->debug) pxlog("pfcGlobalConfig::saveInCache()", "chatconfig", $this->getId());
   }
 

Modified: trunk/src/pfcuserconfig.class.php
===================================================================
--- trunk/src/pfcuserconfig.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/pfcuserconfig.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -68,7 +68,7 @@
   function _setParam($p, $v)
   {
     $c =& pfcGlobalConfig::Instance();
-    $nickid_param = "pfcuserconfig_".$c->getId()./*"_".$this->nickid.*/"_".$p;
+    $nickid_param = "pfcuserconfig_".$c->getId()."_".$p;
     $_SESSION[$nickid_param] = $v;
     $this->$p = $v;
   }
@@ -76,7 +76,7 @@
   function _rmParam($p)
   {
     $c =& pfcGlobalConfig::Instance();
-    $nickid_param = "pfcuserconfig_".$c->getId()./*"_".$this->nickid.*/"_".$p;    
+    $nickid_param = "pfcuserconfig_".$c->getId()."_".$p;    
     unset($_SESSION[$nickid_param]);
     unset($this->$p);
     if ($p == 'active') $this->active = false;
@@ -98,15 +98,29 @@
     $c =& pfcGlobalConfig::Instance();
 
     // do not save anything as long as nickname is not assigned
-    if ($this->active && $this->nick != "")
+    //if ($this->active && $this->nick != "")
     {
-      $this->_setParam("nick",$this->nick);
-      $this->_setParam("active",$this->active);
-      $this->_setParam("channels",$this->channels);
-      $this->_setParam("privmsg",$this->privmsg);
-      $this->_setParam("serverid",$this->serverid);
+      $this->_setParam("nick",     $this->nick);
+      $this->_setParam("active",   $this->active);
+      $this->_setParam("channels", $this->channels);
+      $this->_setParam("privmsg",  $this->privmsg);
+      $this->_setParam("serverid", $this->serverid);
     }
   }
+
+  function isOnline()
+  {
+    $ct =& pfcContainer::Instance();
+    $online = ($ct->isNickOnline(NULL, $this->nickid) >= 0);
+    return $online;
+  }
+
+  function getNickname()
+  {
+    if ($this->nick != '') return $this->nick;
+    $ct =& pfcContainer::Instance();
+    return $ct->getNickname($this->nickid);
+  }
 }
 
 ?>
\ No newline at end of file

Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/phpfreechat.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -265,7 +265,7 @@
     $recipientid = isset($res['params'][1]) ? $res['params'][1] : "";
     $params      = array_slice(is_array($res['params']) ? $res['params'] : array() ,2);
     $param       = implode(" ",$params); // to keep compatibility (will be removed)
-    $sender      = $u->nick;
+    $sender      = $u->getNickname();
     
     // translate the recipientid to the channel name
     if (isset($u->channels[$recipientid]))
@@ -290,8 +290,8 @@
         $nickidtopv = $u->privmsg[$recipientid]["pvnickid"];
         $cmdstr = 'privmsg2';
         $cmdp = array();
-        $cmdp['param']    = $u->nick;
-        $cmdp['params'][] = $u->nick;
+        $cmdp['param']    = $u->nickid;//$sender;
+        $cmdp['params'][] = $u->nickid;//$sender;
         pfcCommand::AppendCmdToPlay($nickidtopv, $cmdstr, $cmdp);
       }
 
@@ -336,7 +336,7 @@
     // do not update when the user just quit
     if ($cmdname != "update" &&
       	$cmdname != "quit" &&
-      	(!isset($u->nick) || $u->nick != ""))
+      	$u->nickid != '')
     {
       // force an update just after a command is sent
       // thus the message user just poster is really fastly displayed

Modified: trunk/src/proxies/auth.class.php
===================================================================
--- trunk/src/proxies/auth.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/proxies/auth.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -41,6 +41,20 @@
     $c =& pfcGlobalConfig::Instance();
     $u =& pfcUserConfig::Instance();
 
+
+    // do not allow someone to run a command if he is not online
+    if ($this->name != 'error' &&
+        $this->name != 'connect' &&
+        !$u->isOnline())
+    {
+      $cmdp = $p;
+      $cmdp["param"] = _pfc("Your must be connected to send a message");
+      $cmd =& pfcCommand::Factory("error");
+      $cmd->run($xml_reponse, $cmdp);
+      return;
+    }
+
+    
     // protect admin commands
     $admincmd = array("kick", "ban", "unban", "op", "deop", "debug", "rehash");
     if ( in_array($this->name, $admincmd) )

Modified: trunk/src/proxies/checknickchange.class.php
===================================================================
--- trunk/src/proxies/checknickchange.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/proxies/checknickchange.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -38,19 +38,21 @@
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
     $owner       = isset($p["owner"]) ? $p["owner"] : '';
-    $c =& pfcGlobalConfig::Instance();
-    $u =& pfcUserConfig::Instance();
+    $c  =& pfcGlobalConfig::Instance();
+    $u  =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
 
+    $newnick = phpFreeChat::FilterNickname($param);
+    $oldnick = $ct->getNickname($u->nickid);
+
     if ( $this->name == 'nick' )
     {
-      $newnick = phpFreeChat::FilterNickname($param);
-      $oldnick = $u->nick;
       
       // if the user want to change his nickname but the frozen_nick is enable
       // then send him a warning
-      if ( $this->name == "nick" && 
-           $u->nick != "" &&
-           $param != $u->nick &&
+      if ( $this->name == 'nick' && 
+           $oldnick != '' &&
+           $newnick != $oldnick &&
            $c->frozen_nick == true &&
            $owner != $this->proxyname )
       {
@@ -59,8 +61,7 @@
           return;      
       }
 
-      $container =& pfcContainer::Instance();
-      $newnickid = $container->getNickId($newnick);
+      $newnickid = $ct->getNickId($newnick);
       $oldnickid = $u->nickid;
 
       if ($newnick == $oldnick &&
@@ -90,8 +91,8 @@
     // allow nick changes only from the parameters array (server side)
     if ($this->name != 'connect' && // don't check anything on the connect process or it could block the periodic refresh
         $c->frozen_nick == true &&
-        $u->nick != $c->nick &&
-        $c->nick != "" && // don't change the nickname to empty or the asknick popup will loop indefinatly
+        $oldnick != $c->nick &&
+        $c->nick != '' && // don't change the nickname to empty or the asknick popup will loop indefinatly
         $owner != $this->proxyname)
     {
       // change the user nickname

Modified: trunk/src/proxies/checktimeout.class.php
===================================================================
--- trunk/src/proxies/checktimeout.class.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/proxies/checktimeout.class.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -39,11 +39,11 @@
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& pfcGlobalConfig::Instance();
-    $u =& pfcUserConfig::Instance();
+    $c  =& pfcGlobalConfig::Instance();
+    $u  =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
 
     // disconnect users from specific channels
-    $ct =& pfcContainer::Instance();
     $disconnected_users = $ct->removeObsoleteNick($c->timeout);
     for($i=0; $i<count($disconnected_users["nick"]); $i++)
     {

Modified: trunk/themes/default/chat.js.tpl.php
===================================================================
--- trunk/themes/default/chat.js.tpl.php	2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/themes/default/chat.js.tpl.php	2007-03-07 19:14:11 UTC (rev 984)
@@ -15,7 +15,7 @@
 require_once dirname(__FILE__).'/../../src/pfcjson.class.php';
 $json = new pfcJSON();
 ?>
-<?php $nick = $u->nick != "" ? $json->encode($u->nick) : $json->encode($c->nick); ?>
+<?php $nick = $u->getNickname() != '' ? $json->encode($u->getNickname()) : $json->encode($c->nick); ?>
 
 var pfc                       = null; // will contains a pfcClient instance
 var pfc_nickname              = <?php echo ($GLOBALS["output_encoding"]=="UTF-8" ? $nick : iconv("UTF-8", $GLOBALS["output_encoding"],$nick)); ?>;


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [983] trunk/demo

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

Revision: 983
          http://svn.sourceforge.net/phpfreechat/?rev=983&view=rev
Author:   kerphi
Date:     2007-03-04 05:37:46 -0800 (Sun, 04 Mar 2007)

Log Message:
-----------
add comments

Modified Paths:
--------------
    trunk/demo/demo31_show_who_is_online-chat.php
    trunk/demo/demo31_show_who_is_online-whoisonline.php

Modified: trunk/demo/demo31_show_who_is_online-chat.php
===================================================================
--- trunk/demo/demo31_show_who_is_online-chat.php	2007-02-28 17:58:04 UTC (rev 982)
+++ trunk/demo/demo31_show_who_is_online-chat.php	2007-03-04 13:37:46 UTC (rev 983)
@@ -22,7 +22,8 @@
     
   <body>
     <?php $chat->printChat(); ?>
-
+  <p>Then have a look to the <a href="./demo31_show_who_is_online-whoisonline.php">whoisonline script</a></p>
+  
 <?php
   // print the current file
   echo "<h2>The source code</h2>";

Modified: trunk/demo/demo31_show_who_is_online-whoisonline.php
===================================================================
--- trunk/demo/demo31_show_who_is_online-whoisonline.php	2007-02-28 17:58:04 UTC (rev 982)
+++ trunk/demo/demo31_show_who_is_online-whoisonline.php	2007-03-04 13:37:46 UTC (rev 983)
@@ -17,7 +17,7 @@
   $info = "<strong>%d</strong> users are connected to the server !";
 echo "<p>".sprintf($info, $nb_users)."</p>";
 
-echo "<p>Here is the nicknames' list:</p>";
+echo "<p>Here is the online nicknames list of <a href='./demo31_show_who_is_online-chat.php'>this chat</a>:</p>";
 echo "<ul>";
 foreach($users as $u)
 {


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

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

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

Revision: 982
          http://svn.sourceforge.net/phpfreechat/?rev=982&view=rev
Author:   kerphi
Date:     2007-02-28 09:58:04 -0800 (Wed, 28 Feb 2007)

Log Message:
-----------
[en] Bug fix: QUERY_STRING should not be added when server_script_url setup in the parameter list [0h40]
[fr] Bug fix : QUERY_STRING ne doit pas etre ajoute lorsque le parametre server_script_url est explicitement regle dans la liste des parametres 
[0h40]
-- Cette ligne, et les suivantes ci-dessous, seront ignor?\195?\169es--

M    demo/demo50_customized_usermetadata.php
M    demo/demo34_add_a_link_on_nicknames.php
M    demo/demo5_customized_style.php
M    demo/demo21_with_hardcoded_urls.php
M    demo/demo3_config.php
M    themes/default/chat.js.tpl.php
M    src/phpfreechat.class.php
M    src/pfcglobalconfig.class.php

Modified Paths:
--------------
    trunk/demo/demo21_with_hardcoded_urls.php
    trunk/demo/demo34_add_a_link_on_nicknames.php
    trunk/demo/demo3_config.php
    trunk/demo/demo50_customized_usermetadata.php
    trunk/demo/demo5_customized_style.php
    trunk/src/pfcglobalconfig.class.php
    trunk/src/phpfreechat.class.php
    trunk/themes/default/chat.js.tpl.php

Modified: trunk/demo/demo21_with_hardcoded_urls.php
===================================================================
--- trunk/demo/demo21_with_hardcoded_urls.php	2007-02-28 17:21:49 UTC (rev 981)
+++ trunk/demo/demo21_with_hardcoded_urls.php	2007-02-28 17:58:04 UTC (rev 982)
@@ -8,7 +8,6 @@
 
 // setup urls
 $params["data_public_url"]   = "../data/public";
-$params["client_script_url"] = "./demo21_with_hardcoded_urls.php";
 $params["server_script_url"] = "./demo21_with_hardcoded_urls.php";
 $params["theme_default_url"] = "../themes";
 

Modified: trunk/demo/demo34_add_a_link_on_nicknames.php
===================================================================
--- trunk/demo/demo34_add_a_link_on_nicknames.php	2007-02-28 17:21:49 UTC (rev 981)
+++ trunk/demo/demo34_add_a_link_on_nicknames.php	2007-02-28 17:58:04 UTC (rev 982)
@@ -4,7 +4,7 @@
 
 $params["serverid"]      = md5(__FILE__); // calculate a unique id for this chat
 $params["title"]         = "A chat with a customized nickname list";
-$params["themepath"]     = dirname(__FILE__)."/demo34_add_a_link_on_nicknames";
+$params["theme_path"]    = dirname(__FILE__)."/demo34_add_a_link_on_nicknames";
 $params["theme"]         = "mytheme";
 $chat = new phpFreeChat( $params );
 

Modified: trunk/demo/demo3_config.php
===================================================================
--- trunk/demo/demo3_config.php	2007-02-28 17:21:49 UTC (rev 981)
+++ trunk/demo/demo3_config.php	2007-02-28 17:58:04 UTC (rev 982)
@@ -6,4 +6,4 @@
 $params["nick"]               = "guest";
 $params["server_script_path"] = dirname(__FILE__)."/demo3_server.php";
 
-?>
+?>
\ No newline at end of file

Modified: trunk/demo/demo50_customized_usermetadata.php
===================================================================
--- trunk/demo/demo50_customized_usermetadata.php	2007-02-28 17:21:49 UTC (rev 981)
+++ trunk/demo/demo50_customized_usermetadata.php	2007-02-28 17:58:04 UTC (rev 982)
@@ -6,7 +6,7 @@
 $params["title"]       = "A chat which shows how to use user metadata : add avatar (images) to each connected users";
 $params["nick"]        = "guest".rand(1,1000);
 $params["nickmeta"]    = array("avatar" => "demo50_data/avatar".rand(1,10).".jpg");
-$params["themepath"]   = dirname(__FILE__)."/demo50_data";
+$params["theme_path"]  = dirname(__FILE__)."/demo50_data";
 $params["theme"]       = "mytheme";
 $chat = new phpFreeChat( $params );
 

Modified: trunk/demo/demo5_customized_style.php
===================================================================
--- trunk/demo/demo5_customized_style.php	2007-02-28 17:21:49 UTC (rev 981)
+++ trunk/demo/demo5_customized_style.php	2007-02-28 17:58:04 UTC (rev 982)
@@ -8,7 +8,7 @@
 // do not uses width parameter because of a display bug in IE6
 //$params["width"]         = "650px";
 $params["max_msg"]       = 21;
-$params["themepath"]     = dirname(__FILE__)."/demo5_customized_style_data";
+$params["theme_path"]    = dirname(__FILE__)."/demo5_customized_style_data";
 $params["theme"]         = "mytheme";
 $chat = new phpFreeChat( $params );
 

Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2007-02-28 17:21:49 UTC (rev 981)
+++ trunk/src/pfcglobalconfig.class.php	2007-02-28 17:58:04 UTC (rev 982)
@@ -102,10 +102,10 @@
   var $nickname_colorlist  = array('#CCCCCC','#000000','#3636B2','#2A8C2A','#C33B3B','#C73232','#80267F','#66361F','#D9A641','#3DCC3D','#1A5555','#2F8C74','#4545E6','#B037B0','#4C4C4C','#959595');
   
   var $theme               = "default";
-  var $themepath           = "";
-  var $themepath_default   = "";
-  var $theme_url           = "";
-  var $theme_default_url   = "";
+  var $theme_path          = '';
+  var $theme_default_path  = '';
+  var $theme_url           = '';
+  var $theme_default_url   = '';
 
   var $baseurl             = "";
   
@@ -114,7 +114,7 @@
   var $container_type      = "File";
 
   var $client_script_path  = "";
-  var $client_script_url   = ""; // default is calculated from 'client_script_path'
+  //  var $client_script_url   = ""; // default is calculated from 'client_script_path'
   var $server_script_path  = "";
   var $server_script_url   = ""; // default is calculated from 'server_script_path'
   var $xajaxpath           = ""; // default is dirname(__FILE__)."/../lib/xajax_0.2.3";
@@ -136,6 +136,7 @@
   var $_proxies             = array(); // will contains proxies to execute on each command (filled in the init step)
   var $_dyn_params          = array("nick","isadmin","islocked","admins","frozen_channels", "channels", "privmsg", "nickmeta","baseurl");
   var $_params_type         = array();
+  var $_query_string        = '';
   
   function pfcGlobalConfig( $params = array() )
   {    
@@ -165,12 +166,17 @@
         $this->data_public_path  = dirname(__FILE__)."/../data/public";
       else
         $this->data_public_path = $params["data_public_path"];
+
+      // if the user didn't specify the server_script_url, then remember it and
+      // append QUERY_STRING to it
+      if (!isset($params['server_script_url']))
+        $this->_query_string = isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] != '' ?
+          '?'.$_SERVER['QUERY_STRING'] :
+          '';
       
       // load users container or keep default one
       if (isset($params["container_type"]))
-        $this->container_type = $params["container_type"];
-
-     
+        $this->container_type = $params["container_type"];     
       
       // load default container's config
       $ct =& pfcContainer::Instance($this->container_type, true);
@@ -348,54 +354,60 @@
     //                                                             $this->data_public_path."/xajax_js/xajax.js"));
     //    $this->errors = array_merge($this->errors, @install_file($this->xajaxpath."/xajax_js/xajax_uncompressed.js",
     //                                                             $this->data_public_path."/xajax_js/xajax_uncompressed.js" ));
+
+
+
     // ---
     // test client script
     // try to find the path into server configuration
-    if ($this->client_script_path == "")
+    if ($this->client_script_path == '')
       $this->client_script_path = getScriptFilename();
-    $filetotest = $this->client_script_path;
-    // do not take into account the url parameters
-    if (preg_match("/(.*)\?(.*)/", $filetotest, $res))
-      $filetotest = $res[1];
-    if ( !file_exists($filetotest) )
-      $this->errors[] = _pfc("%s doesn't exist", $filetotest);   
-    if ($this->client_script_url == "")
-      $this->client_script_url = "./".basename($filetotest);
 
+
+    if ($this->server_script_url == '' && $this->server_script_path == '')
+    {    
+      $filetotest = $this->client_script_path;
+      // do not take into account the url parameters
+      if (preg_match("/(.*)\?(.*)/", $filetotest, $res))
+        $filetotest = $res[1];
+      if ( !file_exists($filetotest) )
+        $this->errors[] = _pfc("%s doesn't exist", $filetotest);   
+      $this->server_script_url  = './'.basename($filetotest).$this->_query_string;
+    }
+  
+    //if ($this->client_script_url == "")
+    //      $this->client_script_url = "./".basename($filetotest);
     
     // calculate datapublic url
     if ($this->data_public_url == "")
       $this->data_public_url = relativePath($this->client_script_path, $this->data_public_path);
 
-
+    if ($this->server_script_path == '')
+      $this->server_script_path = $this->client_script_path;
     
     // ---
-    // test server script
-    if ($this->server_script_path == "")
+    // test server script    
+    if ($this->server_script_url == '')
     {
-      $this->server_script_path = $this->client_script_path;
-      if ($this->server_script_url == "")
-        $this->server_script_url  = $this->client_script_url;
+      $filetotest = $this->server_script_path;
+      // do not take into account the url parameters
+      if (preg_match("/(.*)\?(.*)/",$this->server_script_path, $res))
+        $filetotest = $res[1];
+      if ( !file_exists($filetotest) )
+        $this->errors[] = _pfc("%s doesn't exist", $filetotest);
+      $this->server_script_url = relativePath($this->client_script_path, $this->server_script_path).'/'.basename($filetotest).$this->_query_string;
     }
-    $filetotest = $this->server_script_path;
-    // do not take into account the url parameters
-    if (preg_match("/(.*)\?(.*)/",$this->server_script_path, $res))
-      $filetotest = $res[1];
-    if ( !file_exists($filetotest) )
-      $this->errors[] = _pfc("%s doesn't exist", $filetotest);
-    if ($this->server_script_url == "")
-      $this->server_script_url = relativePath($this->client_script_path, $this->server_script_path)."/".basename($filetotest);
-
-    // check if the themepath parameter are correctly setup
-    if ($this->themepath_default == "" || !is_dir($this->themepath_default))
-      $this->themepath_default = realpath(dirname(__FILE__)."/../themes");
-    if ($this->themepath == "" || !is_dir($this->themepath))
-      $this->themepath = $this->themepath_default;
+    
+    // check if the theme_path parameter are correctly setup
+    if ($this->theme_default_path == "" || !is_dir($this->theme_default_path))
+      $this->theme_default_path = realpath(dirname(__FILE__)."/../themes");
+    if ($this->theme_path == "" || !is_dir($this->theme_path))
+      $this->theme_path = $this->theme_default_path;
     // calculate theme url
     if ($this->theme_default_url == '')
-      $this->theme_default_url = relativePath($this->client_script_path, $this->themepath_default);
+      $this->theme_default_url = relativePath($this->client_script_path, $this->theme_default_path);
     if ($this->theme_url == '')
-      $this->theme_url = relativePath($this->client_script_path, $this->themepath);
+      $this->theme_url = relativePath($this->client_script_path, $this->theme_path);
 
     
     // ---
@@ -580,44 +592,47 @@
 
   function isDefaultFile($file)
   {
-    $fexists1 = file_exists($this->themepath."/default/".$file);
-    $fexists2 = file_exists($this->themepath."/".$this->theme."/".$file);
+    $fexists1 = file_exists($this->theme_path."/default/".$file);
+    $fexists2 = file_exists($this->theme_path."/".$this->theme."/".$file);
     return ($this->theme == "default" ? $fexists1 : !$fexists2);
   }
 
   /*
   function getFileUrlByProxy($file, $addprefix = true)
   {
-    if (file_exists($this->themepath."/".$this->theme."/".$file))
+    if (file_exists($this->theme_path."/".$this->theme."/".$file))
       return ($addprefix ? $this->data_public_url."/".$this->getId()."/proxy.php" : "")."?p=".$this->theme."/".$file;
     else
-      if (file_exists($this->themepath_default."/default/".$file))
+      if (file_exists($this->theme_default_path."/default/".$file))
         return ($addprefix ? $this->data_public_url."/".$this->getId()."/proxy.php" : "")."?p=default/".$file;
       else
-	die(_pfc("Error: '%s' could not be found, please check your themepath '%s' and your theme '%s' are correct", $file, $this->themepath, $this->theme));
+	die(_pfc("Error: '%s' could not be found, please check your theme_path '%s' and your theme '%s' are correct", $file, $this->theme_path, $this->theme));
   }
   */
     
   function getFilePathFromTheme($file)
   {
-    if (file_exists($this->themepath."/".$this->theme."/".$file))
-      return $this->themepath."/".$this->theme."/".$file;
+    if (file_exists($this->theme_path."/".$this->theme."/".$file))
+      return $this->theme_path."/".$this->theme."/".$file;
     else
-      if (file_exists($this->themepath_default."/default/".$file))
-	return $this->themepath_default."/default/".$file;
+      if (file_exists($this->theme_default_path."/default/".$file))
+        return $this->theme_default_path."/default/".$file;
       else
-	die(_pfc("Error: '%s' could not be found, please check your themepath '%s' and your theme '%s' are correct", $file, $this->themepath, $this->theme));
+      {
+        $this->destroyCache();
+        die(_pfc("Error: '%s' could not be found, please check your themepath '%s' and your theme '%s' are correct", $file, $this->theme_path, $this->theme));
+      }
   }
 
   function getFileUrlFromTheme($file)
   {
-    if (file_exists($this->themepath.'/'.$this->theme.'/'.$file))
+    if (file_exists($this->theme_path.'/'.$this->theme.'/'.$file))
       return $this->theme_url.'/'.$this->theme.'/'.$file;
     else
-      if (file_exists($this->themepath_default.'/default/'.$file))
+      if (file_exists($this->theme_default_path.'/default/'.$file))
         return $this->theme_default_url.'/default/'.$file;
       else
-	return 'notfound';
+        return 'notfound';
   }
 
 

Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php	2007-02-28 17:21:49 UTC (rev 981)
+++ trunk/src/phpfreechat.class.php	2007-02-28 17:58:04 UTC (rev 982)
@@ -393,7 +393,7 @@
     $t->assignObject($c,"c");
     if (!$c->isDefaultFile('style.css.php'))
     {
-      $t->setTemplate($c->themepath_default.'/default/style.css.php');      
+      $t->setTemplate($c->theme_default_path.'/default/style.css.php');      
       $css_code .= $t->getOutput();
     }
     $t->setTemplate($c->getFilePathFromTheme('style.css.php'));

Modified: trunk/themes/default/chat.js.tpl.php
===================================================================
--- trunk/themes/default/chat.js.tpl.php	2007-02-28 17:21:49 UTC (rev 981)
+++ trunk/themes/default/chat.js.tpl.php	2007-02-28 17:58:04 UTC (rev 982)
@@ -53,7 +53,7 @@
 var pfc_isready               = false;
 
 var xajaxConfig = {
-  requestURI: "<?php echo $c->server_script_url.(isset($_SERVER["QUERY_STRING"]) && $_SERVER["QUERY_STRING"] != "" ? "?".$_SERVER["QUERY_STRING"] : ""); ?>",
+  requestURI: "<?php echo $c->server_script_url; ?>",
   debug: false,
   statusMessages: false,
   waitCursor: false,


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [981] trunk/data/public/js/pfcclient.js

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

Revision: 981
          http://svn.sourceforge.net/phpfreechat/?rev=981&view=rev
Author:   kerphi
Date:     2007-02-28 09:21:49 -0800 (Wed, 28 Feb 2007)

Log Message:
-----------
[en] Bug fix: URL's with a comma does not get recognized as a link (sf bug 1649431)
[fr] Bug fix : les urls avec une virgule n'?\195?\169taient pas reconnues (sf bug 1649431)

Modified Paths:
--------------
    trunk/data/public/js/pfcclient.js

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-02-27 14:23:54 UTC (rev 980)
+++ trunk/data/public/js/pfcclient.js	2007-02-28 17:21:49 UTC (rev 981)
@@ -1154,7 +1154,7 @@
     var rx = null;
    
     // parse urls
-    var rx_url = new RegExp('(^|[^\\"])([a-z]+\:\/\/[a-z0-9.\\~\\/\\?\\=\\&\\-\\_\\#:;%]*)([^\\"]|$)','ig');
+    var rx_url = new RegExp('(^|[^\\"])([a-z]+\:\/\/[a-z0-9.\\~\\/\\?\\=\\&\\-\\_\\#:;%,]*[a-z0-9\\/\\?\\=\\&\\-\\_\\#])([^\\"]|$)','ig');
     var ttt = msg.split(rx_url);
     if (ttt.length > 1 &&
         !navigator.appName.match("Explorer|Konqueror") &&


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [980] trunk/demo/demo21_with_hardcoded_urls.php

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

Revision: 980
          http://svn.sourceforge.net/phpfreechat/?rev=980&view=rev
Author:   kerphi
Date:     2007-02-27 06:23:54 -0800 (Tue, 27 Feb 2007)

Log Message:
-----------
fix the resources url problem (theme_default_url parameter)

Modified Paths:
--------------
    trunk/demo/demo21_with_hardcoded_urls.php

Modified: trunk/demo/demo21_with_hardcoded_urls.php
===================================================================
--- trunk/demo/demo21_with_hardcoded_urls.php	2007-02-25 15:48:12 UTC (rev 979)
+++ trunk/demo/demo21_with_hardcoded_urls.php	2007-02-27 14:23:54 UTC (rev 980)
@@ -10,6 +10,7 @@
 $params["data_public_url"]   = "../data/public";
 $params["client_script_url"] = "./demo21_with_hardcoded_urls.php";
 $params["server_script_url"] = "./demo21_with_hardcoded_urls.php";
+$params["theme_default_url"] = "../themes";
 
 // setup paths
 $params["container_type"]         = "File";


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