phpfreechat-svn Mailing List for phpFreeChat (Page 7)

Status: Beta

Brought to you by: kerphi

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

You can subscribe to this list here.

2006	_Jan	_Feb (2)	_Mar	_Apr (61)	_May (56)	_Jun (96)	_Jul (23)	_Aug (62)	_Sep (76)	_Oct (48)	_Nov (28)	_Dec (28)
2007	_Jan (31)	_Feb (40)	_Mar (29)	_Apr (11)	_May (6)	_Jun (18)	_Jul (18)	_Aug (108)	_Sep (24)	_Oct (6)	_Nov (21)	_Dec
2008	_Jan	_Feb (1)	_Mar (16)	_Apr	_May (3)	_Jun	_Jul (7)	_Aug (1)	_Sep (3)	_Oct	_Nov (3)	_Dec (2)
2009	_Jan (2)	_Feb	_Mar (2)	_Apr (3)	_May	_Jun	_Jul	_Aug (1)	_Sep (1)	_Oct (1)	_Nov	_Dec (1)
2010	_Jan (2)	_Feb	_Mar	_Apr (6)	_May	_Jun	_Jul	_Aug	_Sep (1)	_Oct	_Nov	_Dec
2018	_Jan (1)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 5 6 7 8 9 .. 34 > >> (Page 7 of 34)

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

From: <gpi...@us...> - 2007-08-17 11:59:04

Revision: 1129
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1129&view=rev
Author:   gpinzone
Date:     2007-08-17 04:59:00 -0700 (Fri, 17 Aug 2007)

Log Message:
-----------
IE 5.5 fix needed fixing.

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

Modified: trunk/data/public/js/pfcprompt.js
===================================================================
--- trunk/data/public/js/pfcprompt.js	2007-08-16 23:40:18 UTC (rev 1128)
+++ trunk/data/public/js/pfcprompt.js	2007-08-17 11:59:00 UTC (rev 1129)
@@ -104,7 +104,8 @@
     this.bgbox.style.left    = pos[0]+'px';
     /* Some older IE browsers (e.g., IE 5.5) need scrollHeight/scrollWidth.
        See: http://www.quirksmode.org/viewport/compatibility.html */
-    if (this.container.scrollHeight > this.container.offsetHeight)
+    if (this.container.scrollHeight > this.container.offsetHeight
+          || this.container.scrollWidth > this.container.offsetWidth)
     {
       this.bgbox.style.height  = this.container.scrollHeight+'px';
       this.bgbox.style.width   = this.container.scrollWidth+'px';


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

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

From: <gpi...@us...> - 2007-08-16 23:40:20

Revision: 1128
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1128&view=rev
Author:   gpinzone
Date:     2007-08-16 16:40:18 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Allow blackout of chat area on IE7.  IE6 and lower still does whole screen. Blackout height/width fixed for IE 5.5.

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

Modified: trunk/data/public/js/pfcprompt.js
===================================================================
--- trunk/data/public/js/pfcprompt.js	2007-08-16 17:46:48 UTC (rev 1127)
+++ trunk/data/public/js/pfcprompt.js	2007-08-16 23:40:18 UTC (rev 1128)
@@ -5,7 +5,7 @@
 pfcPrompt.prototype = { 
   initialize: function(container)
   {
-    if (container == undefined || is_ie)
+    if (container == undefined || (is_ie && !is_ie7))
       container = document.getElementsByTagName('body')[0];
     this.container    = container;
     this.box          = $('pfc_promptbox');
@@ -102,8 +102,18 @@
     var pos = this._findPos(this.container);
     this.bgbox.style.top     = pos[1]+'px';
     this.bgbox.style.left    = pos[0]+'px';
-    this.bgbox.style.height  = this.container.offsetHeight+'px';
-    this.bgbox.style.width   = this.container.offsetWidth+'px';
+    /* Some older IE browsers (e.g., IE 5.5) need scrollHeight/scrollWidth.
+       See: http://www.quirksmode.org/viewport/compatibility.html */
+    if (this.container.scrollHeight > this.container.offsetHeight)
+    {
+      this.bgbox.style.height  = this.container.scrollHeight+'px';
+      this.bgbox.style.width   = this.container.scrollWidth+'px';
+    }
+    else
+    {
+      this.bgbox.style.height  = this.container.offsetHeight+'px';
+      this.bgbox.style.width   = this.container.offsetWidth+'px';
+    }
     this.bgbox.style.display = 'block';
 
     // Position the dialog box on the screen and make it visible.
@@ -132,13 +142,13 @@
 
   _findPos: function(obj)
   {
-	  var curleft = curtop = 0;
+    var curleft = curtop = 0;
     if (obj.offsetParent) {
-  	  curleft = obj.offsetLeft;
-	  	curtop = obj.offsetTop;
-		  while (obj = obj.offsetParent) {
+      curleft = obj.offsetLeft;
+      curtop = obj.offsetTop;
+      while (obj = obj.offsetParent) {
         curleft += obj.offsetLeft;
-			  curtop += obj.offsetTop;
+        curtop += obj.offsetTop;
       }
     }
     return [curleft,curtop];


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

[Phpfreechat-svn] SF.net SVN: phpfreechat: [1127] trunk/index.php

From: <gpi...@us...> - 2007-08-16 17:46:49

Revision: 1127
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1127&view=rev
Author:   gpinzone
Date:     2007-08-16 10:46:48 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Fixed SourceForge image height and width parameters.

Modified Paths:
--------------
    trunk/index.php

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2007-08-16 13:04:48 UTC (rev 1126)
+++ trunk/index.php	2007-08-16 17:46:48 UTC (rev 1127)
@@ -95,7 +95,7 @@
       </ul>
       <p class="partner">
         <a href="http://www.phpfreechat.net"><img alt="phpfreechat.net" src="style/logo_88x31.gif" /></a><br/>
-        <a href="http://sourceforge.net/projects/phpfreechat"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=158880&amp;type=1" alt="SourceForge.net Logo" height="31px" width="88px" /></a><br/><br/>
+        <a href="http://sourceforge.net/projects/phpfreechat"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=158880&amp;type=1" alt="SourceForge.net Logo" height="31" width="88" /></a><br/><br/>
         <a href="http://www.hotscripts.com/?RID=N452772">hotscripts.com</a><br/>
         <a href="http://www.jeu-gratuit.net/">jeu-gratuit.net</a><br/>
         <a href="http://www.pronofun.com/">pronofun.com</a><br/>


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

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

From: <gpi...@us...> - 2007-08-16 13:04:46

Revision: 1126
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1126&view=rev
Author:   gpinzone
Date:     2007-08-16 06:04:48 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Minor documentation updates. No change in functionality.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-15 19:35:55 UTC (rev 1125)
+++ trunk/data/public/js/pfcclient.js	2007-08-16 13:04:48 UTC (rev 1126)
@@ -31,7 +31,6 @@
 
     // this array contains all the sent commands
     // use the up and down arrow key to navigate through the history
-    // may not work in Safari 1.3
     this.cmdhistory   = Array();
     this.cmdhistoryid = -1;
     this.cmdhistoryissearching = false;
@@ -1071,6 +1070,8 @@
     // supports the Gecko selection model. However, these values may be
     // useful for debugging. Also, Opera recognizes Gecko and IE range
     // commands, so we need to ensure Opera only uses the Gecko model.
+    /* WARNING: Do not use this for textareas. They require a more
+                complex algorithm. */
     if (obj.setSelectionRange) 
     {
       obj.selStart = obj.selectionStart;
@@ -1141,7 +1142,6 @@
   
   /**
    * insert a smiley
-   * TODO: Merge functionality into "insert_text" function and eliminate.
    */
   insertSmiley: function(smiley)
   {

Modified: trunk/data/public/js/pfcprompt.js
===================================================================
--- trunk/data/public/js/pfcprompt.js	2007-08-15 19:35:55 UTC (rev 1125)
+++ trunk/data/public/js/pfcprompt.js	2007-08-16 13:04:48 UTC (rev 1126)
@@ -119,7 +119,7 @@
   {
     // _doSubmit is called when the user enters or cancels the box.
     var val = this.prompt_field.value;
-    if (is_gecko) this.box.focus(); // test is_ff because it doesn't work on KHTML browser, the popup shows infinitly
+    if (is_gecko) this.box.focus(); // test is_gecko because it doesn't work on KHTML browser, the popup shows infinitly
     this.box.style.display   = 'none'; // clear out the dialog box
     this.bgbox.style.display = 'none'; // clear out the screen
     this.prompt_field.value  = ''; // clear out the text field


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

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

From: <gpi...@us...> - 2007-08-15 19:36:06

Revision: 1125
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1125&view=rev
Author:   gpinzone
Date:     2007-08-15 12:35:55 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
Modified nickname completion to work anywhere within a string rather than only working at the end.  Uses caret/selection position. Need to test on non-compliant browser like older Konqueror.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-15 03:57:47 UTC (rev 1124)
+++ trunk/data/public/js/pfcclient.js	2007-08-15 19:35:55 UTC (rev 1125)
@@ -604,10 +604,30 @@
   completeNick: function()
   {
     var w = this.el_words;
-    var last_space = w.value.lastIndexOf(' ');
-    var nick_src = w.value.substring(last_space+1, w.value.length);
-    var non_nick_src = w.value.substring(0, last_space+1);
+    var selStart = w.value.length; // Default for browsers that don't support selection/caret position commands.
+    var selEnd = selStart;
     
+    // Get selection/caret position.
+    if (w.setSelectionRange) 
+    {
+      // We don't rely on the stored values for browsers that support
+      // the selectionStart and selectionEnd commands.
+      selStart = w.selectionStart;
+      selEnd   = w.selectionEnd;
+    }
+    else if (w.createTextRange && document.selection)
+    {
+      // We must rely on the stored values for IE browsers.
+      selStart = (w.selStart != null) ? w.selStart : w.value.length;
+      selEnd   = (w.selEnd != null) ? w.selEnd : w.value.length;
+    }
+    
+    var begin          = w.value.lastIndexOf(' ', selStart - 1) + 1;
+    var end            = (w.value.indexOf(' ', selStart) >= 0) ? w.value.indexOf(' ', selStart) : w.value.length;
+    var nick_src       = w.value.substring(begin, end);
+    var non_nick_begin = w.value.substring(0, begin);
+    var non_nick_end   = w.value.substring(end, w.value.length);
+
     if (nick_src != '')
     {
       var tabid = this.gui.getTabId();
@@ -641,15 +661,14 @@
       }
       if (nick_match)
       {
-        w.value = non_nick_src + nick_src.replace(nick_src, nick_replace);
-        // Move cursor to end of line.
-        // This fixes Webkit (Safari) and hopefully newer Konqueror releases.
-        /* Konqueror does not support setSelectionRange() on KDE versions <3.5.2. */
+        w.value = non_nick_begin + nick_src.replace(nick_src, nick_replace) + non_nick_end;
+        w.selStart = w.selEnd = non_nick_begin.length + nick_replace.length;
+        
+        // Move cursor to end of completed nick.
         if (w.setSelectionRange)
-        {
-          var selEnd = w.value.length;
-          w.setSelectionRange(selEnd, selEnd);
-        }
+          w.setSelectionRange(w.selEnd, w.selEnd); // Gecko
+        else
+          this.setSelection(w);  // IE
       }
     }
   },


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

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

From: <gpi...@us...> - 2007-08-15 03:57:46

Revision: 1124
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1124&view=rev
Author:   gpinzone
Date:     2007-08-14 20:57:47 -0700 (Tue, 14 Aug 2007)

Log Message:
-----------
Spelling fix (global): Choosen to Chosen.

Modified Paths:
--------------
    trunk/data/public/js/pfcclient.js
    trunk/i18n/ar_LB/main.php
    trunk/i18n/ba_BA/main.php
    trunk/i18n/bg_BG/main.php
    trunk/i18n/bn_BD/main.php
    trunk/i18n/da_DK/main.php
    trunk/i18n/de_DE-formal/main.php
    trunk/i18n/de_DE-informal/main.php
    trunk/i18n/el_GR/main.php
    trunk/i18n/en_US/main.php
    trunk/i18n/eo/main.php
    trunk/i18n/es_ES/main.php
    trunk/i18n/fr_FR/main.php
    trunk/i18n/hr_HR/main.php
    trunk/i18n/hu_HU/main.php
    trunk/i18n/hy_AM/main.php
    trunk/i18n/id_ID/main.php
    trunk/i18n/it_IT/main.php
    trunk/i18n/ja_JP/main.php
    trunk/i18n/ko_KR/main.php
    trunk/i18n/nb_NO/main.php
    trunk/i18n/nl_NL/main.php
    trunk/i18n/nn_NO/main.php
    trunk/i18n/pl_PL/main.php
    trunk/i18n/pt_BR/main.php
    trunk/i18n/pt_PT/main.php
    trunk/i18n/ru_RU/main.php
    trunk/i18n/sr_CS/main.php
    trunk/i18n/sv_SE/main.php
    trunk/i18n/tr_TR/main.php
    trunk/i18n/uk_RO/main.php
    trunk/i18n/uk_UA/main.php
    trunk/i18n/vi_VN/main.php
    trunk/i18n/zh_CN/main.php
    trunk/i18n/zh_TW/main.php
    trunk/src/phpfreechat.class.php

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/data/public/js/pfcclient.js	2007-08-15 03:57:47 UTC (rev 1124)
@@ -318,8 +318,8 @@
       }
       else if (resp == "isused")
       {
-        this.setError(this.res.getLabel('Choosen nickname is already used'), Array());
-        this.askNick(param,this.res.getLabel('Choosen nickname is already used'));
+        this.setError(this.res.getLabel('Chosen nickname is already used'), Array());
+        this.askNick(param,this.res.getLabel('Chosen nickname is already used'));
       }
       else if (resp == "notallowed")
       {
@@ -329,7 +329,7 @@
         // as long as the forced nickname is not changed.
 
         // display a message
-        this.setError(this.res.getLabel('Choosen nickname is not allowed'), Array());
+        this.setError(this.res.getLabel('Chosen nickname is not allowed'), Array());
         // then stop chat updates
         this.updateChat(false);
         this.isconnected = false;

Modified: trunk/i18n/ar_LB/main.php
===================================================================
--- trunk/i18n/ar_LB/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/ar_LB/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
@@ -319,7 +319,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/ba_BA/main.php
===================================================================
--- trunk/i18n/ba_BA/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/ba_BA/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -295,7 +295,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
@@ -322,7 +322,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/bg_BG/main.php
===================================================================
--- trunk/i18n/bg_BG/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/bg_BG/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -290,7 +290,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
@@ -317,7 +317,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/bn_BD/main.php
===================================================================
--- trunk/i18n/bn_BD/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/bn_BD/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = " Rehash করার সময় সমস্যা দেখা দিচ্ছে";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "পছন্দের ডাকনামটি আগেই কেউ নিয়ে নিয়েছে";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "পছন্দের ডাকনামটি আগেই কেউ নিয়ে নিয়েছে";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat এর বর্তমান ভার্সন হলো %s";
@@ -323,7 +323,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/da_DK/main.php
===================================================================
--- trunk/i18n/da_DK/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/da_DK/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -291,7 +291,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Der opstår et problem under rehash";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Det valgte chatnavn er allerede i brug";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Det valgte chatnavn er allerede i brug";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat nuværende version er %s";
@@ -313,7 +313,7 @@
 $GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "";
 
 // line 474 in phpfreechat.class.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "";
 
 // line 475 in phpfreechat.class.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/de_DE-formal/main.php
===================================================================
--- trunk/i18n/de_DE-formal/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/de_DE-formal/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -296,7 +296,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Ein Problem ist beim Laden der Konfiguration aufgetreten";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Der gewählte Nickname ist schon vergeben";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Der gewählte Nickname ist schon vergeben";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Die installierte Version von phpfreechat ist %s";
@@ -323,7 +323,7 @@
 $GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Sie können nicht mit sich selber sprechen";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Der gewählte Nickname ist nicht zulässig";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "Der gewählte Nickname ist nicht zulässig";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Akustische Signale einschalten";

Modified: trunk/i18n/de_DE-informal/main.php
===================================================================
--- trunk/i18n/de_DE-informal/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/de_DE-informal/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -297,7 +297,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Ein Problem ist beim Laden der Konfiguration aufgetreten";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Der gewählte Nickname ist schon vergeben";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Der gewählte Nickname ist schon vergeben";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Die installierte Version von phpfreechat ist %s";
@@ -324,7 +324,7 @@
 $GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Du kannst nicht mit dir selber sprechen";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Der gewählte Nickname ist nicht zulässig";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "Der gewählte Nickname ist nicht zulässig";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Akustische Signale einschalten";

Modified: trunk/i18n/el_GR/main.php
===================================================================
--- trunk/i18n/el_GR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/el_GR/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -291,7 +291,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
@@ -318,7 +318,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/en_US/main.php
===================================================================
--- trunk/i18n/en_US/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/en_US/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -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 already used"] = "Chosen nickname is already in use";
+$GLOBALS["i18n"]["Chosen nickname is already 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";
@@ -319,7 +319,7 @@
 $GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "You are not allowed to speak to yourself";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Choosen nickname is not allowed";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "Chosen nickname is not allowed";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Enable sound notifications";

Modified: trunk/i18n/eo/main.php
===================================================================
--- trunk/i18n/eo/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/eo/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -298,7 +298,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 74 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "";
 
 // line 75 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
@@ -322,7 +322,7 @@
 $GLOBALS["i18n"]["Close"] = "";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/es_ES/main.php
===================================================================
--- trunk/i18n/es_ES/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/es_ES/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Ocurrió un problema durante el proceso";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "El nickname elegido ya esta siendo usado";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "El nickname elegido ya esta siendo usado";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "la actual versión de phpfreechat es %s";
@@ -319,7 +319,7 @@
 $GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "No esta permitido hablarse a si mismo";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "No esta permitido elegir nickname";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "No esta permitido elegir nickname";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Habilitar notificaciones de sonido";

Modified: trunk/i18n/fr_FR/main.php
===================================================================
--- trunk/i18n/fr_FR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/fr_FR/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Un problème est survenu pendant le rehash";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Le pseudonyme est déjà utilisé";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Le pseudonyme est déjà utilisé";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "La version courante de phpfreechat est %s";
@@ -319,7 +319,7 @@
 $GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Vous n'êtes pas autorisés à vous parler";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Le pseudonyme choisi n'est pas autorisé";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "Le pseudonyme choisi n'est pas autorisé";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Activer la notification sonore";

Modified: trunk/i18n/hr_HR/main.php
===================================================================
--- trunk/i18n/hr_HR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/hr_HR/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -295,7 +295,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Nickname je zauzet!";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Nickname je zauzet!";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Trenutna verzija phpfreechat je %s";
@@ -322,7 +322,7 @@
 $GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Odabrani nadimak nije dopusten";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "Odabrani nadimak nije dopusten";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/hu_HU/main.php
===================================================================
--- trunk/i18n/hu_HU/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/hu_HU/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -294,7 +294,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Probléma akadt az újra hash-elés közben";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "A választott becenevet már valaki használja";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "A választott becenevet már valaki használja";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat aktuális verziója: %s";
@@ -321,7 +321,7 @@
 $GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Nem beszélgethetsz saját magaddal :-)";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "A választott becenév nem engedélyezett";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "A választott becenév nem engedélyezett";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Hang értesítés engedélyezése";

Modified: trunk/i18n/hy_AM/main.php
===================================================================
--- trunk/i18n/hy_AM/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/hy_AM/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -294,7 +294,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Վերաբեռնավորման ընթացքում սխալ տեղի ունեցավ";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Ընտրված ծածկանունն արդեն զբաղված է";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Ընտրված ծածկանունն արդեն զբաղված է";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat-ի ներկա տարբերակը` %s";
@@ -322,7 +322,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/id_ID/main.php
===================================================================
--- trunk/i18n/id_ID/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/id_ID/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -295,7 +295,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
@@ -322,7 +322,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/it_IT/main.php
===================================================================
--- trunk/i18n/it_IT/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/it_IT/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Si è verificato un problema durante l'aggiornamento";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Lo pseudonimo scelto è già in uso";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Lo pseudonimo scelto è già in uso";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat versione &s";
@@ -322,7 +322,7 @@
 $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"] = "Il nickname scelto non è valido";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "Il nickname scelto non è valido";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Abilita la notifica sonora";

Modified: trunk/i18n/ja_JP/main.php
===================================================================
--- trunk/i18n/ja_JP/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/ja_JP/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -293,7 +293,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "作成中に問題が発生しました";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "選択したニックネームは既に試用されています";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "選択したニックネームは既に試用されています";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat の現在のバージョンは %s です";
@@ -320,7 +320,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/ko_KR/main.php
===================================================================
--- trunk/i18n/ko_KR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/ko_KR/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "재설정중 문제가 생겼습니다.";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "이미 사용중인 별명입니다.";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "이미 사용중인 별명입니다.";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat 의 현재 버전은 %s 입니다.";
@@ -314,7 +314,7 @@
 $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"]["Chosen nickname is not allowed"] = "지정한 닉네임은 허가되지 않았습니다.";
 
 // line 492 in phpfreechat.class.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "음성 알림 켜기";

Modified: trunk/i18n/nb_NO/main.php
===================================================================
--- trunk/i18n/nb_NO/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/nb_NO/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
@@ -319,7 +319,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/nl_NL/main.php
===================================================================
--- trunk/i18n/nl_NL/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/nl_NL/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -293,7 +293,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
@@ -320,7 +320,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/nn_NO/main.php
===================================================================
--- trunk/i18n/nn_NO/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/nn_NO/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $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 already used"] = "Kallenamnet er allereie i bruk";
+$GLOBALS["i18n"]["Chosen nickname is already 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";
@@ -319,7 +319,7 @@
 $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";
+$GLOBALS["i18n"]["Chosen 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";

Modified: trunk/i18n/pl_PL/main.php
===================================================================
--- trunk/i18n/pl_PL/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/pl_PL/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -295,7 +295,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Wystąpił problem podczas haszowania";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Wybrany pseudonim jest już w użyciu";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Wybrany pseudonim jest już w użyciu";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "obecna wersja phpfreechat to %s";
@@ -322,7 +322,7 @@
 $GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Nie możesz rozmawiać ze samym sobą";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Wybrany pseudonim jest niedozwolony";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "Wybrany pseudonim jest niedozwolony";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Włącz powiadomienia dźwiękowe";

Modified: trunk/i18n/pt_BR/main.php
===================================================================
--- trunk/i18n/pt_BR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/pt_BR/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -296,7 +296,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Um problema ocorreu durante o rehash";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "O apelido escolhido já está em uso";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "O apelido escolhido já está em uso";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "A versão atual do phpFreeChat é %s";
@@ -318,7 +318,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 492 in phpfreechat.class.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/pt_PT/main.php
===================================================================
--- trunk/i18n/pt_PT/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/pt_PT/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -293,7 +293,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
@@ -320,7 +320,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/ru_RU/main.php
===================================================================
--- trunk/i18n/ru_RU/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/ru_RU/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -297,7 +297,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Произошла ошибка при перехешировании";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Выбраний ник уже используется";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Выбраний ник уже используется";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Текущая версия phpfreechat - %s";
@@ -324,7 +324,7 @@
 $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"]["Chosen nickname is not allowed"] = "Выбранный ник запрещен";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Включить звуковые оповещения";

Modified: trunk/i18n/sr_CS/main.php
===================================================================
--- trunk/i18n/sr_CS/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/sr_CS/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -295,7 +295,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
@@ -322,7 +322,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/sv_SE/main.php
===================================================================
--- trunk/i18n/sv_SE/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/sv_SE/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -296,7 +296,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Ett problem inträffade vid uppdateringen";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Vald alias används";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Vald alias används";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat - chat, version: %s";
@@ -327,7 +327,7 @@
 $GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Ehmm.. Du kan inte prata med dig själv";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Vald alias är inte tillåten";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "Vald alias är inte tillåten";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Tillåt ljud";

Modified: trunk/i18n/tr_TR/main.php
===================================================================
--- trunk/i18n/tr_TR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/tr_TR/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Tekrar okuma sırasında hata";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Seçtiğiniz takma ad başkası tarafından kullanılmakta";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Seçtiğiniz takma ad başkası tarafından kullanılmakta";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Şu anki phpfreechat versiyonu %s";
@@ -310,7 +310,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 492 in phpfreechat.class.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/uk_RO/main.php
===================================================================
--- trunk/i18n/uk_RO/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/uk_RO/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "O problema a aparut in timpul restartului";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Alege alt nick acesta este deja folosit";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Alege alt nick acesta este deja folosit";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "versiunea curenta de phpfreechat %s";
@@ -310,7 +310,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 492 in phpfreechat.class.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/i18n/uk_UA/main.php
===================================================================
--- trunk/i18n/uk_UA/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/uk_UA/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Виникла помилка при перехешуванні";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Вибраний нік уже використовується";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Вибраний нік уже використовується";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Поточна версія phpfreechat - %s";
@@ -319,7 +319,7 @@
 $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"]["Chosen nickname is not allowed"] = "Вибраний нік заборонений";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Включити звукові повідомлення";

Modified: trunk/i18n/vi_VN/main.php
===================================================================
--- trunk/i18n/vi_VN/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/vi_VN/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Không cập nhật được các thay đổi";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "Tên truy cập này đã được sử dụng";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "Tên truy cập này đã được sử dụng";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Phiên bản hiện thời của PFC là %s";
@@ -319,7 +319,7 @@
 $GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Bạn không được phép tự chat một mình";
 
 // line 82 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Tên truy cập không được chấp nhận";
+$GLOBALS["i18n"]["Chosen nickname is not allowed"] = "Tên truy cập không được chấp nhận";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "Bật chức năng thông báo bằng âm thanh";

Modified: trunk/i18n/zh_CN/main.php
===================================================================
--- trunk/i18n/zh_CN/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/zh_CN/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -294,7 +294,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "更新时发生了错误";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "您选择的昵称已经被别人使用了";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "您选择的昵称已经被别人使用了";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat 当前版本是 %s";
@@ -321,7 +321,7 @@
 $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"]["Chosen nickname is not allowed"] = "所选昵称已被禁用";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "启用声音通知";

Modified: trunk/i18n/zh_TW/main.php
===================================================================
--- trunk/i18n/zh_TW/main.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/i18n/zh_TW/main.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
+$GLOBALS["i18n"]["Chosen nickname is already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";
@@ -319,7 +319,7 @@
 $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"]["Chosen nickname is not allowed"] = "";
 
 // line 83 in chat.js.tpl.php
 $GLOBALS["i18n"]["Enable sound notifications"] = "";

Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php	2007-08-15 02:48:25 UTC (rev 1123)
+++ trunk/src/phpfreechat.class.php	2007-08-15 03:57:47 UTC (rev 1124)
@@ -444,7 +444,7 @@
              "Enter the text to format", // _pfc
              "Configuration has been rehashed", // _pfc
              "A problem occurs during rehash", // _pfc
-             "Choosen nickname is already used", // _pfc
+             "Chosen nickname is already used", // _pfc
              "phpfreechat current version is %s", // _pfc
              "Maximum number of joined channels has been reached", // _pfc
              "Maximum number of private chat has been reached", // _pfc
@@ -452,7 +452,7 @@
              "Send", // _pfc
              "You are not allowed to speak to yourself", // _pfc
              "Close", // _pfc
-             "Choosen nickname is not allowed", // _pfc
+             "Chosen nickname is not allowed", // _pfc
              "Enable sound notifications", // _pfc
              "Disable sound notifications", // _pfc
              "Input Required", // _pfc


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

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

From: <gpi...@us...> - 2007-08-15 02:48:23

Revision: 1123
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1123&view=rev
Author:   gpinzone
Date:     2007-08-14 19:48:25 -0700 (Tue, 14 Aug 2007)

Log Message:
-----------
Spelling fix (global): allready to already.

Modified Paths:
--------------
    trunk/contrib/installer.beta-5.1/engine_data/step_aboutto.inc
    trunk/contrib/pfcInstaller2/step1.php
    trunk/contrib/pfcInstaller2/step2.php
    trunk/data/public/js/pfcclient.js
    trunk/i18n/ar_LB/main.php
    trunk/i18n/ba_BA/main.php
    trunk/i18n/bg_BG/main.php
    trunk/i18n/bn_BD/main.php
    trunk/i18n/da_DK/main.php
    trunk/i18n/de_DE-formal/main.php
    trunk/i18n/de_DE-informal/main.php
    trunk/i18n/el_GR/main.php
    trunk/i18n/en_US/main.php
    trunk/i18n/eo/main.php
    trunk/i18n/es_ES/main.php
    trunk/i18n/fr_FR/main.php
    trunk/i18n/hr_HR/main.php
    trunk/i18n/hu_HU/main.php
    trunk/i18n/hy_AM/main.php
    trunk/i18n/id_ID/main.php
    trunk/i18n/it_IT/main.php
    trunk/i18n/ja_JP/main.php
    trunk/i18n/ko_KR/main.php
    trunk/i18n/nb_NO/main.php
    trunk/i18n/nl_NL/main.php
    trunk/i18n/nn_NO/main.php
    trunk/i18n/pl_PL/main.php
    trunk/i18n/pt_BR/main.php
    trunk/i18n/pt_PT/main.php
    trunk/i18n/ru_RU/main.php
    trunk/i18n/sr_CS/main.php
    trunk/i18n/sv_SE/main.php
    trunk/i18n/tr_TR/main.php
    trunk/i18n/uk_RO/main.php
    trunk/i18n/uk_UA/main.php
    trunk/i18n/vi_VN/main.php
    trunk/i18n/zh_CN/main.php
    trunk/i18n/zh_TW/main.php
    trunk/src/pfcglobalconfig.class.php
    trunk/src/pfcinfo.class.php
    trunk/src/phpfreechat.class.php
    trunk/src/proxies/checknickchange.class.php

Modified: trunk/contrib/installer.beta-5.1/engine_data/step_aboutto.inc
===================================================================
--- trunk/contrib/installer.beta-5.1/engine_data/step_aboutto.inc	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/contrib/installer.beta-5.1/engine_data/step_aboutto.inc	2007-08-15 02:48:25 UTC (rev 1123)
@@ -4,7 +4,7 @@
 
 if(is_dir($gpvobj->is_writable())){
 	echo <<<HTML
-	<p><b>The directory you chose ($gpvpath) allready exists. 
+	<p><b>The directory you chose ($gpvpath) already exists. 
 	This isn't a really bad thing, but a few errors may appear because the
 	directories all ready exist, and any files in the list below will be overwritten.</b></p>
 HTML;

Modified: trunk/contrib/pfcInstaller2/step1.php
===================================================================
--- trunk/contrib/pfcInstaller2/step1.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/contrib/pfcInstaller2/step1.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -38,7 +38,7 @@
  <?php }?>
 
 <?php } else { ?>
-<p>phpfreechat (<?php echo $archivename2; ?>) is allready installed <a href="./data/<?php echo $archivename2; ?>">here</a>.</p>
+<p>phpfreechat (<?php echo $archivename2; ?>) is already installed <a href="./data/<?php echo $archivename2; ?>">here</a>.</p>
 <?php } ?>
 
 

Modified: trunk/contrib/pfcInstaller2/step2.php
===================================================================
--- trunk/contrib/pfcInstaller2/step2.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/contrib/pfcInstaller2/step2.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -11,7 +11,7 @@
 <?php if (!$isinstalled) { ?>
 <p>Installation de <?php echo $archivename; ?> </p>
 <?php } else { ?>
-<p>phpfreechat (<?php echo $archivename2; ?>) is allready installed <a href="./data/<?php echo $archivename2; ?>">here</a>.</p>
+<p>phpfreechat (<?php echo $archivename2; ?>) is already installed <a href="./data/<?php echo $archivename2; ?>">here</a>.</p>
 <?php } ?>
 
 <?php

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/data/public/js/pfcclient.js	2007-08-15 02:48:25 UTC (rev 1123)
@@ -318,8 +318,8 @@
       }
       else if (resp == "isused")
       {
-        this.setError(this.res.getLabel('Choosen nickname is allready used'), Array());
-        this.askNick(param,this.res.getLabel('Choosen nickname is allready used'));
+        this.setError(this.res.getLabel('Choosen nickname is already used'), Array());
+        this.askNick(param,this.res.getLabel('Choosen nickname is already used'));
       }
       else if (resp == "notallowed")
       {
@@ -1498,17 +1498,17 @@
   getAndAssignNickColor: function(nick)
   {
     /* check the nickname is colorized or not */
-    var allready_colorized = false;
+    var already_colorized = false;
     var nc = '';
-    for(var j = 0; j < this.nickcolor.length && !allready_colorized; j++)
+    for(var j = 0; j < this.nickcolor.length && !already_colorized; j++)
     {
       if (this.nickcolor[j][0] == nick)
       {
-        allready_colorized = true;
+        already_colorized = true;
         nc = this.nickcolor[j][1];
       }
     }
-    if (!allready_colorized)
+    if (!already_colorized)
     {
       /* reload the color stack if it's empty */
       if (this.colorlist.length == 0) this.reloadColorList();

Modified: trunk/i18n/ar_LB/main.php
===================================================================
--- trunk/i18n/ar_LB/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/ar_LB/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $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 already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";

Modified: trunk/i18n/ba_BA/main.php
===================================================================
--- trunk/i18n/ba_BA/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/ba_BA/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -295,7 +295,7 @@
 $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 already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";

Modified: trunk/i18n/bg_BG/main.php
===================================================================
--- trunk/i18n/bg_BG/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/bg_BG/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -290,7 +290,7 @@
 $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 already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";

Modified: trunk/i18n/bn_BD/main.php
===================================================================
--- trunk/i18n/bn_BD/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/bn_BD/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = " Rehash করার সময় সমস্যা দেখা দিচ্ছে";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "পছন্দের ডাকনামটি আগেই কেউ নিয়ে নিয়েছে";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "পছন্দের ডাকনামটি আগেই কেউ নিয়ে নিয়েছে";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat এর বর্তমান ভার্সন হলো %s";

Modified: trunk/i18n/da_DK/main.php
===================================================================
--- trunk/i18n/da_DK/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/da_DK/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -291,7 +291,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Der opstår et problem under rehash";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Det valgte chatnavn er allerede i brug";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "Det valgte chatnavn er allerede i brug";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat nuværende version er %s";

Modified: trunk/i18n/de_DE-formal/main.php
===================================================================
--- trunk/i18n/de_DE-formal/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/de_DE-formal/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -296,7 +296,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Ein Problem ist beim Laden der Konfiguration aufgetreten";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Der gewählte Nickname ist schon vergeben";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "Der gewählte Nickname ist schon vergeben";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Die installierte Version von phpfreechat ist %s";

Modified: trunk/i18n/de_DE-informal/main.php
===================================================================
--- trunk/i18n/de_DE-informal/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/de_DE-informal/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -297,7 +297,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Ein Problem ist beim Laden der Konfiguration aufgetreten";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Der gewählte Nickname ist schon vergeben";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "Der gewählte Nickname ist schon vergeben";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Die installierte Version von phpfreechat ist %s";

Modified: trunk/i18n/el_GR/main.php
===================================================================
--- trunk/i18n/el_GR/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/el_GR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -291,7 +291,7 @@
 $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 already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";

Modified: trunk/i18n/en_US/main.php
===================================================================
--- trunk/i18n/en_US/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/en_US/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -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"] = "Chosen nickname is already in use";
+$GLOBALS["i18n"]["Choosen nickname is already 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";

Modified: trunk/i18n/eo/main.php
===================================================================
--- trunk/i18n/eo/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/eo/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -298,7 +298,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 74 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "";
 
 // line 75 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";

Modified: trunk/i18n/es_ES/main.php
===================================================================
--- trunk/i18n/es_ES/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/es_ES/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Ocurrió un problema durante el proceso";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "El nickname elegido ya esta siendo usado";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "El nickname elegido ya esta siendo usado";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "la actual versión de phpfreechat es %s";

Modified: trunk/i18n/fr_FR/main.php
===================================================================
--- trunk/i18n/fr_FR/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/fr_FR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Un problème est survenu pendant le rehash";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Le pseudonyme est déjà utilisé";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "Le pseudonyme est déjà utilisé";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "La version courante de phpfreechat est %s";

Modified: trunk/i18n/hr_HR/main.php
===================================================================
--- trunk/i18n/hr_HR/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/hr_HR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -295,7 +295,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Nickname je zauzet!";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "Nickname je zauzet!";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Trenutna verzija phpfreechat je %s";

Modified: trunk/i18n/hu_HU/main.php
===================================================================
--- trunk/i18n/hu_HU/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/hu_HU/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -294,7 +294,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Probléma akadt az újra hash-elés közben";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "A választott becenevet már valaki használja";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "A választott becenevet már valaki használja";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat aktuális verziója: %s";

Modified: trunk/i18n/hy_AM/main.php
===================================================================
--- trunk/i18n/hy_AM/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/hy_AM/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -294,7 +294,7 @@
 $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 already used"] = "Ընտրված ծածկանունն արդեն զբաղված է";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat-ի ներկա տարբերակը` %s";

Modified: trunk/i18n/id_ID/main.php
===================================================================
--- trunk/i18n/id_ID/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/id_ID/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -295,7 +295,7 @@
 $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 already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";

Modified: trunk/i18n/it_IT/main.php
===================================================================
--- trunk/i18n/it_IT/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/it_IT/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Si è verificato un problema durante l'aggiornamento";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Lo pseudonimo scelto è già in uso";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "Lo pseudonimo scelto è già in uso";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat versione &s";

Modified: trunk/i18n/ja_JP/main.php
===================================================================
--- trunk/i18n/ja_JP/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/ja_JP/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -293,7 +293,7 @@
 $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 already used"] = "選択したニックネームは既に試用されています";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat の現在のバージョンは %s です";

Modified: trunk/i18n/ko_KR/main.php
===================================================================
--- trunk/i18n/ko_KR/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/ko_KR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $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 already used"] = "이미 사용중인 별명입니다.";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat 의 현재 버전은 %s 입니다.";

Modified: trunk/i18n/nb_NO/main.php
===================================================================
--- trunk/i18n/nb_NO/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/nb_NO/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $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 already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";

Modified: trunk/i18n/nl_NL/main.php
===================================================================
--- trunk/i18n/nl_NL/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/nl_NL/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -293,7 +293,7 @@
 $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 already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";

Modified: trunk/i18n/nn_NO/main.php
===================================================================
--- trunk/i18n/nn_NO/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/nn_NO/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $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";
+$GLOBALS["i18n"]["Choosen nickname is already 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";

Modified: trunk/i18n/pl_PL/main.php
===================================================================
--- trunk/i18n/pl_PL/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/pl_PL/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -295,7 +295,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Wystąpił problem podczas haszowania";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Wybrany pseudonim jest już w użyciu";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "Wybrany pseudonim jest już w użyciu";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "obecna wersja phpfreechat to %s";

Modified: trunk/i18n/pt_BR/main.php
===================================================================
--- trunk/i18n/pt_BR/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/pt_BR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -296,7 +296,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Um problema ocorreu durante o rehash";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "O apelido escolhido já está em uso";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "O apelido escolhido já está em uso";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "A versão atual do phpFreeChat é %s";

Modified: trunk/i18n/pt_PT/main.php
===================================================================
--- trunk/i18n/pt_PT/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/pt_PT/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -293,7 +293,7 @@
 $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 already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";

Modified: trunk/i18n/ru_RU/main.php
===================================================================
--- trunk/i18n/ru_RU/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/ru_RU/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -297,7 +297,7 @@
 $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 already used"] = "Выбраний ник уже используется";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Текущая версия phpfreechat - %s";

Modified: trunk/i18n/sr_CS/main.php
===================================================================
--- trunk/i18n/sr_CS/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/sr_CS/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -295,7 +295,7 @@
 $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 already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";

Modified: trunk/i18n/sv_SE/main.php
===================================================================
--- trunk/i18n/sv_SE/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/sv_SE/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -296,7 +296,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Ett problem inträffade vid uppdateringen";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Vald alias används";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "Vald alias används";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat - chat, version: %s";

Modified: trunk/i18n/tr_TR/main.php
===================================================================
--- trunk/i18n/tr_TR/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/tr_TR/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Tekrar okuma sırasında hata";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Seçtiğiniz takma ad başkası tarafından kullanılmakta";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "Seçtiğiniz takma ad başkası tarafından kullanılmakta";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Şu anki phpfreechat versiyonu %s";

Modified: trunk/i18n/uk_RO/main.php
===================================================================
--- trunk/i18n/uk_RO/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/uk_RO/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "O problema a aparut in timpul restartului";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Alege alt nick acesta este deja folosit";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "Alege alt nick acesta este deja folosit";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "versiunea curenta de phpfreechat %s";

Modified: trunk/i18n/uk_UA/main.php
===================================================================
--- trunk/i18n/uk_UA/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/uk_UA/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $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 already used"] = "Вибраний нік уже використовується";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Поточна версія phpfreechat - %s";

Modified: trunk/i18n/vi_VN/main.php
===================================================================
--- trunk/i18n/vi_VN/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/vi_VN/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $GLOBALS["i18n"]["A problem occurs during rehash"] = "Không cập nhật được các thay đổi";
 
 // line 83 in chat.js.tpl.php
-$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Tên truy cập này đã được sử dụng";
+$GLOBALS["i18n"]["Choosen nickname is already used"] = "Tên truy cập này đã được sử dụng";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "Phiên bản hiện thời của PFC là %s";

Modified: trunk/i18n/zh_CN/main.php
===================================================================
--- trunk/i18n/zh_CN/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/zh_CN/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -294,7 +294,7 @@
 $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 already used"] = "您选择的昵称已经被别人使用了";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "phpfreechat 当前版本是 %s";

Modified: trunk/i18n/zh_TW/main.php
===================================================================
--- trunk/i18n/zh_TW/main.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/i18n/zh_TW/main.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -292,7 +292,7 @@
 $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 already used"] = "";
 
 // line 84 in chat.js.tpl.php
 $GLOBALS["i18n"]["phpfreechat current version is %s"] = "";

Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/src/pfcglobalconfig.class.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -193,7 +193,7 @@
     else
       $this->data_private_path = $params["data_private_path"];
     
-    // check if a cached configuration allready exists
+    // check if a cached configuration already exists
     // don't load parameters if the cache exists
     $cachefile = $this->_GetCacheFile();    
     if (!file_exists($cachefile))

Modified: trunk/src/pfcinfo.class.php
===================================================================
--- trunk/src/pfcinfo.class.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/src/pfcinfo.class.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -11,7 +11,7 @@
   
   function pfcInfo( $serverid, $data_private_path = "" )
   {
-    // check if the cache allready exists
+    // check if the cache already exists
     // if it doesn't exists, just stop the process
     // because we can't initialize the chat from the external API
     if ($data_private_path == "") $data_private_path = dirname(__FILE__)."/../data/private";

Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/src/phpfreechat.class.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -444,7 +444,7 @@
              "Enter the text to format", // _pfc
              "Configuration has been rehashed", // _pfc
              "A problem occurs during rehash", // _pfc
-             "Choosen nickname is allready used", // _pfc
+             "Choosen nickname is already used", // _pfc
              "phpfreechat current version is %s", // _pfc
              "Maximum number of joined channels has been reached", // _pfc
              "Maximum number of private chat has been reached", // _pfc

Modified: trunk/src/proxies/checknickchange.class.php
===================================================================
--- trunk/src/proxies/checknickchange.class.php	2007-08-15 00:23:11 UTC (rev 1122)
+++ trunk/src/proxies/checknickchange.class.php	2007-08-15 02:48:25 UTC (rev 1123)
@@ -83,7 +83,7 @@
         else
           $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());
+          pxlog("/nick ".$newnick." (wanted nick is already in use -> wantednickid=".$newnickid.")", "chat", $c->getId());
         return 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: [1122] trunk/data/public/js/pfcclient.js

From: <gpi...@us...> - 2007-08-15 00:23:10

Revision: 1122
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1122&view=rev
Author:   gpinzone
Date:     2007-08-14 17:23:11 -0700 (Tue, 14 Aug 2007)

Log Message:
-----------
Various cleanups and documentation updates.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-14 20:55:19 UTC (rev 1121)
+++ trunk/data/public/js/pfcclient.js	2007-08-15 00:23:11 UTC (rev 1122)
@@ -798,7 +798,7 @@
     //      this.el_handle.focus();
     
     // Needed for IE since the text box loses selection/caret position on blur
-    this.setSelectionIE(this.el_words);
+    this.setSelection(this.el_words);
   },
   callbackHandle_OnKeydown: function(evt)
   {
@@ -1043,15 +1043,25 @@
 
   /**
    * Stores the caret/selection position for IE 6.x and 7.x
+   * Returns true if text range start and end values were updated.
    * Code based on: http://www.bazon.net/mishoo/articles.epl?art_id=1292
    */
   storeSelectionPos: function(obj)
   {
-    // Exit function if browser supports Gecko selection model
-    if (obj.setSelectionRange) return false;
-
+    // We don't need to store the start and end positions if the browser
+    // supports the Gecko selection model. However, these values may be
+    // useful for debugging. Also, Opera recognizes Gecko and IE range
+    // commands, so we need to ensure Opera only uses the Gecko model.
+    if (obj.setSelectionRange) 
+    {
+      obj.selStart = obj.selectionStart;
+      obj.selEnd   = obj.selectionEnd;
+      
+      return true;
+    }
+    
     // IE
-    if (obj.createTextRange && document.selection)
+    else if (obj.createTextRange && document.selection)
     {
       // Determine current selection start position.
       var range = document.selection.createRange();
@@ -1071,17 +1081,32 @@
       
       return true;
     }
+    
+    // Browser does not support selection range processing.
+    else
+      return false;
   },
 
   /**
-   * Sets the selection/caret in the object based on the object's selStart and selEnd parameters.
-   * This is for IE 6.x and 7.x only.
+   * Sets the selection/caret in the object based on the
+   * object's selStart and selEnd parameters.
+   * This should only be needed for IE only.
    */
-  setSelectionIE: function(obj)
+  setSelection: function(obj)
   {
-    // IE - Don't process if browser supports Gecko selection model
-    if (obj.createTextRange && !obj.setSelectionRange)
+    // This part of the function is included to prevent
+    // Opera from executing the IE portion.
+    /* WARNING: Do not attempt to use this function as
+       a wrapper for the Gekco based setSelectionRange.
+       It causes problems in Opera when executed from
+       the event trigger onFocus. */
+    if (obj.setSelectionRange)
     {
+      return null;
+    }  
+    // IE
+    else if (obj.createTextRange)
+    {
       var range = obj.createTextRange();
       range.collapse(true);
       range.moveStart("character", obj.selStart);
@@ -1090,16 +1115,21 @@
     
       return range;
     }
+    // Browser does not support selection range processing.
+    else
+      return null;
   },
   
   /**
    * insert a smiley
+   * TODO: Merge functionality into "insert_text" function and eliminate.
    */
   insertSmiley: function(smiley)
   {
     var w = this.el_words;
     
-    if (w.setSelectionRange) {
+    if (w.setSelectionRange)
+    {
       // Gecko
       var s = w.selectionStart;
       var e = w.selectionEnd;
@@ -1112,13 +1142,12 @@
       // IE
       w.focus();
 
-      // Set range based on stored values.
-      var range = this.setSelectionIE(w);
+      // Get range based on stored values.
+      var range = this.setSelection(w);
       
-      //document.selection.createRange().text = smiley;
       range.text = smiley;
 
-      // Increment caret position.
+      // Move caret position to end of smiley and collapse selection, if any.
       // Check if internally kept values for selection are initialized.
       w.selStart = (w.selStart) ? w.selStart + smiley.length : smiley.length;
       w.selEnd   = w.selStart;
@@ -1677,7 +1706,6 @@
   },
 
 
-
   /**
    * Minimize/Maximized the chat zone
    */
@@ -1726,30 +1754,31 @@
     pfcp.promptifselempty = promptifselempty;
     pfcp.callback = this.insert_text_callback;
 
-    // Mozilla support
+    // Gecko
+    /* Always check for Gecko selection processing commands
+       first. This is needed for Opera. */
     if (msgfield.selectionStart || msgfield.selectionStart == '0')
     {
       var startPos = msgfield.selectionStart;
       var endPos   = msgfield.selectionEnd;
       
       var text = msgfield.value.substring(startPos, endPos);
-      var extralength = 0;
       if (startPos == endPos && promptifselempty)
       {
         pfcp.prompt(this.res.getLabel('Enter the text to format'), '');
         pfcp.focus();
       }
       else
-        this.insert_text_callback(text,pfcp);
+        this.insert_text_callback(text, pfcp);
     }
 
-    // IE support
+    // IE
     else if (document.selection && document.selection.createRange)
     {
       msgfield.focus();
       
-      // Set range based on stored values.
-      pfcp.range = this.setSelectionIE(msgfield);
+      // Get selection range.
+      pfcp.range = this.setSelection(msgfield);
       var text = pfcp.range.text;
       if (text == "" && promptifselempty)
       {
@@ -1757,7 +1786,7 @@
         pfcp.focus();
       }
       else
-        this.insert_text_callback(text,pfcp);
+        this.insert_text_callback(text, pfcp);
     }
     
     // Fallback support for other browsers
@@ -1768,7 +1797,7 @@
     }
     return;
   },
-  insert_text_callback: function(text,pfcp)
+  insert_text_callback: function(text, pfcp)
   {
     var open             = pfcp.open;
     var close            = pfcp.close;
@@ -1776,7 +1805,9 @@
     var msgfield         = pfcp.msgfield;
     var range            = pfcp.range;
 
-    // Mozilla support
+    // Gecko
+    /* Always check for Gecko selection processing commands
+       first. This is needed for Opera. */
     if (msgfield.selectionStart || msgfield.selectionStart == '0')
     {
       var startPos = msgfield.selectionStart;
@@ -1796,7 +1827,7 @@
         msgfield.focus();
       }
     }
-    // IE support
+    // IE
     else if (document.selection && document.selection.createRange)
     {
       if (text == null) text = "";


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

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

From: <gpi...@us...> - 2007-08-14 20:55:19

Revision: 1121
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1121&view=rev
Author:   gpinzone
Date:     2007-08-14 13:55:19 -0700 (Tue, 14 Aug 2007)

Log Message:
-----------
Successfully merged insertSmiley caret/selection for IE enhancements to insert_text.  Moved IE selection enhancements to separate functions. Moved check for Gecko first in insert_text to prevent problems with Opera.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-14 17:05:15 UTC (rev 1120)
+++ trunk/data/public/js/pfcclient.js	2007-08-14 20:55:19 UTC (rev 1121)
@@ -784,18 +784,21 @@
   },
   callbackWords_OnKeyup: function(evt)
   {
-    // Needed for IE since the text box loses caret position on blur
-    this.storeSelectionPos();
+    // Needed for IE since the text box loses selection/caret position on blur
+    this.storeSelectionPos(this.el_words);
   },
   callbackWords_OnMouseup: function(evt)
   {
-    // Needed for IE since the text box loses caret position on blur
-    this.storeSelectionPos();
+    // Needed for IE since the text box loses selection/caret position on blur
+    this.storeSelectionPos(this.el_words);
   },
   callbackWords_OnFocus: function(evt)
   {
     //    if (this.el_handle && this.el_handle.value == '' && !this.minmax_status)
     //      this.el_handle.focus();
+    
+    // Needed for IE since the text box loses selection/caret position on blur
+    this.setSelectionIE(this.el_words);
   },
   callbackHandle_OnKeydown: function(evt)
   {
@@ -1039,35 +1042,57 @@
   },
 
   /**
-   * Stores the caret position for IE 6.x and 7.x
+   * Stores the caret/selection position for IE 6.x and 7.x
    * Code based on: http://www.bazon.net/mishoo/articles.epl?art_id=1292
    */
-  storeSelectionPos: function()
+  storeSelectionPos: function(obj)
   {
-    var w = this.el_words;
-    
+    // Exit function if browser supports Gecko selection model
+    if (obj.setSelectionRange) return false;
+
     // IE
-    if (w.createTextRange && document.selection)
+    if (obj.createTextRange && document.selection)
     {
       // Determine current selection start position.
       var range = document.selection.createRange();
       var isCollapsed = range.compareEndPoints("StartToEnd", range) == 0;
       if (!isCollapsed)
         range.collapse(true);
-	    var b = range.getBookmark();
-	    w.selStart = b.charCodeAt(2) - b.charCodeAt(0) - 1;
-	
+      var b = range.getBookmark();
+      obj.selStart = b.charCodeAt(2) - b.charCodeAt(0) - 1;
+  
       // Determine current selection end position.
       range = document.selection.createRange();
-	    isCollapsed = range.compareEndPoints("StartToEnd", range) == 0;
+      isCollapsed = range.compareEndPoints("StartToEnd", range) == 0;
       if (!isCollapsed)
         range.collapse(false);
       b = range.getBookmark();
-      w.selEnd = b.charCodeAt(2) - b.charCodeAt(0) - 1;
+      obj.selEnd = b.charCodeAt(2) - b.charCodeAt(0) - 1;
+      
+      return true;
     }
   },
 
   /**
+   * Sets the selection/caret in the object based on the object's selStart and selEnd parameters.
+   * This is for IE 6.x and 7.x only.
+   */
+  setSelectionIE: function(obj)
+  {
+    // IE - Don't process if browser supports Gecko selection model
+    if (obj.createTextRange && !obj.setSelectionRange)
+    {
+      var range = obj.createTextRange();
+      range.collapse(true);
+      range.moveStart("character", obj.selStart);
+      range.moveEnd("character", obj.selEnd - obj.selStart);
+      range.select();
+    
+      return range;
+    }
+  },
+  
+  /**
    * insert a smiley
    */
   insertSmiley: function(smiley)
@@ -1088,11 +1113,7 @@
       w.focus();
 
       // Set range based on stored values.
-		  var range = w.createTextRange();
-		  range.collapse(true);
-		  range.moveStart("character", w.selStart);
-		  range.moveEnd("character", w.selEnd - w.selStart);
-		  range.select();
+      var range = this.setSelectionIE(w);
       
       //document.selection.createRange().text = smiley;
       range.text = smiley;
@@ -1689,6 +1710,7 @@
       content.style.display = 'block';
     }
   },
+
   
   /**
    * BBcode ToolBar
@@ -1704,21 +1726,15 @@
     pfcp.promptifselempty = promptifselempty;
     pfcp.callback = this.insert_text_callback;
 
-    // IE support
-    if (document.selection && document.selection.createRange)
+    // Mozilla support
+    if (msgfield.selectionStart || msgfield.selectionStart == '0')
     {
-      msgfield.focus();
+      var startPos = msgfield.selectionStart;
+      var endPos   = msgfield.selectionEnd;
       
-      // Set range based on stored values.
-		  var range = msgfield.createTextRange();
-		  range.collapse(true);
-		  range.moveStart("character", msgfield.selStart);
-		  range.moveEnd("character", msgfield.selEnd - msgfield.selStart);
-		  range.select();
-      
-      pfcp.sel = range;
-      var text = pfcp.sel.text;
-      if (text == "" && promptifselempty)
+      var text = msgfield.value.substring(startPos, endPos);
+      var extralength = 0;
+      if (startPos == endPos && promptifselempty)
       {
         pfcp.prompt(this.res.getLabel('Enter the text to format'), '');
         pfcp.focus();
@@ -1727,15 +1743,15 @@
         this.insert_text_callback(text,pfcp);
     }
 
-    // Mozilla support
-    else if (msgfield.selectionStart || msgfield.selectionStart == '0')
+    // IE support
+    else if (document.selection && document.selection.createRange)
     {
-      var startPos = msgfield.selectionStart;
-      var endPos   = msgfield.selectionEnd;
+      msgfield.focus();
       
-      var text = msgfield.value.substring(startPos, endPos);
-      var extralength = 0;
-      if (startPos == endPos && promptifselempty)
+      // Set range based on stored values.
+      pfcp.range = this.setSelectionIE(msgfield);
+      var text = pfcp.range.text;
+      if (text == "" && promptifselempty)
       {
         pfcp.prompt(this.res.getLabel('Enter the text to format'), '');
         pfcp.focus();
@@ -1758,24 +1774,10 @@
     var close            = pfcp.close;
     var promptifselempty = pfcp.promptifselempty;
     var msgfield         = pfcp.msgfield;
-    var sel              = pfcp.sel;
-    // IE support
-    if (document.selection && document.selection.createRange)
-    {
-      if (text == null) text = "";
-      if (text.length > 0 || !promptifselempty)
-      {
-        msgfield.focus();
-        sel.text = open + text + close;
-        // @todo move the cursor just after the BBCODE, this doesn't work when the text to enclose is selected, IE6 keeps the whole selection active after the operation.
-        // Increment caret position.
-        // Check if internally kept values for selection are initialized.
-        msgfield.selStart = (msgfield.selStart) ? msgfield.selStart + sel.text.length : sel.text.length;
-        msgfield.selEnd   = msgfield.selStart;
-      }
-    }
+    var range            = pfcp.range;
+
     // Mozilla support
-    else if (msgfield.selectionStart || msgfield.selectionStart == '0')
+    if (msgfield.selectionStart || msgfield.selectionStart == '0')
     {
       var startPos = msgfield.selectionStart;
       var endPos   = msgfield.selectionEnd;
@@ -1789,10 +1791,29 @@
       if (text.length > 0 || !promptifselempty)
       {
         msgfield.value = msgfield.value.substring(0, startPos) + open + text + close + msgfield.value.substring(endPos, msgfield.value.length);
-        msgfield.selectionStart = msgfield.selectionEnd = endPos + open.length + extralength + close.length;
+        var caretPos = endPos + open.length + extralength + close.length;
+        msgfield.setSelectionRange(caretPos, caretPos);
         msgfield.focus();
       }
     }
+    // IE support
+    else if (document.selection && document.selection.createRange)
+    {
+      if (text == null) text = "";
+      if (text.length > 0 || !promptifselempty)
+      {
+        msgfield.focus();
+
+        range.text = open + text + close;
+
+        // Increment caret position.
+        // Check if internally kept values for selection are initialized.
+        msgfield.selStart = (msgfield.selStart) ? msgfield.selStart + open.length + text.length + close.length : open.length + text.length + close.length;
+        msgfield.selEnd   = msgfield.selStart;
+
+        msgfield.focus();
+      }
+    }
     // Fallback support for other browsers
     else
     {


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

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

From: <gpi...@us...> - 2007-08-14 17:05:13

Revision: 1120
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1120&view=rev
Author:   gpinzone
Date:     2007-08-14 10:05:15 -0700 (Tue, 14 Aug 2007)

Log Message:
-----------
Attempt to implement IE selection tracking code to insert_text.  Does not seem to retain last known caret/selection positions.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-13 17:08:34 UTC (rev 1119)
+++ trunk/data/public/js/pfcclient.js	2007-08-14 17:05:15 UTC (rev 1120)
@@ -1708,7 +1708,15 @@
     if (document.selection && document.selection.createRange)
     {
       msgfield.focus();
-      pfcp.sel = document.selection.createRange();
+      
+      // Set range based on stored values.
+		  var range = msgfield.createTextRange();
+		  range.collapse(true);
+		  range.moveStart("character", msgfield.selStart);
+		  range.moveEnd("character", msgfield.selEnd - msgfield.selStart);
+		  range.select();
+      
+      pfcp.sel = range;
       var text = pfcp.sel.text;
       if (text == "" && promptifselempty)
       {
@@ -1757,9 +1765,13 @@
       if (text == null) text = "";
       if (text.length > 0 || !promptifselempty)
       {
+        msgfield.focus();
         sel.text = open + text + close;
         // @todo move the cursor just after the BBCODE, this doesn't work when the text to enclose is selected, IE6 keeps the whole selection active after the operation.
-        msgfield.focus();
+        // Increment caret position.
+        // Check if internally kept values for selection are initialized.
+        msgfield.selStart = (msgfield.selStart) ? msgfield.selStart + sel.text.length : sel.text.length;
+        msgfield.selEnd   = msgfield.selStart;
       }
     }
     // Mozilla support


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

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

From: <gpi...@us...> - 2007-08-13 17:08:33

Revision: 1119
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1119&view=rev
Author:   gpinzone
Date:     2007-08-13 10:08:34 -0700 (Mon, 13 Aug 2007)

Log Message:
-----------
Simplified caret position update on smiley insert for IE.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-13 15:06:14 UTC (rev 1118)
+++ trunk/data/public/js/pfcclient.js	2007-08-13 17:08:34 UTC (rev 1119)
@@ -1097,14 +1097,10 @@
       //document.selection.createRange().text = smiley;
       range.text = smiley;
 
+      // Increment caret position.
       // Check if internally kept values for selection are initialized.
-      if (w.selStart && w.selEnd)
-      {
-        w.selStart += smiley.length;
-        w.selEnd = w.selStart;
-      }
-      else
-      	this.storeSelectionPos();
+      w.selStart = (w.selStart) ? w.selStart + smiley.length : smiley.length;
+      w.selEnd   = w.selStart;
     }
     else
     {


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

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

From: <gpi...@us...> - 2007-08-13 15:06:13

Revision: 1118
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1118&view=rev
Author:   gpinzone
Date:     2007-08-13 08:06:14 -0700 (Mon, 13 Aug 2007)

Log Message:
-----------
Added text selection tracking to fix annoying IE loss of selection and caret position.  Will look to extend this fix to other areas like bbcode insertion.  Tested on IE 6.0 and IE 7.0.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-12 16:22:48 UTC (rev 1117)
+++ trunk/data/public/js/pfcclient.js	2007-08-13 15:06:14 UTC (rev 1118)
@@ -81,6 +81,8 @@
 // don't use this line because when doing completeNick the "return false" doesn't work (focus is lost)
 //    Event.observe(this.el_words,     'keypress',  this.callbackWords_OnKeypress.bindAsEventListener(this), false);
     Event.observe(this.el_words,     'keydown',   this.callbackWords_OnKeydown.bindAsEventListener(this), false);
+    Event.observe(this.el_words,     'keyup',     this.callbackWords_OnKeyup.bindAsEventListener(this), false);
+    Event.observe(this.el_words,     'mouseup',   this.callbackWords_OnMouseup.bindAsEventListener(this), false);
     Event.observe(this.el_words,     'focus',     this.callbackWords_OnFocus.bindAsEventListener(this), false);
     Event.observe(this.el_handle,    'keydown',   this.callbackHandle_OnKeydown.bindAsEventListener(this), false);
     Event.observe(this.el_handle,    'change',    this.callbackHandle_OnChange.bindAsEventListener(this), false);
@@ -780,6 +782,16 @@
       return true;
     }
   },
+  callbackWords_OnKeyup: function(evt)
+  {
+    // Needed for IE since the text box loses caret position on blur
+    this.storeSelectionPos();
+  },
+  callbackWords_OnMouseup: function(evt)
+  {
+    // Needed for IE since the text box loses caret position on blur
+    this.storeSelectionPos();
+  },
   callbackWords_OnFocus: function(evt)
   {
     //    if (this.el_handle && this.el_handle.value == '' && !this.minmax_status)
@@ -1027,6 +1039,35 @@
   },
 
   /**
+   * Stores the caret position for IE 6.x and 7.x
+   * Code based on: http://www.bazon.net/mishoo/articles.epl?art_id=1292
+   */
+  storeSelectionPos: function()
+  {
+    var w = this.el_words;
+    
+    // IE
+    if (w.createTextRange && document.selection)
+    {
+      // Determine current selection start position.
+      var range = document.selection.createRange();
+      var isCollapsed = range.compareEndPoints("StartToEnd", range) == 0;
+      if (!isCollapsed)
+        range.collapse(true);
+	    var b = range.getBookmark();
+	    w.selStart = b.charCodeAt(2) - b.charCodeAt(0) - 1;
+	
+      // Determine current selection end position.
+      range = document.selection.createRange();
+	    isCollapsed = range.compareEndPoints("StartToEnd", range) == 0;
+      if (!isCollapsed)
+        range.collapse(false);
+      b = range.getBookmark();
+      w.selEnd = b.charCodeAt(2) - b.charCodeAt(0) - 1;
+    }
+  },
+
+  /**
    * insert a smiley
    */
   insertSmiley: function(smiley)
@@ -1045,7 +1086,25 @@
     {
       // IE
       w.focus();
-      document.selection.createRange().text = smiley;
+
+      // Set range based on stored values.
+		  var range = w.createTextRange();
+		  range.collapse(true);
+		  range.moveStart("character", w.selStart);
+		  range.moveEnd("character", w.selEnd - w.selStart);
+		  range.select();
+      
+      //document.selection.createRange().text = smiley;
+      range.text = smiley;
+
+      // Check if internally kept values for selection are initialized.
+      if (w.selStart && w.selEnd)
+      {
+        w.selStart += smiley.length;
+        w.selEnd = w.selStart;
+      }
+      else
+      	this.storeSelectionPos();
     }
     else
     {


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

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

From: <gpi...@us...> - 2007-08-12 16:22:48

Revision: 1117
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1117&view=rev
Author:   gpinzone
Date:     2007-08-12 09:22:48 -0700 (Sun, 12 Aug 2007)

Log Message:
-----------
Moved Webkit/Konqueror cursor position fix into completeNick function. Modified to move cursor if setSelectionRange is supported rather than on browser id. Hopefully, this will fix newer versions of Konqueror. Rewrote insertSmiley to work truly as an "insert" function. Fixes Opera issue when smiley is inserted into an empty textbox.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-12 04:27:16 UTC (rev 1116)
+++ trunk/data/public/js/pfcclient.js	2007-08-12 16:22:48 UTC (rev 1117)
@@ -638,7 +638,17 @@
         }
       }
       if (nick_match)
+      {
         w.value = non_nick_src + nick_src.replace(nick_src, nick_replace);
+        // Move cursor to end of line.
+        // This fixes Webkit (Safari) and hopefully newer Konqueror releases.
+        /* Konqueror does not support setSelectionRange() on KDE versions <3.5.2. */
+        if (w.setSelectionRange)
+        {
+          var selEnd = w.value.length;
+          w.setSelectionRange(selEnd, selEnd);
+        }
+      }
     }
   },
   
@@ -744,21 +754,9 @@
     }
     else if (code == 9) /* TAB key */
     {
-      /* Konqueror has the same problem as Webkit (Safari),
-         but setSelectionRange() won't work on 
-         KDE versions <3.5.2.  Therefore, I'm leaving
-         the Webkit fix out for these browsers. */
-
       // Do nickname completion like on IRC / Unix command line.
       this.completeNick();
       
-      var tb = evt.srcElement || evt.target;
-      if (is_webkit)
-      {
-        // Move cursor to end of line for Webkit (Safari).
-        var selEnd = this.el_words.value.length;
-        tb.setSelectionRange(selEnd, selEnd);
-      }
       if (is_opera)
       {
         // Fixes Opera's loss of focus after TAB key is pressed.
@@ -766,7 +764,8 @@
         // that executes the default key operation BEFORE the
         // keydown and keypress event handler.
         // This is probably the reason for the "up arrow" issue above.
-        window.setTimeout(function(){tb.focus();}, 0);
+        //window.setTimeout(function(){evt.target.focus();}, 0);
+        evt.target.onblur = function() { this.focus(); this.onblur = null; };
       }
       
       if (evt.returnValue) // IE
@@ -1030,10 +1029,30 @@
   /**
    * insert a smiley
    */
-  insertSmiley: function(s)
+  insertSmiley: function(smiley)
   {
-    this.el_words.value += s;
-    this.el_words.focus();
+    var w = this.el_words;
+    
+    if (w.setSelectionRange) {
+      // Gecko
+      var s = w.selectionStart;
+      var e = w.selectionEnd;
+      w.value = w.value.substring(0, s) + smiley + w.value.substr(e);
+      w.setSelectionRange(s + smiley.length, s + smiley.length);
+      w.focus();
+    }
+    else if (w.createTextRange)
+    {
+      // IE
+      w.focus();
+      document.selection.createRange().text = smiley;
+    }
+    else
+    {
+      // Unsupported browsers get smiley at end of string like old times.
+      w.value += smiley;
+      w.focus();
+    }
   },
 
   updateNickBox: function(nickid)


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

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

From: <gpi...@us...> - 2007-08-12 04:27:13

Revision: 1116
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1116&view=rev
Author:   gpinzone
Date:     2007-08-11 21:27:16 -0700 (Sat, 11 Aug 2007)

Log Message:
-----------
pfcclient.js: Major browser compatibility updates for Nickname completion. Safari and Opera work as well as IE and Firefox. Documented all known issues with Konqueror.
pfcprompt.js: Forgot to change is_ff to is_gecko. Fixed.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-11 06:41:57 UTC (rev 1115)
+++ trunk/data/public/js/pfcclient.js	2007-08-12 04:27:16 UTC (rev 1116)
@@ -1,3 +1,4 @@
+// Browser detection mostly taken from prototype.js 1.5.1.1.
 var is_ie     = !!(window.attachEvent && !window.opera);
 var is_khtml  = !!(navigator.appName.match("Konqueror") || navigator.appVersion.match("KHTML"));
 var is_gecko  = navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1;
@@ -189,7 +190,6 @@
           trace('handleResponse: '+cmd + "-"+resp+"-"+param);
       }
 
-
     // store the new refresh time
     this.last_response_time = new Date().getTime();
 
@@ -321,10 +321,10 @@
       }
       else if (resp == "notallowed")
       {
-        // when frozen_nick is true and the nickname is allready used, server will return
+        // When frozen_nick is true and the nickname is already used, server will return
         // the 'notallowed' status. It will display a message and stop chat update.
-        // if the chat update is not stopped, this will loop forever 
-        // as long as the forced nickname is not changed
+        // If the chat update is not stopped, this will loop forever 
+        // as long as the forced nickname is not changed.
 
         // display a message
         this.setError(this.res.getLabel('Choosen nickname is not allowed'), Array());
@@ -556,32 +556,32 @@
     var w = this.el_words;
     var wval = w.value;
 
-    // append the string to the history
+    // Append the string to the history.
     this.cmdhistory.push(wval);
     this.cmdhistoryid = this.cmdhistory.length;
     this.cmdhistoryissearching = false;
 
-    // send the string to the server
+    // Send the string to the server.
     re = new RegExp("^(\/[a-zA-Z0-9]+)( (.*)|)");
     if (wval.match(re))
     {
-      // a user command
+      // A user command.
       cmd = wval.replace(re, '$1');
       param = wval.replace(re, '$3');
       this.sendRequest(cmd +' '+ param.substr(0, pfc_max_text_len + 2*this.clientid.length));
     }
     else
     {
-      // a classic 'send' command
+      // A classic 'send' command.
 
-      // empty messages with only spaces
+      // Empty messages with only spaces.
       rx = new RegExp('^[ ]*$','g');
       wval = wval.replace(rx,'');
         
-      // truncate the text length 
+      // Truncate the text length.
       wval = wval.substr(0,pfc_max_text_len);
 
-      // colorize the text with current_text_color
+      // Colorize the text with current_text_color.
       if (this.current_text_color != '' && wval.length != '')
         wval = '[color=#' + this.current_text_color + '] ' + wval + ' [/color]';
 
@@ -592,19 +592,19 @@
   },
 
   /**
-   * Try to complete a nickname like on IRC when pressing the TAB key
-   * Nicks with spaces may not work under certain circumstances
-   * Replacing standards spaces with alternate spaces (e.g., &nbsp;) helps
-   * Gecko browsers convert the &nbsp; to regular spaces
-   * TODO: Move cursor to end of line after nick completion in Konqueror and Webkit browsers
-   * Note: IRC does not allow nicks with spaces
+   * Try to complete a nickname like on IRC when pressing the TAB key.
+   * Nicks with spaces may not work under certain circumstances.
+   * Replacing spaces with alternate spaces (e.g., &nbsp;) helps.
+   * Gecko browsers convert the &nbsp; to regular spaces, so no help for these browsers.
+   * Note: IRC does not allow nicks with spaces, so it's much easier for those clients. :)
+   * @author Gerard Pinzone
    */
   completeNick: function()
   {
     var w = this.el_words;
     var last_space = w.value.lastIndexOf(' ');
     var nick_src = w.value.substring(last_space+1, w.value.length);
-    var non_nick_src = w.value.substring(0,last_space+1);
+    var non_nick_src = w.value.substring(0, last_space+1);
     
     if (nick_src != '')
     {
@@ -641,12 +641,13 @@
         w.value = non_nick_src + nick_src.replace(nick_src, nick_replace);
     }
   },
+  
   /**
    * Cycle to older entry in history
    */
   historyUp: function()
   {
-    // write the previous command in the history
+    // Write the previous command in the history.
     if (this.cmdhistory.length > 0)
     {
       var w = this.el_words;
@@ -665,7 +666,7 @@
    */
   historyDown: function()
   {
-    // write the next command in the history
+    // Write the next command in the history.
     if (this.cmdhistory.length > 0)
     {
       var w = this.el_words;
@@ -684,32 +685,26 @@
   },
 
   /**
-   * Handle the pressed keys
+   * Handle the pressed keys.
    * see also callbackWords_OnKeydown
    */
   callbackWords_OnKeypress: function(evt)
   {
-    // All browsers except for IE should use evt.which
+    // All browsers except for IE should use "evt.which."
     var code = (evt.which) ? evt.which : evt.keyCode;
-    if (code == Event.KEY_TAB) /* tab key */
+    if (code == Event.KEY_RETURN) /* ENTER key */
     {
-      /* FF & Konqueror workaround : ignore TAB key here */
-      /* do the nickname completion work like on IRC */
-      this.completeNick();
-      return false; /* do not leave the tab key default behavior */
-    }
-    else if (code == Event.KEY_RETURN) /* enter key */
-    {
       return this.doSendMessage();
     }
     else
     {
-      /* allow other keys */
+      // Allow other key defaults.
       return true;
     }
   },
+  
   /**
-   * Handle the pressed keys
+   * Handle the pressed keys.
    * see also callbackWords_OnKeypress
    * WARNING: Suppressing defaults on the keydown event 
    *          may prevent keypress and/or keyup events
@@ -720,31 +715,69 @@
     if (!this.isconnected) return false;
     this.clearError(Array(this.el_words));
     var code = (evt.which) ? evt.which : evt.keyCode
-    if (code == 9) /* tab key */
+    if (code == 38 && (is_gecko || is_ie || is_opera || is_webkit)) // up arrow key
     {
-      /* IE workaround : ignore TAB key here */
-      /* do the nickname completion work like on IRC */
-      this.completeNick();
-      return false; /* do not leave the tab key default behavior */
-    }
-    else if (code == 38 && (is_gecko || is_ie || is_opera || is_webkit)) // up arrow key
-    {
-      /* TODO: Fix up arrow issue in Opera */
-      // Konqueror does not work due to keycode conflicts
-      // write the previous command in the history
+      /* TODO: Fix up arrow issue in Opera - may be a bug in Opera. See TAB handler comments below. */
+      /* Konqueror cannot use this feature due to keycode conflicts. */
+      
+      // Write the previous command in the history.
       this.historyUp();
-      return false;  // do not leave the tab key default behavior
+
+      if (evt.returnValue) // IE
+        evt.returnValue = false;
+      if (evt.preventDefault) // DOM
+        evt.preventDefault();
+      return false; // should work in all browsers
     }
     else if (code == 40 && (is_gecko || is_ie || is_opera || is_webkit)) // down arrow key
     {
-      // Konqueror does not work due to keycode conflicts
-      // write the next command in the history
+      /* Konqueror cannot use this feature due to keycode conflicts. */
+      
+      // Write the previous command in the history.
       this.historyDown();
-      return false;  // do not leave the tab key default behavior
+
+      if (evt.returnValue) // IE
+        evt.returnValue = false;
+      if (evt.preventDefault) // DOM
+        evt.preventDefault();
+      return false; // should work in all browsers
     }
+    else if (code == 9) /* TAB key */
+    {
+      /* Konqueror has the same problem as Webkit (Safari),
+         but setSelectionRange() won't work on 
+         KDE versions <3.5.2.  Therefore, I'm leaving
+         the Webkit fix out for these browsers. */
+
+      // Do nickname completion like on IRC / Unix command line.
+      this.completeNick();
+      
+      var tb = evt.srcElement || evt.target;
+      if (is_webkit)
+      {
+        // Move cursor to end of line for Webkit (Safari).
+        var selEnd = this.el_words.value.length;
+        tb.setSelectionRange(selEnd, selEnd);
+      }
+      if (is_opera)
+      {
+        // Fixes Opera's loss of focus after TAB key is pressed.
+        // This is most likely due to a bug in Opera
+        // that executes the default key operation BEFORE the
+        // keydown and keypress event handler.
+        // This is probably the reason for the "up arrow" issue above.
+        window.setTimeout(function(){tb.focus();}, 0);
+      }
+      
+      if (evt.returnValue) // IE
+        evt.returnValue = false;
+      if (evt.preventDefault) // DOM
+        evt.preventDefault();
+      return false; // Should work in all browsers.
+    }
     else
     {
-      /* allow other keys */
+      // Allow other key defaults.
       return true;
     }
   },

Modified: trunk/data/public/js/pfcprompt.js
===================================================================
--- trunk/data/public/js/pfcprompt.js	2007-08-11 06:41:57 UTC (rev 1115)
+++ trunk/data/public/js/pfcprompt.js	2007-08-12 04:27:16 UTC (rev 1116)
@@ -27,7 +27,7 @@
       this.box.style.zIndex   = 100;
       this.box.style.display  = 'none';
 
-      if (is_ff) {
+      if (is_gecko) {
         this.box.style.overflow = 'auto';
       }
 
@@ -119,7 +119,7 @@
   {
     // _doSubmit is called when the user enters or cancels the box.
     var val = this.prompt_field.value;
-    if (is_ff) this.box.focus(); // test is_ff because it doesn't work on KHTML browser, the popup shows infinitly
+    if (is_gecko) this.box.focus(); // test is_ff because it doesn't work on KHTML browser, the popup shows infinitly
     this.box.style.display   = 'none'; // clear out the dialog box
     this.bgbox.style.display = 'none'; // clear out the screen
     this.prompt_field.value  = ''; // clear out the text field


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

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

From: <gpi...@us...> - 2007-08-11 06:41:58

Revision: 1115
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1115&view=rev
Author:   gpinzone
Date:     2007-08-10 23:41:57 -0700 (Fri, 10 Aug 2007)

Log Message:
-----------
Replace spaces in nick text with &nbsp; to help with completion of nicknames that contain spaces.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-11 00:22:37 UTC (rev 1114)
+++ trunk/data/public/js/pfcclient.js	2007-08-11 06:41:57 UTC (rev 1115)
@@ -591,19 +591,12 @@
     return false;
   },
 
-  reverse: function(inp)
-  {
-    var outp = '';
-
-    for (var i = 0; i < inp.length; i++)
-      outp = inp.charAt(i) + outp;
-
-    return outp;
-  },
-
   /**
    * Try to complete a nickname like on IRC when pressing the TAB key
    * Nicks with spaces may not work under certain circumstances
+   * Replacing standards spaces with alternate spaces (e.g., &nbsp;) helps
+   * Gecko browsers convert the &nbsp; to regular spaces
+   * TODO: Move cursor to end of line after nick completion in Konqueror and Webkit browsers
    * Note: IRC does not allow nicks with spaces
    */
   completeNick: function()
@@ -621,6 +614,8 @@
       for (var i = 0; i < n_list.length; i++)
       {
         var nick_tmp = n_list[i];
+        // replace spaces in nicks with &nbsp;
+        nick_tmp = nick_tmp.replace(/ /g, '\240');
         if (nick_tmp.indexOf(nick_src) == 0)
         {
           if (! nick_match)


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

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

From: <gpi...@us...> - 2007-08-11 00:22:37

Revision: 1114
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1114&view=rev
Author:   gpinzone
Date:     2007-08-10 17:22:37 -0700 (Fri, 10 Aug 2007)

Log Message:
-----------
Nickname completion now works based on last space in string instead of only at the beginning of line.  This more closely emulates IRC.  However, nicknames with spaces may not work well.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-10 20:24:20 UTC (rev 1113)
+++ trunk/data/public/js/pfcclient.js	2007-08-11 00:22:37 UTC (rev 1114)
@@ -591,13 +591,28 @@
     return false;
   },
 
+  reverse: function(inp)
+  {
+    var outp = '';
+
+    for (var i = 0; i < inp.length; i++)
+      outp = inp.charAt(i) + outp;
+
+    return outp;
+  },
+
   /**
    * Try to complete a nickname like on IRC when pressing the TAB key
+   * Nicks with spaces may not work under certain circumstances
+   * Note: IRC does not allow nicks with spaces
    */
   completeNick: function()
   {
     var w = this.el_words;
-    var nick_src = w.value;
+    var last_space = w.value.lastIndexOf(' ');
+    var nick_src = w.value.substring(last_space+1, w.value.length);
+    var non_nick_src = w.value.substring(0,last_space+1);
+    
     if (nick_src != '')
     {
       var tabid = this.gui.getTabId();
@@ -628,7 +643,7 @@
         }
       }
       if (nick_match)
-        w.value = w.value.replace(nick_src, nick_replace);
+        w.value = non_nick_src + nick_src.replace(nick_src, nick_replace);
     }
   },
   /**


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

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

From: <gpi...@us...> - 2007-08-10 20:24:27

Revision: 1113
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1113&view=rev
Author:   gpinzone
Date:     2007-08-10 13:24:20 -0700 (Fri, 10 Aug 2007)

Log Message:
-----------
Simplification to Nickname Completion script.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-10 18:17:23 UTC (rev 1112)
+++ trunk/data/public/js/pfcclient.js	2007-08-10 20:24:20 UTC (rev 1113)
@@ -601,7 +601,7 @@
     if (nick_src != '')
     {
       var tabid = this.gui.getTabId();
-      var n_list = this.getChanMeta(tabid,'users')['nick'];
+      var n_list = this.getChanMeta(tabid, 'users')['nick'];
       var nick_match = false;
       for (var i = 0; i < n_list.length; i++)
       {
@@ -616,21 +616,18 @@
           else
           {
             // more than one possibility for completion
-            // return common characters only
             var nick_len = Math.min(nick_tmp.length, nick_replace.length);
-            for (var j = 0; j < nick_len; j++)
-            {
+            // only keep characters that are common to all matches
+            var j = 0;
+            for (j = 0; j < nick_len; j++)
               if (nick_tmp.charAt(j) != nick_replace.charAt(j))
-              {
-                nick_replace = nick_replace.substr(0,j);
                 break;
-              }
-            }
-            nick_replace = nick_replace.substr(0,nick_len);
+
+            nick_replace = nick_replace.substr(0, j);
           }
         }
       }
-      if (nick_match == true)
+      if (nick_match)
         w.value = w.value.replace(nick_src, nick_replace);
     }
   },


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

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

From: <gpi...@us...> - 2007-08-10 18:17:20

Revision: 1112
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1112&view=rev
Author:   gpinzone
Date:     2007-08-10 11:17:23 -0700 (Fri, 10 Aug 2007)

Log Message:
-----------
Patch 1771266: Updated code to use W3C standard DOM parentNode with fallback on IE parentElement.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-10 15:06:09 UTC (rev 1111)
+++ trunk/data/public/js/pfcclient.js	2007-08-10 18:17:23 UTC (rev 1112)
@@ -936,11 +936,12 @@
       while (elt)
       {
         // delete this element to save browser memory
-        if (is_gecko)
+        if(elt.parentNode)
+          elt.parentNode.removeChild(elt);
+        else if(elt.parentElement)  // older IE browsers (<6.0) may not support parentNode
+          elt.parentElement.removeChild(elt);
+        else  // if all else fails
           elt.innerHTML = '';
-        else
-          //  this code don't work in FF, why ? don't know ..
-          elt.parentElement.removeChild(elt);
         limit_msgid--;
         elt = $('pfc_msg_'+recipientid+'_'+limit_msgid);
       }


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

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

From: <gpi...@us...> - 2007-08-10 15:06:08

Revision: 1111
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1111&view=rev
Author:   gpinzone
Date:     2007-08-10 08:06:09 -0700 (Fri, 10 Aug 2007)

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


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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-10 14:54:27 UTC (rev 1110)
+++ trunk/data/public/js/pfcclient.js	2007-08-10 15:06:09 UTC (rev 1111)
@@ -625,7 +625,8 @@
                 nick_replace = nick_replace.substr(0,j);
                 break;
               }
-            }            
+            }
+            nick_replace = nick_replace.substr(0,nick_len);
           }
         }
       }


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

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

From: <gpi...@us...> - 2007-08-10 14:54:26

Revision: 1110
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1110&view=rev
Author:   gpinzone
Date:     2007-08-10 07:54:27 -0700 (Fri, 10 Aug 2007)

Log Message:
-----------
Fixed "Nickname Completion" bug 1595638.  Rewrote algorithm to do intelligent completion like on a Linux command line.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-09 22:30:42 UTC (rev 1109)
+++ trunk/data/public/js/pfcclient.js	2007-08-10 14:54:27 UTC (rev 1110)
@@ -1,5 +1,5 @@
 var is_ie     = !!(window.attachEvent && !window.opera);
-var is_khtml  = navigator.appName.match("Konqueror") || navigator.appVersion.match("KHTML");
+var is_khtml  = !!(navigator.appName.match("Konqueror") || navigator.appVersion.match("KHTML"));
 var is_gecko  = navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1;
 var is_ie7    = navigator.userAgent.indexOf('MSIE 7') > 0;
 var is_opera  = !!window.opera;
@@ -593,31 +593,52 @@
 
   /**
    * Try to complete a nickname like on IRC when pressing the TAB key
-   * @todo: improve the algorithme, it should take into account the cursor position
    */
   completeNick: function()
   {
     var w = this.el_words;
-    var nick_src = w.value.substring(w.value.lastIndexOf(' ')+1,w.value.length);
+    var nick_src = w.value;
     if (nick_src != '')
     {
       var tabid = this.gui.getTabId();
       var n_list = this.getChanMeta(tabid,'users')['nick'];
-      for (var i=0; i<n_list.length; i++)
+      var nick_match = false;
+      for (var i = 0; i < n_list.length; i++)
       {
-        var nick = n_list[i];
-        if (nick.indexOf(nick_src) == 0)
-        w.value = w.value.replace(nick_src, nick);
+        var nick_tmp = n_list[i];
+        if (nick_tmp.indexOf(nick_src) == 0)
+        {
+          if (! nick_match)
+          {
+            nick_match = true;
+            nick_replace = nick_tmp;
+          }
+          else
+          {
+            // more than one possibility for completion
+            // return common characters only
+            var nick_len = Math.min(nick_tmp.length, nick_replace.length);
+            for (var j = 0; j < nick_len; j++)
+            {
+              if (nick_tmp.charAt(j) != nick_replace.charAt(j))
+              {
+                nick_replace = nick_replace.substr(0,j);
+                break;
+              }
+            }            
+          }
+        }
       }
+      if (nick_match == true)
+        w.value = w.value.replace(nick_src, nick_replace);
     }
   },
-
   /**
    * Cycle to older entry in history
    */
   historyUp: function()
   {
-	  // write the previous command in the history
+    // write the previous command in the history
     if (this.cmdhistory.length > 0)
     {
       var w = this.el_words;


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

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

From: <gpi...@us...> - 2007-08-09 22:30:43

Revision: 1109
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1109&view=rev
Author:   gpinzone
Date:     2007-08-09 15:30:42 -0700 (Thu, 09 Aug 2007)

Log Message:
-----------
Moved Safari function out of keypress.  Misc cleanup.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-09 18:27:36 UTC (rev 1108)
+++ trunk/data/public/js/pfcclient.js	2007-08-09 22:30:42 UTC (rev 1109)
@@ -1,8 +1,8 @@
-var is_ie     = window.attachEvent && !window.opera;
+var is_ie     = !!(window.attachEvent && !window.opera);
 var is_khtml  = navigator.appName.match("Konqueror") || navigator.appVersion.match("KHTML");
 var is_gecko  = navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1;
 var is_ie7    = navigator.userAgent.indexOf('MSIE 7') > 0;
-var is_opera  = window.opera;
+var is_opera  = !!window.opera;
 var is_webkit = navigator.userAgent.indexOf('AppleWebKit/') > -1;
 
 /**
@@ -614,11 +614,10 @@
 
   /**
    * Cycle to older entry in history
-   * TODO: Fix up arrow issue in Opera
    */
   historyUp: function()
   {
-	    // write the previous command in the history
+	  // write the previous command in the history
     if (this.cmdhistory.length > 0)
     {
       var w = this.el_words;
@@ -626,7 +625,8 @@
         this.cmdhistory.push(w.value);
       this.cmdhistoryissearching = true;
       this.cmdhistoryid = this.cmdhistoryid - 1;
-      if (this.cmdhistoryid < 0) this.cmdhistoryid = 0; // stop at oldest entry
+      if (this.cmdhistoryid < 0)
+        this.cmdhistoryid = 0; // stop at oldest entry
       w.value = this.cmdhistory[this.cmdhistoryid];
     }
   },
@@ -673,18 +673,6 @@
     {
       return this.doSendMessage();
     }
-    else if (code == 63232 && is_webkit) // up arrow key
-    {
-      // write the previous command in the history
-      this.historyUp();
-      return false;  // do not leave the tab key default behavior
-    }
-    else if (code == 63233 && is_webkit) // down arrow key
-    {
-      // write the next command in the history
-      this.historyDown();
-      return false;  // do not leave the tab key default behavior
-    }
     else
     {
       /* allow other keys */
@@ -710,20 +698,24 @@
       this.completeNick();
       return false; /* do not leave the tab key default behavior */
     }
-    else if (code == 38 && (is_gecko || is_ie || is_opera)) // up arrow key
+    else if (code == 38 && (is_gecko || is_ie || is_opera || is_webkit)) // up arrow key
     {
+      /* TODO: Fix up arrow issue in Opera */
+      // Konqueror does not work due to keycode conflicts
       // write the previous command in the history
       this.historyUp();
       return false;  // do not leave the tab key default behavior
     }
-    else if (code == 40 && (is_gecko || is_ie || is_opera)) // down arrow key
+    else if (code == 40 && (is_gecko || is_ie || is_opera || is_webkit)) // down arrow key
     {
+      // Konqueror does not work due to keycode conflicts
       // write the next command in the history
       this.historyDown();
       return false;  // do not leave the tab key default behavior
     }
     else
     {
+      /* allow other keys */
       return true;
     }
   },


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

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

From: <gpi...@us...> - 2007-08-09 18:27:35

Revision: 1108
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1108&view=rev
Author:   gpinzone
Date:     2007-08-09 11:27:36 -0700 (Thu, 09 Aug 2007)

Log Message:
-----------
Disabled history feature for Konqueror. Moved history operations to separate functions. TODO: prevent up arrow default operation in Opera.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-09 11:04:30 UTC (rev 1107)
+++ trunk/data/public/js/pfcclient.js	2007-08-09 18:27:36 UTC (rev 1108)
@@ -613,6 +613,48 @@
   },
 
   /**
+   * Cycle to older entry in history
+   * TODO: Fix up arrow issue in Opera
+   */
+  historyUp: function()
+  {
+	    // write the previous command in the history
+    if (this.cmdhistory.length > 0)
+    {
+      var w = this.el_words;
+      if (this.cmdhistoryissearching == false && w.value != "")
+        this.cmdhistory.push(w.value);
+      this.cmdhistoryissearching = true;
+      this.cmdhistoryid = this.cmdhistoryid - 1;
+      if (this.cmdhistoryid < 0) this.cmdhistoryid = 0; // stop at oldest entry
+      w.value = this.cmdhistory[this.cmdhistoryid];
+    }
+  },
+
+  /**
+   * Cycle to newer entry in history
+   */
+  historyDown: function()
+  {
+    // write the next command in the history
+    if (this.cmdhistory.length > 0)
+    {
+      var w = this.el_words;
+      if (this.cmdhistoryissearching == false && w.value != "")
+        this.cmdhistory.push(w.value);
+      this.cmdhistoryissearching = true;
+      this.cmdhistoryid = this.cmdhistoryid + 1;
+      if (this.cmdhistoryid >= this.cmdhistory.length)
+      {
+        this.cmdhistoryid = this.cmdhistory.length; // stop at newest entry + 1
+        w.value = ""; // blank input box
+      }
+      else
+        w.value = this.cmdhistory[this.cmdhistoryid];
+    }
+  },
+
+  /**
    * Handle the pressed keys
    * see also callbackWords_OnKeydown
    */
@@ -634,35 +676,14 @@
     else if (code == 63232 && is_webkit) // up arrow key
     {
       // write the previous command in the history
-      if (this.cmdhistory.length > 0)
-      {
-        var w = this.el_words;
-        if (this.cmdhistoryissearching == false && w.value != "")
-          this.cmdhistory.push(w.value);
-        this.cmdhistoryissearching = true;
-        this.cmdhistoryid = this.cmdhistoryid - 1;
-        if (this.cmdhistoryid < 0) this.cmdhistoryid = 0; // stop at oldest entry
-        w.value = this.cmdhistory[this.cmdhistoryid];
-      }
+      this.historyUp();
+      return false;  // do not leave the tab key default behavior
     }
     else if (code == 63233 && is_webkit) // down arrow key
     {
       // write the next command in the history
-      if (this.cmdhistory.length > 0)
-      {
-        var w = this.el_words;
-        if (this.cmdhistoryissearching == false && w.value != "")
-          this.cmdhistory.push(w.value);
-        this.cmdhistoryissearching = true;
-        this.cmdhistoryid = this.cmdhistoryid + 1;
-        if (this.cmdhistoryid >= this.cmdhistory.length)
-        {
-          this.cmdhistoryid = this.cmdhistory.length; // stop at newest entry + 1
-          w.value = ""; // blank input box
-        }
-        else
-          w.value = this.cmdhistory[this.cmdhistoryid];
-      }
+      this.historyDown();
+      return false;  // do not leave the tab key default behavior
     }
     else
     {
@@ -689,38 +710,17 @@
       this.completeNick();
       return false; /* do not leave the tab key default behavior */
     }
-    else if (code == 38 && (is_gecko || is_ie || is_khtml || is_opera)) // up arrow key
+    else if (code == 38 && (is_gecko || is_ie || is_opera)) // up arrow key
     {
       // write the previous command in the history
-      if (this.cmdhistory.length > 0)
-      {
-        var w = this.el_words;
-        if (this.cmdhistoryissearching == false && w.value != "")
-          this.cmdhistory.push(w.value);
-        this.cmdhistoryissearching = true;
-        this.cmdhistoryid = this.cmdhistoryid - 1;
-        if (this.cmdhistoryid < 0) this.cmdhistoryid = 0; // stop at oldest entry
-        w.value = this.cmdhistory[this.cmdhistoryid];
-      }
+      this.historyUp();
+      return false;  // do not leave the tab key default behavior
     }
-    else if (code == 40 && (is_gecko || is_ie || is_khtml || is_opera)) // down arrow key
+    else if (code == 40 && (is_gecko || is_ie || is_opera)) // down arrow key
     {
       // write the next command in the history
-      if (this.cmdhistory.length > 0)
-      {
-        var w = this.el_words;
-        if (this.cmdhistoryissearching == false && w.value != "")
-          this.cmdhistory.push(w.value);
-        this.cmdhistoryissearching = true;
-        this.cmdhistoryid = this.cmdhistoryid + 1;
-        if (this.cmdhistoryid >= this.cmdhistory.length)
-        {
-          this.cmdhistoryid = this.cmdhistory.length; // stop at newest entry + 1
-          w.value = ""; // blank input box
-        }
-        else
-          w.value = this.cmdhistory[this.cmdhistoryid];
-      }
+      this.historyDown();
+      return false;  // do not leave the tab key default behavior
     }
     else
     {


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

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

From: <gpi...@us...> - 2007-08-09 11:06:58

Revision: 1107
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1107&view=rev
Author:   gpinzone
Date:     2007-08-09 04:04:30 -0700 (Thu, 09 Aug 2007)

Log Message:
-----------
Smiley fix for Webkit (Safari) browsers.

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

Modified: trunk/data/public/js/pfcgui.js
===================================================================
--- trunk/data/public/js/pfcgui.js	2007-08-09 02:02:05 UTC (rev 1106)
+++ trunk/data/public/js/pfcgui.js	2007-08-09 11:04:30 UTC (rev 1107)
@@ -407,7 +407,8 @@
       s_symbol = s_symbol.unescapeHTML();
       // Replace &quot; with " for IE and Webkit browsers.
       // The prototype.js version 1.5.1.1 does not do this.
-      if (window.attachEvent && !window.opera) // IE detection from prototype.js
+      // IE and Webkit detection from prototype.js
+      if (window.attachEvent && !window.opera || navigator.userAgent.indexOf('AppleWebKit/') > -1)
         s_symbol = s_symbol.replace(/&quot;/g,'"');
 
       var img = document.createElement('img');


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

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

From: <gpi...@us...> - 2007-08-09 02:02:06

Revision: 1106
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1106&view=rev
Author:   gpinzone
Date:     2007-08-08 19:02:05 -0700 (Wed, 08 Aug 2007)

Log Message:
-----------
Oops! modified line 1422 by accident.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-09 01:57:45 UTC (rev 1105)
+++ trunk/data/public/js/pfcclient.js	2007-08-09 02:02:05 UTC (rev 1106)
@@ -1419,7 +1419,7 @@
       for(var i = 0; elts.length > i; i++)
       {
         // this is not supported in konqueror =>>>  elts[i].removeAttribute('style');
-        Elts[i].style.color = '';
+        elts[i].style.color = '';
       }
     }
   },


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

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

From: <gpi...@us...> - 2007-08-09 01:57:43

Revision: 1105
          http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1105&view=rev
Author:   gpinzone
Date:     2007-08-08 18:57:45 -0700 (Wed, 08 Aug 2007)

Log Message:
-----------
Command history stops at oldest entry and provides blank textbox after newest. This emulates most IRC clients.  Cleaned up comments and removed all tabs.

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

Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js	2007-08-09 01:07:15 UTC (rev 1104)
+++ trunk/data/public/js/pfcclient.js	2007-08-09 01:57:45 UTC (rev 1105)
@@ -605,9 +605,9 @@
       var n_list = this.getChanMeta(tabid,'users')['nick'];
       for (var i=0; i<n_list.length; i++)
       {
-	var nick = n_list[i];
-	if (nick.indexOf(nick_src) == 0)
-	  w.value = w.value.replace(nick_src, nick);
+        var nick = n_list[i];
+        if (nick.indexOf(nick_src) == 0)
+        w.value = w.value.replace(nick_src, nick);
       }
     }
   },
@@ -618,6 +618,7 @@
    */
   callbackWords_OnKeypress: function(evt)
   {
+    // All browsers except for IE should use evt.which
     var code = (evt.which) ? evt.which : evt.keyCode;
     if (code == Event.KEY_TAB) /* tab key */
     {
@@ -632,30 +633,35 @@
     }
     else if (code == 63232 && is_webkit) // up arrow key
     {
-      // write the last command in the history
-      if (this.cmdhistory.length>0)
+      // write the previous command in the history
+      if (this.cmdhistory.length > 0)
       {
         var w = this.el_words;
         if (this.cmdhistoryissearching == false && w.value != "")
           this.cmdhistory.push(w.value);
         this.cmdhistoryissearching = true;
-        this.cmdhistoryid = this.cmdhistoryid-1;
-        if (this.cmdhistoryid<0) this.cmdhistoryid = this.cmdhistory.length-1;
+        this.cmdhistoryid = this.cmdhistoryid - 1;
+        if (this.cmdhistoryid < 0) this.cmdhistoryid = 0; // stop at oldest entry
         w.value = this.cmdhistory[this.cmdhistoryid];
       }
     }
     else if (code == 63233 && is_webkit) // down arrow key
     {
       // write the next command in the history
-      if (this.cmdhistory.length>0)
+      if (this.cmdhistory.length > 0)
       {
         var w = this.el_words;
         if (this.cmdhistoryissearching == false && w.value != "")
           this.cmdhistory.push(w.value);
         this.cmdhistoryissearching = true;
-        this.cmdhistoryid = this.cmdhistoryid+1;
-        if (this.cmdhistoryid>=this.cmdhistory.length) this.cmdhistoryid = 0;
-        w.value = this.cmdhistory[this.cmdhistoryid];
+        this.cmdhistoryid = this.cmdhistoryid + 1;
+        if (this.cmdhistoryid >= this.cmdhistory.length)
+        {
+          this.cmdhistoryid = this.cmdhistory.length; // stop at newest entry + 1
+          w.value = ""; // blank input box
+        }
+        else
+          w.value = this.cmdhistory[this.cmdhistoryid];
       }
     }
     else
@@ -667,6 +673,9 @@
   /**
    * Handle the pressed keys
    * see also callbackWords_OnKeypress
+   * WARNING: Suppressing defaults on the keydown event 
+   *          may prevent keypress and/or keyup events
+   *          from firing.
    */
   callbackWords_OnKeydown: function(evt)
   {
@@ -682,30 +691,35 @@
     }
     else if (code == 38 && (is_gecko || is_ie || is_khtml || is_opera)) // up arrow key
     {
-      // write the last command in the history
-      if (this.cmdhistory.length>0)
+      // write the previous command in the history
+      if (this.cmdhistory.length > 0)
       {
         var w = this.el_words;
         if (this.cmdhistoryissearching == false && w.value != "")
           this.cmdhistory.push(w.value);
         this.cmdhistoryissearching = true;
-        this.cmdhistoryid = this.cmdhistoryid-1;
-        if (this.cmdhistoryid<0) this.cmdhistoryid = this.cmdhistory.length-1;
+        this.cmdhistoryid = this.cmdhistoryid - 1;
+        if (this.cmdhistoryid < 0) this.cmdhistoryid = 0; // stop at oldest entry
         w.value = this.cmdhistory[this.cmdhistoryid];
       }
     }
     else if (code == 40 && (is_gecko || is_ie || is_khtml || is_opera)) // down arrow key
     {
       // write the next command in the history
-      if (this.cmdhistory.length>0)
+      if (this.cmdhistory.length > 0)
       {
         var w = this.el_words;
         if (this.cmdhistoryissearching == false && w.value != "")
           this.cmdhistory.push(w.value);
         this.cmdhistoryissearching = true;
-        this.cmdhistoryid = this.cmdhistoryid+1;
-        if (this.cmdhistoryid>=this.cmdhistory.length) this.cmdhistoryid = 0;
-        w.value = this.cmdhistory[this.cmdhistoryid];
+        this.cmdhistoryid = this.cmdhistoryid + 1;
+        if (this.cmdhistoryid >= this.cmdhistory.length)
+        {
+          this.cmdhistoryid = this.cmdhistory.length; // stop at newest entry + 1
+          w.value = ""; // blank input box
+        }
+        else
+          w.value = this.cmdhistory[this.cmdhistoryid];
       }
     }
     else
@@ -778,13 +792,13 @@
     {
       if (this.blinkloop[id] == 1)
       {
-	$(id).style.backgroundColor = '#FFDFC0';
-	this.blinkloop[id] = 2;
+        $(id).style.backgroundColor = '#FFDFC0';
+        this.blinkloop[id] = 2;
       }
       else
       {
-	$(id).style.backgroundColor = '#FFFFFF';
-	this.blinkloop[id] = 1;
+        $(id).style.backgroundColor = '#FFFFFF';
+        this.blinkloop[id] = 1;
       }
       this.blinktimeout[id] = setTimeout('pfc.blink(\'' + id + '\',\'loop\')', 500);
     }
@@ -844,15 +858,15 @@
       line += '<span class="pfc_heure">'+ time +'</span> ';
       if (cmd == 'send')
       {
-      	line += ' <span class="pfc_nick">';
-      	line += '&#x2039;';
-      	line += '<span ';
+        line += ' <span class="pfc_nick">';
+        line += '&#x2039;';
+        line += '<span ';
         line += 'onclick="pfc.insert_text(\'' + sender.replace("'", '\\\'') + ', \',\'\',false)" ';
-      	line += 'class="pfc_nickmarker pfc_nick_'+ hex_md5(_to_utf8(sender)) +'">';
-      	line += sender;
-      	line += '</span>';
-      	line += '&#x203A;';
-      	line += '</span> ';
+        line += 'class="pfc_nickmarker pfc_nick_'+ hex_md5(_to_utf8(sender)) +'">';
+        line += sender;
+        line += '</span>';
+        line += '&#x203A;';
+        line += '</span> ';
       }
       if (cmd == 'notice' || cmd == 'me')
         line += '<span class="pfc_words">* '+ this.parseMessage(param) +'</span> ';
@@ -1353,8 +1367,9 @@
     var rx2 = new RegExp('.*'+clsIgnore+'.*');
     for(i=0; i<els.length; i++) {
       if(els.item(i).className.match(rx1) &&
-         (clsIgnore == '' || !els.item(i).className.match(rx2)) ) {
-	matches.push(els.item(i));
+         (clsIgnore == '' || !els.item(i).className.match(rx2)) )
+      {
+        matches.push(els.item(i));
       }
     }
     return matches;
@@ -1403,8 +1418,8 @@
       var elts = this.getElementsByClassName(root, 'pfc_nickmarker', '');
       for(var i = 0; elts.length > i; i++)
       {
-	// this is not supported in konqueror =>>>  elts[i].removeAttribute('style');
-	elts[i].style.color = '';
+        // this is not supported in konqueror =>>>  elts[i].removeAttribute('style');
+        Elts[i].style.color = '';
       }
     }
   },


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

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 5 6 7 8 9 .. 34 > >> (Page 7 of 34)

2006	Jan	Feb (2)	Mar	Apr (61)	May (56)	Jun (96)	Jul (23)	Aug (62)	Sep (76)	Oct (48)	Nov (28)	Dec (28)
2007	Jan (31)	Feb (40)	Mar (29)	Apr (11)	May (6)	Jun (18)	Jul (18)	Aug (108)	Sep (24)	Oct (6)	Nov (21)	Dec
2008	Jan	Feb (1)	Mar (16)	Apr	May (3)	Jun	Jul (7)	Aug (1)	Sep (3)	Oct	Nov (3)	Dec (2)
2009	Jan (2)	Feb	Mar (2)	Apr (3)	May	Jun	Jul	Aug (1)	Sep (1)	Oct (1)	Nov	Dec (1)
2010	Jan (2)	Feb	Mar	Apr (6)	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2018	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec