Thread: [Phpfreechat-svn] SF.net SVN: phpfreechat: [984] trunk (Page 4)
Status: Beta
Brought to you by:
kerphi
Menu
▾
▴
phpfreechat-svn
|
From: <ke...@us...> - 2007-03-07 19:14:25
|
Revision: 984
http://svn.sourceforge.net/phpfreechat/?rev=984&view=rev
Author: kerphi
Date: 2007-03-07 11:14:11 -0800 (Wed, 07 Mar 2007)
Log Message:
-----------
work on simplifications
Modified Paths:
--------------
trunk/data/public/js/pfcclient.js
trunk/src/commands/ban.class.php
trunk/src/commands/connect.class.php
trunk/src/commands/deop.class.php
trunk/src/commands/identify.class.php
trunk/src/commands/join.class.php
trunk/src/commands/leave.class.php
trunk/src/commands/me.class.php
trunk/src/commands/nick.class.php
trunk/src/commands/notice.class.php
trunk/src/commands/op.class.php
trunk/src/commands/privmsg.class.php
trunk/src/commands/quit.class.php
trunk/src/commands/send.class.php
trunk/src/commands/update.class.php
trunk/src/commands/whois.class.php
trunk/src/pfccommand.class.php
trunk/src/pfccontainer.class.php
trunk/src/pfcglobalconfig.class.php
trunk/src/pfcuserconfig.class.php
trunk/src/phpfreechat.class.php
trunk/src/proxies/auth.class.php
trunk/src/proxies/checknickchange.class.php
trunk/src/proxies/checktimeout.class.php
trunk/themes/default/chat.js.tpl.php
Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/data/public/js/pfcclient.js 2007-03-07 19:14:11 UTC (rev 984)
@@ -39,11 +39,12 @@
this.privmsgs = Array();
this.privmsgids = Array();
- this.timeout = null;
- this.refresh_delay = pfc_refresh_delay;
- this.max_refresh_delay = pfc_max_refresh_delay;
+ this.timeout = null;
+ this.refresh_delay = pfc_refresh_delay;
+ this.max_refresh_delay = pfc_max_refresh_delay;
this.last_response_time = new Date().getTime();
this.last_request_time = new Date().getTime();
+ this.canupdatenexttime = true;
/* unique client id for each windows used to identify a open window
* this id is passed every time the JS communicate with server
@@ -145,7 +146,12 @@
askNickResponse: function(newnick)
{
if (newnick)
- this.sendRequest('/nick "'+newnick+'"');
+ {
+ if (this.isconnected)
+ this.sendRequest('/nick "'+newnick+'"');
+ else
+ this.sendRequest('/connect '+newnick);
+ }
},
/**
@@ -167,7 +173,10 @@
{
//alert(cmd + "-"+resp+"-"+param);
if (resp == "ok")
- {
+ {
+ this.nickname = param[0];
+ this.sendRequest('/nick "'+this.nickname+'"');
+/*
if (this.nickname == '')
// ask to choose a nickname
this.askNick(this.nickname);
@@ -175,9 +184,59 @@
{
this.sendRequest('/nick "'+this.nickname+'"');
}
-
+*/
this.isconnected = true;
+/*
+ // join the default channels comming from the parameter list
+ // and the user's channels comming from the
+ var ch = pfc_defaultchan;
+ for (var i=0; i<pfc_userchan.length; i++)
+ {
+ if (indexOf(ch,pfc_userchan[i]) == -1)
+ ch.push(pfc_userchan[i]);
+ }
+*/
+ // join the default channels comming from the parameter list
+ if (pfc_userchan.length == 0)
+ for (var i=0; i<pfc_defaultchan.length; i++)
+ {
+ if (i<pfc_defaultchan.length-1)
+ cmd = '/join2';
+ else
+ cmd = '/join';
+ cmd += ' "'+pfc_defaultchan[i]+'"';
+ this.sendRequest(cmd);
+ }
+ else
+ // join channels comming from user sessions
+ for (var i=0; i<pfc_userchan.length; i++)
+ {
+ if (i<pfc_userchan.length-1)
+ cmd = '/join2';
+ else
+ cmd = '/join';
+ cmd += ' "'+pfc_userchan[i]+'"';
+ this.sendRequest(cmd);
+ }
+
+ // join the default privmsg comming from the parameter list
+ for (var i=0; i<pfc_defaultprivmsg.length; i++)
+ {
+ if (i<pfc_defaultprivmsg.length-1)
+ cmd = '/privmsg2';
+ else
+ cmd = '/privmsg';
+ cmd += ' "'+pfc_defaultprivmsg[i]+'"';
+ this.sendRequest(cmd);
+ }
+ // now join privmsg comming from the sessions
+ for (var i=0; i<pfc_userprivmsg.length; i++)
+ {
+ this.sendRequest('/privmsg "'+pfc_userprivmsg[i]+'"');
+ }
+
+
// start the polling system
this.updateChat(true);
}
@@ -277,6 +336,7 @@
{
cmd = '';
+/*
// join the default channels comming from the parameter list
for (var i=0; i<pfc_defaultchan.length; i++)
{
@@ -313,6 +373,7 @@
{
this.sendRequest('/privmsg "'+pfc_userprivmsg[i]+'"');
}
+*/
}
if (resp == "ok" || resp == "notchanged" || resp == "changed" || resp == "connected")
@@ -473,7 +534,7 @@
var nickid = meta['users']['nickid'][i];
var nick = meta['users']['nick'][i];
var um = this.getAllUserMeta(nickid);
- if (!um) this.sendRequest('/whois2 "'+nick+'"');
+ if (!um) this.sendRequest('/whois2 "'+nickid+'"');
}
// update the nick list display on the current channel
@@ -504,6 +565,9 @@
this.handleComingRequest(param);
}
}
+ else if (cmd == "send")
+ {
+ }
else
alert(cmd + "-"+resp+"-"+param);
},
@@ -1462,7 +1526,12 @@
if (this.isconnected)
this.sendRequest('/quit');
else
- this.sendRequest('/connect');
+ {
+ if (this.nickname == '')
+ this.askNick();
+ else
+ this.sendRequest('/connect '+this.nickname);
+ }
},
refresh_loginlogout: function()
{
Modified: trunk/src/commands/ban.class.php
===================================================================
--- trunk/src/commands/ban.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/ban.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -39,7 +39,7 @@
// notify all the channel
$cmdp = $p;
- $cmdp["param"] = _pfc("banished from %s by %s", $channame, $sender);
+ $cmdp["param"] = _pfc("%s banished from %s by %s", $nick, $channame, $sender);
$cmdp["flag"] = 1;
$cmd =& pfcCommand::Factory("notice");
$cmd->run($xml_reponse, $cmdp);
Modified: trunk/src/commands/connect.class.php
===================================================================
--- trunk/src/commands/connect.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/connect.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -8,13 +8,17 @@
{
$clientid = $p["clientid"];
$param = $p["param"];
+ $params = $p["params"];
$sender = $p["sender"];
$recipient = $p["recipient"];
$recipientid = $p["recipientid"];
$getoldmsg = isset($p["getoldmsg"]) ? $p["getoldmsg"] : true;
-
- $c =& pfcGlobalConfig::Instance();
- $u =& pfcUserConfig::Instance();
+
+ // nickname must be given to be able to connect to the chat
+ $nick = $params[0];
+
+ $c =& pfcGlobalConfig::Instance();
+ $u =& pfcUserConfig::Instance();
$ct =& pfcContainer::Instance();
// reset the message id indicator (see getnewmsg.class.php)
@@ -69,9 +73,21 @@
(count($users["nickid"]) == 0 || (count($users["nickid"]) == 1 && $users["nickid"][0] == $u->nickid)))
$isadmin = true;
}
-
+
// setup some user meta
$nickid = $u->nickid;
+
+ // create the nickid
+ $ct->joinChan($nickid, NULL); // join the server
+ $ct->createNick($nickid, $nick);
+
+ $u->nick = $nick;
+ $u->saveInCache();
+
+ // setup the active flag in user session
+ // $u->active = true;
+ // $u->saveInCache();
+
// store the user ip
$ip = $_SERVER["REMOTE_ADDR"];
if ($ip == "::1") $ip = "127.0.0.1"; // fix for konqueror & localhost
@@ -83,7 +99,7 @@
$ct->setUserMeta($nickid, $k, $v);
// connect to the server
- $xml_reponse->script("pfc.handleResponse('connect', 'ok', '');");
+ $xml_reponse->script("pfc.handleResponse('connect', 'ok', Array('".addslashes($nick)."'));");
}
}
Modified: trunk/src/commands/deop.class.php
===================================================================
--- trunk/src/commands/deop.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/deop.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -8,8 +8,9 @@
function run(&$xml_reponse, $p)
{
- $c =& pfcGlobalConfig::Instance();
- $u =& pfcUserConfig::Instance();
+ $c =& pfcGlobalConfig::Instance();
+ $u =& pfcUserConfig::Instance();
+ $ct =& pfcContainer::Instance();
if (trim($p["param"]) == "")
{
@@ -24,11 +25,10 @@
// just change the "isadmin" meta flag
$nicktodeop = trim($p["param"]);
- $container =& pfcContainer::Instance();
- $nicktodeopid = $container->getNickId($nicktodeop);
- $container->setUserMeta($nicktodeopid, 'isadmin', false);
+ $nicktodeopid = $ct->getNickId($nicktodeop);
+ $ct->setUserMeta($nicktodeopid, 'isadmin', false);
- $this->forceWhoisReload($nicktodeop);
+ $this->forceWhoisReload($nicktodeopid);
}
}
Modified: trunk/src/commands/identify.class.php
===================================================================
--- trunk/src/commands/identify.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/identify.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -59,7 +59,7 @@
// ok the current user is an admin, just save the isadmin flag in the metadata
$ct =& pfcContainer::Instance();
$ct->setUserMeta($u->nickid, 'isadmin', $isadmin);
- $this->forceWhoisReload($u->nick);
+ $this->forceWhoisReload($u->nickid);
$msg .= _pfc("Succesfully identified");
$xml_reponse->script("pfc.handleResponse('".$this->name."', 'ok', '".$msg."');");
Modified: trunk/src/commands/join.class.php
===================================================================
--- trunk/src/commands/join.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/join.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -46,7 +46,7 @@
// show a join message
$cmdp = $p;
- $cmdp["param"] = _pfc("%s joins %s",$u->nick, $channame);
+ $cmdp["param"] = _pfc("%s joins %s",$u->getNickname(), $channame);
$cmdp["recipient"] = $chanrecip;
$cmdp["recipientid"] = $chanid;
$cmdp["flag"] = 2;
@@ -56,8 +56,9 @@
// register the user (and his metadata) in the channel
$ct =& pfcContainer::Instance();
- $ct->createNick($chanrecip, $u->nick, $u->nickid);
- $this->forceWhoisReload($u->nick);
+ // $ct->createNick($chanrecip, $u->nick, $u->nickid);
+ $ct->joinChan($u->nickid, $chanrecip);
+ $this->forceWhoisReload($u->nickid);
// return ok to the client
// then the client will create a new tab
Modified: trunk/src/commands/leave.class.php
===================================================================
--- trunk/src/commands/leave.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/leave.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -67,7 +67,7 @@
$leave_recip = '';
$leave_id = '';
- // check into channels
+ // save the new channel list in the session
if ( isset($u->channels[$id]) )
{
$leave_recip = $u->channels[$id]["recipient"];
@@ -77,7 +77,7 @@
$leavech = true;
}
- // check into private messages
+ // save the new private messages list in the session
if ( isset($u->privmsg[$id]) )
{
$leave_recip = $u->privmsg[$id]["recipient"];
@@ -89,14 +89,14 @@
if($leavepv || $leavech)
{
- if ($leavech)
+ // if ($leavech)
{
// show a leave message with the showing the reason if present
$cmdp = $p;
$cmdp["recipient"] = $leave_recip;
$cmdp["recipientid"] = $leave_id;
$cmdp["flag"] = 2;
- $cmdp["param"] = _pfc("%s quit",$u->nick);
+ $cmdp["param"] = _pfc("%s quit",$u->getNickname());
if ($reason != "") $cmdp["param"] .= " (".$reason.")";
$cmd =& pfcCommand::Factory("notice");
$cmd->run($xml_reponse, $cmdp);
Modified: trunk/src/commands/me.class.php
===================================================================
--- trunk/src/commands/me.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/me.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -14,8 +14,9 @@
$recipient = $p["recipient"];
$recipientid = $p["recipientid"];
- $c =& pfcGlobalConfig::Instance();
- $u =& pfcUserConfig::Instance();
+ $c =& pfcGlobalConfig::Instance();
+ $u =& pfcUserConfig::Instance();
+ $ct =& pfcContainer::Instance();
if (trim($param) == "")
{
@@ -28,9 +29,8 @@
return;
}
- $container =& pfcContainer::Instance();
$msg = phpFreeChat::PreFilterMsg($param);
- $container->write($recipient, "*me*", $this->name, $u->nick." ".$msg);
+ $ct->write($recipient, "*me*", $this->name, $u->getNickname()." ".$msg);
if ($c->debug) pxlog("/me ".$msg, "chat", $c->getId());
}
Modified: trunk/src/commands/nick.class.php
===================================================================
--- trunk/src/commands/nick.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/nick.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -14,8 +14,9 @@
$recipient = $p["recipient"];
$recipientid = $p["recipientid"];
- $c =& pfcGlobalConfig::Instance();
- $u =& pfcUserConfig::Instance();
+ $c =& pfcGlobalConfig::Instance();
+ $u =& pfcUserConfig::Instance();
+ $ct =& pfcContainer::Instance();
if (trim($param) == "")
{
@@ -29,11 +30,10 @@
}
$newnick = phpFreeChat::FilterNickname($param);
- $oldnick = $u->nick;
+ $oldnick = $ct->getNickname($u->nickid);
- $container =& pfcContainer::Instance();
- $newnickid = $container->getNickId($newnick);
- $oldnickid = $container->getNickId($oldnick);
+ $newnickid = $ct->getNickId($newnick);
+ $oldnickid = $u->nickid;
if ($c->debug) pxlog("/nick ".$newnick, "chat", $c->getId());
@@ -42,13 +42,14 @@
// oldnick is different from new nick
// -> this is a nickname change
if ($oldnickid == $u->nickid &&
- $oldnick != $newnick && $oldnick != "")
+ $oldnick != $newnick &&
+ $oldnick != '')
{
// really change the nick (rename it)
- $container->changeNick($newnick, $oldnick);
+ $ct->changeNick($newnick, $oldnick);
$u->nick = $newnick;
$u->saveInCache();
- $this->forceWhoisReload($u->nick);
+ $this->forceWhoisReload($u->nickid);
// notify all the joined channels/privmsg
$cmdp = $p;
@@ -68,8 +69,10 @@
$cmd->run($xml_reponse, $cmdp);
}
$xml_reponse->script("pfc.handleResponse('nick', 'changed', '".addslashes($newnick)."');");
+ return;
}
-
+
+ /*
// new nickname is undefined (not used) and
// current nickname (oldnick) is not mine or is undefined
// -> this is a first connection
@@ -77,24 +80,24 @@
$oldnickid != $u->nickid)
{
// this is a first connection : create the nickname on the server
- $container->createNick(NULL, $newnick, $u->nickid);
- /*
- // useless code, it's done in updatemynick command
- foreach($u->channels as $chan)
- $container->createNick($chan["recipient"], $newnick, $u->nickid);
- foreach($u->privmsg as $pv)
- $container->createNick($pv["recipient"], $newnick, $u->nickid);
- */
- $u->nick = $newnick;
- $u->active = true;
- $u->saveInCache();
- $this->forceWhoisReload($u->nick);
+ // $container->createNick(NULL, $newnick, $u->nickid);
+ $container->createNick($u->nickid, $newnick);
+ //$u->nick = $newnick;
+ // $u->active = true;
+ //$u->saveInCache();
+ $this->forceWhoisReload($u->nickid);
+
$xml_reponse->script("pfc.handleResponse('nick', 'connected', '".addslashes($newnick)."');");
if ($c->debug)
pxlog("/nick ".$newnick." (first connection, oldnick=".$oldnick.")", "chat", $c->getId());
+ return;
}
+ */
+
+ // $ct->createNick($u->nickid, $newnick);
+
}
}
Modified: trunk/src/commands/notice.class.php
===================================================================
--- trunk/src/commands/notice.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/notice.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -13,15 +13,16 @@
$recipientid = $p["recipientid"];
$flag = isset($p["flag"]) ? $p["flag"] : 3;
- $c =& pfcGlobalConfig::Instance();
- $u =& pfcUserConfig::Instance();
+ $c =& pfcGlobalConfig::Instance();
+ $u =& pfcUserConfig::Instance();
+ $ct =& pfcContainer::Instance();
if ($c->shownotice > 0 &&
($c->shownotice & $flag) == $flag)
{
- $container =& pfcContainer::Instance();
$msg = phpFreeChat::FilterSpecialChar($msg);
- $res = $container->write($recipient, $u->nick, "notice", $msg);
+ $nick = $ct->getNickname($u->nickid);
+ $res = $ct->write($recipient, $nick, "notice", $msg);
if (is_array($res))
{
$cmdp = $p;
Modified: trunk/src/commands/op.class.php
===================================================================
--- trunk/src/commands/op.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/op.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -14,8 +14,9 @@
$recipient = $p["recipient"];
$recipientid = $p["recipientid"];
- $c =& pfcGlobalConfig::Instance();
- $u =& pfcUserConfig::Instance();
+ $c =& pfcGlobalConfig::Instance();
+ $u =& pfcUserConfig::Instance();
+ $ct =& pfcContainer::Instance();
if (trim($param) == "")
{
@@ -30,11 +31,10 @@
// just change the "isadmin" meta flag
$nicktoop = trim($param);
- $container =& pfcContainer::Instance();
- $nicktoopid = $container->getNickId($nicktoop);
- $container->setUserMeta($nicktoopid, 'isadmin', true);
+ $nicktoopid = $ct->getNickId($nicktoop);
+ $ct->setUserMeta($nicktoopid, 'isadmin', true);
- $this->forceWhoisReload($nicktoop);
+ $this->forceWhoisReload($nicktoopid);
}
}
Modified: trunk/src/commands/privmsg.class.php
===================================================================
--- trunk/src/commands/privmsg.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/privmsg.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -14,13 +14,23 @@
$c =& pfcGlobalConfig::Instance();
$u =& pfcUserConfig::Instance();
+ $ct =& pfcContainer::Instance();
- $pvname = $param;
-
// check the pvname exists on the server
- $container =& pfcContainer::Instance();
- $pvnickid = $container->getNickId($pvname);
+ $pvname = '';
+ $pvnickid = '';
+ if ($this->name == 'privmsg2')
+ {
+ $pvnickid = $ct->getNickId($param);
+ $pvname = $ct->getNickname($pvnickid);
+ }
+ else
+ {
+ $pvname = $param;
+ $pvnickid = $ct->getNickId($pvname);
+ }
$nickid = $u->nickid;
+ $nick = $ct->getNickname($u->nickid);
// error: can't speak to myself
if ($pvnickid == $nickid)
@@ -78,14 +88,14 @@
// reset the message id indicator
// i.e. be ready to re-get all last posted messages
$from_id_sid = "pfc_from_id_".$c->getId()."_".$clientid."_".$pvrecipientid;
- $from_id = $container->getLastId($pvrecipient)-$c->max_msg-1;
+ $from_id = $ct->getLastId($pvrecipient)-$c->max_msg-1;
$_SESSION[$from_id_sid] = ($from_id<0) ? 0 : $from_id;
}
// register the user (and his metadata) in this pv
- $ct =& pfcContainer::Instance();
- $ct->createNick($pvrecipient, $u->nick, $u->nickid);
- $this->forceWhoisReload($u->nick);
+ // $ct->createNick($pvrecipient, $u->nick, $u->nickid);
+ $ct->joinChan($nickid, $pvrecipient);
+ $this->forceWhoisReload($nickid);
// return ok to the client
// then the client will create a new tab
Modified: trunk/src/commands/quit.class.php
===================================================================
--- trunk/src/commands/quit.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/quit.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -12,14 +12,13 @@
$recipient = $p["recipient"];
$recipientid = $p["recipientid"];
- $c =& pfcGlobalConfig::Instance();
- $u =& pfcUserConfig::Instance();
+ $c =& pfcGlobalConfig::Instance();
+ $u =& pfcUserConfig::Instance();
+ $ct =& pfcContainer::Instance();
- // then remove the nickname file
- $ct =& pfcContainer::Instance();
- $quitmsg = $param == "" ? _pfc("%s quit", $u->nick) : _pfc("%s quit (%s)", $u->nick, $param);
+ $nick = $ct->getNickname($u->nickid);
- // from the channels
+ // leave the channels
foreach( $u->channels as $id => $chandetail )
if ($ct->removeNick($chandetail["recipient"], $u->nickid))
{
@@ -30,7 +29,7 @@
$cmd =& pfcCommand::Factory("leave");
$cmd->run($xml_reponse, $cmdp);
}
- // from the private messages
+ // leave the private messages
foreach( $u->privmsg as $id => $pvdetail )
if ($ct->removeNick($pvdetail["recipient"], $u->nickid))
{
@@ -41,16 +40,18 @@
$cmd =& pfcCommand::Factory("leave");
$cmd->run($xml_reponse, $cmdp);
}
- // from the server
+ // leave the server
$ct->removeNick(NULL, $u->nickid);
+ /*
// then set the chat inactive
$u->active = false;
$u->saveInCache();
+ */
$xml_reponse->script("pfc.handleResponse('quit', 'ok', '');");
- if ($c->debug) pxlog("/quit (a user just quit -> nick=".$u->nick.")", "chat", $c->getId());
+ if ($c->debug) pxlog("/quit (a user just quit -> nick=".$nick.")", "chat", $c->getId());
}
}
Modified: trunk/src/commands/send.class.php
===================================================================
--- trunk/src/commands/send.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/send.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -12,23 +12,13 @@
$recipient = $p["recipient"];
$recipientid = $p["recipientid"];
- $c =& pfcGlobalConfig::Instance();
- $u =& pfcUserConfig::Instance();
- $nick = phpFreeChat::FilterSpecialChar($sender);
+ $c =& pfcGlobalConfig::Instance();
+ $u =& pfcUserConfig::Instance();
+ $ct =& pfcContainer::Instance();
+
+ $nick = $ct->getNickname($u->nickid); //phpFreeChat::FilterSpecialChar($sender);
$text = phpFreeChat::PreFilterMsg($param);
-
- // send an error because the current user is not connected
- if (!$u->active)
- {
- $cmdp = $p;
- $cmdp["param"] = _pfc("Your must be connected to send a message");
- $cmd =& pfcCommand::Factory("error");
- $cmd->run($xml_reponse, $cmdp);
- return;
- }
-
-
// $offline = $container->getMeta("offline", "nickname", $u->privmsg[$recipientid]["name"]);
// if this channel is a pv (one to one channel),
@@ -37,12 +27,12 @@
$can_send = true;
if (isset($u->privmsg[$recipientid]))
{
- $container =& pfcContainer::Instance();
- $pvnick = $u->privmsg[$recipientid]["name"];
- $pvnickid = $container->getNickId($pvnick);
+ $pvnickid = $u->privmsg[$recipientid]["pvnickid"];
+ $pvnick = $ct->getNickname($pvnickid);//$u->privmsg[$recipientid]["name"];
+ // $pvnickid = $ct->getNickId($pvnick);
// now check if this user is currently online
- $onlineusers = $container->getOnlineNick(NULL);
+ $onlineusers = $ct->getOnlineNick(NULL);
if (!in_array($pvnickid, $onlineusers["nickid"]))
{
// send an error because the user is not online
@@ -63,7 +53,7 @@
{
// an error occured, just ignore the message and display errors
foreach($errors as $e)
- if ($c->debug) pxlog("error /send, user can't send a message -> nick=".$u->nick." err=".$e, "chat", $c->getId());
+ if ($c->debug) pxlog("error /send, user can't send a message -> nick=".$nick." err=".$e, "chat", $c->getId());
$cmdp = $p;
$cmdp["param"] = $errors;
$cmd =& pfcCommand::Factory("error");
@@ -77,8 +67,7 @@
// Now send the message if there is no errors
if ($can_send)
{
- $container =& pfcContainer::Instance();
- $msgid = $container->write($recipient, $nick, "send", $text);
+ $msgid = $ct->write($recipient, $nick, "send", $text);
if (is_array($msgid))
{
$cmdp = $p;
@@ -87,14 +76,17 @@
$cmd->run($xml_reponse, $cmdp);
return;
}
- if ($c->debug) pxlog("/send ".$text." (a user just sent a message -> nick=".$u->nick.")", "chat", $c->getId());
+ if ($c->debug) pxlog("/send ".$text." (a user just sent a message -> nick=".$nick.")", "chat", $c->getId());
// a message has been posted so :
// - clear errors
// - give focus to "words" field
+ // @todo move this code in the handleResponse function
$xml_reponse->script("pfc.clearError(Array('pfc_words"."','pfc_handle"."'));");
$xml_reponse->script("$('pfc_words').focus();");
}
+
+ $xml_reponse->script("pfc.handleResponse('".$this->name."', 'ok', '');");
}
}
Modified: trunk/src/commands/update.class.php
===================================================================
--- trunk/src/commands/update.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/update.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -16,7 +16,7 @@
$u =& pfcUserConfig::Instance();
// do not update if user isn't active (didn't connect)
- if ($u->active)
+ if ($u->isOnline())
{
// check the user has not been disconnected from the server by timeout
// if I found he has been disconnected, then I reconnect him with /connect command
@@ -52,7 +52,7 @@
$cmdp["recipientid"] = $id;
$cmdp["param"] = ''; // don't forward the parameter because it will be interpreted as a channel name
$cmd->run($xml_reponse, $cmdp);
- }
+ }
// get new message posted on each channels
$cmd =& pfcCommand::Factory("getnewmsg");
Modified: trunk/src/commands/whois.class.php
===================================================================
--- trunk/src/commands/whois.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/commands/whois.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -30,6 +30,7 @@
{
$clientid = $p["clientid"];
$param = $p["param"];
+ $params = $p["params"];
$sender = $p["sender"];
$recipient = $p["recipient"];
$recipientid = $p["recipientid"];
@@ -38,7 +39,17 @@
$u =& pfcUserConfig::Instance();
$ct =& pfcContainer::Instance();
- $nickid = $ct->getNickId($param);
+ // $xml_reponse->script("trace('".implode(',',$params)."');");
+ // return;
+
+ // get the nickid from the parameters
+ // if the run command is whois2 then the parameter is a nickid
+ $nickid = '';
+ if ($this->name == 'whois2')
+ $nickid = $params[0];
+ else
+ $nickid = $ct->getNickId($params[0]);
+
if ($nickid)
{
$usermeta = $ct->getAllUserMeta($nickid);
@@ -67,4 +78,4 @@
}
}
-?>
+?>
\ No newline at end of file
Modified: trunk/src/pfccommand.class.php
===================================================================
--- trunk/src/pfccommand.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/pfccommand.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -73,9 +73,9 @@
// instanciate the proxies chaine
$firstproxy =& $cmd;
- for($i = count($c->_proxies)-1; $i >= 0; $i--)
+ for($i = count($c->proxies)-1; $i >= 0; $i--)
{
- $proxy_name = $c->_proxies[$i];
+ $proxy_name = $c->proxies[$i];
$proxy_classname = "pfcProxyCommand_" . $proxy_name;
// try to include the proxy class file from the default path or from the customized path
@@ -131,15 +131,13 @@
/**
* Force whois reloading
*/
- function forceWhoisReload($nicktorewhois)
+ function forceWhoisReload($nickid)
{
$c =& pfcGlobalConfig::Instance();
$u =& pfcUserConfig::Instance();
$ct =& pfcContainer::Instance();
- $nickid = $ct->getNickid($nicktorewhois);
-
- // get the user who have $nicktorewhois in their list
+ // list the users in the same channel as $nickid
$channels = $ct->getMeta("nickid-to-channelid", $nickid);
$channels = $channels['value'];
$channels = array_diff($channels, array('SERVER'));
@@ -150,12 +148,12 @@
$otherids = array_merge($otherids, $ret['nickid']);
}
- // alert them that $nicktorewhois user info just changed
+ // alert them that $nickid user info just changed
foreach($otherids as $otherid)
{
$cmdstr = 'whois2';
$cmdp = array();
- $cmdp['param'] = $nicktorewhois;
+ $cmdp['params'] = array($nickid);
pfcCommand::AppendCmdToPlay($otherid, $cmdstr, $cmdp);
/*
Modified: trunk/src/pfccontainer.class.php
===================================================================
--- trunk/src/pfccontainer.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/pfccontainer.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -75,6 +75,7 @@
* @param $nick the nickname to create
* @param $nickid is the corresponding nickname id (taken from session)
*/
+ /*
function createNick($chan, $nick, $nickid)
{
$c =& pfcGlobalConfig::Instance();
@@ -97,7 +98,44 @@
return true;
}
+ */
+
+ function createNick($nickid, $nick)
+ {
+ $c =& pfcGlobalConfig::Instance();
+ if ($nick == '')
+ user_error('pfcContainer::createNick nick is empty', E_USER_ERROR);
+ if ($nickid == '')
+ user_error('pfcContainer::createNick nickid is empty', E_USER_ERROR);
+
+ $this->setMeta("nickid-to-metadata", $nickid, 'nick', $nick);
+ $this->setMeta("metadata-to-nickid", 'nick', $this->encode($nick), $nickid);
+
+ return true;
+ }
+
+
+ function joinChan($nickid, $chan)
+ {
+ $c =& pfcGlobalConfig::Instance();
+
+ if ($nickid == '')
+ user_error('pfcContainer::joinChan nickid is empty', E_USER_ERROR);
+
+ if ($chan == NULL) $chan = 'SERVER';
+
+ $this->setMeta("nickid-to-channelid", $nickid, $this->encode($chan));
+ $this->setMeta("channelid-to-nickid", $this->encode($chan), $nickid);
+
+ // update the SERVER channel
+ if ($chan != 'SERVER') $this->updateNick($nickid);
+
+ return true;
+ }
+
+
+
/**
* Remove (disconnect/quit) the nickname from the server or from a channel
* Notice: when a user quit, the caller must take care removeNick from each channels ('SERVER' included)
Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/pfcglobalconfig.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -49,6 +49,7 @@
var $skip_proxies = array(); // these proxies will be skiped. ex: append "censor" to the list to disable words censoring
var $post_proxies = array(); // these proxies will be handled just before to process commands and just after system proxies
var $pre_proxies = array(); // these proxies will be handled before system proxies (at begining)
+ var $proxies = array(); // will contains proxies to execute on each command (filled in the init step) this parameter could not be overridden
var $proxies_cfg = array("auth" => array(),
"noflood" => array("charlimit" => 450,
"msglimit" => 10,
@@ -133,7 +134,6 @@
// private parameters
var $_sys_proxies = array("lock", "checktimeout", "checknickchange", "auth", "noflood", "censor", "log");
- var $_proxies = array(); // will contains proxies to execute on each command (filled in the init step)
var $_dyn_params = array("nick","isadmin","islocked","admins","frozen_channels", "channels", "privmsg", "nickmeta","baseurl");
var $_params_type = array();
var $_query_string = '';
@@ -428,23 +428,23 @@
$this->errors[] = _pfc("'%s' parameter is not valid. Available values are : '%s'", "language", implode(", ", $lg_list));
// calculate the proxies chaine
- $this->_proxies = array();
+ $this->proxies = array();
foreach($this->pre_proxies as $px)
{
- if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->_proxies))
- $this->_proxies[] = $px;
+ if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->proxies))
+ $this->proxies[] = $px;
}
foreach($this->_sys_proxies as $px)
{
- if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->_proxies))
- $this->_proxies[] = $px;
+ if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->proxies))
+ $this->proxies[] = $px;
}
foreach($this->post_proxies as $px)
{
- if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->_proxies))
- $this->_proxies[] = $px;
+ if (!in_array($px,$this->skip_proxies) && !in_array($px,$this->proxies))
+ $this->proxies[] = $px;
}
// save the proxies path
@@ -452,10 +452,12 @@
// check the customized proxies path
if ($this->proxies_path != '' && !is_dir($this->proxies_path))
$this->errors[] = _pfc("'%s' directory doesn't exist", $this->proxies_path);
+ if ($this->proxies_path == '') $this->proxies_path = $this->proxies_path_default;
// save the commands path
$this->cmd_path_default = dirname(__FILE__).'/commands';
-
+ if ($this->cmd_path == '') $this->cmd_path = $this->cmd_path_default;
+
// load smileys from file
$this->loadSmileyTheme();
@@ -513,9 +515,9 @@
function _GetCacheFile($serverid = "", $data_private_path = "")
{
- if ($serverid == "") $serverid = $this->getId();
- if ($data_private_path == "") $data_private_path = $this->data_private_path;
- return $data_private_path."/cache/pfcglobalconfig_".$serverid;
+ if ($serverid == '') $serverid = $this->getId();
+ if ($data_private_path == '') $data_private_path = $this->data_private_path;
+ return $data_private_path.'/cache/'.$serverid.'.php';
}
function destroyCache()
@@ -545,6 +547,11 @@
// if a cache file exists, remove the lock file because config has been succesfully stored
if (file_exists($cachefile_lock)) @unlink($cachefile_lock);
+ include $cachefile;
+ foreach($pfc_conf as $key => $val)
+ $this->$key = $val;
+
+ /*
$pfc_configvar = unserialize(file_get_contents($cachefile));
foreach($pfc_configvar as $key => $val)
{
@@ -552,6 +559,7 @@
if (!in_array($key,$this->_dyn_params))
$this->$key = $val;
}
+ */
return true; // synchronized
}
@@ -586,7 +594,22 @@
function saveInCache()
{
$cachefile = $this->_GetCacheFile();
- file_put_contents($cachefile, serialize(get_object_vars($this)));
+ $data = '<?php ';
+
+ $conf = get_object_vars($this);
+ $keys = array_keys($conf);
+ foreach($keys as $k)
+ if (preg_match('/^_.*/',$k))
+ unset($conf[$k]);
+
+ // remove dynamic parameters
+ foreach($this->_dyn_params as $k)
+ unset($conf[$k]);
+
+ $data .= '$pfc_conf = '.var_export($conf,true).";\n";
+ $data .= '?>';
+
+ file_put_contents($cachefile, $data/*serialize(get_object_vars($this))*/);
if ($this->debug) pxlog("pfcGlobalConfig::saveInCache()", "chatconfig", $this->getId());
}
Modified: trunk/src/pfcuserconfig.class.php
===================================================================
--- trunk/src/pfcuserconfig.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/pfcuserconfig.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -68,7 +68,7 @@
function _setParam($p, $v)
{
$c =& pfcGlobalConfig::Instance();
- $nickid_param = "pfcuserconfig_".$c->getId()./*"_".$this->nickid.*/"_".$p;
+ $nickid_param = "pfcuserconfig_".$c->getId()."_".$p;
$_SESSION[$nickid_param] = $v;
$this->$p = $v;
}
@@ -76,7 +76,7 @@
function _rmParam($p)
{
$c =& pfcGlobalConfig::Instance();
- $nickid_param = "pfcuserconfig_".$c->getId()./*"_".$this->nickid.*/"_".$p;
+ $nickid_param = "pfcuserconfig_".$c->getId()."_".$p;
unset($_SESSION[$nickid_param]);
unset($this->$p);
if ($p == 'active') $this->active = false;
@@ -98,15 +98,29 @@
$c =& pfcGlobalConfig::Instance();
// do not save anything as long as nickname is not assigned
- if ($this->active && $this->nick != "")
+ //if ($this->active && $this->nick != "")
{
- $this->_setParam("nick",$this->nick);
- $this->_setParam("active",$this->active);
- $this->_setParam("channels",$this->channels);
- $this->_setParam("privmsg",$this->privmsg);
- $this->_setParam("serverid",$this->serverid);
+ $this->_setParam("nick", $this->nick);
+ $this->_setParam("active", $this->active);
+ $this->_setParam("channels", $this->channels);
+ $this->_setParam("privmsg", $this->privmsg);
+ $this->_setParam("serverid", $this->serverid);
}
}
+
+ function isOnline()
+ {
+ $ct =& pfcContainer::Instance();
+ $online = ($ct->isNickOnline(NULL, $this->nickid) >= 0);
+ return $online;
+ }
+
+ function getNickname()
+ {
+ if ($this->nick != '') return $this->nick;
+ $ct =& pfcContainer::Instance();
+ return $ct->getNickname($this->nickid);
+ }
}
?>
\ No newline at end of file
Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/phpfreechat.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -265,7 +265,7 @@
$recipientid = isset($res['params'][1]) ? $res['params'][1] : "";
$params = array_slice(is_array($res['params']) ? $res['params'] : array() ,2);
$param = implode(" ",$params); // to keep compatibility (will be removed)
- $sender = $u->nick;
+ $sender = $u->getNickname();
// translate the recipientid to the channel name
if (isset($u->channels[$recipientid]))
@@ -290,8 +290,8 @@
$nickidtopv = $u->privmsg[$recipientid]["pvnickid"];
$cmdstr = 'privmsg2';
$cmdp = array();
- $cmdp['param'] = $u->nick;
- $cmdp['params'][] = $u->nick;
+ $cmdp['param'] = $u->nickid;//$sender;
+ $cmdp['params'][] = $u->nickid;//$sender;
pfcCommand::AppendCmdToPlay($nickidtopv, $cmdstr, $cmdp);
}
@@ -336,7 +336,7 @@
// do not update when the user just quit
if ($cmdname != "update" &&
$cmdname != "quit" &&
- (!isset($u->nick) || $u->nick != ""))
+ $u->nickid != '')
{
// force an update just after a command is sent
// thus the message user just poster is really fastly displayed
Modified: trunk/src/proxies/auth.class.php
===================================================================
--- trunk/src/proxies/auth.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/proxies/auth.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -41,6 +41,20 @@
$c =& pfcGlobalConfig::Instance();
$u =& pfcUserConfig::Instance();
+
+ // do not allow someone to run a command if he is not online
+ if ($this->name != 'error' &&
+ $this->name != 'connect' &&
+ !$u->isOnline())
+ {
+ $cmdp = $p;
+ $cmdp["param"] = _pfc("Your must be connected to send a message");
+ $cmd =& pfcCommand::Factory("error");
+ $cmd->run($xml_reponse, $cmdp);
+ return;
+ }
+
+
// protect admin commands
$admincmd = array("kick", "ban", "unban", "op", "deop", "debug", "rehash");
if ( in_array($this->name, $admincmd) )
Modified: trunk/src/proxies/checknickchange.class.php
===================================================================
--- trunk/src/proxies/checknickchange.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/proxies/checknickchange.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -38,19 +38,21 @@
$recipient = $p["recipient"];
$recipientid = $p["recipientid"];
$owner = isset($p["owner"]) ? $p["owner"] : '';
- $c =& pfcGlobalConfig::Instance();
- $u =& pfcUserConfig::Instance();
+ $c =& pfcGlobalConfig::Instance();
+ $u =& pfcUserConfig::Instance();
+ $ct =& pfcContainer::Instance();
+ $newnick = phpFreeChat::FilterNickname($param);
+ $oldnick = $ct->getNickname($u->nickid);
+
if ( $this->name == 'nick' )
{
- $newnick = phpFreeChat::FilterNickname($param);
- $oldnick = $u->nick;
// if the user want to change his nickname but the frozen_nick is enable
// then send him a warning
- if ( $this->name == "nick" &&
- $u->nick != "" &&
- $param != $u->nick &&
+ if ( $this->name == 'nick' &&
+ $oldnick != '' &&
+ $newnick != $oldnick &&
$c->frozen_nick == true &&
$owner != $this->proxyname )
{
@@ -59,8 +61,7 @@
return;
}
- $container =& pfcContainer::Instance();
- $newnickid = $container->getNickId($newnick);
+ $newnickid = $ct->getNickId($newnick);
$oldnickid = $u->nickid;
if ($newnick == $oldnick &&
@@ -90,8 +91,8 @@
// allow nick changes only from the parameters array (server side)
if ($this->name != 'connect' && // don't check anything on the connect process or it could block the periodic refresh
$c->frozen_nick == true &&
- $u->nick != $c->nick &&
- $c->nick != "" && // don't change the nickname to empty or the asknick popup will loop indefinatly
+ $oldnick != $c->nick &&
+ $c->nick != '' && // don't change the nickname to empty or the asknick popup will loop indefinatly
$owner != $this->proxyname)
{
// change the user nickname
Modified: trunk/src/proxies/checktimeout.class.php
===================================================================
--- trunk/src/proxies/checktimeout.class.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/src/proxies/checktimeout.class.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -39,11 +39,11 @@
$recipient = $p["recipient"];
$recipientid = $p["recipientid"];
- $c =& pfcGlobalConfig::Instance();
- $u =& pfcUserConfig::Instance();
+ $c =& pfcGlobalConfig::Instance();
+ $u =& pfcUserConfig::Instance();
+ $ct =& pfcContainer::Instance();
// disconnect users from specific channels
- $ct =& pfcContainer::Instance();
$disconnected_users = $ct->removeObsoleteNick($c->timeout);
for($i=0; $i<count($disconnected_users["nick"]); $i++)
{
Modified: trunk/themes/default/chat.js.tpl.php
===================================================================
--- trunk/themes/default/chat.js.tpl.php 2007-03-04 13:37:46 UTC (rev 983)
+++ trunk/themes/default/chat.js.tpl.php 2007-03-07 19:14:11 UTC (rev 984)
@@ -15,7 +15,7 @@
require_once dirname(__FILE__).'/../../src/pfcjson.class.php';
$json = new pfcJSON();
?>
-<?php $nick = $u->nick != "" ? $json->encode($u->nick) : $json->encode($c->nick); ?>
+<?php $nick = $u->getNickname() != '' ? $json->encode($u->getNickname()) : $json->encode($c->nick); ?>
var pfc = null; // will contains a pfcClient instance
var pfc_nickname = <?php echo ($GLOBALS["output_encoding"]=="UTF-8" ? $nick : iconv("UTF-8", $GLOBALS["output_encoding"],$nick)); ?>;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-03-08 14:27:22
|
Revision: 988
http://svn.sourceforge.net/phpfreechat/?rev=988&view=rev
Author: kerphi
Date: 2007-03-08 06:27:07 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
rename files without extentions (doesn't allowed on few servers)
Modified Paths:
--------------
trunk/src/pfcglobalconfig.class.php
Added Paths:
-----------
trunk/AUTHORS.txt
trunk/COPYING.txt
trunk/themes/cerutti/smileys/theme.txt
trunk/themes/default/smileys/theme.txt
trunk/themes/msn/smileys/theme.txt
trunk/themes/phoenity/smileys/theme.txt
trunk/themes/phpbb2/smileys/theme.txt
trunk/version.txt
Removed Paths:
-------------
trunk/AUTHORS
trunk/COPYING
trunk/themes/cerutti/smileys/theme
trunk/themes/default/smileys/theme
trunk/themes/msn/smileys/theme
trunk/themes/phoenity/smileys/theme
trunk/themes/phpbb2/smileys/theme
trunk/version
Deleted: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/AUTHORS 2007-03-08 14:27:07 UTC (rev 988)
@@ -1 +0,0 @@
-Stephane Gully <ste...@gm...>
Copied: trunk/AUTHORS.txt (from rev 985, trunk/AUTHORS)
===================================================================
--- trunk/AUTHORS.txt (rev 0)
+++ trunk/AUTHORS.txt 2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1 @@
+Stephane Gully <ste...@gm...>
Deleted: trunk/COPYING
===================================================================
--- trunk/COPYING 2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/COPYING 2007-03-08 14:27:07 UTC (rev 988)
@@ -1,17 +0,0 @@
-phpFreeChat a simple, fast, and customizable chat server.
-Copyright \xA9 2006 Stephane Gully <ste...@gm...>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the
-Free Software Foundation, 51 Franklin St, Fifth Floor,
-Boston, MA 02110-1301 USA
\ No newline at end of file
Copied: trunk/COPYING.txt (from rev 985, trunk/COPYING)
===================================================================
--- trunk/COPYING.txt (rev 0)
+++ trunk/COPYING.txt 2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,17 @@
+phpFreeChat a simple, fast, and customizable chat server.
+Copyright \xA9 2006 Stephane Gully <ste...@gm...>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the
+Free Software Foundation, 51 Franklin St, Fifth Floor,
+Boston, MA 02110-1301 USA
\ No newline at end of file
Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php 2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/src/pfcglobalconfig.class.php 2007-03-08 14:27:07 UTC (rev 988)
@@ -462,7 +462,7 @@
$this->loadSmileyTheme();
// load version number from file
- $this->version = trim(file_get_contents(dirname(__FILE__)."/../version"));
+ $this->version = trim(file_get_contents(dirname(__FILE__)."/../version.txt"));
$this->is_init = (count($this->errors) == 0);
}
@@ -479,7 +479,7 @@
function loadSmileyTheme()
{
- $theme = file($this->getFilePathFromTheme("smileys/theme"));
+ $theme = file($this->getFilePathFromTheme("smileys/theme.txt"));
$result = array();
foreach($theme as $line)
{
Deleted: trunk/themes/cerutti/smileys/theme
===================================================================
--- trunk/themes/cerutti/smileys/theme 2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/themes/cerutti/smileys/theme 2007-03-08 14:27:07 UTC (rev 988)
@@ -1,11 +0,0 @@
-smile.png :-) :)
-happy.png ^_^ ^^
-wink.png ;-) ;)
-confused.png :-/ :/
-neutral.png :-| :|
-lol.png :-D :D
-sad.png :( :-(
-omg.png :-o :-0 :0 :0
-dizzy.png o_O O_o o_o O_O
-cry.png ;-( :'( ;(
-tongue.png :P :p :-p :-P
\ No newline at end of file
Copied: trunk/themes/cerutti/smileys/theme.txt (from rev 985, trunk/themes/cerutti/smileys/theme)
===================================================================
--- trunk/themes/cerutti/smileys/theme.txt (rev 0)
+++ trunk/themes/cerutti/smileys/theme.txt 2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,11 @@
+smile.png :-) :)
+happy.png ^_^ ^^
+wink.png ;-) ;)
+confused.png :-/ :/
+neutral.png :-| :|
+lol.png :-D :D
+sad.png :( :-(
+omg.png :-o :-0 :0 :0
+dizzy.png o_O O_o o_o O_O
+cry.png ;-( :'( ;(
+tongue.png :P :p :-p :-P
\ No newline at end of file
Deleted: trunk/themes/default/smileys/theme
===================================================================
--- trunk/themes/default/smileys/theme 2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/themes/default/smileys/theme 2007-03-08 14:27:07 UTC (rev 988)
@@ -1,27 +0,0 @@
-# This theme set based on the icons at
-# http://www.famfamfam.com/lab/icons/silk/
-#
-# Ported to PHPFreeChat by Robin Monks
-#
-# These icons are under a Creative Commons Attribution 2.5
-# License http://creativecommons.org/licenses/by/2.5/
-
-emoticon_smile.png :-) ^_^ :)
-emoticon_evilgrin.png >(
-emoticon_surprised.png :S :s :-S :-s :-/
-emoticon_grin.png :-D :D
-emoticon_unhappy.png :'( :-( :o( :-< :(
-emoticon_happy.png :lol:
-emoticon_waii.png :{} :-{} :razz: :} :-}
-emoticon_wink.png ;-) ;o) ;)
-emoticon_tongue.png :P :-P :-p :p
-weather_rain.png /// \\\ ||| :rain: :drizzle:
-weather_snow.png :***:
-weather_sun.png >O<
-weather_clouds.png :""": :cloud: :clouds:
-weather_cloudy.png :"O": :cloudly:
-weather_lightning.png :$:
-arrow_right.png => -> --> ==> >>>
-arrow_left.png <= <- <-- <== <<<
-exclamation.png :!:
-lightbulb.png *) 0=
Copied: trunk/themes/default/smileys/theme.txt (from rev 985, trunk/themes/default/smileys/theme)
===================================================================
--- trunk/themes/default/smileys/theme.txt (rev 0)
+++ trunk/themes/default/smileys/theme.txt 2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,27 @@
+# This theme set based on the icons at
+# http://www.famfamfam.com/lab/icons/silk/
+#
+# Ported to PHPFreeChat by Robin Monks
+#
+# These icons are under a Creative Commons Attribution 2.5
+# License http://creativecommons.org/licenses/by/2.5/
+
+emoticon_smile.png :-) ^_^ :)
+emoticon_evilgrin.png >(
+emoticon_surprised.png :S :s :-S :-s :-/
+emoticon_grin.png :-D :D
+emoticon_unhappy.png :'( :-( :o( :-< :(
+emoticon_happy.png :lol:
+emoticon_waii.png :{} :-{} :razz: :} :-}
+emoticon_wink.png ;-) ;o) ;)
+emoticon_tongue.png :P :-P :-p :p
+weather_rain.png /// \\\ ||| :rain: :drizzle:
+weather_snow.png :***:
+weather_sun.png >O<
+weather_clouds.png :""": :cloud: :clouds:
+weather_cloudy.png :"O": :cloudly:
+weather_lightning.png :$:
+arrow_right.png => -> --> ==> >>>
+arrow_left.png <= <- <-- <== <<<
+exclamation.png :!:
+lightbulb.png *) 0=
Deleted: trunk/themes/msn/smileys/theme
===================================================================
--- trunk/themes/msn/smileys/theme 2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/themes/msn/smileys/theme 2007-03-08 14:27:07 UTC (rev 988)
@@ -1,82 +0,0 @@
-msn_smiley.gif :-) :)
-msn_sad.gif :-( :( :-<
-msn_laugh.gif :-D :-d :d :D :-> :>
-msn_tongue.gif :-P :P :-p :p
-msn_wink.gif ;) ;-)
-msn_cry.gif :'(
-msn_hot.gif (H) (h)
-msn_ooooh.gif :-o
-msn_angry.gif :-@ :@
-msn_nerd.gif 8-|
-msn_neutral.gif :-| :|
-msn_dontknow.gif :^)
-msn_donttell.gif :-#
-msn_eyeroll.gif 8-)
-msn_weird.gif :-S :-s :s :S
-msn_teeth.gif 8o|
-msn_think.gif *-)
-msn_sarcastic.gif ^o)
-msn_sleepy.gif |-)
-msn_brb.gif (brb)
-msn_angel.gif (a) (A)
-msn_embarrassed.gif :$ :-$
-msn_party.gif <:o)
-msn_secret.gif :-*
-msn_sick.gif +o(
-msn_devil.gif (6)
-tux1.gif (tux1)
-tux2.gif (tux2)
-gnu.gif (gnu)
-msn_bat.gif :-[ :[
-msn_cat.gif (@)
-msn_sheep.gif (bah)
-msn_snail.gif (sn)
-msn_turtle.gif (tu)
-msn_dog.gif (dog)
-msn_beer.gif (B) (b)
-msn_bowl.gif (||)
-msn_boy.gif (Z) (z)
-msn_brheart.gif (U) (u)
-msn_cake.gif (^)
-msn_car.gif (au)
-msn_cellphone.gif (mp)
-msn_cigarette.gif (ci)
-msn_clock.gif (o) (O)
-msn_coffee.gif (C) (c)
-msn_coins.gif (mo)
-msn_computer.gif (co)
-msn_deadflower.gif (W) (w)
-msn_drink.gif (D) (d)
-msn_email.gif (e) (E)
-msn_film.gif (~)
-msn_fingerscrossed.gif (yn)
-msn_flower.gif (F) (f)
-msn_gift.gif (g) (G)
-msn_girl.gif (X) (x)
-msn_handcuffs.gif (%)
-msn_heart.gif (L) (l)
-msn_highfive.gif (h5)
-msn_icon.gif (M) (m)
-msn_idea.gif (I) (i)
-msn_island.gif (ip)
-msn_kiss.gif (K) (k)
-msn_lightning.gif (li)
-msn_note.gif (8)
-msn_phone.gif (T) (t)
-msn_photo.gif (P) (p)
-msn_pizza.gif (pi)
-msn_plane.gif (ap)
-msn_plate.gif (pl)
-msn_question.gif (?)
-msn_rainbow.gif (r) (R)
-msn_run.gif ({)
-msn_runback.gif (})
-msn_sleep.gif (S)
-msn_soccer.gif (so)
-msn_star.gif (*)
-msn_stormy.gif (st)
-msn_sun.gif (#)
-msn_thumbdown.gif (N) (n)
-msn_thumbup.gif (Y) (y)
-msn_umbrella.gif (um)
-msn_xbox.gif (xx)
Copied: trunk/themes/msn/smileys/theme.txt (from rev 985, trunk/themes/msn/smileys/theme)
===================================================================
--- trunk/themes/msn/smileys/theme.txt (rev 0)
+++ trunk/themes/msn/smileys/theme.txt 2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,82 @@
+msn_smiley.gif :-) :)
+msn_sad.gif :-( :( :-<
+msn_laugh.gif :-D :-d :d :D :-> :>
+msn_tongue.gif :-P :P :-p :p
+msn_wink.gif ;) ;-)
+msn_cry.gif :'(
+msn_hot.gif (H) (h)
+msn_ooooh.gif :-o
+msn_angry.gif :-@ :@
+msn_nerd.gif 8-|
+msn_neutral.gif :-| :|
+msn_dontknow.gif :^)
+msn_donttell.gif :-#
+msn_eyeroll.gif 8-)
+msn_weird.gif :-S :-s :s :S
+msn_teeth.gif 8o|
+msn_think.gif *-)
+msn_sarcastic.gif ^o)
+msn_sleepy.gif |-)
+msn_brb.gif (brb)
+msn_angel.gif (a) (A)
+msn_embarrassed.gif :$ :-$
+msn_party.gif <:o)
+msn_secret.gif :-*
+msn_sick.gif +o(
+msn_devil.gif (6)
+tux1.gif (tux1)
+tux2.gif (tux2)
+gnu.gif (gnu)
+msn_bat.gif :-[ :[
+msn_cat.gif (@)
+msn_sheep.gif (bah)
+msn_snail.gif (sn)
+msn_turtle.gif (tu)
+msn_dog.gif (dog)
+msn_beer.gif (B) (b)
+msn_bowl.gif (||)
+msn_boy.gif (Z) (z)
+msn_brheart.gif (U) (u)
+msn_cake.gif (^)
+msn_car.gif (au)
+msn_cellphone.gif (mp)
+msn_cigarette.gif (ci)
+msn_clock.gif (o) (O)
+msn_coffee.gif (C) (c)
+msn_coins.gif (mo)
+msn_computer.gif (co)
+msn_deadflower.gif (W) (w)
+msn_drink.gif (D) (d)
+msn_email.gif (e) (E)
+msn_film.gif (~)
+msn_fingerscrossed.gif (yn)
+msn_flower.gif (F) (f)
+msn_gift.gif (g) (G)
+msn_girl.gif (X) (x)
+msn_handcuffs.gif (%)
+msn_heart.gif (L) (l)
+msn_highfive.gif (h5)
+msn_icon.gif (M) (m)
+msn_idea.gif (I) (i)
+msn_island.gif (ip)
+msn_kiss.gif (K) (k)
+msn_lightning.gif (li)
+msn_note.gif (8)
+msn_phone.gif (T) (t)
+msn_photo.gif (P) (p)
+msn_pizza.gif (pi)
+msn_plane.gif (ap)
+msn_plate.gif (pl)
+msn_question.gif (?)
+msn_rainbow.gif (r) (R)
+msn_run.gif ({)
+msn_runback.gif (})
+msn_sleep.gif (S)
+msn_soccer.gif (so)
+msn_star.gif (*)
+msn_stormy.gif (st)
+msn_sun.gif (#)
+msn_thumbdown.gif (N) (n)
+msn_thumbup.gif (Y) (y)
+msn_umbrella.gif (um)
+msn_xbox.gif (xx)
Deleted: trunk/themes/phoenity/smileys/theme
===================================================================
--- trunk/themes/phoenity/smileys/theme 2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/themes/phoenity/smileys/theme 2007-03-08 14:27:07 UTC (rev 988)
@@ -1,23 +0,0 @@
-smile.gif :-) :) :} ^_^
-alien.gif o) o-) O) O-) O> o>
-evil.gif >(
-arrow.gif => -> --> ==> >>>
-confused.gif :S :s :-S :-s :/ :-/ :\ :-\
-cool.gif 8) 8-) B) B-) o-o O-O 0-0
-cry.gif :'( :"(
-dizzy.gif O_o o_O Oo oO
-eek.gif O_O o_o 0.0 O.O OO 00 o.o
-angry.gif :-@ :@
-exclam.gif (!) [!] :!:
-idea.gif *)
-laugh.gif :-D :D
-lol.gif :lol:
-mrgreen.gif :green: +o( +( +-(
-normal.gif :| :-| |-: |: :o|
-question.gif :? :-? :o? [?] (?) :?:
-razz.gif :{} :-{} :razz:
-redface.gif :-# :# :o# :$ :-$ :o$
-rolleyes.gif 9_9 ^o) ^-)
-sad.gif :( :-( :o( :-< :-{
-surprised.gif :o :O :-o :-O :!?!: :?!?:
-wink.gif ;-) ;) ;o) *_- o_- -_o
\ No newline at end of file
Copied: trunk/themes/phoenity/smileys/theme.txt (from rev 985, trunk/themes/phoenity/smileys/theme)
===================================================================
--- trunk/themes/phoenity/smileys/theme.txt (rev 0)
+++ trunk/themes/phoenity/smileys/theme.txt 2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,23 @@
+smile.gif :-) :) :} ^_^
+alien.gif o) o-) O) O-) O> o>
+evil.gif >(
+arrow.gif => -> --> ==> >>>
+confused.gif :S :s :-S :-s :/ :-/ :\ :-\
+cool.gif 8) 8-) B) B-) o-o O-O 0-0
+cry.gif :'( :"(
+dizzy.gif O_o o_O Oo oO
+eek.gif O_O o_o 0.0 O.O OO 00 o.o
+angry.gif :-@ :@
+exclam.gif (!) [!] :!:
+idea.gif *)
+laugh.gif :-D :D
+lol.gif :lol:
+mrgreen.gif :green: +o( +( +-(
+normal.gif :| :-| |-: |: :o|
+question.gif :? :-? :o? [?] (?) :?:
+razz.gif :{} :-{} :razz:
+redface.gif :-# :# :o# :$ :-$ :o$
+rolleyes.gif 9_9 ^o) ^-)
+sad.gif :( :-( :o( :-< :-{
+surprised.gif :o :O :-o :-O :!?!: :?!?:
+wink.gif ;-) ;) ;o) *_- o_- -_o
\ No newline at end of file
Deleted: trunk/themes/phpbb2/smileys/theme
===================================================================
--- trunk/themes/phpbb2/smileys/theme 2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/themes/phpbb2/smileys/theme 2007-03-08 14:27:07 UTC (rev 988)
@@ -1,37 +0,0 @@
-icon_biggrin.gif :-D :grin: :D
-icon_smile.gif :smile: :-) :)
-icon_sad.gif :( :-( :sad:
-icon_surprised.gif :o :-o :eek:
-icon_eek.gif :shock:
-icon_confused.gif :-?
-icon_cool.gif :cool: 8) 8-)
-icon_lol.gif :lol:
-icon_mad.gif :x :-x :mad:
-icon_razz.gif :P :-P :razz:
-icon_redface.gif <oops>
-icon_cry.gif :cry:
-icon_evil.gif :evil:
-icon_twisted.gif :twisted:
-icon_rolleyes.gif :roll:
-icon_wink.gif :wink: ;) ;-)
-icon_exclaim.gif :!:
-icon_question.gif :?:
-icon_idea.gif :idea:
-icon_arrow.gif :arrow:
-icon_neutral.gif :| :-| :neutral:
-icon_mrgreen.gif :mrgreen:
-eusa_liar.gif :---) :^o
-eusa_clap.gif =D<
-eusa_doh.gif #-o
-eusa_drool.gif =P~
-eusa_hand.gif =;
-eusa_sick.gif :-&
-eusa_boohoo.gif :boohoo:
-eusa_dance.gif \\:D/
-eusa_silenced.gif :-#
-eusa_whistle.gif :-"
-eusa_wall.gif ](*,)
-eusa_think.gif :-k
-eusa_shifty.gif 8-[
-eusa_pray.gif [-o>
-eusa_naughty.gif [-X
\ No newline at end of file
Copied: trunk/themes/phpbb2/smileys/theme.txt (from rev 985, trunk/themes/phpbb2/smileys/theme)
===================================================================
--- trunk/themes/phpbb2/smileys/theme.txt (rev 0)
+++ trunk/themes/phpbb2/smileys/theme.txt 2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1,37 @@
+icon_biggrin.gif :-D :grin: :D
+icon_smile.gif :smile: :-) :)
+icon_sad.gif :( :-( :sad:
+icon_surprised.gif :o :-o :eek:
+icon_eek.gif :shock:
+icon_confused.gif :-?
+icon_cool.gif :cool: 8) 8-)
+icon_lol.gif :lol:
+icon_mad.gif :x :-x :mad:
+icon_razz.gif :P :-P :razz:
+icon_redface.gif <oops>
+icon_cry.gif :cry:
+icon_evil.gif :evil:
+icon_twisted.gif :twisted:
+icon_rolleyes.gif :roll:
+icon_wink.gif :wink: ;) ;-)
+icon_exclaim.gif :!:
+icon_question.gif :?:
+icon_idea.gif :idea:
+icon_arrow.gif :arrow:
+icon_neutral.gif :| :-| :neutral:
+icon_mrgreen.gif :mrgreen:
+eusa_liar.gif :---) :^o
+eusa_clap.gif =D<
+eusa_doh.gif #-o
+eusa_drool.gif =P~
+eusa_hand.gif =;
+eusa_sick.gif :-&
+eusa_boohoo.gif :boohoo:
+eusa_dance.gif \\:D/
+eusa_silenced.gif :-#
+eusa_whistle.gif :-"
+eusa_wall.gif ](*,)
+eusa_think.gif :-k
+eusa_shifty.gif 8-[
+eusa_pray.gif [-o>
+eusa_naughty.gif [-X
\ No newline at end of file
Deleted: trunk/version
===================================================================
--- trunk/version 2007-03-08 14:16:59 UTC (rev 987)
+++ trunk/version 2007-03-08 14:27:07 UTC (rev 988)
@@ -1 +0,0 @@
-1.0-beta9
\ No newline at end of file
Copied: trunk/version.txt (from rev 985, trunk/version)
===================================================================
--- trunk/version.txt (rev 0)
+++ trunk/version.txt 2007-03-08 14:27:07 UTC (rev 988)
@@ -0,0 +1 @@
+1.0-beta9
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-03-08 14:53:46
|
Revision: 992
http://svn.sourceforge.net/phpfreechat/?rev=992&view=rev
Author: kerphi
Date: 2007-03-08 06:53:41 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
New Norwegian Nynorsk translation (thanks to Yngve Spjeld Landro)
Modified Paths:
--------------
trunk/demo/index.php
trunk/src/pfci18n.class.php
Added Paths:
-----------
trunk/demo/demo59_in_norwegian_nynorsk.php
trunk/i18n/nn_NO/
trunk/i18n/nn_NO/main.php
Added: trunk/demo/demo59_in_norwegian_nynorsk.php
===================================================================
--- trunk/demo/demo59_in_norwegian_nynorsk.php (rev 0)
+++ trunk/demo/demo59_in_norwegian_nynorsk.php 2007-03-08 14:53:41 UTC (rev 992)
@@ -0,0 +1,36 @@
+<?php
+
+require_once dirname(__FILE__)."/../src/phpfreechat.class.php";
+
+$params["serverid"] = md5(__FILE__); // calculate a unique id for this chat
+$params["language"] = "nn_NO";
+$chat = new phpFreeChat( $params );
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <title>phpFreeChat demo</title>
+
+ <?php $chat->printJavascript(); ?>
+ <?php $chat->printStyle(); ?>
+
+ </head>
+
+ <body>
+ <?php $chat->printChat(); ?>
+
+<?php
+ // print the current file
+ echo "<h2>The source code</h2>";
+ $filename = __FILE__;
+ echo "<p><code>".$filename."</code></p>";
+ echo "<pre style=\"margin: 0 50px 0 50px; padding: 10px; background-color: #DDD;\">";
+ $content = file_get_contents($filename);
+ echo htmlentities($content);
+ echo "</pre>";
+?>
+
+ </body>
+</html>
Modified: trunk/demo/index.php
===================================================================
--- trunk/demo/index.php 2007-03-08 14:47:32 UTC (rev 991)
+++ trunk/demo/index.php 2007-03-08 14:53:41 UTC (rev 992)
@@ -124,6 +124,7 @@
<li><a href="demo56_in_romanian.php">demo56 - Romanian translation of the chat</a></li>
<li><a href="demo57_in_korean.php">demo57 - Korean translation of the chat</a></li>
<li><a href="demo58_in_danish.php">demo58 - Danish translation of the chat</a></li>
+ <li><a href="demo59_in_norwegian_nynorsk.php">demo58 - Norwegian Nynorsk translation of the chat</a></li>
</ul>
</div>
Added: trunk/i18n/nn_NO/main.php
===================================================================
--- trunk/i18n/nn_NO/main.php (rev 0)
+++ trunk/i18n/nn_NO/main.php 2007-03-08 14:53:41 UTC (rev 992)
@@ -0,0 +1,384 @@
+<?php
+/**
+ * i18n/nn_NO/main.php
+ *
+ * Copyright © 2006 Stephane Gully <ste...@gm...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+/**
+ * Norwegian (Nynorsk) translation of the messages (utf8 encoded!)
+ *
+ * @author Yngve Spjeld Landro <nynorsk[ at ]strilen.net>
+ */
+
+// line 45 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["My Chat"] = "Praten min";
+
+// line 201 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s not found, %s library can't be found."] = "fann ikkje %s, finn ikkje biblioteksfila %s.";
+
+// line 355 in phpfreechat.class.php
+$GLOBALS["i18n"]["Please enter your nickname"] = "Skriv kallenamnet ditt";
+
+// line 565 in phpfreechat.class.php
+$GLOBALS["i18n"]["Text cannot be empty"] = "Tekststrengen kan ikkje vera tom";
+
+// line 392 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s changes his nickname to %s"] = "%s endrar kallenamnet sitt til %s";
+
+// line 398 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s is connected"] = "%s er tilkopla";
+
+// line 452 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s quit"] = "%s forlét praten";
+
+// line 468 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s disconnected (timeout)"] = "%s fråkopla (tidsavbrot)";
+
+// line 262 in phpfreechat.class.php
+$GLOBALS["i18n"]["Unknown command [%s]"] = "Ukjent kommando [%s]";
+
+// line 149 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist: %s"] = "%s finst ikkje: %s";
+
+// line 180 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["You need %s"] = "Du treng %s";
+
+// line 241 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist, %s library can't be found"] = "%s finst ikkje, finn ikkje biblioteksfila %";
+
+// line 280 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist"] = "%s finst ikkje";
+
+// line 433 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s directory must be specified"] = "ein må oppgje %s-katalogen";
+
+// line 439 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s must be a directory"] = "%s må vera ein filkatalog";
+
+// line 446 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s can't be created"] = "%s kan ikkje lagast";
+
+// line 451 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not writeable"] = "kan ikkje skriva til %s";
+
+// line 496 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not readable"] = "kan ikkje lesa %s";
+
+// line 469 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not a file"] = "%s er ikkje ei fil";
+
+// line 491 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not a directory"] = "%s er ikkje een filkatalog";
+
+// line 23 in chat.html.tpl.php
+$GLOBALS["i18n"]["PHP FREE CHAT [powered by phpFreeChat-%s]"] = "PHP FREE CHAT [driven av phpFreeChat-%s]";
+
+// line 296 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Hide nickname marker"] = "Skjul kallenamnfarge";
+
+// line 304 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Show nickname marker"] = "Vis kallenamnfarge";
+
+// line 389 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Disconnect"] = "Kopla frå";
+
+// line 395 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Connect"] = "Kopla til";
+
+// line 427 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Magnify"] = "Gjer større";
+
+// line 434 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Cut down"] = "Avgrens";
+
+// line 345 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Hide dates and hours"] = "Skjul datoar og timar";
+
+// line 353 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Show dates and hours"] = "Vis datoar og timar";
+
+// line 21 in chat.html.tpl.php
+$GLOBALS["i18n"]["Enter your message here"] = "Skriv meldinga di her";
+
+// line 24 in chat.html.tpl.php
+$GLOBALS["i18n"]["Enter your nickname here"] = "Før opp kallenamnet ditt";
+
+// line 93 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["Error: undefined or obsolete parameter '%s', please correct or remove this parameter"] = "Feil: parameteren '%s' er ikkje definert, eller er forelda. Korriger eller fjern parameteren";
+
+// line 48 in phpfreechattemplate.class.php
+$GLOBALS["i18n"]["%s template could not be found"] = "fann ikkje %s-malen";
+
+// line 512 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["Error: '%s' could not be found, please check your themepath '%s' and your theme '%s' are correct"] = "Feil: Fann ikkje '%s'. Sjå etter om temabana '%s' og temaet ditt '%s' er rette";
+
+// line 33 in chat.html.tpl.php
+$GLOBALS["i18n"]["Bold"] = "Feit";
+
+// line 34 in chat.html.tpl.php
+$GLOBALS["i18n"]["Italics"] = "Kursiv";
+
+// line 35 in chat.html.tpl.php
+$GLOBALS["i18n"]["Underline"] = "Understrek";
+
+// line 36 in chat.html.tpl.php
+$GLOBALS["i18n"]["Delete"] = "Slett";
+
+// line 37 in chat.html.tpl.php
+$GLOBALS["i18n"]["Pre"] = "Pre";
+
+// line 38 in chat.html.tpl.php
+$GLOBALS["i18n"]["Mail"] = "E-post";
+
+// line 39 in chat.html.tpl.php
+$GLOBALS["i18n"]["Color"] = "Farge";
+
+// line 86 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Hide smiley box"] = "Skjul smilefjesvindauge";
+
+// line 87 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Show smiley box"] = "Vis smilefjesvindauge";
+
+// line 88 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Hide online users box"] = "Skjul tilkopla brukarar";
+
+// line 89 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Show online users box"] = "Vis tilkopla brukarar";
+
+// line 75 in pfccommand.class.php
+$GLOBALS["i18n"]["%s must be implemented"] = "%s må vera brukt";
+
+// line 343 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter is mandatory by default use '%s' value"] = "'%s'-parameteren er obligatorisk. Bruk '%s' som standardverdi";
+
+// line 378 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a positive number"] = "Parameteren '%s' må større enn null";
+
+// line 386 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "Parameteren '%s' er ikkje gyldig. Tilgjengelege verdiar er : '%s'";
+
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "Rommet mitt";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "Manglande parameter";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "bortvist frå %s av %s";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "Den bortviste brukaren si ID-liste er:";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "Tom";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "'/unban {id}' vil oppheva bortvisinga av brukaren med ID-en {id}";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all' will unban all the users on this channel"] = "'/unban all' vil oppheva bortvisinga av alle brukarane på denne kanalen";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "%s slutt (tidsavbrot)";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "%s blir med i %s";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "sparka ut frå %s av %s";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "Klarer ikkje senda meldinga - %s er ikkje tilkopla";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "Ingen er blitt bortviste";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "Bortvisinga av %s er oppheva";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "%s brukarar har fått bortvisinga oppheva";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "Du har ikkje lov til å kjøra kommandoen '%s'";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "Kan ikkje bli med i %s fordi du er bortvist";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "Kan ikkje bli med i %s sia tilgangen til kanallista er avgrensa";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "Du har ikkje lov til å endra kallenamnet ditt";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "Send ikkje så mange meldingar. Fløyming blir ikkje godteke";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "Privat melding";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "Lukk denne fana";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "Vil du verkeleg forlata dette rommet?";
+
+// line 169 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["Error: '%s' is a private parameter, you are not allowed to change it"] = "Feil: '%s' er ein privat parameter. Du har ikkje lov til å endra han.";
+
+// line 253 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be an array"] = "'%s'-parameteren må vera ein tabell";
+
+// line 265 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a boolean"] = "'%s'-parameteren må vera boolsk";
+
+// line 271 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a charatere string"] = "'%s'-parameteren må vera ein teiknstreng";
+
+// line 395 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' must be writable"] = "Ein må kunna skriva til '%s'";
+
+// line 425 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' directory doesn't exist"] = "'%s'-katalogen finst ikkje";
+
+// line 544 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["Please correct these errors"] = "Rett desse feila";
+
+// line 21 in pfcinfo.class.php
+$GLOBALS["i18n"]["Error: the cached config file doesn't exists"] = "Feil: den mellomlagra innstillingsfila finst ikkje";
+
+// line 190 in phpfreechat.class.php
+$GLOBALS["i18n"]["Error: the chat cannot be loaded! two possibilities: your browser doesn't support javascript or you didn't setup correctly the server directories rights - don't hesitate to ask some help on the forum"] = "Feil: praten kan ikkje lastast. Det kan vera to grunnar til dette: nettlesaren din støttar ikkje JavaScript, eller det er feil i tilgangsrettane på tenarmappene. Spør om hjelp i forumet";
+
+// line 31 in help.class.php
+$GLOBALS["i18n"]["Here is the command list:"] = "Her er kommandolista:";
+
+// line 63 in identify.class.php
+$GLOBALS["i18n"]["Succesfully identified"] = "Rett identifisert";
+
+// line 68 in identify.class.php
+$GLOBALS["i18n"]["Identification failure"] = "Identifiseringsfeil";
+
+// line 25 in send.class.php
+$GLOBALS["i18n"]["Your must be connected to send a message"] = "Du må vera tilkopla for å kunna senda ei melding";
+
+// line 87 in chat.js.tpl.php
+$GLOBALS["i18n"]["Click here to send your message"] = "Klikk her for å senda meldinga di";
+
+// line 80 in chat.js.tpl.php
+$GLOBALS["i18n"]["Enter the text to format"] = "Skriv inn teksten som skal formaterast";
+
+// line 81 in chat.js.tpl.php
+$GLOBALS["i18n"]["Configuration has been rehashed"] = "Innstillingane er blitt oppdatert";
+
+// line 82 in chat.js.tpl.php
+$GLOBALS["i18n"]["A problem occurs during rehash"] = "Det oppstod eit problem under oppdateringa";
+
+// line 83 in chat.js.tpl.php
+$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Kallenamnet er allereie i bruk";
+
+// line 84 in chat.js.tpl.php
+$GLOBALS["i18n"]["phpfreechat current version is %s"] = "Gjeldande versjon av phpfreechat er %s";
+
+// line 85 in chat.js.tpl.php
+$GLOBALS["i18n"]["Maximum number of joined channels has been reached"] = "Har nådd grensa for tilkopla kanalar";
+
+// line 86 in chat.js.tpl.php
+$GLOBALS["i18n"]["Maximum number of private chat has been reached"] = "Har nådd grensa for private samtaler";
+
+// line 88 in chat.js.tpl.php
+$GLOBALS["i18n"]["Send"] = "Send";
+
+// line 86 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: connect error"] = "Mysql container: tilkoplingsfeil";
+
+// line 101 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "Mysql container: databaseopprettingsfeil '%s'";
+
+// line 112 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "Mysql container: tabellopprettingsfeil '%s'";
+
+// line 80 in chat.js.tpl.php
+$GLOBALS["i18n"]["You are not allowed to speak to yourself"] = "Du kan ikkje tala med deg sjølv";
+
+// line 82 in chat.js.tpl.php
+$GLOBALS["i18n"]["Choosen nickname is not allowed"] = "Du har ikkje lov til ta det valde kallenamnet";
+
+// line 83 in chat.js.tpl.php
+$GLOBALS["i18n"]["Enable sound notifications"] = "Bruk meldingslydar";
+
+// line 84 in chat.js.tpl.php
+$GLOBALS["i18n"]["Disable sound notifications"] = "Slå av meldingslydar";
+
+// line 23 in kick.class.php
+$GLOBALS["i18n"]["no reason"] = "utan grunn";
+
+// line 24 in banlist.class.php
+$GLOBALS["i18n"]["The banished user list is:"] = "Bortvistbrukarlista er:";
+
+// line 39 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "'/unban {kallenamn}' vil oppheva bortvisinga av brukaren med {kallenamn}";
+
+// line 43 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "sparka ut frå %s av %s. Årsak: %s";
+
+// line 20 in quit.class.php
+$GLOBALS["i18n"]["%s quit (%s)"] = "%s avslutta (%s)";
+
+// line 124 in chat.js.tpl.php
+$GLOBALS["i18n"]["Chat loading ..."] = "Lastar praten …";
+
+// line 124 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please wait"] = "Vent";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "%s er anten ikkje i bruk eller er ikkje støtta av nettlesaren din.";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["This web application requires %s to work properly."] = "Denne nettapplikasjonen treng %s for å kunna brukast skikkeleg.";
+
+// line 135 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "Slå på %s i nettlesarinnstillingane, eller oppgrader til ein nettlesar med støtte for %s og prøv igjen.";
+
+// line 137 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "Oppgrader til ein nettlesar med støtte for %s og prøv igjen.";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "I Internet Explorer-utgåvene før 7.0 var Ajax teken i bruk gjennom ActiveX. Slå på ActiveX i nettlesaren din, eller oppgrader til ein nettlesar med Ajax-støtte og prøv igjen.";
+
+// line 359 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "%s finst ikkje. Klarer ikkje installera data_public_path";
+
+// line 73 in invite.class.php
+$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "Du må vera med i %s for å kunna invitera brukarar til kanalen";
+
+// line 47 in chat.html.tpl.php
+$GLOBALS["i18n"]["Ping"] = "Ping";
+
+// line 477 in phpfreechat.class.php
+$GLOBALS["i18n"]["Input Required"] = "Inndata er påkravd";
+
+// line 478 in phpfreechat.class.php
+$GLOBALS["i18n"]["OK"] = "OK";
+
+// line 479 in phpfreechat.class.php
+$GLOBALS["i18n"]["Cancel"] = "Avbryt";
+
+?>
Modified: trunk/src/pfci18n.class.php
===================================================================
--- trunk/src/pfci18n.class.php 2007-03-08 14:47:32 UTC (rev 991)
+++ trunk/src/pfci18n.class.php 2007-03-08 14:53:41 UTC (rev 992)
@@ -97,7 +97,7 @@
*/
function GetAcceptedLanguage($type="main")
{
- return /*<GetAcceptedLanguage>*/array('ar_LB','sv_SE','ja_JP','ba_BA','pt_PT','el_GR','tr_TR','hy_AM','nb_NO','zh_TW','ru_RU','fr_FR','es_ES','bg_BG','zh_CN','nl_NL','de_DE-informal','pl_PL','pt_BR','it_IT','id_ID','hu_HU','en_US','sr_CS','de_DE-formal','eo','bn_BD','uk_UA','uk_RO','ko_KR','da_DK');/*</GetAcceptedLanguage>*/
+ return /*<GetAcceptedLanguage>*/array('ar_LB','sv_SE','ja_JP','ba_BA','pt_PT','el_GR','tr_TR','hy_AM','nb_NO','zh_TW','ru_RU','fr_FR','es_ES','bg_BG','zh_CN','nl_NL','de_DE-informal','pl_PL','pt_BR','it_IT','id_ID','hu_HU','en_US','sr_CS','de_DE-formal','eo','bn_BD','uk_UA','uk_RO','ko_KR','da_DK','nn_NO');/*</GetAcceptedLanguage>*/
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-03-11 12:37:38
|
Revision: 995
http://svn.sourceforge.net/phpfreechat/?rev=995&view=rev
Author: kerphi
Date: 2007-03-11 05:37:38 -0700 (Sun, 11 Mar 2007)
Log Message:
-----------
Bug fix: it was possible to connect with an existing nickname [1h30]
Modified Paths:
--------------
trunk/data/public/js/pfcclient.js
trunk/src/commands/connect.class.php
trunk/src/commands/nick.class.php
trunk/src/proxies/auth.class.php
trunk/src/proxies/censor.class.php
trunk/src/proxies/checknickchange.class.php
trunk/src/proxies/checktimeout.class.php
trunk/src/proxies/lock.class.php
trunk/src/proxies/log.class.php
trunk/src/proxies/noflood.class.php
Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js 2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/data/public/js/pfcclient.js 2007-03-11 12:37:38 UTC (rev 995)
@@ -132,7 +132,7 @@
/**
* Show a popup dialog to ask user to choose a nickname
*/
- askNick: function(nickname)
+ askNick: function(nickname,error_text)
{
// ask to choose a nickname
if (nickname == '' || nickname == undefined) nickname = this.nickname;
@@ -140,7 +140,7 @@
// build a dhtml prompt box
var pfcp = this.getPrompt();//new pfcPrompt($('pfc_container'));
pfcp.callback = function(v) { pfc.askNickResponse(v); }
- pfcp.prompt(this.res.getLabel('Please enter your nickname'), nickname);
+ pfcp.prompt((error_text != undefined ? '<span style="color:red">'+error_text+'</span><br/>' : '')+this.res.getLabel('Please enter your nickname'), nickname);
pfcp.focus();
},
askNickResponse: function(newnick)
@@ -389,7 +389,7 @@
else if (resp == "isused")
{
this.setError(this.res.getLabel('Choosen nickname is allready used'), Array());
- this.askNick(param);
+ this.askNick(param,this.res.getLabel('Choosen nickname is allready used'));
}
else if (resp == "notallowed")
{
Modified: trunk/src/commands/connect.class.php
===================================================================
--- trunk/src/commands/connect.class.php 2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/commands/connect.class.php 2007-03-11 12:37:38 UTC (rev 995)
@@ -79,10 +79,6 @@
// create the nickid
$ct->joinChan($nickid, NULL); // join the server
- $ct->createNick($nickid, $nick);
-
- $u->nick = $nick;
- $u->saveInCache();
// setup the active flag in user session
// $u->active = true;
@@ -98,8 +94,20 @@
foreach($c->nickmeta as $k => $v)
$ct->setUserMeta($nickid, $k, $v);
- // connect to the server
- $xml_reponse->script("pfc.handleResponse('connect', 'ok', Array('".addslashes($nick)."'));");
+ // run the /nick command to assign the user nick
+ $cmdp = array();
+ $cmdp["param"] = $nick;
+ $cmd =& pfcCommand::Factory('nick');
+ $ret = $cmd->run($xml_reponse, $cmdp);
+
+ if ($ret)
+ {
+ $xml_reponse->script("pfc.handleResponse('".$this->name."', 'ok', Array('".addslashes($nick)."'));");
+ }
+ else
+ {
+ $xml_reponse->script("pfc.handleResponse('".$this->name."', 'ko', Array('".addslashes($nick)."'));");
+ }
}
}
Modified: trunk/src/commands/nick.class.php
===================================================================
--- trunk/src/commands/nick.class.php 2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/commands/nick.class.php 2007-03-11 12:37:38 UTC (rev 995)
@@ -18,7 +18,7 @@
$u =& pfcUserConfig::Instance();
$ct =& pfcContainer::Instance();
- if (trim($param) == "")
+ if (trim($param) == '')
{
// error
$cmdp = $p;
@@ -26,7 +26,7 @@
$cmdp["param"] .= " (".$this->usage.")";
$cmd =& pfcCommand::Factory("error");
$cmd->run($xml_reponse, $cmdp);
- return;
+ return false;
}
$newnick = phpFreeChat::FilterNickname($param);
@@ -41,8 +41,7 @@
// current nickname (oldnick) is mine and
// oldnick is different from new nick
// -> this is a nickname change
- if ($oldnickid == $u->nickid &&
- $oldnick != $newnick &&
+ if ($oldnick != $newnick &&
$oldnick != '')
{
// really change the nick (rename it)
@@ -69,35 +68,28 @@
$cmd->run($xml_reponse, $cmdp);
}
$xml_reponse->script("pfc.handleResponse('nick', 'changed', '".addslashes($newnick)."');");
- return;
+ return true;
}
- /*
- // new nickname is undefined (not used) and
- // current nickname (oldnick) is not mine or is undefined
- // -> this is a first connection
- if ($newnickid == '' &&
- $oldnickid != $u->nickid)
+ // new nickname is undefined (not used)
+ // -> this is a first connection (this piece of code is called by /connect command)
+ if ($newnickid == '')
{
// this is a first connection : create the nickname on the server
- // $container->createNick(NULL, $newnick, $u->nickid);
- $container->createNick($u->nickid, $newnick);
-
- //$u->nick = $newnick;
- // $u->active = true;
- //$u->saveInCache();
+ $ct->createNick($u->nickid, $newnick);
+ $u->nick = $nick;
+ $u->saveInCache();
+
$this->forceWhoisReload($u->nickid);
$xml_reponse->script("pfc.handleResponse('nick', 'connected', '".addslashes($newnick)."');");
if ($c->debug)
pxlog("/nick ".$newnick." (first connection, oldnick=".$oldnick.")", "chat", $c->getId());
- return;
+ return true;
}
- */
- // $ct->createNick($u->nickid, $newnick);
-
+ return false;
}
}
Modified: trunk/src/proxies/auth.class.php
===================================================================
--- trunk/src/proxies/auth.class.php 2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/auth.class.php 2007-03-11 12:37:38 UTC (rev 995)
@@ -51,7 +51,7 @@
$cmdp["param"] = _pfc("Your must be connected to send a message");
$cmd =& pfcCommand::Factory("error");
$cmd->run($xml_reponse, $cmdp);
- return;
+ return false;
}
@@ -65,7 +65,7 @@
if (!$isadmin)
{
$xml_reponse->script("alert('".addslashes(_pfc("You are not allowed to run '%s' command", $this->name))."');");
- return;
+ return false;
}
}
@@ -87,7 +87,7 @@
// the user is banished, show a message and don't forward the /join command
$msg = _pfc("Can't join %s because you are banished", $param);
$xml_reponse->script("pfc.handleResponse('".$this->proxyname."', 'ban', '".addslashes($msg)."');");
- return;
+ return false;
}
if (count($c->frozen_channels)>0)
@@ -97,7 +97,7 @@
// the user is banished, show a message and don't forward the /join command
$msg = _pfc("Can't join %s because the channels list is restricted", $param);
$xml_reponse->script("pfc.handleResponse('".$this->proxyname."', 'frozen', '".addslashes($msg)."');");
- return;
+ return false;
}
}
}
@@ -108,7 +108,7 @@
$p["sender"] = $sender;
$p["recipient"] = $recipient;
$p["recipientid"] = $recipientid;
- $this->next->run($xml_reponse, $p);
+ return $this->next->run($xml_reponse, $p);
}
}
Modified: trunk/src/proxies/censor.class.php
===================================================================
--- trunk/src/proxies/censor.class.php 2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/censor.class.php 2007-03-11 12:37:38 UTC (rev 995)
@@ -74,7 +74,7 @@
$p["sender"] = $sender;
$p["recipient"] = $recipient;
$p["recipientid"] = $recipientid;
- $this->next->run($xml_reponse, $p);
+ return $this->next->run($xml_reponse, $p);
}
}
Modified: trunk/src/proxies/checknickchange.class.php
===================================================================
--- trunk/src/proxies/checknickchange.class.php 2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/checknickchange.class.php 2007-03-11 12:37:38 UTC (rev 995)
@@ -58,7 +58,7 @@
{
$msg = _pfc("You are not allowed to change your nickname");
$xml_reponse->script("pfc.handleResponse('".$this->proxyname."', 'nick', '".addslashes($msg)."');");
- return;
+ return false;
}
$newnickid = $ct->getNickId($newnick);
@@ -70,7 +70,7 @@
$xml_reponse->script("pfc.handleResponse('".$this->name."', 'notchanged', '".addslashes($newnick)."');");
if ($c->debug)
pxlog("/nick ".$newnick." (user just reloded the page so let him keep his nickname without any warnings)", "chat", $c->getId());
- return;
+ return true;
}
// now check the nickname is not yet used (unsensitive case)
@@ -84,7 +84,7 @@
$xml_reponse->script("pfc.handleResponse('nick', 'isused', '".addslashes($newnick)."');");
if ($c->debug)
pxlog("/nick ".$newnick." (wanted nick is allready in use -> wantednickid=".$newnickid.")", "chat", $c->getId());
- return;
+ return false;
}
}
@@ -100,12 +100,11 @@
$cmdp["param"] = $c->nick;
$cmdp["owner"] = $this->proxyname;
$cmd =& pfcCommand::Factory("nick");
- $cmd->run($xml_reponse, $cmdp);
- return;
+ return $cmd->run($xml_reponse, $cmdp);
}
// forward the command to the next proxy or to the final command
- $this->next->run($xml_reponse, $p);
+ return $this->next->run($xml_reponse, $p);
}
function _checkNickIsUsed($newnick, $oldnickid)
Modified: trunk/src/proxies/checktimeout.class.php
===================================================================
--- trunk/src/proxies/checktimeout.class.php 2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/checktimeout.class.php 2007-03-11 12:37:38 UTC (rev 995)
@@ -70,7 +70,7 @@
}
// forward the command to the next proxy or to the final command
- $this->next->run($xml_reponse, $p);
+ return $this->next->run($xml_reponse, $p);
}
}
Modified: trunk/src/proxies/lock.class.php
===================================================================
--- trunk/src/proxies/lock.class.php 2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/lock.class.php 2007-03-11 12:37:38 UTC (rev 995)
@@ -45,6 +45,7 @@
if ($c->islocked)
{
$xml_reponse->addRedirect($c->lockurl);
+ return false;
}
else
{
@@ -54,7 +55,7 @@
$p["sender"] = $sender;
$p["recipient"] = $recipient;
$p["recipientid"] = $recipientid;
- $this->next->run($xml_reponse, $p);
+ return $this->next->run($xml_reponse, $p);
}
}
}
Modified: trunk/src/proxies/log.class.php
===================================================================
--- trunk/src/proxies/log.class.php 2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/log.class.php 2007-03-11 12:37:38 UTC (rev 995)
@@ -69,7 +69,7 @@
}
// forward the command to the next proxy or to the final command
- $this->next->run($xml_reponse, $p);
+ return $this->next->run($xml_reponse, $p);
}
}
Modified: trunk/src/proxies/noflood.class.php
===================================================================
--- trunk/src/proxies/noflood.class.php 2007-03-10 11:30:38 UTC (rev 994)
+++ trunk/src/proxies/noflood.class.php 2007-03-11 12:37:38 UTC (rev 995)
@@ -81,7 +81,7 @@
$cmdp["param"] .=_pfc("kicked from %s by %s", $u->channels[$recipientid]["name"], "noflood");
$cmd =& pfcCommand::Factory("leave");
$cmd->run($xml_reponse, $cmdp);
- return;
+ return false;
}
if ($flood_nbmsg == 0)
@@ -96,7 +96,7 @@
$p["sender"] = $sender;
$p["recipient"] = $recipient;
$p["recipientid"] = $recipientid;
- $this->next->run($xml_reponse, $p);
+ return $this->next->run($xml_reponse, $p);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-03-19 19:23:26
|
Revision: 1002
http://svn.sourceforge.net/phpfreechat/?rev=1002&view=rev
Author: kerphi
Date: 2007-03-19 12:23:11 -0700 (Mon, 19 Mar 2007)
Log Message:
-----------
[en] Tidy up the whois box elements [1h00]
[fr] R?\195?\169ordonne les elements de la boite d'info whois [1h00]
Modified Paths:
--------------
trunk/data/public/js/pfcclient.js
trunk/themes/default/images/close-whoisbox.gif
trunk/themes/default/style.css.php
Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js 2007-03-16 08:14:25 UTC (rev 1001)
+++ trunk/data/public/js/pfcclient.js 2007-03-19 19:23:11 UTC (rev 1002)
@@ -1049,72 +1049,43 @@
updateNickWhoisBox: function(nickid)
{
+ var usermeta = this.getAllUserMeta(nickid);
+
var div = document.createElement('div');
div.setAttribute('class', 'pfc_nickwhois');
div.setAttribute('className', 'pfc_nickwhois'); // for IE6
- var ul = document.createElement('ul');
- div.appendChild(ul);
+ var p = document.createElement('p');
+ p.setAttribute('class', 'pfc_nickwhois_header');
+ p.setAttribute('className', 'pfc_nickwhois_header'); // for IE6
+ div.appendChild(p);
// add the close button
- var li = document.createElement('li');
- li.setAttribute('class', 'pfc_nickwhois_close');
- li.setAttribute('className', 'pfc_nickwhois_close'); // for IE6
- ul.appendChild(li);
- var a = document.createElement('a');
- a.setAttribute('href', '');
- a.pfc_parent = div;
- a.onclick = function(evt){
+ var img = document.createElement('img');
+ img.setAttribute('class', 'pfc_nickwhois_close');
+ img.setAttribute('className', 'pfc_nickwhois_close'); // for IE6
+ img.pfc_parent = div;
+ img.onclick = function(evt){
this.pfc_parent.style.display = 'none';
return false;
}
- var img = document.createElement('img');
img.setAttribute('src', this.res.getFileUrl('images/close-whoisbox.gif'));
- img.alt = document.createTextNode(this.res.getLabel('Close'));
- a.appendChild(img);
- li.appendChild(a);
+ img.alt = this.res.getLabel('Close');
+ p.appendChild(img);
+ p.appendChild(document.createTextNode(usermeta['nick'])); // append the nickname text in the title
- // add the privmsg link (do not add it if this button is yourself)
- if (pfc.getUserMeta(nickid,'nick') != this.nickname)
- {
- var li = document.createElement('li');
- li.setAttribute('class', 'pfc_nickwhois_pv');
- li.setAttribute('className', 'pfc_nickwhois_pv'); // for IE6
- ul.appendChild(li);
- var a = document.createElement('a');
- a.setAttribute('href', '');
- a.pfc_nickid = nickid;
- a.pfc_parent = div;
- a.onclick = function(evt){
- var nick = pfc.getUserMeta(this.pfc_nickid,'nick');
- pfc.sendRequest('/privmsg "'+nick+'"');
- this.pfc_parent.style.display = 'none';
- return false;
- }
- var img = document.createElement('img');
- img.setAttribute('src', this.res.getFileUrl('images/openpv.gif'));
- img.alt = document.createTextNode(this.res.getLabel('Private message'));
- a.appendChild(img);
- a.appendChild(document.createTextNode(this.res.getLabel('Private message')));
- li.appendChild(a);
- }
-
-
// add the whois information table
var table = document.createElement('table');
-// table.setAttribute('cellspacing',0);
-// table.setAttribute('cellpadding',0);
-// table.setAttribute('border',0);
var tbody = document.createElement('tbody');
table.appendChild(tbody);
- var um = this.getAllUserMeta(nickid);
- var um_keys = um.keys();
+ var um_keys = usermeta.keys();
var msg = '';
for (var i=0; i<um_keys.length; i++)
{
var k = um_keys[i];
- var v = um[k];
+ var v = usermeta[k];
if (v && k != 'nickid'
+ && k != 'nick' // useless because it is displayed in the box title
&& k != 'isadmin' // useless because of the gold shield icon
&& k != 'floodtime'
&& k != 'flood_nbmsg'
@@ -1137,6 +1108,31 @@
}
div.appendChild(table);
+ // add the privmsg link (do not add it if this button is yourself)
+ if (pfc.getUserMeta(nickid,'nick') != this.nickname)
+ {
+ var p = document.createElement('p');
+ p.setAttribute('class', 'pfc_nickwhois_pv');
+ p.setAttribute('className', 'pfc_nickwhois_pv'); // for IE6
+ var a = document.createElement('a');
+ a.setAttribute('href', '');
+ a.pfc_nickid = nickid;
+ a.pfc_parent = div;
+ a.onclick = function(evt){
+ var nick = pfc.getUserMeta(this.pfc_nickid,'nick');
+ pfc.sendRequest('/privmsg "'+nick+'"');
+ this.pfc_parent.style.display = 'none';
+ return false;
+ }
+ var img = document.createElement('img');
+ img.setAttribute('src', this.res.getFileUrl('images/openpv.gif'));
+ img.alt = document.createTextNode(this.res.getLabel('Private message'));
+ a.appendChild(img);
+ a.appendChild(document.createTextNode(this.res.getLabel('Private message')));
+ p.appendChild(a);
+ div.appendChild(p);
+ }
+
this.nickwhoisbox[nickid] = div;
},
@@ -1158,8 +1154,8 @@
d.style.display = 'block';
d.style.zIndex = '400';
d.style.position = 'absolute';
- d.style.left = (mousePosX(evt)-5)+'px';
- d.style.top = (mousePosY(evt)-5)+'px';
+ d.style.left = (mousePosX(evt)-7)+'px';
+ d.style.top = (mousePosY(evt)-7)+'px';
return false;
}
li.appendChild(a);
Modified: trunk/themes/default/images/close-whoisbox.gif
===================================================================
(Binary files differ)
Modified: trunk/themes/default/style.css.php
===================================================================
--- trunk/themes/default/style.css.php 2007-03-16 08:14:25 UTC (rev 1001)
+++ trunk/themes/default/style.css.php 2007-03-19 19:23:11 UTC (rev 1002)
@@ -351,31 +351,35 @@
vertical-align: middle;
}
-div.pfc_nickwhois * { padding: 0; margin: 0; }
+div.pfc_nickwhois { padding: 0; margin: 0; }
div.pfc_nickwhois a img { border: none; }
div.pfc_nickwhois {
border: 1px solid #444;
background-color: #FFF;
font-size: 75%;
}
-div.pfc_nickwhois ul {
- list-style-type: none;
+.pfc_nickwhois_header {
background-color: #EEE;
border-bottom: 1px solid #444;
+ text-align: center;
+ font-weight: bold;
+ vertical-align: middle;
}
-div.pfc_nickwhois li {
- display: inline;
- margin-right: 4px;
- padding: 2px;
+.pfc_nickwhois_header img {
+ float: left;
+ cursor: pointer;
+ vertical-align: middle;
+ margin: 3px 0 3px 2px;
}
+div.pfc_nickwhois table {
+ width: 120px;
+}
td.pfc_nickwhois_c1 {
font-weight: bold;
}
-li.pfc_nickwhois_pv {
- padding-left: 2px;
- border-left: 1px solid #444;
+td.pfc_nickwhois_c2 {
}
-li.pfc_nickwhois_pv a {
+.pfc_nickwhois_pv a {
text-decoration: none;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-03-25 15:47:50
|
Revision: 1006
http://svn.sourceforge.net/phpfreechat/?rev=1006&view=rev
Author: kerphi
Date: 2007-03-25 08:47:50 -0700 (Sun, 25 Mar 2007)
Log Message:
-----------
improve the non-wanted timeout disconnections managment
Modified Paths:
--------------
trunk/data/public/js/pfcclient.js
trunk/src/commands/connect.class.php
trunk/src/pfcuserconfig.class.php
Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js 2007-03-20 17:28:34 UTC (rev 1005)
+++ trunk/data/public/js/pfcclient.js 2007-03-25 15:47:50 UTC (rev 1006)
@@ -171,72 +171,13 @@
if (cmd == "connect")
{
- //alert(cmd + "-"+resp+"-"+param);
if (resp == "ok")
{
this.nickname = param[0];
this.sendRequest('/nick "'+this.nickname+'"');
-/*
- if (this.nickname == '')
- // ask to choose a nickname
- this.askNick(this.nickname);
- else
- {
- this.sendRequest('/nick "'+this.nickname+'"');
- }
-*/
+
this.isconnected = true;
-/*
- // join the default channels comming from the parameter list
- // and the user's channels comming from the
- var ch = pfc_defaultchan;
- for (var i=0; i<pfc_userchan.length; i++)
- {
- if (indexOf(ch,pfc_userchan[i]) == -1)
- ch.push(pfc_userchan[i]);
- }
-*/
- // join the default channels comming from the parameter list
- if (pfc_userchan.length == 0)
- for (var i=0; i<pfc_defaultchan.length; i++)
- {
- if (i<pfc_defaultchan.length-1)
- cmd = '/join2';
- else
- cmd = '/join';
- cmd += ' "'+pfc_defaultchan[i]+'"';
- this.sendRequest(cmd);
- }
- else
- // join channels comming from user sessions
- for (var i=0; i<pfc_userchan.length; i++)
- {
- if (i<pfc_userchan.length-1)
- cmd = '/join2';
- else
- cmd = '/join';
- cmd += ' "'+pfc_userchan[i]+'"';
- this.sendRequest(cmd);
- }
-
- // join the default privmsg comming from the parameter list
- for (var i=0; i<pfc_defaultprivmsg.length; i++)
- {
- if (i<pfc_defaultprivmsg.length-1)
- cmd = '/privmsg2';
- else
- cmd = '/privmsg';
- cmd += ' "'+pfc_defaultprivmsg[i]+'"';
- this.sendRequest(cmd);
- }
- // now join privmsg comming from the sessions
- for (var i=0; i<pfc_userprivmsg.length; i++)
- {
- this.sendRequest('/privmsg "'+pfc_userprivmsg[i]+'"');
- }
-
-
// start the polling system
this.updateChat(true);
}
@@ -335,45 +276,6 @@
if (resp == "connected" || resp == "notchanged")
{
cmd = '';
-
-/*
- // join the default channels comming from the parameter list
- for (var i=0; i<pfc_defaultchan.length; i++)
- {
- if (i<pfc_defaultchan.length-1)
- cmd = '/join2';
- else
- cmd = '/join';
- cmd += ' "'+pfc_defaultchan[i]+'"';
- this.sendRequest(cmd);
- }
- // now join channels comming from sessions
- for (var i=0; i<pfc_userchan.length; i++)
- {
- if (i<pfc_userchan.length-1)
- cmd = '/join2';
- else
- cmd = '/join';
- cmd += ' "'+pfc_userchan[i]+'"';
- this.sendRequest(cmd);
- }
-
- // join the default privmsg comming from the parameter list
- for (var i=0; i<pfc_defaultprivmsg.length; i++)
- {
- if (i<pfc_defaultprivmsg.length-1)
- cmd = '/privmsg2';
- else
- cmd = '/privmsg';
- cmd += ' "'+pfc_defaultprivmsg[i]+'"';
- this.sendRequest(cmd);
- }
- // now join privmsg comming from the sessions
- for (var i=0; i<pfc_userprivmsg.length; i++)
- {
- this.sendRequest('/privmsg "'+pfc_userprivmsg[i]+'"');
- }
-*/
}
if (resp == "ok" || resp == "notchanged" || resp == "changed" || resp == "connected")
Modified: trunk/src/commands/connect.class.php
===================================================================
--- trunk/src/commands/connect.class.php 2007-03-20 17:28:34 UTC (rev 1005)
+++ trunk/src/commands/connect.class.php 2007-03-25 15:47:50 UTC (rev 1006)
@@ -1,6 +1,6 @@
<?php
-require_once(dirname(__FILE__)."/../pfccommand.class.php");
+require_once dirname(__FILE__).'/../pfccommand.class.php';
class pfcCommand_connect extends pfcCommand
{
@@ -64,13 +64,26 @@
$cmdp["param"] = $nick;
$cmd =& pfcCommand::Factory('nick');
$ret = $cmd->run($xml_reponse, $cmdp);
-
if ($ret)
{
- // @todo join the channels if $joinoldchan is true (see /update command code)
- // @todo remove the /join client side in pfcclient.js.php
-
+ $chanlist = (count($u->channels) == 0) ? $c->channels : $u->getChannelNames();
+ for($i = 0 ; $i < count($chanlist) ; $i++)
+ {
+ $cmdp = array();
+ $cmdp["param"] = $chanlist[$i];
+ $cmd =& pfcCommand::Factory( $i < count($chanlist)-1 || !$joinoldchan ? 'join2' : 'join' );
+ $cmd->run($xml_reponse, $cmdp);
+ }
+ $pvlist = (count($u->privmsg) == 0) ? $c->privmsg : $u->getPrivMsgNames();
+ for($i = 0 ; $i < count($pvlist) ; $i++)
+ {
+ $cmdp = array();
+ $cmdp["param"] = $pvlist[$i];
+ $cmd =& pfcCommand::Factory( $i < count($pvlist)-1 || !$joinoldchan ? 'join2' : 'join' );
+ $cmd->run($xml_reponse, $cmdp);
+ }
+
$xml_reponse->script("pfc.handleResponse('".$this->name."', 'ok', Array('".addslashes($nick)."'));");
}
else
Modified: trunk/src/pfcuserconfig.class.php
===================================================================
--- trunk/src/pfcuserconfig.class.php 2007-03-20 17:28:34 UTC (rev 1005)
+++ trunk/src/pfcuserconfig.class.php 2007-03-25 15:47:50 UTC (rev 1006)
@@ -121,6 +121,21 @@
$ct =& pfcContainer::Instance();
return $ct->getNickname($this->nickid);
}
+
+ function getChannelNames()
+ {
+ $list = array();
+ foreach( $this->channels as $v )
+ $list[] = $v["name"];
+ return $list;
+ }
+ function getPrivMsgNames()
+ {
+ $list = array();
+ foreach( $this->privmsg as $v )
+ $list[] = $v["name"];
+ return $list;
+ }
}
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-04-13 11:52:03
|
Revision: 1015
http://svn.sourceforge.net/phpfreechat/?rev=1015&view=rev
Author: kerphi
Date: 2007-04-13 04:42:00 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
[en] Bug fix: the demo50 (usermeta / avatar) was broken [0h25]
[fr] Bug fix?\194?\160: la demo50 (usermeta / avatar) ne fonctionnait pas corretement [0h25]
Modified Paths:
--------------
trunk/demo/demo50_customized_usermetadata.php
trunk/demo/demo50_data/mytheme/customize.js.php
trunk/themes/default/style.css.php
Modified: trunk/demo/demo50_customized_usermetadata.php
===================================================================
--- trunk/demo/demo50_customized_usermetadata.php 2007-04-01 13:10:16 UTC (rev 1014)
+++ trunk/demo/demo50_customized_usermetadata.php 2007-04-13 11:42:00 UTC (rev 1015)
@@ -5,7 +5,7 @@
$params["serverid"] = md5(__FILE__); // calculate a unique id for this chat
$params["title"] = "A chat which shows how to use user metadata : add avatar (images) to each connected users";
$params["nick"] = "guest".rand(1,1000);
-$params["nickmeta"] = array("avatar" => "demo50_data/avatar".rand(1,10).".jpg");
+$params["nickmeta"] = array("avatar" => "demo50_data/avatar".rand(1,9).".jpg");
$params["theme_path"] = dirname(__FILE__)."/demo50_data";
$params["theme"] = "mytheme";
$chat = new phpFreeChat( $params );
Modified: trunk/demo/demo50_data/mytheme/customize.js.php
===================================================================
--- trunk/demo/demo50_data/mytheme/customize.js.php 2007-04-01 13:10:16 UTC (rev 1014)
+++ trunk/demo/demo50_data/mytheme/customize.js.php 2007-04-13 11:42:00 UTC (rev 1015)
@@ -1,71 +1,43 @@
pfcClient.prototype.updateNickWhoisBox = function(nickid)
- {
+{
+ var usermeta = this.getAllUserMeta(nickid);
+
var div = document.createElement('div');
div.setAttribute('class', 'pfc_nickwhois');
div.setAttribute('className', 'pfc_nickwhois'); // for IE6
- var ul = document.createElement('ul');
- div.appendChild(ul);
+ var p = document.createElement('p');
+ p.setAttribute('class', 'pfc_nickwhois_header');
+ p.setAttribute('className', 'pfc_nickwhois_header'); // for IE6
+ div.appendChild(p);
// add the close button
- var li = document.createElement('li');
- li.setAttribute('class', 'pfc_nickwhois_close');
- li.setAttribute('className', 'pfc_nickwhois_close'); // for IE6
- ul.appendChild(li);
- var a = document.createElement('a');
- a.setAttribute('href', '');
- a.pfc_parent = div;
- a.onclick = function(evt){
+ var img = document.createElement('img');
+ img.setAttribute('class', 'pfc_nickwhois_close');
+ img.setAttribute('className', 'pfc_nickwhois_close'); // for IE6
+ img.pfc_parent = div;
+ img.onclick = function(evt){
this.pfc_parent.style.display = 'none';
return false;
}
- var img = document.createElement('img');
img.setAttribute('src', this.res.getFileUrl('images/close-whoisbox.gif'));
- img.alt = document.createTextNode(this.res.getLabel('Close'));
- a.appendChild(img);
- li.appendChild(a);
+ img.alt = this.res.getLabel('Close');
+ p.appendChild(img);
+ p.appendChild(document.createTextNode(usermeta['nick'])); // append the nickname text in the title
- // add the privmsg link (do not add it if this button is yourself)
- if (pfc.getUserMeta(nickid,'nick') != this.nickname)
- {
- var li = document.createElement('li');
- li.setAttribute('class', 'pfc_nickwhois_pv');
- li.setAttribute('className', 'pfc_nickwhois_pv'); // for IE6
- ul.appendChild(li);
- var a = document.createElement('a');
- a.setAttribute('href', '');
- a.pfc_nickid = nickid;
- a.pfc_parent = div;
- a.onclick = function(evt){
- var nick = pfc.getUserMeta(this.pfc_nickid,'nick');
- pfc.sendRequest('/privmsg "'+nick+'"');
- this.pfc_parent.style.display = 'none';
- return false;
- }
- var img = document.createElement('img');
- img.setAttribute('src', this.res.getFileUrl('images/openpv.gif'));
- img.alt = document.createTextNode(this.res.getLabel('Private message'));
- a.appendChild(img);
- a.appendChild(document.createTextNode(this.res.getLabel('Private message')));
- li.appendChild(a);
- }
-
-
// add the whois information table
var table = document.createElement('table');
-// table.setAttribute('cellspacing',0);
-// table.setAttribute('cellpadding',0);
-// table.setAttribute('border',0);
var tbody = document.createElement('tbody');
table.appendChild(tbody);
- var um = this.getAllUserMeta(nickid);
- var um_keys = um.keys();
+ var um_keys = usermeta.keys();
var msg = '';
for (var i=0; i<um_keys.length; i++)
{
var k = um_keys[i];
- var v = um[k];
+ var v = usermeta[k];
if (v && k != 'nickid'
+ && k != 'nick' // useless because it is displayed in the box title
+ && k != 'isadmin' // useless because of the gold shield icon
&& k != 'floodtime'
&& k != 'flood_nbmsg'
&& k != 'flood_nbchar'
@@ -89,11 +61,39 @@
div.appendChild(table);
// append the avatar image
- var img = document.createElement('img');
- img.setAttribute('src',this.getUserMeta(nickid,'avatar'));
- img.setAttribute('class', 'pfc_nickwhois_avatar');
- img.setAttribute('className', 'pfc_nickwhois_avatar'); // for IE6
- div.appendChild(img);
+ if (this.getUserMeta(nickid,'avatar'))
+ {
+ var img = document.createElement('img');
+ img.setAttribute('src',this.getUserMeta(nickid,'avatar'));
+ img.setAttribute('class', 'pfc_nickwhois_avatar');
+ img.setAttribute('className', 'pfc_nickwhois_avatar'); // for IE6
+ div.appendChild(img);
+ }
+
+ // add the privmsg link (do not add it if this button is yourself)
+ if (pfc.getUserMeta(nickid,'nick') != this.nickname)
+ {
+ var p = document.createElement('p');
+ p.setAttribute('class', 'pfc_nickwhois_pv');
+ p.setAttribute('className', 'pfc_nickwhois_pv'); // for IE6
+ var a = document.createElement('a');
+ a.setAttribute('href', '');
+ a.pfc_nickid = nickid;
+ a.pfc_parent = div;
+ a.onclick = function(evt){
+ var nick = pfc.getUserMeta(this.pfc_nickid,'nick');
+ pfc.sendRequest('/privmsg "'+nick+'"');
+ this.pfc_parent.style.display = 'none';
+ return false;
+ }
+ var img = document.createElement('img');
+ img.setAttribute('src', this.res.getFileUrl('images/openpv.gif'));
+ img.alt = document.createTextNode(this.res.getLabel('Private message'));
+ a.appendChild(img);
+ a.appendChild(document.createTextNode(this.res.getLabel('Private message')));
+ p.appendChild(a);
+ div.appendChild(p);
+ }
- this.nickwhoisbox[nickid] = div;
- }
+ this.nickwhoisbox[nickid] = div;
+}
Modified: trunk/themes/default/style.css.php
===================================================================
--- trunk/themes/default/style.css.php 2007-04-01 13:10:16 UTC (rev 1014)
+++ trunk/themes/default/style.css.php 2007-04-13 11:42:00 UTC (rev 1015)
@@ -359,6 +359,7 @@
font-size: 75%;
}
.pfc_nickwhois_header {
+ margin: 0; padding: 0;
background-color: #EEE;
border-bottom: 1px solid #444;
text-align: center;
@@ -379,6 +380,10 @@
}
td.pfc_nickwhois_c2 {
}
+.pfc_nickwhois_pv {
+ margin:0; padding: 0;
+ text-align: center;
+}
.pfc_nickwhois_pv a {
text-decoration: none;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-04-18 12:17:28
|
Revision: 1018
http://svn.sourceforge.net/phpfreechat/?rev=1018&view=rev
Author: kerphi
Date: 2007-04-18 05:17:25 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
[en] New Vietnamese vi_VN translation (thanks to lvt)
[fr] Nouvelle traduction Vietnamienne (merci ?\195?\160 lvt)
Modified Paths:
--------------
trunk/demo/index.php
trunk/src/pfci18n.class.php
Added Paths:
-----------
trunk/demo/demo60_in_vietnamese.php
trunk/i18n/vi_VN/
trunk/i18n/vi_VN/main.php
Added: trunk/demo/demo60_in_vietnamese.php
===================================================================
--- trunk/demo/demo60_in_vietnamese.php (rev 0)
+++ trunk/demo/demo60_in_vietnamese.php 2007-04-18 12:17:25 UTC (rev 1018)
@@ -0,0 +1,36 @@
+<?php
+
+require_once dirname(__FILE__)."/../src/phpfreechat.class.php";
+
+$params["serverid"] = md5(__FILE__); // calculate a unique id for this chat
+$params["language"] = "vi_VN";
+$chat = new phpFreeChat( $params );
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <title>phpFreeChat demo</title>
+
+ <?php $chat->printJavascript(); ?>
+ <?php $chat->printStyle(); ?>
+
+ </head>
+
+ <body>
+ <?php $chat->printChat(); ?>
+
+<?php
+ // print the current file
+ echo "<h2>The source code</h2>";
+ $filename = __FILE__;
+ echo "<p><code>".$filename."</code></p>";
+ echo "<pre style=\"margin: 0 50px 0 50px; padding: 10px; background-color: #DDD;\">";
+ $content = file_get_contents($filename);
+ echo htmlentities($content);
+ echo "</pre>";
+?>
+
+ </body>
+</html>
Modified: trunk/demo/index.php
===================================================================
--- trunk/demo/index.php 2007-04-17 20:19:40 UTC (rev 1017)
+++ trunk/demo/index.php 2007-04-18 12:17:25 UTC (rev 1018)
@@ -124,7 +124,8 @@
<li><a href="demo56_in_romanian.php">demo56 - Romanian translation of the chat</a></li>
<li><a href="demo57_in_korean.php">demo57 - Korean translation of the chat</a></li>
<li><a href="demo58_in_danish.php">demo58 - Danish translation of the chat</a></li>
- <li><a href="demo59_in_norwegian_nynorsk.php">demo58 - Norwegian Nynorsk translation of the chat</a></li>
+ <li><a href="demo59_in_norwegian_nynorsk.php">demo59 - Norwegian Nynorsk translation of the chat</a></li>
+ <li><a href="demo60_in_vietnamese.php">demo60 - Vietnamese translation of the chat</a></li>
</ul>
</div>
Added: trunk/i18n/vi_VN/main.php
===================================================================
--- trunk/i18n/vi_VN/main.php (rev 0)
+++ trunk/i18n/vi_VN/main.php 2007-04-18 12:17:25 UTC (rev 1018)
@@ -0,0 +1,384 @@
+<?php
+/**
+ * i18n/vi_VN/main.php
+ *
+ * Copyright © 2006 Stephane Gully <ste...@gm...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+/**
+ * Vietnamese translation of the messages (utf8 encoded!)
+ *
+ * @author Jet <mir...@ya...>
+ */
+
+// line 45 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["My Chat"] = "Chat room";
+
+// line 201 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s not found, %s library can't be found."] = "Không tìm thấy %s, không tìm thấy tệp tin %s.";
+
+// line 355 in phpfreechat.class.php
+$GLOBALS["i18n"]["Please enter your nickname"] = "Hãy nhập tên truy cập của bạn vào đây";
+
+// line 565 in phpfreechat.class.php
+$GLOBALS["i18n"]["Text cannot be empty"] = "Tin nhắn không thể bị để trống";
+
+// line 392 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s changes his nickname to %s"] = "%s đã đổi sang tên mới là %s";
+
+// line 398 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s is connected"] = "%s đang vào phòng chat";
+
+// line 452 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s quit"] = "%s ra khỏi phòng chat";
+
+// line 468 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s disconnected (timeout)"] = "%s đã ra khỏi phòng chat (hết thời gian chờ)";
+
+// line 262 in phpfreechat.class.php
+$GLOBALS["i18n"]["Unknown command [%s]"] = "Câu lệnh không phù hợp [%s]";
+
+// line 149 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist: %s"] = "Không tìm thấy %s: %s";
+
+// line 180 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["You need %s"] = "Bạn cần có %s";
+
+// line 241 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist, %s library can't be found"] = "Không tìm thấy %s, không tìm thấy thư viện %s";
+
+// line 280 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist"] = "Không tìm thấy %s";
+
+// line 433 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s directory must be specified"] = "thư mục %s phải được chỉ định";
+
+// line 439 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s must be a directory"] = "%s phải là một thư mục";
+
+// line 446 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s can't be created"] = "Không tạo được %s";
+
+// line 451 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not writeable"] = "Không ghi được %s";
+
+// line 496 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not readable"] = "Không đọc được %s";
+
+// line 469 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not a file"] = "%s không phải là tệp tin";
+
+// line 491 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not a directory"] = "%s không phải là thư mục";
+
+// line 23 in chat.html.tpl.php
+$GLOBALS["i18n"]["PHP FREE CHAT [powered by phpFreeChat-%s]"] = "PHP FREE CHAT [powered by phpFreeChat-%s]";
+
+// line 296 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Hide nickname marker"] = "Ẩn mầu sắc của tên truy cập";
+
+// line 304 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Show nickname marker"] = "Hiện mầu sắc của tên truy cập";
+
+// line 389 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Disconnect"] = "Thoát ra";
+
+// line 395 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Connect"] = "Đăng nhập";
+
+// line 427 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Magnify"] = "Phóng to";
+
+// line 434 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Cut down"] = "Cắt";
+
+// line 345 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Hide dates and hours"] = "Ẩn ngày tháng và thời gian";
+
+// line 353 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Show dates and hours"] = "Hiện ngày tháng và thời gian";
+
+// line 21 in chat.html.tpl.php
+$GLOBALS["i18n"]["Enter your message here"] = "Nhập tin nhắn của bạn vào đây";
+
+// line 24 in chat.html.tpl.php
+$GLOBALS["i18n"]["Enter your nickname here"] = "Nhập tên truy cập của bạn vào đây";
+
+// line 93 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["Error: undefined or obsolete parameter '%s', please correct or remove this parameter"] = "Có lỗi: tham số không xác định hay không cần thiết '%s', hãy chỉnh lại hay lược bỏ tham số này";
+
+// line 86 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Hide smiley box"] = "Ẩn mặt cười";
+
+// line 87 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Show smiley box"] = "Hiện mặt cười";
+
+// line 88 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Hide online users box"] = "Ẩn danh sách người đang chat";
+
+// line 89 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Show online users box"] = "Hiện danh sách người đang chat";
+
+// line 33 in chat.html.tpl.php
+$GLOBALS["i18n"]["Bold"] = "Đậm";
+
+// line 34 in chat.html.tpl.php
+$GLOBALS["i18n"]["Italics"] = "Nghiêng";
+
+// line 35 in chat.html.tpl.php
+$GLOBALS["i18n"]["Underline"] = "Gạch chân";
+
+// line 36 in chat.html.tpl.php
+$GLOBALS["i18n"]["Delete"] = "Xóa";
+
+// line 37 in chat.html.tpl.php
+$GLOBALS["i18n"]["Pre"] = "Pre";
+
+// line 38 in chat.html.tpl.php
+$GLOBALS["i18n"]["Mail"] = "Mail";
+
+// line 39 in chat.html.tpl.php
+$GLOBALS["i18n"]["Color"] = "Mầu sắc";
+
+// line 48 in phpfreechattemplate.class.php
+$GLOBALS["i18n"]["%s template could not be found"] = "Không tìm thấy tệp tin template sau : %s";
+
+// line 512 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["Error: '%s' could not be found, please check your themepath '%s' and your theme '%s' are correct"] = "Có lỗi: không tìm thấy '%s', hãy kiểm tra lại đường dẫn cho '%s' và '%s'";
+
+// line 75 in pfccommand.class.php
+$GLOBALS["i18n"]["%s must be implemented"] = "%s phải được khởi tạo";
+
+
+// line 343 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter is mandatory by default use '%s' value"] = "'%s' là bắt buộc, tham số mặc định là '%s'";
+
+// line 378 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a positive number"] = "'%s' phải là một số thực";
+
+// line 386 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "Giá trị của '%s' không hợp lệ. Những giá trị có thể dùng là: '%s'";
+
+// line 185 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "Chat Room";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "Tin nhắn cá nhân";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "Đóng thẻ này lại";
+
+// line 225 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "Bạn thực sự muốn rời khỏi phòng chat ?";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "Thiếu tham số";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "bị cấm vào %s bởi %s";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "Danh sách những người bị cấm:";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "Trống";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "'/unban {id}' sẽ xóa lệnh cấm cho {id}";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all' will unban all the users on this channel"] = "'/unban all' sẽ xóa lệnh cấm cho tất những người đang ở trong phòng chat này";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "%s rời khỏi phòng (hết thời gian chờ)";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "%s đang vào %s";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "bị đuổi ra khỏi %s bởi %s";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "Không gửi được tin nhắn, %s hiện không có mặt trong phòng chat";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "Không có ai được bỏ lệnh cấm cả";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "%s đã được bỏ lệnh cấm";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "%s người đã được xóa lệnh cấm";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "Bạn không có quyền sử dụng lệnh '%s'";
+
+// line 67 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "Bạn không vào được %s vì bạn đang bị cấm vận";
+
+// line 79 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "Bạn không có quyền thay tên truy cập";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "Không vào được %s vì phòng này nằm trong danh sách bị hạn chế";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "Xin đừng gửi nhiều tin nhắn một lúc như vậy, mọi hành động bị coi là spam sẽ bị xử lý";
+
+// line 169 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["Error: '%s' is a private parameter, you are not allowed to change it"] = "Có lỗi: '%s' là một tham số cố định, bạn không thể thay đổi nó";
+
+// line 253 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be an array"] = "'%s' phải là tham số có dạng xâu (Array)";
+
+// line 265 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a boolean"] = "'%s' phải là tham số dạng Boolean";
+
+// line 271 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a charatere string"] = "'%s' phải là tham số dạng chuỗi ký tự";
+
+// line 395 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' must be writable"] = "'%s' phải cho phép ghi";
+
+// line 425 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' directory doesn't exist"] = "Không tìm được thư mục '%s'";
+
+// line 544 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["Please correct these errors"] = "Hãy kiểm tra lại những lỗi trên";
+
+// line 21 in pfcinfo.class.php
+$GLOBALS["i18n"]["Error: the cached config file doesn't exists"] = "Có lỗi: không tìm thấy tệp đệm của tệp tin điều khiển";
+
+// line 190 in phpfreechat.class.php
+$GLOBALS["i18n"]["Error: the chat cannot be loaded! two possibilities: your browser doesn't support javascript or you didn't setup correctly the server directories rights - don't hesitate to ask some help on the forum"] = "Có lỗi: không khởi động được chức năng chat! Có hai khả năng sau: trình duyệt của bạn không hỗ trợ JavaScript hay bạn chưa set quyền hợp lý cho các thư mục - Xin đừng ngại, bạn có thể đặt câu hỏi trên forum của chúng tôi";
+
+// line 31 in help.class.php
+$GLOBALS["i18n"]["Here is the command list:"] = "Danh sách các lệnh:";
+
+// line 63 in identify.class.php
+$GLOBALS["i18n"]["Succesfully identified"] = "Đăng nhập thành công";
+
+// line 68 in identify.class.php
+$GLOBALS["i18n"]["Identification failure"] = "Không đăng nhập được";
+
+// line 25 in send.class.php
+$GLOBALS["i18n"]["Your must be connected to send a message"] = "Bạn phải đăng nhập để có thể gửi tin nhắn";
+
+// line 87 in chat.js.tpl.php
+$GLOBALS["i18n"]["Click here to send your message"] = "Nhấn vào đây để gửi tin nhắn";
+
+// line 80 in chat.js.tpl.php
+$GLOBALS["i18n"]["Enter the text to format"] = "Nhập văn bản cần định dạng";
+
+// line 81 in chat.js.tpl.php
+$GLOBALS["i18n"]["Configuration has been rehashed"] = "Các thay đổi đã được cập nhật";
+
+// line 82 in chat.js.tpl.php
+$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";
+
+// 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";
+
+// line 85 in chat.js.tpl.php
+$GLOBALS["i18n"]["Maximum number of joined channels has been reached"] = "Số lượng phòng chat bạn truy cập vào đã đạt mức tối đa";
+
+// line 86 in chat.js.tpl.php
+$GLOBALS["i18n"]["Maximum number of private chat has been reached"] = "Số lượng tin nhắn riêng tư đã đạt tới mức tối đa";
+
+// line 88 in chat.js.tpl.php
+$GLOBALS["i18n"]["Send"] = "Gửi đi";
+
+// line 86 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: connect error"] = "Lỗi Mysql: không kết nối được với cơ sở dữ liệu";
+
+// line 101 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "Lỗi Mysql: không tạo được cơ sở dữ liệu '%s'";
+
+// line 112 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "Lỗi Mysql: không tạo được bảng '%s'";
+
+// line 80 in chat.js.tpl.php
+$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";
+
+// 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";
+
+// line 84 in chat.js.tpl.php
+$GLOBALS["i18n"]["Disable sound notifications"] = "Tắt chức năng thông báo bằng âm thanh";
+
+// line 23 in kick.class.php
+$GLOBALS["i18n"]["no reason"] = "không có lý do";
+
+// line 24 in banlist.class.php
+$GLOBALS["i18n"]["The banished user list is:"] = "Danh sách những người bị cấm:";
+
+// line 39 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "'/unban {nickname}' sẽ bỏ lệnh cấm đối với người có tên truy cập {nickname}";
+
+// line 43 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "bị đuổi khỏi %s bởi %s - Lý do: %s";
+
+// line 20 in quit.class.php
+$GLOBALS["i18n"]["%s quit (%s)"] = "%s rời khỏi (%s)";
+
+// line 124 in chat.js.tpl.php
+$GLOBALS["i18n"]["Chat loading ..."] = "Đang nạp thông tin ...";
+
+// line 124 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please wait"] = "Xin chờ một chút";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "%s có thể bị tắt hoặc trình duyệt của bạn không hỗ trợ tính năng này.";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["This web application requires %s to work properly."] = "Ứng dụng này cần có %s để có thể chạy được.";
+
+// line 135 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "Bạn phải bật tính năng hỗ trợ %s cho trình duyệt hoặc cập nhật trình duyệt lên phiên bản có hỗ trợ %s và thử lại.";
+
+// line 137 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "Bạn phải cập nhật trình duyệt lên phiên bản mới nhất có hỗ trợ %s và thử lại.";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "Trình duyệt Internet Explorer cũ hơn 7.0 dùng ActiveX để hỗ trợ Ajax, bạn phải bật ActiveX hay cập nhật lên phiên bản mới nhất";
+
+// line 359 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "Không tìm thấy %s, không cài đặt được data_public_path";
+
+// line 73 in invite.class.php
+$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "Bạn phải vào %s để mời người chat trong phòng";
+
+// line 47 in chat.html.tpl.php
+$GLOBALS["i18n"]["Ping"] = "Ping";
+
+// line 477 in phpfreechat.class.php
+$GLOBALS["i18n"]["Input Required"] = "Bạn chưa nhập thông tin";
+
+// line 478 in phpfreechat.class.php
+$GLOBALS["i18n"]["OK"] = "OK";
+
+// line 479 in phpfreechat.class.php
+$GLOBALS["i18n"]["Cancel"] = "Thôi";
+
+?>
Modified: trunk/src/pfci18n.class.php
===================================================================
--- trunk/src/pfci18n.class.php 2007-04-17 20:19:40 UTC (rev 1017)
+++ trunk/src/pfci18n.class.php 2007-04-18 12:17:25 UTC (rev 1018)
@@ -97,7 +97,7 @@
*/
function GetAcceptedLanguage($type="main")
{
- return /*<GetAcceptedLanguage>*/array('ar_LB','sv_SE','ja_JP','ba_BA','pt_PT','el_GR','tr_TR','hy_AM','nb_NO','zh_TW','ru_RU','fr_FR','es_ES','bg_BG','zh_CN','nl_NL','de_DE-informal','pl_PL','pt_BR','it_IT','id_ID','hu_HU','en_US','sr_CS','de_DE-formal','eo','bn_BD','uk_UA','uk_RO','ko_KR','da_DK','nn_NO');/*</GetAcceptedLanguage>*/
+ return /*<GetAcceptedLanguage>*/array('ar_LB','sv_SE','ja_JP','ba_BA','pt_PT','el_GR','tr_TR','hy_AM','nb_NO','zh_TW','ru_RU','fr_FR','es_ES','bg_BG','zh_CN','nl_NL','de_DE-informal','pl_PL','pt_BR','it_IT','id_ID','hu_HU','en_US','sr_CS','de_DE-formal','eo','bn_BD','uk_UA','uk_RO','ko_KR','da_DK','nn_NO','vi_VN');/*</GetAcceptedLanguage>*/
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-05-20 19:58:47
|
Revision: 1028
http://svn.sourceforge.net/phpfreechat/?rev=1028&view=rev
Author: kerphi
Date: 2007-05-20 12:58:45 -0700 (Sun, 20 May 2007)
Log Message:
-----------
[en] Remove xajax dependencies, pfc only uses prototype js library. [6h45]
[fr] Retire les d?\195?\169pendances avec la lib xajax, pfc n'utilise plus que la lib prototype. [6h45]
[en] Bug fix: CSS selectors separated with comma didn't worked on IE6
[fr] Bug fix : les selecteurs CSS s?\195?\169par?\195?\169s par des virgules ne fonctionnaient pas sous IE6
Modified Paths:
--------------
trunk/data/public/js/createstylerule.js
trunk/data/public/js/myprototype.js
trunk/data/public/js/pfcclient.js
trunk/data/public/js/pfcgui.js
trunk/demo/demo2_simple_with_params.php
trunk/src/commands/redirect.class.php
trunk/src/pfcglobalconfig.class.php
trunk/src/phpfreechat.class.php
trunk/src/proxies/lock.class.php
trunk/themes/default/chat.js.tpl.php
trunk/themes/default/style.css.php
Added Paths:
-----------
trunk/data/public/js/prototype.js
trunk/src/pfcresponse.class.php
Removed Paths:
-------------
trunk/lib/xajax_0.5_beta1/
Modified: trunk/data/public/js/createstylerule.js
===================================================================
--- trunk/data/public/js/createstylerule.js 2007-05-20 10:21:38 UTC (rev 1027)
+++ trunk/data/public/js/createstylerule.js 2007-05-20 19:58:45 UTC (rev 1028)
@@ -24,12 +24,16 @@
applyRule: function(selector, declaration)
{
- if (!this.is_iewin) {
- var styleRule = document.createTextNode(selector + " {" + declaration + "}");
- this.style.appendChild(styleRule); // bugs in IE/Win
+ selector = selector.split(',');
+ for ( var i = 0; i < selector.length; i++)
+ {
+ if (!this.is_iewin) {
+ var styleRule = document.createTextNode(selector[i] + " {" + declaration + "}");
+ this.style.appendChild(styleRule); // bugs in IE/Win
+ }
+ if (this.is_iewin && document.styleSheets && document.styleSheets.length > 0) {
+ this.lastStyle.addRule(selector[i], declaration);
+ }
}
- if (this.is_iewin && document.styleSheets && document.styleSheets.length > 0) {
- this.lastStyle.addRule(selector, declaration);
- }
}
}
\ No newline at end of file
Modified: trunk/data/public/js/myprototype.js
===================================================================
--- trunk/data/public/js/myprototype.js 2007-05-20 10:21:38 UTC (rev 1027)
+++ trunk/data/public/js/myprototype.js 2007-05-20 19:58:45 UTC (rev 1028)
@@ -1,1502 +1,5 @@
-// modified prototype library
-var Prototype = {
- Version: '1.4.0',
- ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)',
- emptyFunction: function() {},
- K: function(x) {return x}
-}
-
-var Class = {
- create: function() {
- return function() {
- this.initialize.apply(this, arguments);
- }
- }
-}
-
-var Abstract = new Object();
-
-Object.extend = function(destination, source) {
- for (property in source) {
- destination[property] = source[property];
- }
- return destination;
-}
-
-Object.inspect = function(object) {
- try {
- if (object == undefined) return 'undefined';
- if (object == null) return 'null';
- return object.inspect ? object.inspect() : object.toString();
- } catch (e) {
- if (e instanceof RangeError) return '...';
- throw e;
- }
-}
-
-Function.prototype.bind = function() {
- var __method = this, args = $A(arguments), object = args.shift();
- return function() {
- return __method.apply(object, args.concat($A(arguments)));
- }
-}
-
-Function.prototype.bindAsEventListener = function(object) {
- var __method = this;
- return function(event) {
- return __method.call(object, event || window.event);
- }
-}
-
-Object.extend(Number.prototype, {
- toColorPart: function() {
- var digits = this.toString(16);
- if (this < 16) return '0' + digits;
- return digits;
- },
-
- succ: function() {
- return this + 1;
- },
-
- times: function(iterator) {
- $R(0, this, true).each(iterator);
- return this;
- }
-});
-
-var Try = {
- these: function() {
- var returnValue;
-
- for (var i = 0; i < arguments.length; i++) {
- var lambda = arguments[i];
- try {
- returnValue = lambda();
- break;
- } catch (e) {}
- }
-
- return returnValue;
- }
-}
-
-/*--------------------------------------------------------------------------*/
-
-var PeriodicalExecuter = Class.create();
-PeriodicalExecuter.prototype = {
- initialize: function(callback, frequency) {
- this.callback = callback;
- this.frequency = frequency;
- this.currentlyExecuting = false;
-
- this.registerCallback();
- },
-
- registerCallback: function() {
- setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
- },
-
- onTimerEvent: function() {
- if (!this.currentlyExecuting) {
- try {
- this.currentlyExecuting = true;
- this.callback();
- } finally {
- this.currentlyExecuting = false;
- }
- }
- }
-}
-
-/*--------------------------------------------------------------------------*/
-
-function $() {
- var elements = new Array();
-
- for (var i = 0; i < arguments.length; i++) {
- var element = arguments[i];
- if (typeof element == 'string')
- element = document.getElementById(element);
-
- if (arguments.length == 1)
- return element;
-
- elements.push(element);
- }
-
- return elements;
-}
-Object.extend(String.prototype, {
- stripTags: function() {
- return this.replace(/<\/?[^>]+>/gi, '');
- },
-
- stripScripts: function() {
- return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
- },
-
- extractScripts: function() {
- var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
- var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
- return (this.match(matchAll) || []).map(function(scriptTag) {
- return (scriptTag.match(matchOne) || ['', ''])[1];
- });
- },
-
- evalScripts: function() {
- return this.extractScripts().map(eval);
- },
-
- escapeHTML: function() {
- var div = document.createElement('div');
- var text = document.createTextNode(this);
- div.appendChild(text);
- return div.innerHTML;
- },
-
- unescapeHTML: function() {
- var div = document.createElement('div');
- div.innerHTML = this.stripTags();
- return div.childNodes[0] ? div.childNodes[0].nodeValue : '';
- },
-
- toQueryParams: function() {
- var pairs = this.match(/^\??(.*)$/)[1].split('&');
- return pairs.inject({}, function(params, pairString) {
- var pair = pairString.split('=');
- params[pair[0]] = pair[1];
- return params;
- });
- },
-
- toArray: function() {
- return this.split('');
- },
-
- camelize: function() {
- var oStringList = this.split('-');
- if (oStringList.length == 1) return oStringList[0];
-
- var camelizedString = this.indexOf('-') == 0
- ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1)
- : oStringList[0];
-
- for (var i = 1, len = oStringList.length; i < len; i++) {
- var s = oStringList[i];
- camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
- }
-
- return camelizedString;
- },
-
- inspect: function() {
- return "'" + this.replace('\\', '\\\\').replace("'", '\\\'') + "'";
- }
-});
-
-String.prototype.parseQuery = String.prototype.toQueryParams;
-
-var $break = new Object();
-var $continue = new Object();
-
-var Enumerable = {
- each: function(iterator) {
- var index = 0;
- try {
- this._each(function(value) {
- try {
- iterator(value, index++);
- } catch (e) {
- if (e != $continue) throw e;
- }
- });
- } catch (e) {
- if (e != $break) throw e;
- }
- },
-
- all: function(iterator) {
- var result = true;
- this.each(function(value, index) {
- result = result && !!(iterator || Prototype.K)(value, index);
- if (!result) throw $break;
- });
- return result;
- },
-
- any: function(iterator) {
- var result = true;
- this.each(function(value, index) {
- if (result = !!(iterator || Prototype.K)(value, index))
- throw $break;
- });
- return result;
- },
-
- collect: function(iterator) {
- var results = [];
- this.each(function(value, index) {
- results.push(iterator(value, index));
- });
- return results;
- },
-
- detect: function (iterator) {
- var result;
- this.each(function(value, index) {
- if (iterator(value, index)) {
- result = value;
- throw $break;
- }
- });
- return result;
- },
-
- findAll: function(iterator) {
- var results = [];
- this.each(function(value, index) {
- if (iterator(value, index))
- results.push(value);
- });
- return results;
- },
-
- grep: function(pattern, iterator) {
- var results = [];
- this.each(function(value, index) {
- var stringValue = value.toString();
- if (stringValue.match(pattern))
- results.push((iterator || Prototype.K)(value, index));
- })
- return results;
- },
-
- include: function(object) {
- var found = false;
- this.each(function(value) {
- if (value == object) {
- found = true;
- throw $break;
- }
- });
- return found;
- },
-
- inject: function(memo, iterator) {
- this.each(function(value, index) {
- memo = iterator(memo, value, index);
- });
- return memo;
- },
-
- invoke: function(method) {
- var args = $A(arguments).slice(1);
- return this.collect(function(value) {
- return value[method].apply(value, args);
- });
- },
-
- max: function(iterator) {
- var result;
- this.each(function(value, index) {
- value = (iterator || Prototype.K)(value, index);
- if (value >= (result || value))
- result = value;
- });
- return result;
- },
-
- min: function(iterator) {
- var result;
- this.each(function(value, index) {
- value = (iterator || Prototype.K)(value, index);
- if (value <= (result || value))
- result = value;
- });
- return result;
- },
-
- partition: function(iterator) {
- var trues = [], falses = [];
- this.each(function(value, index) {
- ((iterator || Prototype.K)(value, index) ?
- trues : falses).push(value);
- });
- return [trues, falses];
- },
-
- pluck: function(property) {
- var results = [];
- this.each(function(value, index) {
- results.push(value[property]);
- });
- return results;
- },
-
- reject: function(iterator) {
- var results = [];
- this.each(function(value, index) {
- if (!iterator(value, index))
- results.push(value);
- });
- return results;
- },
-
- sortBy: function(iterator) {
- return this.collect(function(value, index) {
- return {value: value, criteria: iterator(value, index)};
- }).sort(function(left, right) {
- var a = left.criteria, b = right.criteria;
- return a < b ? -1 : a > b ? 1 : 0;
- }).pluck('value');
- },
-
- toArray: function() {
- return this.collect(Prototype.K);
- },
-
- zip: function() {
- var iterator = Prototype.K, args = $A(arguments);
- if (typeof args.last() == 'function')
- iterator = args.pop();
-
- var collections = [this].concat(args).map($A);
- return this.map(function(value, index) {
- iterator(value = collections.pluck(index));
- return value;
- });
- },
-
- inspect: function() {
- return '#<Enumerable:' + this.toArray().inspect() + '>';
- }
-}
-
-Object.extend(Enumerable, {
- map: Enumerable.collect,
- find: Enumerable.detect,
- select: Enumerable.findAll,
- member: Enumerable.include,
- entries: Enumerable.toArray
- });
-
-var $A = Array.from = function(iterable) {
- if (!iterable) return [];
- if (iterable.toArray) {
- return iterable.toArray();
- } else {
- var results = [];
- for (var i = 0; i < iterable.length; i++)
- results.push(iterable[i]);
- return results;
- }
-}
-
-//Array.prototype._reverse = Array.prototype.reverse;
-
-//Object.extend(Array.prototype, Enumerable);
-/*
-Array.prototype._reverse = Array.prototype.reverse;
-
-
-Object.extend(Array.prototype, {
- _each: function(iterator) {
- for (var i = 0; i < this.length; i++)
- iterator(this[i]);
- },
-
- clear: function() {
- this.length = 0;
- return this;
- },
-
- first: function() {
- return this[0];
- },
-
- last: function() {
- return this[this.length - 1];
- },
-
- compact: function() {
- return this.select(function(value) {
- return value != undefined || value != null;
- });
- },
-
- flatten: function() {
- return this.inject([], function(array, value) {
- return array.concat(value.constructor == Array ?
- value.flatten() : [value]);
- });
- },
-
- without: function() {
- var values = $A(arguments);
- return this.select(function(value) {
- return !values.include(value);
- });
- },
-
- indexOf: function(object) {
- for (var i = 0; i < this.length; i++)
- if (this[i] == object) return i;
- return -1;
- },
-
- reverse: function(inline) {
- return (inline !== false ? this : this.toArray())._reverse();
- },
-
- shift: function() {
- var result = this[0];
- for (var i = 0; i < this.length - 1; i++)
- this[i] = this[i + 1];
- this.length--;
- return result;
- },
-
- inspect: function() {
- return '[' + this.map(Object.inspect).join(', ') + ']';
- }
-});
-*/
-
-
-var Hash = {
- _each: function(iterator) {
- for (key in this) {
- var value = this[key];
- if (typeof value == 'function') continue;
-
- var pair = [key, value];
- pair.key = key;
- pair.value = value;
- iterator(pair);
- }
- },
-
- keys: function() {
- return this.pluck('key');
- },
-
- values: function() {
- return this.pluck('value');
- },
-
- merge: function(hash) {
- return $H(hash).inject($H(this), function(mergedHash, pair) {
- mergedHash[pair.key] = pair.value;
- return mergedHash;
- });
- },
-
- toQueryString: function() {
- return this.map(function(pair) {
- return pair.map(encodeURIComponent).join('=');
- }).join('&');
- },
-
- inspect: function() {
- return '#<Hash:{' + this.map(function(pair) {
- return pair.map(Object.inspect).join(': ');
- }).join(', ') + '}>';
- }
-}
-
-function $H(object) {
- var hash = Object.extend({}, object || {});
- Object.extend(hash, Enumerable);
- Object.extend(hash, Hash);
- return hash;
-}
-ObjectRange = Class.create();
-Object.extend(ObjectRange.prototype, Enumerable);
-Object.extend(ObjectRange.prototype, {
- initialize: function(start, end, exclusive) {
- this.start = start;
- this.end = end;
- this.exclusive = exclusive;
- },
-
- _each: function(iterator) {
- var value = this.start;
- do {
- iterator(value);
- value = value.succ();
- } while (this.include(value));
- },
-
- include: function(value) {
- if (value < this.start)
- return false;
- if (this.exclusive)
- return value < this.end;
- return value <= this.end;
- }
-});
-
-var $R = function(start, end, exclusive) {
- return new ObjectRange(start, end, exclusive);
-}
-
-document.getElementsByClassName = function(className, parentElement) {
- var children = ($(parentElement) || document.body).getElementsByTagName('*');
- return $A(children).inject([], function(elements, child) {
- if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
- elements.push(child);
- return elements;
- });
-}
-
-/*--------------------------------------------------------------------------*/
-
-if (!window.Element) {
- var Element = new Object();
-}
-
-Object.extend(Element, {
- visible: function(element) {
- return $(element).style.display != 'none';
- },
-
- toggle: function() {
- for (var i = 0; i < arguments.length; i++) {
- var element = $(arguments[i]);
- Element[Element.visible(element) ? 'hide' : 'show'](element);
- }
- },
-
- hide: function() {
- for (var i = 0; i < arguments.length; i++) {
- var element = $(arguments[i]);
- element.style.display = 'none';
- }
- },
-
- show: function() {
- for (var i = 0; i < arguments.length; i++) {
- var element = $(arguments[i]);
- element.style.display = '';
- }
- },
-
- remove: function(element) {
- element = $(element);
- element.parentNode.removeChild(element);
- },
-
- update: function(element, html) {
- $(element).innerHTML = html.stripScripts();
- setTimeout(function() {html.evalScripts()}, 10);
- },
-
- getHeight: function(element) {
- element = $(element);
- return element.offsetHeight;
- },
-
- classNames: function(element) {
- return new Element.ClassNames(element);
- },
-
- hasClassName: function(element, className) {
- if (!(element = $(element))) return;
- return Element.classNames(element).include(className);
- },
-
- addClassName: function(element, className) {
- if (!(element = $(element))) return;
- return Element.classNames(element).add(className);
- },
-
- removeClassName: function(element, className) {
- if (!(element = $(element))) return;
- return Element.classNames(element).remove(className);
- },
-
- // removes whitespace-only text node children
- cleanWhitespace: function(element) {
- element = $(element);
- for (var i = 0; i < element.childNodes.length; i++) {
- var node = element.childNodes[i];
- if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
- Element.remove(node);
- }
- },
-
- empty: function(element) {
- return $(element).innerHTML.match(/^\s*$/);
- },
-
- scrollTo: function(element) {
- element = $(element);
- var x = element.x ? element.x : element.offsetLeft,
- y = element.y ? element.y : element.offsetTop;
- window.scrollTo(x, y);
- },
-
- getStyle: function(element, style) {
- element = $(element);
- var value = element.style[style.camelize()];
- if (!value) {
- if (document.defaultView && document.defaultView.getComputedStyle) {
- var css = document.defaultView.getComputedStyle(element, null);
- value = css ? css.getPropertyValue(style) : null;
- } else if (element.currentStyle) {
- value = element.currentStyle[style.camelize()];
- }
- }
-
- if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
- if (Element.getStyle(element, 'position') == 'static') value = 'auto';
-
- return value == 'auto' ? null : value;
- },
-
- setStyle: function(element, style) {
- element = $(element);
- for (name in style)
- element.style[name.camelize()] = style[name];
- },
-
- getDimensions: function(element) {
- element = $(element);
- if (Element.getStyle(element, 'display') != 'none')
- return {width: element.offsetWidth, height: element.offsetHeight};
-
- // All *Width and *Height properties give 0 on elements with display none,
- // so enable the element temporarily
- var els = element.style;
- var originalVisibility = els.visibility;
- var originalPosition = els.position;
- els.visibility = 'hidden';
- els.position = 'absolute';
- els.display = '';
- var originalWidth = element.clientWidth;
- var originalHeight = element.clientHeight;
- els.display = 'none';
- els.position = originalPosition;
- els.visibility = originalVisibility;
- return {width: originalWidth, height: originalHeight};
- },
-
- makePositioned: function(element) {
- element = $(element);
- var pos = Element.getStyle(element, 'position');
- if (pos == 'static' || !pos) {
- element._madePositioned = true;
- element.style.position = 'relative';
- // Opera returns the offset relative to the positioning context, when an
- // element is position relative but top and left have not been defined
- if (window.opera) {
- element.style.top = 0;
- element.style.left = 0;
- }
- }
- },
-
- undoPositioned: function(element) {
- element = $(element);
- if (element._madePositioned) {
- element._madePositioned = undefined;
- element.style.position =
- element.style.top =
- element.style.left =
- element.style.bottom =
- element.style.right = '';
- }
- },
-
- makeClipping: function(element) {
- element = $(element);
- if (element._overflow) return;
- element._overflow = element.style.overflow;
- if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
- element.style.overflow = 'hidden';
- },
-
- undoClipping: function(element) {
- element = $(element);
- if (element._overflow) return;
- element.style.overflow = element._overflow;
- element._overflow = undefined;
- }
-});
-
-var Toggle = new Object();
-Toggle.display = Element.toggle;
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.Insertion = function(adjacency) {
- this.adjacency = adjacency;
-}
-
-Abstract.Insertion.prototype = {
- initialize: function(element, content) {
- this.element = $(element);
- this.content = content.stripScripts();
-
- if (this.adjacency && this.element.insertAdjacentHTML) {
- try {
- this.element.insertAdjacentHTML(this.adjacency, this.content);
- } catch (e) {
- if (this.element.tagName.toLowerCase() == 'tbody') {
- this.insertContent(this.contentFromAnonymousTable());
- } else {
- throw e;
- }
- }
- } else {
- this.range = this.element.ownerDocument.createRange();
- if (this.initializeRange) this.initializeRange();
- this.insertContent([this.range.createContextualFragment(this.content)]);
- }
-
- setTimeout(function() {content.evalScripts()}, 10);
- },
-
- contentFromAnonymousTable: function() {
- var div = document.createElement('div');
- div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>';
- return $A(div.childNodes[0].childNodes[0].childNodes);
- }
-}
-
-var Insertion = new Object();
-
-Insertion.Before = Class.create();
-Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), {
- initializeRange: function() {
- this.range.setStartBefore(this.element);
- },
-
- insertContent: function(fragments) {
- fragments.each((function(fragment) {
- this.element.parentNode.insertBefore(fragment, this.element);
- }).bind(this));
- }
-});
-
-Insertion.Top = Class.create();
-Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), {
- initializeRange: function() {
- this.range.selectNodeContents(this.element);
- this.range.collapse(true);
- },
-
- insertContent: function(fragments) {
- fragments.reverse(false).each((function(fragment) {
- this.element.insertBefore(fragment, this.element.firstChild);
- }).bind(this));
- }
-});
-
-Insertion.Bottom = Class.create();
-Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), {
- initializeRange: function() {
- this.range.selectNodeContents(this.element);
- this.range.collapse(this.element);
- },
-
- insertContent: function(fragments) {
- fragments.each((function(fragment) {
- this.element.appendChild(fragment);
- }).bind(this));
- }
-});
-
-Insertion.After = Class.create();
-Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
- initializeRange: function() {
- this.range.setStartAfter(this.element);
- },
-
- insertContent: function(fragments) {
- fragments.each((function(fragment) {
- this.element.parentNode.insertBefore(fragment,
- this.element.nextSibling);
- }).bind(this));
- }
-});
-
-/*--------------------------------------------------------------------------*/
-
-Element.ClassNames = Class.create();
-Element.ClassNames.prototype = {
- initialize: function(element) {
- this.element = $(element);
- },
-
- _each: function(iterator) {
- this.element.className.split(/\s+/).select(function(name) {
- return name.length > 0;
- })._each(iterator);
- },
-
- set: function(className) {
- this.element.className = className;
- },
-
- add: function(classNameToAdd) {
- if (this.include(classNameToAdd)) return;
- this.set(this.toArray().concat(classNameToAdd).join(' '));
- },
-
- remove: function(classNameToRemove) {
- if (!this.include(classNameToRemove)) return;
- this.set(this.select(function(className) {
- return className != classNameToRemove;
- }).join(' '));
- },
-
- toString: function() {
- return this.toArray().join(' ');
- }
-}
-
-Object.extend(Element.ClassNames.prototype, Enumerable);
-var Field = {
- clear: function() {
- for (var i = 0; i < arguments.length; i++)
- $(arguments[i]).value = '';
- },
-
- focus: function(element) {
- $(element).focus();
- },
-
- present: function() {
- for (var i = 0; i < arguments.length; i++)
- if ($(arguments[i]).value == '') return false;
- return true;
- },
-
- select: function(element) {
- $(element).select();
- },
-
- activate: function(element) {
- element = $(element);
- element.focus();
- if (element.select)
- element.select();
- }
-}
-
-/*--------------------------------------------------------------------------*/
-
-var Form = {
- serialize: function(form) {
- var elements = Form.getElements($(form));
- var queryComponents = new Array();
-
- for (var i = 0; i < elements.length; i++) {
- var queryComponent = Form.Element.serialize(elements[i]);
- if (queryComponent)
- queryComponents.push(queryComponent);
- }
-
- return queryComponents.join('&');
- },
-
- getElements: function(form) {
- form = $(form);
- var elements = new Array();
-
- for (tagName in Form.Element.Serializers) {
- var tagElements = form.getElementsByTagName(tagName);
- for (var j = 0; j < tagElements.length; j++)
- elements.push(tagElements[j]);
- }
- return elements;
- },
-
- getInputs: function(form, typeName, name) {
- form = $(form);
- var inputs = form.getElementsByTagName('input');
-
- if (!typeName && !name)
- return inputs;
-
- var matchingInputs = new Array();
- for (var i = 0; i < inputs.length; i++) {
- var input = inputs[i];
- if ((typeName && input.type != typeName) ||
- (name && input.name != name))
- continue;
- matchingInputs.push(input);
- }
-
- return matchingInputs;
- },
-
- disable: function(form) {
- var elements = Form.getElements(form);
- for (var i = 0; i < elements.length; i++) {
- var element = elements[i];
- element.blur();
- element.disabled = 'true';
- }
- },
-
- enable: function(form) {
- var elements = Form.getElements(form);
- for (var i = 0; i < elements.length; i++) {
- var element = elements[i];
- element.disabled = '';
- }
- },
-
- findFirstElement: function(form) {
- return Form.getElements(form).find(function(element) {
- return element.type != 'hidden' && !element.disabled &&
- ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
- });
- },
-
- focusFirstElement: function(form) {
- Field.activate(Form.findFirstElement(form));
- },
-
- reset: function(form) {
- $(form).reset();
- }
-}
-
-Form.Element = {
- serialize: function(element) {
- element = $(element);
- var method = element.tagName.toLowerCase();
- var parameter = Form.Element.Serializers[method](element);
-
- if (parameter) {
- var key = encodeURIComponent(parameter[0]);
- if (key.length == 0) return;
-
- if (parameter[1].constructor != Array)
- parameter[1] = [parameter[1]];
-
- return parameter[1].map(function(value) {
- return key + '=' + encodeURIComponent(value);
- }).join('&');
- }
- },
-
- getValue: function(element) {
- element = $(element);
- var method = element.tagName.toLowerCase();
- var parameter = Form.Element.Serializers[method](element);
-
- if (parameter)
- return parameter[1];
- }
-}
-
-Form.Element.Serializers = {
- input: function(element) {
- switch (element.type.toLowerCase()) {
- case 'submit':
- case 'hidden':
- case 'password':
- case 'text':
- return Form.Element.Serializers.textarea(element);
- case 'checkbox':
- case 'radio':
- return Form.Element.Serializers.inputSelector(element);
- }
- return false;
- },
-
- inputSelector: function(element) {
- if (element.checked)
- return [element.name, element.value];
- },
-
- textarea: function(element) {
- return [element.name, element.value];
- },
-
- select: function(element) {
- return Form.Element.Serializers[element.type == 'select-one' ?
- 'selectOne' : 'selectMany'](element);
- },
-
- selectOne: function(element) {
- var value = '', opt, index = element.selectedIndex;
- if (index >= 0) {
- opt = element.options[index];
- value = opt.value;
- if (!value && !('value' in opt))
- value = opt.text;
- }
- return [element.name, value];
- },
-
- selectMany: function(element) {
- var value = new Array();
- for (var i = 0; i < element.length; i++) {
- var opt = element.options[i];
- if (opt.selected) {
- var optValue = opt.value;
- if (!optValue && !('value' in opt))
- optValue = opt.text;
- value.push(optValue);
- }
- }
- return [element.name, value];
- }
-}
-
-/*--------------------------------------------------------------------------*/
-
-var $F = Form.Element.getValue;
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.TimedObserver = function() {}
-Abstract.TimedObserver.prototype = {
- initialize: function(element, frequency, callback) {
- this.frequency = frequency;
- this.element = $(element);
- this.callback = callback;
-
- this.lastValue = this.getValue();
- this.registerCallback();
- },
-
- registerCallback: function() {
- setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
- },
-
- onTimerEvent: function() {
- var value = this.getValue();
- if (this.lastValue != value) {
- this.callback(this.element, value);
- this.lastValue = value;
- }
- }
-}
-
-Form.Element.Observer = Class.create();
-Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
- getValue: function() {
- return Form.Element.getValue(this.element);
- }
-});
-
-Form.Observer = Class.create();
-Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
- getValue: function() {
- return Form.serialize(this.element);
- }
-});
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.EventObserver = function() {}
-Abstract.EventObserver.prototype = {
- initialize: function(element, callback) {
- this.element = $(element);
- this.callback = callback;
-
- this.lastValue = this.getValue();
- if (this.element.tagName.toLowerCase() == 'form')
- this.registerFormCallbacks();
- else
- this.registerCallback(this.element);
- },
-
- onElementEvent: function() {
- var value = this.getValue();
- if (this.lastValue != value) {
- this.callback(this.element, value);
- this.lastValue = value;
- }
- },
-
- registerFormCallbacks: function() {
- var elements = Form.getElements(this.element);
- for (var i = 0; i < elements.length; i++)
- this.registerCallback(elements[i]);
- },
-
- registerCallback: function(element) {
- if (element.type) {
- switch (element.type.toLowerCase()) {
- case 'checkbox':
- case 'radio':
- Event.observe(element, 'click', this.onElementEvent.bind(this));
- break;
- case 'password':
- case 'text':
- case 'textarea':
- case 'select-one':
- case 'select-multiple':
- Event.observe(element, 'change', this.onElementEvent.bind(this));
- break;
- }
- }
- }
-}
-
-Form.Element.EventObserver = Class.create();
-Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
- getValue: function() {
- return Form.Element.getValue(this.element);
- }
-});
-
-Form.EventObserver = Class.create();
-Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
- getValue: function() {
- return Form.serialize(this.element);
- }
-});
-if (!window.Event) {
- var Event = new Object();
-}
-
-Object.extend(Event, {
- KEY_BACKSPACE: 8,
- KEY_TAB: 9,
- KEY_RETURN: 13,
- KEY_ESC: 27,
- KEY_LEFT: 37,
- KEY_UP: 38,
- KEY_RIGHT: 39,
- KEY_DOWN: 40,
- KEY_DELETE: 46,
-
- element: function(event) {
- return event.target || event.srcElement;
- },
-
- isLeftClick: function(event) {
- return (((event.which) && (event.which == 1)) ||
- ((event.button) && (event.button == 1)));
- },
-
- pointerX: function(event) {
- return event.pageX || (event.clientX +
- (document.documentElement.scrollLeft || document.body.scrollLeft));
- },
-
- pointerY: function(event) {
- return event.pageY || (event.clientY +
- (document.documentElement.scrollTop || document.body.scrollTop));
- },
-
- stop: function(event) {
- if (event.preventDefault) {
- event.preventDefault();
- event.stopPropagation();
- } else {
- event.returnValue = false;
- event.cancelBubble = true;
- }
- },
-
- // find the first node with the given tagName, starting from the
- // node the event was triggered on; traverses the DOM upwards
- findElement: function(event, tagName) {
- var element = Event.element(event);
- while (element.parentNode && (!element.tagName ||
- (element.tagName.toUpperCase() != tagName.toUpperCase())))
- element = element.parentNode;
- return element;
- },
-
- observers: false,
-
- _observeAndCache: function(element, name, observer, useCapture) {
- if (!this.observers) this.observers = [];
- if (element.addEventListener) {
- this.observers.push([element, name, observer, useCapture]);
- element.addEventListener(name, observer, useCapture);
- } else if (element.attachEvent) {
- this.observers.push([element, name, observer, useCapture]);
- element.attachEvent('on' + name, observer);
- }
- },
-
- unloadCache: function() {
- if (!Event.observers) return;
- for (var i = 0; i < Event.observers.length; i++) {
- Event.stopObserving.apply(this, Event.observers[i]);
- Event.observers[i][0] = null;
- }
- Event.observers = false;
- },
-
- observe: function(element, name, observer, useCapture) {
- var element = $(element);
- useCapture = useCapture || false;
-
- if (name == 'keypress' &&
- (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
- || element.attachEvent))
- name = 'keydown';
-
- this._observeAndCache(element, name, observer, useCapture);
- },
-
- stopObserving: function(element, name, observer, useCapture) {
- var element = $(element);
- useCapture = useCapture || false;
-
- if (name == 'keypress' &&
- (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
- || element.detachEvent))
- name = 'keydown';
-
- if (element.removeEventListener) {
- element.removeEventListener(name, observer, useCapture);
- } else if (element.detachEvent) {
- element.detachEvent('on' + name, observer);
- }
- }
-});
-
-/* prevent memory leaks in IE */
-Event.observe(window, 'unload', Event.unloadCache, false);
-var Position = {
- // set to true if needed, warning: firefox performance problems
- // NOT neeeded for page scrolling, only if draggable contained in
- // scrollable elements
- includeScrollOffsets: false,
-
- // must be called before calling withinIncludingScrolloffset, every time the
- // page is scrolled
- prepare: function() {
- this.deltaX = window.pageXOffset
- || document.documentElement.scrollLeft
- || document.body.scrollLeft
- || 0;
- this.deltaY = window.pageYOffset
- || document.documentElement.scrollTop
- || document.body.scrollTop
- || 0;
- },
-
- realOffset: function(element) {
- var valueT = 0, valueL = 0;
- do {
- valueT += element.scrollTop || 0;
- valueL += element.scrollLeft || 0;
- element = element.parentNode;
- } while (element);
- return [valueL, valueT];
- },
-
- cumulativeOffset: function(element) {
- var valueT = 0, valueL = 0;
- do {
- valueT += element.offsetTop || 0;
- valueL += element.offsetLeft || 0;
- element = element.offsetParent;
- } while (element);
- return [valueL, valueT];
- },
-
- positionedOffset: function(element) {
- var valueT = 0, valueL = 0;
- do {
- valueT += element.offsetTop || 0;
- valueL += element.offsetLeft || 0;
- element = element.offsetParent;
- if (element) {
- p = Element.getStyle(element, 'position');
- if (p == 'relative' || p == 'absolute') break;
- }
- } while (element);
- return [valueL, valueT];
- },
-
- offsetParent: function(element) {
- if (element.offsetParent) return element.offsetParent;
- if (element == document.body) return element;
-
- while ((element = element.parentNode) && element != document.body)
- if (Element.getStyle(element, 'position') != 'static')
- return element;
-
- return document.body;
- },
-
- // caches x/y coordinate pair to use with overlap
- within: function(element, x, y) {
- if (this.includeScrollOffsets)
- return this.withinIncludingScrolloffsets(element, x, y);
- this.xcomp = x;
- this.ycomp = y;
- this.offset = this.cumulativeOffset(element);
-
- return (y >= this.offset[1] &&
- y < this.offset[1] + element.offsetHeight &&
- x >= this.offset[0] &&
- x < this.offset[0] + element.offsetWidth);
- },
-
- withinIncludingScrolloffsets: function(element, x, y) {
- var offsetcache = this.realOffset(element);
-
- this.xcomp = x + offsetcache[0] - this.deltaX;
- this.ycomp = y + offsetcache[1] - this.deltaY;
- this.offset = this.cumulativeOffset(element);
-
- return (this.ycomp >= this.offset[1] &&
- this.ycomp < this.offset[1] + element.offsetHeight &&
- this.xcomp >= this.offset[0] &&
- this.xcomp < this.offset[0] + element.offsetWidth);
- },
-
- // within must be called directly before
- overlap: function(mode, element) {
- if (!mode) return 0;
- if (mode == 'vertical')
- return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
- element.offsetHeight;
- if (mode == 'horizontal')
- return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
- element.offsetWidth;
- },
-
- clone: function(source, target) {
- source = $(source);
- target = $(target);
- target.style.position = 'absolute';
- var offsets = this.cumulativeOffset(source);
- target.style.top = offsets[1] + 'px';
- target.style.left = offsets[0] + 'px';
- target.style.width = source.offsetWidth + 'px';
- target.style.height = source.offsetHeight + 'px';
- },
-
- page: function(forElement) {
- var valueT = 0, valueL = 0;
-
- var element = forElement;
- do {
- valueT += element.offsetTop || 0;
- valueL += element.offsetLeft || 0;
-
- // Safari fix
- if (element.offsetParent==document.body)
- if (Element.getStyle(element,'position')=='absolute') break;
-
- } while (element = element.offsetParent);
-
- element = forElement;
- do {
- valueT -= element.scrollTop || 0;
- valueL -= element.scrollLeft || 0;
- } while (element = element.parentNode);
-
- return [valueL, valueT];
- },
-
- clone: function(source, target) {
- var options = Object.extend({
- setLeft: true,
- setTop: true,
- setWidth: true,
- setHeight: true,
- offsetTop: 0,
- offsetLeft: 0
- }, arguments[2] || {})
-
- // find page position of source
- source = $(source);
- var p = Position.page(source);
-
- // find coordinate system to use
- target = $(target);
- var delta = [0, 0];
- var parent = null;
- // delta [0,0] will do fine with position: fixed elements,
- // position:absolute needs offsetParent deltas
- if (Element.getStyle(target,'position') == 'absolute') {
- parent = Position.offsetParent(target);
- delta = Position.page(parent);
- }
-
- // correct by body offsets (fixes Safari)
- if (parent == document.body) {
- delta[0] -= document.body.offsetLeft;
- delta[1] -= document.body.offsetTop;
- }
-
- // set position
- if(options.setLeft) target.style.left = (p[0] - delta[0] + options.offsetLeft) + 'px';
- if(options.setTop) target.style.top = (p[1] - delta[1] + options.offsetTop) + 'px';
- if(options.setWidth) target.style.width = source.offsetWidth + 'px';
- if(options.setHeight) target.style.height = source.offsetHeight + 'px';
- },
-
- absolutize: function(element) {
- element = $(element);
- if (element.style.position == 'absolute') return;
- Position.prepare();
-
- var offsets = Position.positionedOffset(element);
- var top = offsets[1];
- var left = offsets[0];
- var width = element.clientWidth;
- var height = element.clientHeight;
-
- element._originalLeft = left - parseFloat(element.style.left || 0);
- element._originalTop = top - parseFloat(element.style.top || 0);
- element._originalWidth = element.style.width;
- element._originalHeight = element.style.height;
-
- element.style.position = 'absolute';
- element.style.top = top + 'px';;
- element.style.left = left + 'px';;
- element.style.width = width + 'px';;
- element.style.height = height + 'px';;
- },
-
- relativize: function(element) {
- element = $(element);
- if (element.style.position == 'relative') return;
- Position.prepare();
-
- element.style.position = 'relative';
- var top = parseFloat(element.style.top || 0) - (element._originalTop || 0);
- var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
-
- element.style.top = top + 'px';
- element.style.left = left + 'px';
- element.style.height = element._originalHeight;
- element.style.width = element._originalWidth;
- }
-}
-
-// Safari returns margins on body which is incorrect if the child is absolutely
-// positioned. For performance reasons, redefine Position.cumulativeOffset for
-// KHTML/WebKit only.
-if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
- Position.cumulativeOffset = function(element) {
- var valueT = 0, valueL = 0;
- do {
- valueT += element.offsetTop || 0;
- valueL += element.offsetLeft || 0;
- if (element.offsetParent == document.body)
- if (Element.getStyle(element, 'position') == 'absolute') break;
-
- element = element.offsetParent;
- } while (element);
-
- return [valueL, valueT];
- }
-}
-
-
function indexOf(array, object)
{
for (var i = 0; i < array.length; i++)
Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js 2007-05-20 10:21:38 UTC (rev 1027)
+++ trunk/data/public/js/pfcclient.js 2007-05-20 19:58:45 UTC (rev 1028)
@@ -159,9 +159,35 @@
*/
handleResponse: function(cmd, resp, param)
{
+ // display some debug messages
if (pfc_debug)
- if (cmd != "update") trace('handleResponse: '+cmd + "-"+resp+"-"+param);
+ if (cmd != "update")
+ {
+ var param2 = param;
+ if (cmd == "who" || cmd == "who2")
+ {
+ param2 = $H(param2);
+ param2['meta'] = $H(param2['meta']);
+ param2['meta']['users'] = $H(param2['meta']['users']);
+ trace('handleResponse: '+cmd + "-"+resp+"-"+param2.inspect());
+ }
+ else
+ if (cmd == "whois" || cmd == "whois2")
+ {
+ param2 = $H(param2);
+ trace('handleResponse: '+cmd + "-"+resp+"-"+param2.inspect());
+ }
+ else
+ if (cmd == "getnewmsg" || cmd == "join")
+ {
+ param2 = $A(param2);
+ trace('handleResponse: '+cmd + "-"+resp+"-"+param2.inspect());
+ }
+ else
+ trace('handleResponse: '+cmd + "-"+resp+"-"+param);
+ }
+
// store the new refresh time
this.last_response_time = new Date().getTime();
@@ -174,8 +200,6 @@
if (resp == "ok")
{
this.nickname = param[0];
- this.sendRequest('/nick "'+this.nickname+'"');
-
this.isconnected = true;
// start the polling system
@@ -216,7 +240,6 @@
}
else if (cmd == "leave")
{
- //alert(cmd + "-"+resp+"-"+param);
if (resp =="ok")
{
// remove the channel
@@ -282,7 +305,7 @@
{
this.el_handle.innerHTML = param;
this.nickname = param;
- this.usermeta[this.nickid]['nick'] = param;
+ this.setUserMeta(this.nickid, 'nick', param);
this.updateNickBox(this.nickid);
// clear the possible error box generated by the bellow displayMsg(...) function
@@ -396,7 +419,7 @@
var nickid = param['nickid'];
if (resp == "ok")
{
- this.usermeta[nickid] = $H(param);
+ this.setUserMeta(nickid, param);
this.updateNickBox(nickid);
this.updateNickWhoisBox(nickid);
}
@@ -426,10 +449,10 @@
var chan = param['chan'];
var chanid = param['chanid'];
var meta = $H(param['meta']);
+ meta['users'] = $H(meta['users']);
if (resp == "ok")
{
- this.chanmeta[chanid] = meta;
-
+ this.setChanMeta(chanid,meta);
// send /whois commands for unknown users
for (var i=0; i<meta['users']['nickid'].length; i++)
{
@@ -490,6 +513,18 @@
return '';
},
+ setUserMeta: function(nickid, key, value)
+ {
+ if (nickid && key)
+ {
+ if (!this.usermeta[nickid]) this.usermeta[nickid] = $H();
+ if (value)
+ this.usermeta[nickid][key] = value;
+ else
+ this.usermeta[nickid] = $H(key);
+ }
+ },
+
getAllChanMeta: function(chanid)
{
if (chanid && this.chanmeta[chanid])
@@ -506,6 +541,18 @@
return '';
},
+ setChanMeta: function(chanid, key, value)
+ {
+ if (chanid && key)
+ {
+ if (!this.chanmeta[chanid]) this.chanmeta[chanid] = $H();
+ if (value)
+ this.chanmeta[chanid][key] = value;
+ else
+ this.chanmeta[chanid] = $H(key);
+ }
+ },
+
doSendMessage: function()
{
var w = this.el_words;
@@ -557,7 +604,7 @@
if (nick_src != '')
{
var tabid = this.gui.getTabId();
- var n_list = this.chanmeta[tabid]['users']['nick'];
+ var n_list = this.getChanMeta(tabid,'users')['nick'];
for (var i=0; i<n_list.length; i++)
{
var nick = n_list[i];
@@ -921,7 +968,7 @@
*/
updateNickListBox: function(chanid)
{
- var nickidlst = this.chanmeta[chanid]['users']['nickid'];
+ var nickidlst = this.getChanMeta(chanid,'users')['nickid'];
var nickdiv = this.gui.getOnlineContentFromTabId(chanid);
var ul = document.createElement('ul');
ul.setAttribute('class', 'pfc_nicklist');
@@ -1757,4 +1804,4 @@
this.pfc = new pfcPrompt($('pfc_container'));
return this.pfc;
}
-};
+};
\ No newline at end of file
Modified: trunk/data/public/js/pfcgui.js
===================================================================
--- trunk/data/public/js/pfcgui.js 2007-05-20 10:21:38 UTC (rev 1027)
+++ trunk/data/public/js/pfcgui.js 2007-05-20 19:58:45 UTC (rev 1028)
@@ -174,7 +174,7 @@
// empty the chat div content
var div_chat = this.getChatContentFromTabId(tabid);
- div_chat.innerHTML = '';
+ div_chat.update('');
// remove the tab from the list
var tabpos = indexOf(this.tabids, tabid);
@@ -184,7 +184,8 @@
this.tabtypes = without(this.tabtypes, this.tabtypes[tabpos]);
tabpos = indexOf(this.tabids, this.getTabId());
if (tabpos<0) tabpos = 0;
- this.setTabById(this.tabids[tabpos]);
+ if (this.tabids[tabpos])
+ this.setTabById(this.tabids[tabpos]);
return name;
},
Added: trunk/data/public/js/prototype.js
===================================================================
--- trunk/data/public/js/prototype.js (rev 0)
+++ trunk/data/public/js/prototype.js 2007-05-20 19:58:45 UTC (rev 1028)
@@ -0,0 +1,3271 @@
+/* Prototype JavaScript framework, version 1.5.1
+ * (c) 2005-2007 Sam Stephenson
+ *
+ * Prototype is freely distributable under the terms of an MIT-style license.
+ * For details, see the Prototype web site: http://www.prototypejs.org/
+ *
+/*--------------------------------------------------------------------------*/
+
+var Prototype = {
+ Version: '1.5.1',
+
+ Browser: {
+ IE: !!(window.attachEvent && !window.opera),
+ Opera: !!window.opera,
+ WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
+ Gecko: navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1
+ },
+
+ BrowserFeatures: {
+ XPath: !!document.evaluate,
+ ElementExtensions: !!window.HTMLElement,
+ SpecificElementExtensions:
+ (document.createElement('div').__proto__ !==
+ document.createElement('form').__proto__)
+ },
+
+ ScriptFragment: '<script[^>]*>([\u0001-\uFFFF]*?)</script>',
+ JSONFilter: /^\/\*-secure-\s*(.*)\s*\*\/\s*$/,
+
+ emptyFunction: function() { },
+ K: function(x) { return x }
+}
+
+var Class = {
+ create: function() {
+ return function() {
+ this.initialize.apply(this, arguments);
+ }
+ }
+}
+
+var Abstract = new Object();
+
+Object.extend = function(destination, source) {
+ for (var property in source) {
+ destination[property] = source[property];
+ }
+ return destination;
+}
+
+Object.extend(Object, {
+ inspect: function(object) {
+ try {
+ if (object === undefined) return 'undefined';
+ if (object === null) return 'null';
+ return object.inspect ? object.inspect() : object.toString();
+ } catch (e) {
+ if (e instanceof RangeError) return '...';
+ throw e;
+ }
+ },
+
+ toJSON: function(object) {
+ var type = typeof object;
+ switch(type) {
+ case 'undefined':
+ case 'function':
+ case 'unknown': return;
+ case 'boolean': return object.toString();
+ }
+ if (object === null) return 'null';
+ if (object.toJSON) return object.toJSON();
+ if (object.ownerDocument === document) return;
+ var results = [];
+ for (var property in object) {
+ var value = Object.toJSON(object[property]);
+ if (value !== undefined)
+ results.push(property.toJSON() + ': ' + value);
+ }
+ return '{' + results.join(', ') + '}';
+ },
+
+ keys: function(object) {
+ var keys = [];
+ for (var property in object)
+ keys.push(property);
+ return keys;
+ },
+
+ values: function(object) {
+ var values = [];
+ for (var property in object)
+ values.push(object[property]);
+ return values;
+ },
+
+ clone: function(object) {
+ return Object.extend({}, object);
+ }
+});
+
+Function.prototype.bind = function() {
+ var __method = this, args = $A(arguments), object = args.shift();
+ return function() {
+ return __method.apply(object, args.concat($A(arguments)));
+ }
+}
+
+Function.prototype.bindAsEventListener = function(object) {
+ var __method = this, args = $A(arguments), object = args.shift();
+ return function(event) {
+ return __method.apply(object, [event || window.event].concat(args));
+ }
+}
+
+Object.extend(Number.prototype, {
+ toColorPart: function() {
+ return this.toPaddedString(2, 16);
+ },
+
+ succ: function() {
+ return this + 1;
+ },
+
+ times: function(iterator) {
+ $R(0, this, true).each(iterator);
+ return this;
+ },
+
+ toPaddedString: function(length, radix) {
+ var string = this.toString(radix || 10);
+ return '0'.times(length - string.length) + string;
+ },
+
+ toJSON: function() {
+ return isFinite(this) ? this.toString() : 'null';
+ }
+});
+
+Date.prototype.toJSON = function() {
+ return '"' + this.getFullYear() + '-' +
+ (this.getMonth() + 1).toPaddedString(2) + '-' +
+ this.getDate().toPaddedString(2) + 'T' +
+ this.getHours().toPaddedString(2) + ':' +
+ this.getMinutes().toPaddedString(2) + ':' +
+ this.getSeconds().toPaddedString(2) + '"';
+};
+
+var Try = {
+ these: function() {
+ var returnValue;
+
+ for (var i = 0, length = arguments.length; i < length; i++) {
+ var lambda = arguments[i];
+ try {
+ returnValue = lambda();
+ break;
+ } catch (e) {}
+ }
+
+ return returnValue;
+ }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var PeriodicalExecuter = Class.create();
+PeriodicalExecuter.prototype = {
+ initialize: function(callback, frequency) {
+ this.callback = callback;
+ this.frequency = frequency;
+ this.currentlyExecuting = false;
+
+ this.registerCallback();
+ },
+
+ registerCallback: function() {
+ this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+ },
+
+ stop: function() {
+ if (!this.timer) return;
+ clearInterval(this.timer);
+ this.timer = null;
+ },
+
+ onTimerEvent: function() {
+ if (!this.currentlyExecuting) {
+ try {
+ this.currentlyExecuting = true;
+ this.callback(this);
+ } finally {
+ this.currentlyExecuting = false;
+ }
+ }
+ }
+}
+Object.extend(String, {
+ interpret: function(value) {
+ return value == null ? '' : String(value);
+ },
+ specialChar: {
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '\\': '\\\\'
+ }
+});
+
+Object.extend(String.prototype, {
+ gsub: function(pattern, replacement) {
+ var result = '', source = this, match;
+ replacement = arguments.callee.prepareReplacement(replacement);
+
+ while (source.length > 0) {
+ if (match = source.match(pattern)) {
+ result += source.slice(0, match.index);
+ result += String.interpret(replacement(match));
+ source = source.slice(match.index + match[0].length);
+ } else {
+ result += source, source = '';
+ }
+ }
+ return result;
+ },
+
+ sub: function(pattern, replacement, count) {
+ replacement = this.gsub.prepareReplacement(replacement);
+ count = count === undefined ? 1 : count;
+
+ return this.gsub(pattern, function(match) {
+ if (--count < 0) return match[0];
+ return replacement(match);
+ });
+ },
+
+ scan: function(pattern, iterator) {
+ this.gsub(pattern, iterator);
+ return this;
+ },
+
+ truncate: function(length, truncation) {
+ length = length || 30;
+ truncation = truncation === undefined ? '...' : truncation;
+ return this.length > length ?
+ this.slice(0, length - truncation.length) + truncation : this;
+ },
+
+ strip: function() {
+ return this.replace(/^\s+/, '').replace(/\s+$/, '');
+ },
+
+ stripTags: function() {
+ return this.replace(/<\/?[^>]+>/gi, '');
+ },
+
+ stripScripts: function() {
+ return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
+ },
+
+ extractScripts: function() {
+ var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
+ var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
+ return (this.match(matchAll) || []).map(function(scriptTag) {
+ return (scriptTag.match(matchOne) || ['', ''])[1];
+ });
+ },
+
+ evalScripts: function() {
+ return this.extractScripts().map(function(script) { return eval(script) });
+ },
+
+ escapeHTML: function() {
+ var self = arguments.callee;
+ self.text.data = this;
+ return self.div.innerHTML;
+ },
+
+ unescapeHTML: function() {
+ var div = document.createElement('div');
+ div.innerHTML = this.stripTags();
+ return div.childNodes[0] ? (div.childNodes.length > 1 ?
+ $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
+ div.childNodes[0].nodeValue) : '';
+ },
+
+ toQueryParams: function(separator) {
+ var match = this.strip().match(/([^?#]*)(#.*)?$/);
+ if (!match) return {};
+
+ return match[1].split(separator || '&').inject({}, function(hash, pair) {
+ if ((pair = pair.split('='))[0]) {
+ var key = decodeURIComponent(pair.shift());
+ var value = pair.length > 1 ? pair.join('=') : pair[0];
+ if (value != undefined) value = decodeURIComponent(value);
+
+ if (key in hash) {
+ if (hash[key].constructor != Array) hash[key] = [hash[key]];
+ hash[key].push(value);
+ }
+ else hash[key] = value;
+ }
+ return hash;
+ });
+ },
+
+ toArray: function() {
+ return this.split('');
+ },
+
+ succ: function() {
+ return this.slice(0, this.length - 1) +
+ String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+ },
+
+ times: function(count) {
+ var result = '';
+ for (var i = 0; i < count; i++) result += this;
+ return result;
+ },
+
+ camelize: function() {
+ var parts = this.split('-'), len = parts.length;
+ if (len == 1) return parts[0];
+
+ var camelized = this.charAt(0) == '-'
+ ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
+ : parts[0];
+
+ for (var i = 1; i < len; i++)
+ camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
+
+ return camelized;
+ },
+
+ capitalize: function() {
+ return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+ },
+
+ underscore: function() {
+ return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
+ },
+
+ dasherize: function() {
+ return this.gsub(/_/,'-');
+ },
+
+ inspect: function(useDoubleQuotes) {
+ var escapedString = this.gsub(/[\x00-\x1f\\]/, function(match) {
+ var character = String.specialChar[match[0]];
+ return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
+ });
+ if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
+ return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+ },
+
+ toJSON: function() {
+ return this.inspect(true);
+ },
+
+ unfilterJSON: function(filter) {
+ return this.sub(filter || Prototype.JSONFilter, '#{1}');
+ },
+
+ evalJSON: function(sanitize) {
+ var json = this.unfilterJSON();
+ try {
+ if (!sanitize || (/^("(\\.|[^"\\\n\r])*?"|[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t])+?$/.test(json)))
+ return eval('(' + json + ')');
+ } catch (e) { }
+ throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
+ },
+
+ include: function(pattern) {
+ return this.indexOf(pattern) > -1;
+ },
+
+ startsWith: function(pattern) {
+ return this.indexOf(pattern) === 0;
+ },
+
+ endsWith: function(pattern) {
+ var d = this.length - pattern.length;
+ return d >= 0 && this.lastIndexOf(pattern) === d;
+ },
+
+ empty: function() {
+ return this == '';
+ },
+
+ blank: function() {
+ return /^\s*$/.test(this);
+ }
+});
+
+if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
+ escapeHTML: function() {
+ return this.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
+ },
+ unescapeHTML: function() {
+ return this.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
+ }
+});
+
+String.prototype.gsub.prepareReplacement = function(replacement) {
+ if (typeof replacement == 'function') return replacement;
+ var template = new Template(replacement);
+ return function(match) { return template.evaluate(match) };
+}
+
+String.prototype.parseQuery = String.prototype.toQueryParams;
+
+Object.extend(String.prototype.escapeHTML, {
+ div: document.createElement('div'),
+ text: document.createTextNode('')
+});
+
+with (String.prototype.escapeHTML) div.appendChild(text);
+
+var Template = Class.create();
+Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
+Template.proto...
[truncated message content] |
|
From: <ke...@us...> - 2007-06-07 10:41:19
|
Revision: 1031
http://svn.sourceforge.net/phpfreechat/?rev=1031&view=rev
Author: kerphi
Date: 2007-06-07 03:41:20 -0700 (Thu, 07 Jun 2007)
Log Message:
-----------
New Croatian translation (thanks to beginner)
Modified Paths:
--------------
trunk/demo/index.php
trunk/src/pfci18n.class.php
Added Paths:
-----------
trunk/demo/demo61_in_croatian.php
trunk/i18n/hr_HR/
trunk/i18n/hr_HR/main.php
Added: trunk/demo/demo61_in_croatian.php
===================================================================
--- trunk/demo/demo61_in_croatian.php (rev 0)
+++ trunk/demo/demo61_in_croatian.php 2007-06-07 10:41:20 UTC (rev 1031)
@@ -0,0 +1,36 @@
+<?php
+
+require_once dirname(__FILE__)."/../src/phpfreechat.class.php";
+
+$params["serverid"] = md5(__FILE__); // calculate a unique id for this chat
+$params["language"] = "hr_HR";
+$chat = new phpFreeChat( $params );
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <title>phpFreeChat demo</title>
+
+ <?php $chat->printJavascript(); ?>
+ <?php $chat->printStyle(); ?>
+
+ </head>
+
+ <body>
+ <?php $chat->printChat(); ?>
+
+<?php
+ // print the current file
+ echo "<h2>The source code</h2>";
+ $filename = __FILE__;
+ echo "<p><code>".$filename."</code></p>";
+ echo "<pre style=\"margin: 0 50px 0 50px; padding: 10px; background-color: #DDD;\">";
+ $content = file_get_contents($filename);
+ echo htmlentities($content);
+ echo "</pre>";
+?>
+
+ </body>
+</html>
Modified: trunk/demo/index.php
===================================================================
--- trunk/demo/index.php 2007-06-07 09:57:18 UTC (rev 1030)
+++ trunk/demo/index.php 2007-06-07 10:41:20 UTC (rev 1031)
@@ -126,6 +126,7 @@
<li><a href="demo58_in_danish.php">demo58 - Danish translation of the chat</a></li>
<li><a href="demo59_in_norwegian_nynorsk.php">demo59 - Norwegian Nynorsk translation of the chat</a></li>
<li><a href="demo60_in_vietnamese.php">demo60 - Vietnamese translation of the chat</a></li>
+ <li><a href="demo61_in_croatian.php">demo61 - Croatian translation of the chat</a></li>
</ul>
</div>
Added: trunk/i18n/hr_HR/main.php
===================================================================
--- trunk/i18n/hr_HR/main.php (rev 0)
+++ trunk/i18n/hr_HR/main.php 2007-06-07 10:41:20 UTC (rev 1031)
@@ -0,0 +1,387 @@
+<?php
+/**
+ * i18n/hr_HR/main.php
+ *
+ * Copyright © 2006 Stephane Gully <ste...@gm...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+/**
+ * Croatian translation of the messages (utf8 encoded!)
+ *
+ * @author Zdravac
+ */
+
+// line 45 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["My Chat"] = "Moj chat";
+
+// line 201 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s not found, %s library can't be found."] = "%s nije pronadjen, %s biblioteka nije pronadjena.";
+
+// line 355 in phpfreechat.class.php
+$GLOBALS["i18n"]["Please enter your nickname"] = "Molim Vas unesite Vas nadimak";
+
+// line 565 in phpfreechat.class.php
+$GLOBALS["i18n"]["Text cannot be empty"] = "Tekst ne smije biti prazan";
+
+// line 392 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s changes his nickname to %s"] = "%s je promijenio/la nadimak u %s";
+
+// line 398 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s is connected"] = "%s se prikljucio/la";
+
+// line 452 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s quit"] = "%s izasao/la";
+
+// line 468 in phpfreechat.class.php
+$GLOBALS["i18n"]["%s disconnected (timeout)"] = "%s je iskljucen/a (timeout)";
+
+// line 262 in phpfreechat.class.php
+$GLOBALS["i18n"]["Unknown command [%s]"] = "Nepoznata naredba [%s]";
+
+// line 149 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist: %s"] = "%s ne postoji: %s";
+
+// line 180 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["You need %s"] = "Treba vam %s";
+
+// line 241 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist, %s library can't be found"] = "%s ne postoji, %s biblioteka nije pronadjena";
+
+// line 280 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist"] = "%s ne postoji";
+
+// line 433 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s directory must be specified"] = "%s direktorij mora biti unesen";
+
+// line 439 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s must be a directory"] = "%s mora biti direktorij";
+
+// line 446 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s can't be created"] = "%s ne moze biti napravljen";
+
+// line 451 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not writeable"] = "Upis onemogucen - %s";
+
+// line 496 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not readable"] = "Ne moze da se cita iz - %s";
+
+// line 469 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not a file"] = "%s nije datoteka";
+
+// line 491 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["%s is not a directory"] = "%s nije direktorij";
+
+// line 23 in chat.html.tpl.php
+$GLOBALS["i18n"]["PHP FREE CHAT [powered by phpFreeChat-%s]"] = "PHP FREE CHAT [powered by phpFreeChat-%s]";
+
+// line 296 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Hide nickname marker"] = "Sakrij boje nadimaka";
+
+// line 304 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Show nickname marker"] = "Prikazi boje nadimaka";
+
+// line 389 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Disconnect"] = "Iskljuci se";
+
+// line 395 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Connect"] = "Ukljuci se";
+
+// line 427 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Magnify"] = "Uvecaj";
+
+// line 434 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Cut down"] = "Smanji";
+
+// line 345 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Hide dates and hours"] = "Sakrij datum i vrijeme";
+
+// line 353 in javascript1.js.tpl.php
+$GLOBALS["i18n"]["Show dates and hours"] = "Prikazi datum i vrijeme";
+
+// line 21 in chat.html.tpl.php
+$GLOBALS["i18n"]["Enter your message here"] = "Unesite vasu poruku ovdje";
+
+// line 24 in chat.html.tpl.php
+$GLOBALS["i18n"]["Enter your nickname here"] = "Unesite vas nadimak ovdje";
+
+// line 48 in phpfreechattemplate.class.php
+$GLOBALS["i18n"]["%s template could not be found"] = "%s obrazac nije pranadjen";
+
+// line 96 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["Error: undefined or obsolete parameter '%s', please correct or remove this parameter"] = "Greska: ne postoji parametar '%s', ispravite gresku ili skinite ovaj parametar";
+
+// line 324 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'serverid' parameter is mandatory by default use 'md5(__FILE__)' value"] = "";
+
+// line 512 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["Error: '%s' could not be found, please check your themepath '%s' and your theme '%s' are correct"] = "Greska: '%s' nije pranadjen, ispravite podatke za vasu temu (theme)";
+
+// line 33 in chat.html.tpl.php
+$GLOBALS["i18n"]["Bold"] = "Podebljano";
+
+// line 34 in chat.html.tpl.php
+$GLOBALS["i18n"]["Italics"] = "Italik";
+
+// line 35 in chat.html.tpl.php
+$GLOBALS["i18n"]["Underline"] = "Podvuceno";
+
+// line 36 in chat.html.tpl.php
+$GLOBALS["i18n"]["Delete"] = "Precrtano";
+
+// line 37 in chat.html.tpl.php
+$GLOBALS["i18n"]["Pre"] = "Pre";
+
+// line 38 in chat.html.tpl.php
+$GLOBALS["i18n"]["Mail"] = "e-mail";
+
+// line 39 in chat.html.tpl.php
+$GLOBALS["i18n"]["Color"] = "Boja";
+
+// line 86 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Hide smiley box"] = "Sakrij smajlice";
+
+// line 87 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Show smiley box"] = "Prikazi smajlice";
+
+// line 88 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Hide online users box"] = "Sakrij korisnike";
+
+// line 89 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Show online users box"] = "Prikazi korisnike";
+
+// line 75 in pfccommand.class.php
+$GLOBALS["i18n"]["%s must be implemented"] = "%s se mora navesti";
+
+// line 343 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter is mandatory by default use '%s' value"] = "'%s' parametar je obavezan, standardni podatak je '%s'";
+
+// line 378 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a positive number"] = "'%s' parametar mora biti pozitivan broj";
+
+// line 386 in phpfreechatconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter is not valid. Available values are : '%s'"] = "'%s' parametar nije dopusten. Dopusteni parametri su: '%s'";
+
+
+// line 186 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["My room"] = "My room";
+
+// line 19 in unban.class.php
+$GLOBALS["i18n"]["Missing parameter"] = "Nedostaje parametar";
+
+// line 38 in ban.class.php
+$GLOBALS["i18n"]["banished from %s by %s"] = "";
+
+// line 23 in banlist.class.php
+$GLOBALS["i18n"]["The banished user's id list is:"] = "";
+
+// line 32 in banlist.class.php
+$GLOBALS["i18n"]["Empty"] = "Prazno";
+
+// line 34 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {id}' will unban the user identified by {id}"] = "";
+
+// line 35 in banlist.class.php
+$GLOBALS["i18n"]["'/unban all' will unban all the users on this channel"] = "";
+
+// line 24 in update.class.php
+$GLOBALS["i18n"]["%s quit (timeout)"] = "%s iskljucen (timeout)";
+
+// line 46 in join.class.php
+$GLOBALS["i18n"]["%s joins %s"] = "%s se pridruzio %s";
+
+// line 31 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s"] = "";
+
+// line 38 in send.class.php
+$GLOBALS["i18n"]["Can't send the message, %s is offline"] = "Poruka nije poslana, %s je offline";
+
+// line 27 in unban.class.php
+$GLOBALS["i18n"]["Nobody has been unbanished"] = "";
+
+// line 42 in unban.class.php
+$GLOBALS["i18n"]["%s has been unbanished"] = "";
+
+// line 49 in unban.class.php
+$GLOBALS["i18n"]["%s users have been unbanished"] = "";
+
+// line 47 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to run '%s' command"] = "%s, nije dopusteno pokrenuti naredbu";
+
+// line 66 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because you are banished"] = "";
+
+// line 76 in auth.class.php
+$GLOBALS["i18n"]["Can't join %s because the channels list is restricted"] = "";
+
+// line 89 in auth.class.php
+$GLOBALS["i18n"]["You are not allowed to change your nickname"] = "Nije dopusteno promijeniti nadimak";
+
+// line 56 in noflood.class.php
+$GLOBALS["i18n"]["Please don't post so many message, flood is not tolerated"] = "";
+
+// line 109 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Private message"] = "Privatni razgovor";
+
+// line 110 in pfcclient.js.tpl.php
+$GLOBALS["i18n"]["Close this tab"] = "Zatvori ovaj tab";
+
+// line 199 in pfcgui.js.tpl.php
+$GLOBALS["i18n"]["Do you really want to leave this room ?"] = "Napustate ?";
+
+// line 169 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["Error: '%s' is a private parameter, you are not allowed to change it"] = "";
+
+// line 253 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be an array"] = "";
+
+// line 265 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a boolean"] = "";
+
+// line 271 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' parameter must be a charatere string"] = "";
+
+// line 395 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' must be writable"] = "";
+
+// line 425 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["'%s' directory doesn't exist"] = "";
+
+// line 544 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["Please correct these errors"] = "";
+
+// line 21 in pfcinfo.class.php
+$GLOBALS["i18n"]["Error: the cached config file doesn't exists"] = "";
+
+// line 190 in phpfreechat.class.php
+$GLOBALS["i18n"]["Error: the chat cannot be loaded! two possibilities: your browser doesn't support javascript or you didn't setup correctly the server directories rights - don't hesitate to ask some help on the forum"] = "";
+
+// line 31 in help.class.php
+$GLOBALS["i18n"]["Here is the command list:"] = "Popis naredbi";
+
+// line 63 in identify.class.php
+$GLOBALS["i18n"]["Succesfully identified"] = "";
+
+// line 68 in identify.class.php
+$GLOBALS["i18n"]["Identification failure"] = "";
+
+// line 25 in send.class.php
+$GLOBALS["i18n"]["Your must be connected to send a message"] = "";
+
+// line 87 in chat.js.tpl.php
+$GLOBALS["i18n"]["Click here to send your message"] = "Ovdje klik da posaljete poruku";
+
+// line 80 in chat.js.tpl.php
+$GLOBALS["i18n"]["Enter the text to format"] = "Ovdje upisite e-mail adresu";
+
+// line 81 in chat.js.tpl.php
+$GLOBALS["i18n"]["Configuration has been rehashed"] = "";
+
+// line 82 in chat.js.tpl.php
+$GLOBALS["i18n"]["A problem occurs during rehash"] = "";
+
+// line 83 in chat.js.tpl.php
+$GLOBALS["i18n"]["Choosen nickname is allready used"] = "Nickname je zauzet!";
+
+// line 84 in chat.js.tpl.php
+$GLOBALS["i18n"]["phpfreechat current version is %s"] = "Trenutna verzija phpfreechat je %s";
+
+// line 85 in chat.js.tpl.php
+$GLOBALS["i18n"]["Maximum number of joined channels has been reached"] = "Maximu postignut!";
+
+// line 86 in chat.js.tpl.php
+$GLOBALS["i18n"]["Maximum number of private chat has been reached"] = "Maximum privatnog razgovora !";
+
+// line 88 in chat.js.tpl.php
+$GLOBALS["i18n"]["Send"] = "Posalji";
+
+// line 86 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: connect error"] = "";
+
+// line 101 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: create database error '%s'"] = "";
+
+// line 112 in mysql.class.php
+$GLOBALS["i18n"]["Mysql container: create table error '%s'"] = "";
+
+// line 80 in chat.js.tpl.php
+$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";
+
+// line 83 in chat.js.tpl.php
+$GLOBALS["i18n"]["Enable sound notifications"] = "";
+
+// line 84 in chat.js.tpl.php
+$GLOBALS["i18n"]["Disable sound notifications"] = "";
+
+// line 23 in kick.class.php
+$GLOBALS["i18n"]["no reason"] = "";
+
+// line 24 in banlist.class.php
+$GLOBALS["i18n"]["The banished user list is:"] = "";
+
+// line 39 in banlist.class.php
+$GLOBALS["i18n"]["'/unban {nickname}' will unban the user identified by {nickname}"] = "";
+
+// line 43 in kick.class.php
+$GLOBALS["i18n"]["kicked from %s by %s - reason: %s"] = "";
+
+// line 20 in quit.class.php
+$GLOBALS["i18n"]["%s quit (%s)"] = "% izasao %S";
+
+// line 124 in chat.js.tpl.php
+$GLOBALS["i18n"]["Chat loading ..."] = "Chat u pripremi..";
+
+// line 124 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please wait"] = "Molim pricekajte..";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["%s appears to be either disabled or unsupported by your browser."] = "";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["This web application requires %s to work properly."] = "";
+
+// line 135 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please enable %s in your browser settings, or upgrade to a browser with %s support and try again."] = "";
+
+// line 137 in chat.js.tpl.php
+$GLOBALS["i18n"]["Please upgrade to a browser with %s support and try again."] = "";
+
+// line 139 in chat.js.tpl.php
+$GLOBALS["i18n"]["In Internet Explorer versions earlier than 7.0, Ajax is implemented using ActiveX. Please enable ActiveX in your browser security settings or upgrade to a browser with Ajax support and try again."] = "";
+
+// line 359 in pfcglobalconfig.class.php
+$GLOBALS["i18n"]["%s doesn't exist, data_public_path cannot be installed"] = "";
+
+// line 73 in invite.class.php
+$GLOBALS["i18n"]["You must join %s to invite users in this channel"] = "";
+
+// line 47 in chat.html.tpl.php
+$GLOBALS["i18n"]["Ping"] = "Ping";
+
+// line 477 in phpfreechat.class.php
+$GLOBALS["i18n"]["Input Required"] = "Unesite podatke";
+
+// line 478 in phpfreechat.class.php
+$GLOBALS["i18n"]["OK"] = "Ok";
+
+// line 479 in phpfreechat.class.php
+$GLOBALS["i18n"]["Cancel"] = "Odustani";
+
+?>
\ No newline at end of file
Modified: trunk/src/pfci18n.class.php
===================================================================
--- trunk/src/pfci18n.class.php 2007-06-07 09:57:18 UTC (rev 1030)
+++ trunk/src/pfci18n.class.php 2007-06-07 10:41:20 UTC (rev 1031)
@@ -103,7 +103,7 @@
*/
function GetAcceptedLanguage($type="main")
{
- return /*<GetAcceptedLanguage>*/array('ar_LB','sv_SE','ja_JP','ba_BA','pt_PT','el_GR','tr_TR','hy_AM','nb_NO','zh_TW','ru_RU','fr_FR','es_ES','bg_BG','zh_CN','nl_NL','de_DE-informal','pl_PL','pt_BR','it_IT','id_ID','hu_HU','en_US','sr_CS','de_DE-formal','eo','bn_BD','uk_UA','uk_RO','ko_KR','da_DK','nn_NO','vi_VN');/*</GetAcceptedLanguage>*/
+ return /*<GetAcceptedLanguage>*/array('ar_LB','sv_SE','ja_JP','ba_BA','pt_PT','el_GR','tr_TR','hy_AM','nb_NO','zh_TW','ru_RU','fr_FR','es_ES','bg_BG','zh_CN','nl_NL','de_DE-informal','pl_PL','pt_BR','it_IT','id_ID','hu_HU','en_US','sr_CS','de_DE-formal','eo','bn_BD','uk_UA','uk_RO','ko_KR','da_DK','nn_NO','vi_VN','hr_HR');/*</GetAcceptedLanguage>*/
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-06-30 20:43:16
|
Revision: 1044
http://svn.sourceforge.net/phpfreechat/?rev=1044&view=rev
Author: kerphi
Date: 2007-06-30 13:43:19 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
When closing private chat the popup mesage was not explicite
Modified Paths:
--------------
trunk/data/public/js/pfcgui.js
trunk/src/pfci18n.class.php
trunk/src/phpfreechat.class.php
Modified: trunk/data/public/js/pfcgui.js
===================================================================
--- trunk/data/public/js/pfcgui.js 2007-06-30 20:40:38 UTC (rev 1043)
+++ trunk/data/public/js/pfcgui.js 2007-06-30 20:43:19 UTC (rev 1044)
@@ -254,7 +254,9 @@
a2.pfc_tabname = name;
a2.pfc_tabtype = type;
a2.onclick = function(){
- var res = confirm(pfc.res.getLabel('Do you really want to leave this room ?'));
+ var msg = (type == 'pv' ? 'Are you sure you want to close this tab ?' :
+ 'Do you really want to leave this room ?');
+ var res = confirm(pfc.res.getLabel(msg));
if (res == true)
pfc.sendRequest('/leave',this.pfc_tabid);
return false;
Modified: trunk/src/pfci18n.class.php
===================================================================
--- trunk/src/pfci18n.class.php 2007-06-30 20:40:38 UTC (rev 1043)
+++ trunk/src/pfci18n.class.php 2007-06-30 20:43:19 UTC (rev 1044)
@@ -103,7 +103,7 @@
*/
function GetAcceptedLanguage($type="main")
{
- return /*<GetAcceptedLanguage>*/array('ar_LB','sv_SE','ja_JP','ba_BA','pt_PT','el_GR','tr_TR','hy_AM','nb_NO','zh_TW','ru_RU','fr_FR','es_ES','bg_BG','zh_CN','nl_NL','de_DE-informal','pl_PL','pt_BR','it_IT','id_ID','hu_HU','en_US','sr_CS','de_DE-formal','eo','bn_BD','uk_UA','uk_RO','ko_KR','da_DK','nn_NO','vi_VN','hr_HR');/*</GetAcceptedLanguage>*/
+ return /*<GetAcceptedLanguage>*/array('ar_LB','sv_SE','uk_RO','ja_JP','ba_BA','pt_PT','el_GR','tr_TR','nb_NO','zh_TW','ru_RU','hy_AM','fr_FR','es_ES','bg_BG','zh_CN','nl_NL','eo','bn_BD','uk_UA','de_DE-informal','pl_PL','pt_BR','it_IT','id_ID','hu_HU','en_US','sr_CS','de_DE-formal','ko_KR','da_DK','nn_NO','vi_VN','hr_HR');/*</GetAcceptedLanguage>*/
}
/**
Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php 2007-06-30 20:40:38 UTC (rev 1043)
+++ trunk/src/phpfreechat.class.php 2007-06-30 20:43:19 UTC (rev 1044)
@@ -411,6 +411,7 @@
$labels_to_load =
array( "Do you really want to leave this room ?", // _pfc
+ "Are you sure you want to close this tab ?", // _pfc
"Hide nickname marker", // _pfc
"Show nickname marker", // _pfc
"Hide dates and hours", // _pfc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-07-01 11:52:31
|
Revision: 1050
http://svn.sourceforge.net/phpfreechat/?rev=1050&view=rev
Author: kerphi
Date: 2007-07-01 04:52:09 -0700 (Sun, 01 Jul 2007)
Log Message:
-----------
Bug fix : IE6 clients were frequently disconnected
Modified Paths:
--------------
trunk/data/public/js/pfcclient.js
trunk/data/public/js/prototype.js
trunk/themes/default/chat.js.tpl.php
Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js 2007-07-01 10:41:31 UTC (rev 1049)
+++ trunk/data/public/js/pfcclient.js 2007-07-01 11:52:09 UTC (rev 1050)
@@ -44,7 +44,6 @@
this.max_refresh_delay = pfc_max_refresh_delay;
this.last_response_time = new Date().getTime();
this.last_request_time = new Date().getTime();
- this.canupdatenexttime = true;
/* unique client id for each windows used to identify a open window
* this id is passed every time the JS communicate with server
@@ -333,11 +332,6 @@
}
else if (cmd == "update")
{
- // if the first ever refresh request never makes it back then the chat will keep
- // trying to refresh as usual
- // this only helps if we temporarily lose connection in the middle of an established
- // chat session
- this.canupdatenexttime = true;
}
else if (cmd == "version")
{
@@ -925,20 +919,8 @@
clearTimeout(this.timeout);
if (start)
{
- var res = true;
- if (this.canupdatenexttime)
- {
- // the connection is ok
- res = this.sendRequest('/update');
- this.canupdatenexttime = false; // don't update if the last 'ok' response is not yet received
- }
- else if ((new Date().getTime() - this.last_response_time) > this.max_refresh_delay)
- {
- // the connection is probably closed or very slow
- res = this.sendRequest('/update');
- this.canupdatenexttime = false; // don't update if the last 'ok' response is not yet received
- this.last_response_time = new Date().getTime();
- }
+ this.sendRequest('/update');
+
// setup the next update
this.timeout = setTimeout('pfc.updateChat(true)', this.refresh_delay);
}
@@ -1802,4 +1784,4 @@
this.pfc = new pfcPrompt($('pfc_container'));
return this.pfc;
}
-};
\ No newline at end of file
+};
Modified: trunk/data/public/js/prototype.js
===================================================================
--- trunk/data/public/js/prototype.js 2007-07-01 10:41:31 UTC (rev 1049)
+++ trunk/data/public/js/prototype.js 2007-07-01 11:52:09 UTC (rev 1050)
@@ -1,4 +1,4 @@
-/* Prototype JavaScript framework, version 1.5.1
+/* Prototype JavaScript framework, version 1.5.1.1
* (c) 2005-2007 Sam Stephenson
*
* Prototype is freely distributable under the terms of an MIT-style license.
@@ -7,7 +7,7 @@
/*--------------------------------------------------------------------------*/
var Prototype = {
- Version: '1.5.1',
+ Version: '1.5.1.1',
Browser: {
IE: !!(window.attachEvent && !window.opera),
@@ -24,8 +24,8 @@
document.createElement('form').__proto__)
},
- ScriptFragment: '<script[^>]*>([\u0001-\uFFFF]*?)</script>',
- JSONFilter: /^\/\*-secure-\s*(.*)\s*\*\/\s*$/,
+ ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
+ JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
emptyFunction: function() { },
K: function(x) { return x }
@@ -364,11 +364,15 @@
return this.sub(filter || Prototype.JSONFilter, '#{1}');
},
+ isJSON: function() {
+ var str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
+ return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
+ },
+
evalJSON: function(sanitize) {
var json = this.unfilterJSON();
try {
- if (!sanitize || (/^("(\\.|[^"\\\n\r])*?"|[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t])+?$/.test(json)))
- return eval('(' + json + ')');
+ if (!sanitize || json.isJSON()) return eval('(' + json + ')');
} catch (e) { }
throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
},
@@ -1270,10 +1274,12 @@
} else document.getElementsByClassName = function(className, parentElement) {
var children = ($(parentElement) || document.body).getElementsByTagName('*');
- var elements = [], child;
+ var elements = [], child, pattern = new RegExp("(^|\\s)" + className + "(\\s|$)");
for (var i = 0, length = children.length; i < length; i++) {
child = children[i];
- if (Element.hasClassName(child, className))
+ var elementClassName = child.className;
+ if (elementClassName.length == 0) continue;
+ if (elementClassName == className || elementClassName.match(pattern))
elements.push(Element.extend(child));
}
return elements;
Modified: trunk/themes/default/chat.js.tpl.php
===================================================================
--- trunk/themes/default/chat.js.tpl.php 2007-07-01 10:41:31 UTC (rev 1049)
+++ trunk/themes/default/chat.js.tpl.php 2007-07-01 11:52:09 UTC (rev 1050)
@@ -73,7 +73,7 @@
params['f'] = 'handleRequest';
params['cmd'] = cmd;
new Ajax.Request(url, {
- method: 'post',
+ method: 'get',
parameters: params,
onSuccess: function(transport) {
eval( transport.responseText );
@@ -158,4 +158,4 @@
<?php if ($debug) { ?>
<div id="pfc_debug"></div>
-<?php } ?>
\ No newline at end of file
+<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-07-19 14:13:09
|
Revision: 1053
http://svn.sourceforge.net/phpfreechat/?rev=1053&view=rev
Author: kerphi
Date: 2007-07-19 07:13:08 -0700 (Thu, 19 Jul 2007)
Log Message:
-----------
Add the pfcComet javascript class that will be used to retrive data with ajax/comet system
See http://www.zeitoun.net/index.php?2007/06/22/46-how-to-implement-comet-with-php
Modified Paths:
--------------
trunk/themes/default/chat.js.tpl.php
Added Paths:
-----------
trunk/data/public/js/pfccomet.js
Added: trunk/data/public/js/pfccomet.js
===================================================================
--- trunk/data/public/js/pfccomet.js (rev 0)
+++ trunk/data/public/js/pfccomet.js 2007-07-19 14:13:08 UTC (rev 1053)
@@ -0,0 +1,87 @@
+/**
+ * This class is used to get data from server using a persistent connexion
+ * thus the clients are informed in realtime from the server changes (very usefull for a chat application)
+ * Usage:
+ * var comet = new pfcComet({'url': './cometbackend.php', 'id': 1});
+ * comet.onResponse = function(req) { alert('id:'+req['id']+' response:'+req['data']); };
+ * comet.onConnect = function(comet) { alert('connected'); };
+ * comet.onDisconnect = function(comet) { alert('disconnected'); };
+ */
+var pfcComet = Class.create();
+pfcComet.prototype = {
+
+ url: null,
+ id: 0,
+ timeout: 5000,
+
+ _noerror: false,
+ _ajax: null,
+ _isconnected: false,
+
+ initialize: function(params) {
+ if (!params) params = {};
+ if (!params['url']) alert('error: url parameter is mandatory');
+ this.url = params['url'];
+ if (params['id']) this.id = params['id'];
+ if (params['timeout']) this.timeout = params['timeout'];
+ },
+
+ connect: function()
+ {
+ if (this._isconnected) return;
+ this._isconnected = true;
+ this.onConnect(this);
+ this.waitForData();
+ },
+
+ disconnect: function()
+ {
+ if (!this._isconnected) return;
+ this._isconnected = false;
+ this.onDisconnect(this);
+ // remove the registred callbacks in order to ignore the next response
+ this._ajax.options.onSuccess = null;
+ this._ajax.options.onComplete = null;
+ },
+
+ waitForData: function()
+ {
+ if (!this._isconnected) return;
+
+ this._ajax = new Ajax.Request(this.url, {
+ method: 'get',
+ parameters: { 'id' : this.id },
+ onSuccess: function(transport) {
+ // handle the server response
+ var response = transport.responseText.evalJSON();
+ this.comet.id = response['id'];
+ this.comet.onResponse(response);
+ this.comet._noerror = true;
+ },
+ onComplete: function(transport) {
+ // send a new ajax request when this request is finished
+ if (!this.comet._noerror)
+ // if a connection problem occurs, try to reconnect periodicaly
+ setTimeout(function(){ this.comet.waitForData(); }.bind(this), this.comet.timeout);
+ else
+ // of wait for the next data
+ this.comet.waitForData();
+ this.comet._noerror = false;
+ }
+ });
+ this._ajax.comet = this;
+ },
+
+ /**
+ * User's callbacks
+ */
+ onResponse: function(response)
+ {
+ },
+ onConnect: function(comet)
+ {
+ },
+ onDisconnect: function(comet)
+ {
+ },
+}
Modified: trunk/themes/default/chat.js.tpl.php
===================================================================
--- trunk/themes/default/chat.js.tpl.php 2007-07-17 18:34:54 UTC (rev 1052)
+++ trunk/themes/default/chat.js.tpl.php 2007-07-19 14:13:08 UTC (rev 1053)
@@ -128,6 +128,7 @@
<script type="text/javascript" src="<?php echo $c->data_public_url; ?>/js/pfcgui.js"></script>
<script type="text/javascript" src="<?php echo $c->data_public_url; ?>/js/pfcresource.js"></script>
<script type="text/javascript" src="<?php echo $c->data_public_url; ?>/js/pfcprompt.js"></script>
+<script type="text/javascript" src="<?php echo $c->data_public_url; ?>/js/pfccomet.js"></script>
<div id="pfc_notloading" style="width:270px;background-color:#FFF;color:#000;border:1px solid #000;text-align:center;margin:5px auto 0 auto;font-size:10px;background-image:url('http://img402.imageshack.us/img402/3766/stopcc3.gif');background-repeat:no-repeat;background-position:center center;">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
;background-repeat:no-repeat;background-position:center){kind=link}
|
From: <ke...@us...> - 2007-07-30 13:16:30
|
Revision: 1062
http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1062&view=rev
Author: kerphi
Date: 2007-07-30 06:16:33 -0700 (Mon, 30 Jul 2007)
Log Message:
-----------
Bug fix: privmsg command errors were not complete (thanks to sappheiros, sd bug 1762828)
Modified Paths:
--------------
trunk/data/public/js/pfcclient.js
trunk/src/commands/privmsg.class.php
trunk/src/commands/privmsg2.class.php
trunk/src/phpfreechat.class.php
Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js 2007-07-30 13:12:30 UTC (rev 1061)
+++ trunk/data/public/js/pfcclient.js 2007-07-30 13:16:33 UTC (rev 1062)
@@ -282,6 +282,7 @@
else if (resp == "unknown")
{
// speak to unknown user
+ this.displayMsg( cmd, this.res.getLabel('You are trying to speak to a unknown (or not connected) user') );
}
else if (resp == "speak_to_myself")
{
Modified: trunk/src/commands/privmsg.class.php
===================================================================
--- trunk/src/commands/privmsg.class.php 2007-07-30 13:12:30 UTC (rev 1061)
+++ trunk/src/commands/privmsg.class.php 2007-07-30 13:16:33 UTC (rev 1062)
@@ -4,10 +4,12 @@
class pfcCommand_privmsg extends pfcCommand
{
+ var $usage = "/privmsg {nickname}";
+
function run(&$xml_reponse, $p)
{
$clientid = $p["clientid"];
- $param = $p["param"];
+ $params = $p["params"];
$sender = $p["sender"];
$recipient = $p["recipient"];
$recipientid = $p["recipientid"];
@@ -16,17 +18,28 @@
$u =& pfcUserConfig::Instance();
$ct =& pfcContainer::Instance();
+ if (count($params) == 0)
+ {
+ // error
+ $cmdp = $p;
+ $cmdp["param"] = _pfc("Missing parameter");
+ $cmdp["param"] .= " (".$this->usage.")";
+ $cmd =& pfcCommand::Factory("error");
+ $cmd->run($xml_reponse, $cmdp);
+ return false;
+ }
+
// check the pvname exists on the server
$pvname = '';
$pvnickid = '';
if ($this->name == 'privmsg2')
{
- $pvnickid = $param;
+ $pvnickid = $params[0];
$pvname = $ct->getNickname($pvnickid);
}
else
{
- $pvname = $param;
+ $pvname = $params[0];
$pvnickid = $ct->getNickId($pvname);
}
$nickid = $u->nickid;
@@ -103,4 +116,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/src/commands/privmsg2.class.php
===================================================================
--- trunk/src/commands/privmsg2.class.php 2007-07-30 13:12:30 UTC (rev 1061)
+++ trunk/src/commands/privmsg2.class.php 2007-07-30 13:16:33 UTC (rev 1062)
@@ -29,6 +29,7 @@
*/
class pfcCommand_privmsg2 extends pfcCommand_privmsg
{
+ var $usage = "/privmsg2 {nicknameid}";
}
-?>
\ No newline at end of file
+?>
Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php 2007-07-30 13:12:30 UTC (rev 1061)
+++ trunk/src/phpfreechat.class.php 2007-07-30 13:16:33 UTC (rev 1062)
@@ -457,6 +457,7 @@
"Input Required", // _pfc
"OK", // _pfc
"Cancel", // _pfc
+ "You are trying to speak to a unknown (or not connected) user", // _pfc
);
foreach($labels_to_load as $l)
{
@@ -566,4 +567,4 @@
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-08-01 14:06:39
|
Revision: 1068
http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1068&view=rev
Author: kerphi
Date: 2007-08-01 07:06:37 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
remove comet stuff because I'll work on it in a special branche
Modified Paths:
--------------
trunk/themes/default/chat.js.tpl.php
Removed Paths:
-------------
trunk/data/public/js/pfccomet.js
Deleted: trunk/data/public/js/pfccomet.js
===================================================================
--- trunk/data/public/js/pfccomet.js 2007-08-01 14:05:22 UTC (rev 1067)
+++ trunk/data/public/js/pfccomet.js 2007-08-01 14:06:37 UTC (rev 1068)
@@ -1,87 +0,0 @@
-/**
- * This class is used to get data from server using a persistent connexion
- * thus the clients are informed in realtime from the server changes (very usefull for a chat application)
- * Usage:
- * var comet = new pfcComet({'url': './cometbackend.php', 'id': 1});
- * comet.onResponse = function(req) { alert('id:'+req['id']+' response:'+req['data']); };
- * comet.onConnect = function(comet) { alert('connected'); };
- * comet.onDisconnect = function(comet) { alert('disconnected'); };
- */
-var pfcComet = Class.create();
-pfcComet.prototype = {
-
- url: null,
- id: 0,
- timeout: 5000,
-
- _noerror: false,
- _ajax: null,
- _isconnected: false,
-
- initialize: function(params) {
- if (!params) params = {};
- if (!params['url']) alert('error: url parameter is mandatory');
- this.url = params['url'];
- if (params['id']) this.id = params['id'];
- if (params['timeout']) this.timeout = params['timeout'];
- },
-
- connect: function()
- {
- if (this._isconnected) return;
- this._isconnected = true;
- this.onConnect(this);
- this.waitForData();
- },
-
- disconnect: function()
- {
- if (!this._isconnected) return;
- this._isconnected = false;
- this.onDisconnect(this);
- // remove the registred callbacks in order to ignore the next response
- this._ajax.options.onSuccess = null;
- this._ajax.options.onComplete = null;
- },
-
- waitForData: function()
- {
- if (!this._isconnected) return;
-
- this._ajax = new Ajax.Request(this.url, {
- method: 'get',
- parameters: { 'id' : this.id },
- onSuccess: function(transport) {
- // handle the server response
- var response = transport.responseText.evalJSON();
- this.comet.id = response['id'];
- this.comet.onResponse(response);
- this.comet._noerror = true;
- },
- onComplete: function(transport) {
- // send a new ajax request when this request is finished
- if (!this.comet._noerror)
- // if a connection problem occurs, try to reconnect periodicaly
- setTimeout(function(){ this.comet.waitForData(); }.bind(this), this.comet.timeout);
- else
- // of wait for the next data
- this.comet.waitForData();
- this.comet._noerror = false;
- }
- });
- this._ajax.comet = this;
- },
-
- /**
- * User's callbacks
- */
- onResponse: function(response)
- {
- },
- onConnect: function(comet)
- {
- },
- onDisconnect: function(comet)
- {
- },
-}
Modified: trunk/themes/default/chat.js.tpl.php
===================================================================
--- trunk/themes/default/chat.js.tpl.php 2007-08-01 14:05:22 UTC (rev 1067)
+++ trunk/themes/default/chat.js.tpl.php 2007-08-01 14:06:37 UTC (rev 1068)
@@ -128,7 +128,6 @@
<script type="text/javascript" src="<?php echo $c->data_public_url; ?>/js/pfcgui.js"></script>
<script type="text/javascript" src="<?php echo $c->data_public_url; ?>/js/pfcresource.js"></script>
<script type="text/javascript" src="<?php echo $c->data_public_url; ?>/js/pfcprompt.js"></script>
-<script type="text/javascript" src="<?php echo $c->data_public_url; ?>/js/pfccomet.js"></script>
<div id="pfc_notloading" style="width:270px;background-color:#FFF;color:#000;border:1px solid #000;text-align:center;margin:5px auto 0 auto;font-size:10px;background-image:url('http://img402.imageshack.us/img402/3766/stopcc3.gif');background-repeat:no-repeat;background-position:center center;">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gpi...@us...> - 2007-08-01 15:59:01
|
Revision: 1070
http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1070&view=rev
Author: gpinzone
Date: 2007-08-01 08:59:02 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Updated log and debug code to use standard file handling functions.
Modified Paths:
--------------
trunk/debug/console.php
trunk/src/pfci18n.class.php
trunk/src/proxies/log.class.php
Modified: trunk/debug/console.php
===================================================================
--- trunk/debug/console.php 2007-08-01 14:37:04 UTC (rev 1069)
+++ trunk/debug/console.php 2007-08-01 15:59:02 UTC (rev 1070)
@@ -9,13 +9,9 @@
{
$filename = dirname(__FILE__)."/../data/private/debug".$section."_".$chatid.".log";
$xml_reponse = new xajaxResponse();
- if (file_exists($filename))
+ if (false !== $html = @file_get_contents_flock($filename))
{
- $fp = fopen($filename, "r");
- $html = "<pre>";
- $html .= fread($fp, filesize($filename));
- $html .= "</pre>";
- fclose($fp);
+ $html = "<pre>" . $html . "</pre>";
unlink($filename);
$xml_reponse->addAppend("debug".$section, "innerHTML", $html);
}
Modified: trunk/src/pfci18n.class.php
===================================================================
--- trunk/src/pfci18n.class.php 2007-08-01 14:37:04 UTC (rev 1069)
+++ trunk/src/pfci18n.class.php 2007-08-01 15:59:02 UTC (rev 1070)
@@ -123,11 +123,11 @@
}
closedir($dh);
$i18n_accepted_lang_str = "array('" . implode("','", $i18n_accepted_lang) . "');";
- $data = file_get_contents(__FILE__);
+ $data = file_get_contents_flock(__FILE__);
$data = preg_replace("/(\/\*<GetAcceptedLanguage>\*\/)(.*)(\/\*<\/GetAcceptedLanguage>\*\/)/",
"$1".$i18n_accepted_lang_str."$3",
$data);
- file_put_contents(__FILE__,$data);
+ file_put_contents(__FILE__, $data, FILE_EX);
// Now scan the source code in order to find "_pfc" patterns
$files = array();
@@ -170,7 +170,7 @@
foreach( $dst_filenames as $dst_filename )
{
// filter lines to keep, line to add
- $old_content = file_get_contents($dst_filename);
+ $old_content = file_get_contents_flock($dst_filename);
// remove php tags to keep only real content
$old_content = preg_replace("/^\<\?php/", "", $old_content);
$old_content = preg_replace("/\?\>$/", "", $old_content);
@@ -187,7 +187,7 @@
$content = "<?php" . $old_content . $new_content . "?>";
//echo $content;
- file_put_contents($dst_filename, $content);
+ file_put_contents($dst_filename, $content, FILE_EX);
}
}
}
Modified: trunk/src/proxies/log.class.php
===================================================================
--- trunk/src/proxies/log.class.php 2007-08-01 14:37:04 UTC (rev 1069)
+++ trunk/src/proxies/log.class.php 2007-08-01 15:59:02 UTC (rev 1070)
@@ -51,19 +51,15 @@
if (file_exists($logpath) && is_writable($logpath))
{
$logfile = $logpath."/chat.log";
- $f_exists = file_exists($logfile);
- if (($f_exists && is_writable($logpath)) ||
- !$f_exists)
+ if (is_writable($logpath))
{
- $fp = fopen($logfile, $f_exists ? 'a' : 'w');
// @todo write logs in a cleaner structured language (xml, html ... ?)
$log = $recipient."\t";
$log .= date("d/m/Y")."\t";
$log .= date("H:i:s")."\t";
$log .= $sender."\t";
$log .= $param."\n";
- fwrite($fp, $log);
- fclose($fp);
+ file_put_contents($logfile, $log, FILE_APPEND);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gpi...@us...> - 2007-08-01 16:28:29
|
Revision: 1071
http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1071&view=rev
Author: gpinzone
Date: 2007-08-01 09:28:27 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Better PNG lossless compression used.
Modified Paths:
--------------
trunk/style/bulle.png
trunk/style/check_off.png
trunk/style/check_on.png
trunk/style/valid-css.png
trunk/style/valid-xhtml.png
trunk/themes/default/smileys/arrow_left.png
trunk/themes/default/smileys/arrow_right.png
trunk/themes/default/smileys/emoticon_evilgrin.png
trunk/themes/default/smileys/emoticon_grin.png
trunk/themes/default/smileys/emoticon_happy.png
trunk/themes/default/smileys/emoticon_surprised.png
trunk/themes/default/smileys/emoticon_tongue.png
trunk/themes/default/smileys/emoticon_unhappy.png
trunk/themes/default/smileys/emoticon_waii.png
trunk/themes/default/smileys/emoticon_wink.png
trunk/themes/default/smileys/exclamation.png
trunk/themes/default/smileys/lightbulb.png
trunk/themes/default/smileys/weather_clouds.png
trunk/themes/default/smileys/weather_cloudy.png
trunk/themes/default/smileys/weather_lightning.png
trunk/themes/default/smileys/weather_rain.png
trunk/themes/default/smileys/weather_snow.png
trunk/themes/default/smileys/weather_sun.png
trunk/themes/zilveer/images/channels_content_bg.png
trunk/themes/zilveer/images/newmsg.png
trunk/themes/zilveer/images/oldmsg.png
trunk/themes/zilveer/images/pfc_message1.png
trunk/themes/zilveer/images/pfc_message2.png
trunk/themes/zilveer/images/pfc_online.png
trunk/themes/zilveer/images/pfc_send.png
trunk/themes/zilveer/images/pfc_words.png
trunk/themes/zilveer/images/tab_off.png
trunk/themes/zilveer/images/tab_on.png
Modified: trunk/style/bulle.png
===================================================================
(Binary files differ)
Modified: trunk/style/check_off.png
===================================================================
(Binary files differ)
Modified: trunk/style/check_on.png
===================================================================
(Binary files differ)
Modified: trunk/style/valid-css.png
===================================================================
(Binary files differ)
Modified: trunk/style/valid-xhtml.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/arrow_left.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/arrow_right.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/emoticon_evilgrin.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/emoticon_grin.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/emoticon_happy.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/emoticon_surprised.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/emoticon_tongue.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/emoticon_unhappy.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/emoticon_waii.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/emoticon_wink.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/exclamation.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/lightbulb.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/weather_clouds.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/weather_cloudy.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/weather_lightning.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/weather_rain.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/weather_snow.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/smileys/weather_sun.png
===================================================================
(Binary files differ)
Modified: trunk/themes/zilveer/images/channels_content_bg.png
===================================================================
(Binary files differ)
Modified: trunk/themes/zilveer/images/newmsg.png
===================================================================
(Binary files differ)
Modified: trunk/themes/zilveer/images/oldmsg.png
===================================================================
(Binary files differ)
Modified: trunk/themes/zilveer/images/pfc_message1.png
===================================================================
(Binary files differ)
Modified: trunk/themes/zilveer/images/pfc_message2.png
===================================================================
(Binary files differ)
Modified: trunk/themes/zilveer/images/pfc_online.png
===================================================================
(Binary files differ)
Modified: trunk/themes/zilveer/images/pfc_send.png
===================================================================
(Binary files differ)
Modified: trunk/themes/zilveer/images/pfc_words.png
===================================================================
(Binary files differ)
Modified: trunk/themes/zilveer/images/tab_off.png
===================================================================
(Binary files differ)
Modified: trunk/themes/zilveer/images/tab_on.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-08-07 07:46:41
|
Revision: 1095
http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1095&view=rev
Author: kerphi
Date: 2007-08-07 00:46:37 -0700 (Tue, 07 Aug 2007)
Log Message:
-----------
Translation fix: http://www.phpfreechat.net/forum/viewtopic.php?id=1749
Modified Paths:
--------------
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/commands/invite.class.php
Modified: trunk/i18n/ar_LB/main.php
===================================================================
--- trunk/i18n/ar_LB/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/ar_LB/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -396,4 +396,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/ba_BA/main.php
===================================================================
--- trunk/i18n/ba_BA/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/ba_BA/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -399,4 +399,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/bg_BG/main.php
===================================================================
--- trunk/i18n/bg_BG/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/bg_BG/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -394,4 +394,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/bn_BD/main.php
===================================================================
--- trunk/i18n/bn_BD/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/bn_BD/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -400,4 +400,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/da_DK/main.php
===================================================================
--- trunk/i18n/da_DK/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/da_DK/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -396,4 +396,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/de_DE-formal/main.php
===================================================================
--- trunk/i18n/de_DE-formal/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/de_DE-formal/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -401,4 +401,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/de_DE-informal/main.php
===================================================================
--- trunk/i18n/de_DE-informal/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/de_DE-informal/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -402,4 +402,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/el_GR/main.php
===================================================================
--- trunk/i18n/el_GR/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/el_GR/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -395,4 +395,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/en_US/main.php
===================================================================
--- trunk/i18n/en_US/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/en_US/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -381,7 +381,6 @@
// line 479 in phpfreechat.class.php
$GLOBALS["i18n"]["Cancel"] = "Cancel";
-
// line 430 in pfcglobalconfig.class.php
$GLOBALS["i18n"]["cannot create %s"] = "cannot create %s";
@@ -397,4 +396,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "%s banished from %s by %s";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "You are trying to speak to a unknown (or not connected) user";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "%s was invited by %s";
+
?>
\ No newline at end of file
Modified: trunk/i18n/eo/main.php
===================================================================
--- trunk/i18n/eo/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/eo/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -399,4 +399,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/es_ES/main.php
===================================================================
--- trunk/i18n/es_ES/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/es_ES/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -397,4 +397,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/fr_FR/main.php
===================================================================
--- trunk/i18n/fr_FR/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/fr_FR/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -396,4 +396,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "%s banni de %s par %s";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "Vous essayez de parler à un utilisateur inconnu (ou inconnu)";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "%s a été invité par %s";
+
?>
\ No newline at end of file
Modified: trunk/i18n/hr_HR/main.php
===================================================================
--- trunk/i18n/hr_HR/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/hr_HR/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -399,4 +399,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/hu_HU/main.php
===================================================================
--- trunk/i18n/hu_HU/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/hu_HU/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -399,4 +399,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/hy_AM/main.php
===================================================================
--- trunk/i18n/hy_AM/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/hy_AM/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -399,4 +399,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/id_ID/main.php
===================================================================
--- trunk/i18n/id_ID/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/id_ID/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -399,4 +399,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/it_IT/main.php
===================================================================
--- trunk/i18n/it_IT/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/it_IT/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -400,4 +400,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/ja_JP/main.php
===================================================================
--- trunk/i18n/ja_JP/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/ja_JP/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -397,4 +397,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/ko_KR/main.php
===================================================================
--- trunk/i18n/ko_KR/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/ko_KR/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -398,4 +398,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/nb_NO/main.php
===================================================================
--- trunk/i18n/nb_NO/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/nb_NO/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -396,4 +396,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/nl_NL/main.php
===================================================================
--- trunk/i18n/nl_NL/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/nl_NL/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -397,4 +397,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/nn_NO/main.php
===================================================================
--- trunk/i18n/nn_NO/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/nn_NO/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -397,4 +397,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/pl_PL/main.php
===================================================================
--- trunk/i18n/pl_PL/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/pl_PL/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -399,4 +399,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/pt_BR/main.php
===================================================================
--- trunk/i18n/pt_BR/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/pt_BR/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -401,4 +401,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/pt_PT/main.php
===================================================================
--- trunk/i18n/pt_PT/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/pt_PT/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -397,4 +397,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/ru_RU/main.php
===================================================================
--- trunk/i18n/ru_RU/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/ru_RU/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -402,4 +402,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/sr_CS/main.php
===================================================================
--- trunk/i18n/sr_CS/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/sr_CS/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -399,4 +399,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/sv_SE/main.php
===================================================================
--- trunk/i18n/sv_SE/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/sv_SE/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -405,4 +405,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/tr_TR/main.php
===================================================================
--- trunk/i18n/tr_TR/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/tr_TR/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -396,4 +396,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/uk_RO/main.php
===================================================================
--- trunk/i18n/uk_RO/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/uk_RO/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -396,4 +396,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/uk_UA/main.php
===================================================================
--- trunk/i18n/uk_UA/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/uk_UA/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -396,4 +396,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/vi_VN/main.php
===================================================================
--- trunk/i18n/vi_VN/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/vi_VN/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -397,4 +397,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/zh_CN/main.php
===================================================================
--- trunk/i18n/zh_CN/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/zh_CN/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -398,4 +398,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/i18n/zh_TW/main.php
===================================================================
--- trunk/i18n/zh_TW/main.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/i18n/zh_TW/main.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -396,4 +396,10 @@
// line 42 in ban.class.php
$GLOBALS["i18n"]["%s banished from %s by %s"] = "";
+// line 461 in phpfreechat.class.php
+$GLOBALS["i18n"]["You are trying to speak to a unknown (or not connected) user"] = "";
+
+// line 89 in invite.class.php
+$GLOBALS["i18n"]["%s was invited by %s"] = "";
+
?>
\ No newline at end of file
Modified: trunk/src/commands/invite.class.php
===================================================================
--- trunk/src/commands/invite.class.php 2007-08-07 07:43:58 UTC (rev 1094)
+++ trunk/src/commands/invite.class.php 2007-08-07 07:46:37 UTC (rev 1095)
@@ -86,7 +86,7 @@
// notify the aimed channel that a user has been invited
$cmdp = array();
- $cmdp["param"] = $nicktoinvite.' was invited by '.$sender;
+ $cmdp["param"] = _pfc("%s was invited by %s",$nicktoinvite,$sender);
$cmdp["flag"] = 1;
$cmdp["recipient"] = pfcCommand_join::GetRecipient($channeltarget);
$cmdp["recipientid"] = pfcCommand_join::GetRecipientId($channeltarget);
@@ -94,4 +94,4 @@
$cmd->run($xml_reponse, $cmdp);
}
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
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.
|
|
From: <gpi...@us...> - 2007-08-17 23:44:25
|
Revision: 1131
http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1131&view=rev
Author: gpinzone
Date: 2007-08-17 16:44:26 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
Updated chat template to use new IDs. Fixed missing button ID.
Modified Paths:
--------------
trunk/data/public/js/pfcgui.js
trunk/themes/default/chat.html.tpl.php
Modified: trunk/data/public/js/pfcgui.js
===================================================================
--- trunk/data/public/js/pfcgui.js 2007-08-17 23:29:41 UTC (rev 1130)
+++ trunk/data/public/js/pfcgui.js 2007-08-17 23:44:26 UTC (rev 1131)
@@ -680,9 +680,11 @@
// bbcode del
var btn = document.createElement('div');
+ btn.setAttribute('id', 'pfc_bt_delete_btn');
btn.setAttribute('class', 'pfc_btn')
btn.setAttribute('className', 'pfc_btn'); // for IE6
var img = document.createElement('img');
+ img.setAttribute('id', 'pfc_bt_delete');
img.setAttribute('class', 'pfc_bt_delete');
img.setAttribute('className', 'pfc_bt_delete'); // for IE6
img.setAttribute('title', pfc.res.getLabel("Delete"));
Modified: trunk/themes/default/chat.html.tpl.php
===================================================================
--- trunk/themes/default/chat.html.tpl.php 2007-08-17 23:29:41 UTC (rev 1130)
+++ trunk/themes/default/chat.html.tpl.php 2007-08-17 23:44:26 UTC (rev 1131)
@@ -1,151 +1,157 @@
- <img id="pfc_minmax" onclick="pfc.swap_minimize_maximize()" src="<?php echo $c->getFileUrlFromTheme('images/'.($start_minimized?'maximize':'minimize').'.gif'); ?>" alt=""/>
- <h2 id="pfc_title"><?php echo $title; ?></h2>
-
- <div id="pfc_content_expandable">
-
- <div id="pfc_channels">
- <ul id="pfc_channels_list"></ul>
- <div id="pfc_channels_content"></div>
- </div>
-
- <div id="pfc_input_container">
-
- <table style="margin:0;padding:0;border-collapse:collapse;">
- <tbody>
- <tr>
- <td class="pfc_td1">
- <p id="pfc_handle"
- title="<?php echo _pfc("Enter your nickname here"); ?>"
- onclick="pfc.askNick('')"><?php echo $u->nick; ?></p>
- </td>
- <td class="pfc_td2">
- <input type="text"
- id="pfc_words"
- title="<?php echo _pfc("Enter your message here"); ?>"
- maxlength="<?php echo $max_text_len; ?>"/>
- </td>
- <td class="pfc_td3">
- <input type="button"
- id="pfc_send"
- value="<?php echo _pfc("Send"); ?>"
- title="<?php echo _pfc("Click here to send your message"); ?>"
- onclick="pfc.doSendMessage()"/>
- </td>
- </tr>
- </tbody>
- </table>
-
- <div id="pfc_cmd_container">
-<?php if ($display_pfc_logo) { ?>
- <a href="http://www.phpfreechat.net"
- id="pfc_logo"<?php if($openlinknewwindow) echo ' onclick="window.open(this.href,\'_blank\');return false;"'; ?>>
- <img src="http://www.phpfreechat.net/pub/logo_80x15.gif"
- alt="<?php echo _pfc("PHP FREE CHAT [powered by phpFreeChat-%s]", $version); ?>"
- title="<?php echo _pfc("PHP FREE CHAT [powered by phpFreeChat-%s]", $version); ?>" />
- </a>
-<?php } ?>
- <span id="pfc_ping" title="<?php echo _pfc("Ping"); ?>"></span>
-
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/logout.gif'); ?>"
- alt="" title=""
- id="pfc_loginlogout"
- onclick="pfc.connect_disconnect()" />
- </div>
-
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/color-on.gif'); ?>"
- alt="" title=""
- id="pfc_nickmarker"
- onclick="pfc.nickmarker_swap()" />
- </div>
-
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/clock-on.gif'); ?>"
- alt="" title=""
- id="pfc_clock"
- onclick="pfc.clock_swap()" />
- </div>
-
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/sound-on.gif'); ?>"
- alt="" title=""
- id="pfc_sound"
- onclick="pfc.sound_swap()" />
- </div>
-
- <?php if ($c->btn_sh_smileys) { ?>
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/smiley-on.gif'); ?>"
- alt="" title=""
- id="pfc_showHideSmileysbtn"
- onclick="pfc.showHideSmileys()" />
- </div>
- <?php } ?>
-
- <?php if ($c->btn_sh_whosonline) { ?>
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/online-on.gif'); ?>"
- alt="" title=""
- id="pfc_showHideWhosOnlineBtn"
- onclick="pfc.showHideWhosOnline()" />
- </div>
- <?php } ?>
-
- </div>
-
- <div id="pfc_bbcode_container">
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/bt_strong.gif'); ?>"
- alt="<?php echo _pfc("Bold"); ?>"
- title="<?php echo _pfc("Bold"); ?>"
- class="pfc_bt_strong"
- onclick="pfc.insert_text('[b]','[/b]',true)" />
- </div>
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/bt_em.gif'); ?>"
- alt="<?php echo _pfc("Italics"); ?>"
- title="<?php echo _pfc("Italics"); ?>"
- class="pfc_bt_strong"
- onclick="pfc.insert_text('[i]','[/i]',true)" />
- </div>
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/bt_ins.gif'); ?>"
- alt="<?php echo _pfc("Underline"); ?>"
- title="<?php echo _pfc("Underline"); ?>"
- class="pfc_bt_strong"
- onclick="pfc.insert_text('[u]','[/u]',true)" />
- </div>
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/bt_del.gif'); ?>"
- alt="<?php echo _pfc("Delete"); ?>"
- title="<?php echo _pfc("Delete"); ?>"
- class="pfc_bt_strong"
- onclick="pfc.insert_text('[s]','[/s]',true)" />
- </div>
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/bt_mail.gif'); ?>"
- alt="<?php echo _pfc("Mail"); ?>"
- title="<?php echo _pfc("Mail"); ?>"
- class="pfc_bt_strong"
- onclick="pfc.insert_text('[email]','[/email]',true)" />
- </div>
- <div class="pfc_btn">
- <img src="<?php echo $c->getFileUrlFromTheme('images/bt_color.gif'); ?>"
- alt="<?php echo _pfc("Color"); ?>"
- title="<?php echo _pfc("Color"); ?>"
- id="pfc_bt_color"
- onclick="pfc.minimize_maximize('pfc_colorlist','inline')" />
- </div>
- <div id="pfc_colorlist"></div>
- </div> <!-- pfc_bbcode_container -->
-
- </div>
-
- <div id="pfc_errors"></div>
-
- <div id="pfc_smileys"></div>
-
- </div>
-
- <div id="pfc_sound_container"></div>
+ <img id="pfc_minmax" onclick="pfc.swap_minimize_maximize()" src="<?php echo $c->getFileUrlFromTheme('images/'.($start_minimized?'maximize':'minimize').'.gif'); ?>" alt=""/>
+ <h2 id="pfc_title"><?php echo $title; ?></h2>
+
+ <div id="pfc_content_expandable">
+
+ <div id="pfc_channels">
+ <ul id="pfc_channels_list"></ul>
+ <div id="pfc_channels_content"></div>
+ </div>
+
+ <div id="pfc_input_container">
+
+ <table style="margin:0;padding:0;border-collapse:collapse;">
+ <tbody>
+ <tr>
+ <td class="pfc_td1">
+ <p id="pfc_handle"
+ title="<?php echo _pfc("Enter your nickname here"); ?>"
+ onclick="pfc.askNick('')"><?php echo $u->nick; ?></p>
+ </td>
+ <td class="pfc_td2">
+ <input type="text"
+ id="pfc_words"
+ title="<?php echo _pfc("Enter your message here"); ?>"
+ maxlength="<?php echo $max_text_len; ?>"/>
+ </td>
+ <td class="pfc_td3">
+ <input type="button"
+ id="pfc_send"
+ value="<?php echo _pfc("Send"); ?>"
+ title="<?php echo _pfc("Click here to send your message"); ?>"
+ onclick="pfc.doSendMessage()"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <div id="pfc_cmd_container">
+<?php if ($display_pfc_logo) { ?>
+ <a href="http://www.phpfreechat.net"
+ id="pfc_logo"<?php if($openlinknewwindow) echo ' onclick="window.open(this.href,\'_blank\');return false;"'; ?>>
+ <img src="http://www.phpfreechat.net/pub/logo_80x15.gif"
+ alt="<?php echo _pfc("PHP FREE CHAT [powered by phpFreeChat-%s]", $version); ?>"
+ title="<?php echo _pfc("PHP FREE CHAT [powered by phpFreeChat-%s]", $version); ?>" />
+ </a>
+<?php } ?>
+ <span id="pfc_ping" title="<?php echo _pfc("Ping"); ?>"></span>
+
+ <div class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/logout.gif'); ?>"
+ alt="" title=""
+ id="pfc_loginlogout"
+ onclick="pfc.connect_disconnect()" />
+ </div>
+
+ <div class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/color-on.gif'); ?>"
+ alt="" title=""
+ id="pfc_nickmarker"
+ onclick="pfc.nickmarker_swap()" />
+ </div>
+
+ <div class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/clock-on.gif'); ?>"
+ alt="" title=""
+ id="pfc_clock"
+ onclick="pfc.clock_swap()" />
+ </div>
+
+ <div class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/sound-on.gif'); ?>"
+ alt="" title=""
+ id="pfc_sound"
+ onclick="pfc.sound_swap()" />
+ </div>
+
+ <?php if ($c->btn_sh_smileys) { ?>
+ <div class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/smiley-on.gif'); ?>"
+ alt="" title=""
+ id="pfc_showHideSmileysbtn"
+ onclick="pfc.showHideSmileys()" />
+ </div>
+ <?php } ?>
+
+ <?php if ($c->btn_sh_whosonline) { ?>
+ <div class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/online-on.gif'); ?>"
+ alt="" title=""
+ id="pfc_showHideWhosOnlineBtn"
+ onclick="pfc.showHideWhosOnline()" />
+ </div>
+ <?php } ?>
+
+ </div>
+
+ <div id="pfc_bbcode_container">
+ <div id="pfc_bt_strong_btn" class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/bt_strong.gif'); ?>"
+ id="pfc_bt_strong"
+ alt="<?php echo _pfc("Bold"); ?>"
+ title="<?php echo _pfc("Bold"); ?>"
+ class="pfc_bt_strong"
+ onclick="pfc.insert_text('[b]','[/b]',true)" />
+ </div>
+ <div id="pfc_bt_italics_btn" class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/bt_em.gif'); ?>"
+ id="pfc_bt_italics"
+ alt="<?php echo _pfc("Italics"); ?>"
+ title="<?php echo _pfc("Italics"); ?>"
+ class="pfc_bt_italics"
+ onclick="pfc.insert_text('[i]','[/i]',true)" />
+ </div>
+ <div id="pfc_bt_underline_btn" class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/bt_ins.gif'); ?>"
+ id="pfc_bt_underline"
+ alt="<?php echo _pfc("Underline"); ?>"
+ title="<?php echo _pfc("Underline"); ?>"
+ class="pfc_bt_underline"
+ onclick="pfc.insert_text('[u]','[/u]',true)" />
+ </div>
+ <div id="pfc_bt_delete_btn" class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/bt_del.gif'); ?>"
+ id="pfc_bt_delete"
+ alt="<?php echo _pfc("Delete"); ?>"
+ title="<?php echo _pfc("Delete"); ?>"
+ class="pfc_bt_delete"
+ onclick="pfc.insert_text('[s]','[/s]',true)" />
+ </div>
+ <div id="pfc_bt_mail_btn" class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/bt_mail.gif'); ?>"
+ id="pfc_bt_mail"
+ alt="<?php echo _pfc("Mail"); ?>"
+ title="<?php echo _pfc("Mail"); ?>"
+ class="pfc_bt_mail"
+ onclick="pfc.insert_text('[email]','[/email]',true)" />
+ </div>
+ <div id="pfc_bt_color_btn" class="pfc_btn">
+ <img src="<?php echo $c->getFileUrlFromTheme('images/bt_color.gif'); ?>"
+ alt="<?php echo _pfc("Color"); ?>"
+ title="<?php echo _pfc("Color"); ?>"
+ id="pfc_bt_color"
+ class="pfc_bt_color"
+ onclick="pfc.minimize_maximize('pfc_colorlist','inline')" />
+ </div>
+ <div id="pfc_colorlist"></div>
+ </div> <!-- pfc_bbcode_container -->
+
+ </div>
+
+ <div id="pfc_errors"></div>
+
+ <div id="pfc_smileys"></div>
+
+ </div>
+
+ <div id="pfc_sound_container"></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://www.phpfreechat.net/pub/logo_80x15.gif"](http://www.phpfreechat.net/pub/logo_80x15.gif"){kind=link}
|
From: <gpi...@us...> - 2007-08-20 02:19:45
|
Revision: 1132
http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1132&view=rev
Author: gpinzone
Date: 2007-08-19 19:19:47 -0700 (Sun, 19 Aug 2007)
Log Message:
-----------
Cleanup of old/bad code.
Modified Paths:
--------------
trunk/data/public/js/pfcgui.js
trunk/src/containers/file.class.php
Modified: trunk/data/public/js/pfcgui.js
===================================================================
--- trunk/data/public/js/pfcgui.js 2007-08-17 23:44:26 UTC (rev 1131)
+++ trunk/data/public/js/pfcgui.js 2007-08-20 02:19:47 UTC (rev 1132)
@@ -443,7 +443,9 @@
}
},
- buildChat: function()
+/* buildChat is not used. Use templates instead. */
+
+/* buildChat: function()
{
var container = $('pfc_container');
@@ -758,4 +760,5 @@
soundcontainerbox.setAttribute('id', 'pfc_sound_container');
container.appendChild(soundcontainerbox);
}
+ */
};
Modified: trunk/src/containers/file.class.php
===================================================================
--- trunk/src/containers/file.class.php 2007-08-17 23:44:26 UTC (rev 1131)
+++ trunk/src/containers/file.class.php 2007-08-20 02:19:47 UTC (rev 1132)
@@ -67,7 +67,6 @@
return $errors;
}
-
function setMeta($group, $subgroup, $leaf, $leafvalue = NULL)
{
$c =& pfcGlobalConfig::Instance();
@@ -217,120 +216,6 @@
return $ret;
}
-
- function popMeta($group, $subgroup, $leaf)
- {
- $c =& pfcGlobalConfig::Instance();
- if ($c->debug)
- file_put_contents("/tmp/debug", "\npopMeta(".$group.",".$subgroup.",".$leaf.")", FILE_APPEND | LOCK_EX);
-
- // create directories
- $dir_base = $c->container_cfg_server_dir;
- $dir = $dir_base.'/'.$group.'/'.$subgroup;
- if (!is_dir($dir)) mkdir_r($dir);
-
- // create or replace metadata file
- $leaffilename = $dir."/".$leaf;
-
- // create return array
- $ret = array();
- $ret["timestamp"] = array();
- $ret["value"] = array();
-
- // read and increment data from metadata file
- clearstatcache();
- if (file_exists($leaffilename))
- {
- $fh = fopen($leaffilename, 'r+');
- for($i = 0; $i < 10; $i++) // Try 10 times until an exclusive lock can be obtained
- {
- if (flock($fh, LOCK_EX))
- {
- $ret["value"][] = chop(fread($fh, filesize($leaffilename)));
- $ret["timestamp"][] = filemtime($leaffilename);
- $leafvalue = array_pop($ret);
- // check if array is now empty
- if (count($ret) == 0)
- {
- fclose($fh);
- unlink($leaffilename);
- break;
- }
- rewind($fh);
- fwrite($fh, $ret);
- fflush($fh);
- ftruncate($fh, ftell($fh));
- flock($fh, LOCK_UN);
- fclose($fh);
- break;
- }
- // If flock is working properly, this will never be reached
- $delay = rand(0, pow(2, ($i+1)) - 1) * 5000; // Exponential backoff
- usleep($delay);
- }
- $ret = $leafvalue;
- }
- else
- {
- // return empty array
- return $ret;
- }
- return $ret;
- }
-
-
- function pushMeta($group, $subgroup, $leaf, $leafvalue = NULL)
- {
- $c =& pfcGlobalConfig::Instance();
- if ($c->debug)
- file_put_contents("/tmp/debug", "\npushMeta(".$group.",".$subgroup.",".$leaf.",".$leafvalue.")", FILE_APPEND | LOCK_EX);
-
- // create directories
- $dir_base = $c->container_cfg_server_dir;
- $dir = $dir_base.'/'.$group.'/'.$subgroup;
- if (!is_dir($dir)) mkdir_r($dir);
-
- // create or replace metadata file
- $leaffilename = $dir."/".$leaf;
-
- // read and increment data from metadata file
- clearstatcache();
- if ( $leafexists = file_exists($leaffilename) )
- {
- $fh = fopen($leaffilename, 'r+');
- for($i = 0; $i < 10; $i++) // Try 10 times until an exclusive lock can be obtained
- {
- if (flock($fh, LOCK_EX))
- {
- if ( $leafvalue == NULL ) $leafvalue = '';
- $leafvaltmp = chop(fread($fh, filesize($leaffilename)));
- array_push($leafvaltmp, $leafvalue);
- rewind($fh);
- fwrite($fh, $leafvaltmp);
- fflush($fh);
- ftruncate($fh, ftell($fh));
- flock($fh, LOCK_UN);
- break;
- }
- // If flock is working properly, this will never be reached
- $delay = rand(0, pow(2, ($i+1)) - 1) * 5000; // Exponential backoff
- usleep($delay);
- }
- fclose($fh);
- }
- else
- {
- file_put_contents($leaffilename, $leafvalue, LOCK_EX);
- }
-
- if ($leafexists)
- return 1; // value overwritten
- else
- return 0; // value created
- }
-
-
-
function rmMeta($group, $subgroup = null, $leaf = null)
{
$c =& pfcGlobalConfig::Instance();
@@ -376,7 +261,6 @@
return true;
}
-
/**
* Used to encode UTF8 strings to ASCII filenames
*/
@@ -392,7 +276,5 @@
{
return urldecode($str);
}
-
}
-
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gpi...@us...> - 2007-08-20 17:49:22
|
Revision: 1133
http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1133&view=rev
Author: gpinzone
Date: 2007-08-20 10:41:46 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
Moved autolink feature out of JavaScript and put it into PHP. Removed email bbcode and button since it's not needed.
Modified Paths:
--------------
trunk/data/public/js/pfcclient.js
trunk/src/pfccontainer.class.php
trunk/themes/default/chat.html.tpl.php
Added Paths:
-----------
trunk/src/urlprocessing.php
Modified: trunk/data/public/js/pfcclient.js
===================================================================
--- trunk/data/public/js/pfcclient.js 2007-08-20 02:19:47 UTC (rev 1132)
+++ trunk/data/public/js/pfcclient.js 2007-08-20 17:41:46 UTC (rev 1133)
@@ -1387,7 +1387,7 @@
parseMessage: function(msg)
{
var rx = null;
-
+/*
// parse urls
var rx_url = new RegExp('(^|[^\\"])([a-z]+\:\/\/[a-z0-9.\\~\\/\\?\\=\\&\\-\\_\\#:;%,@]*[a-z0-9\\/\\?\\=\\&\\-\\_\\#])([^\\"]|$)','ig');
var ttt = msg.split(rx_url);
@@ -1428,7 +1428,7 @@
// replace double spaces by entity
rx = new RegExp(' ','g');
msg = msg.replace(rx, ' ');
-
+*/
// try to parse bbcode
rx = new RegExp('\\[b\\](.+?)\\[\/b\\]','ig');
msg = msg.replace(rx, '<span style="font-weight: bold">$1</span>');
@@ -1440,10 +1440,12 @@
msg = msg.replace(rx, '<span style="text-decoration: line-through">$1</span>');
// rx = new RegExp('\\[pre\\](.+?)\\[\/pre\\]','ig');
// msg = msg.replace(rx, '<pre>$1</pre>');
+/*
rx = new RegExp('\\[email\\]([A-z0-9][\\w.-]*@[A-z0-9][\\w\\-\\.]+\\.[A-z0-9]{2,6})\\[\/email\\]','ig');
msg = msg.replace(rx, '<a href="mailto: $1">$1</a>');
rx = new RegExp('\\[email=([A-z0-9][\\w.-]*@[A-z0-9][\\w\\-\\.]+\\.[A-z0-9]{2,6})\\](.+?)\\[\/email\\]','ig');
msg = msg.replace(rx, '<a href="mailto: $1">$2</a>');
+*/
rx = new RegExp('\\[color=([a-zA-Z]+|\\#?[0-9a-fA-F]{6}|\\#?[0-9a-fA-F]{3})](.+?)\\[\/color\\]','ig');
msg = msg.replace(rx, '<span style="color: $1">$2</span>');
// parse bbcode colors twice because the current_text_color is a bbcolor
Modified: trunk/src/pfccontainer.class.php
===================================================================
--- trunk/src/pfccontainer.class.php 2007-08-20 02:19:47 UTC (rev 1132)
+++ trunk/src/pfccontainer.class.php 2007-08-20 17:41:46 UTC (rev 1133)
@@ -21,6 +21,7 @@
*/
require_once dirname(__FILE__)."/pfccontainerinterface.class.php";
+ require_once dirname(__FILE__)."/urlprocessing.php";
/**
* pfcContainer is an abstract class which define interface
@@ -381,6 +382,9 @@
$msgid = $this->_requestMsgId($chan);
+ // convert URLs to html
+ $param = make_clickable($param);
+
// format message
$data = "\n";
$data .= $msgid."\t";
Added: trunk/src/urlprocessing.php
===================================================================
--- trunk/src/urlprocessing.php (rev 0)
+++ trunk/src/urlprocessing.php 2007-08-20 17:41:46 UTC (rev 1133)
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Rewritten by Nathan Codding - Feb 6, 2001.
+ * - Goes through the given string, and replaces xxxx://yyyy with an HTML <a> tag linking
+ * to that URL
+ * - Goes through the given string, and replaces www.xxxx.yyyy[zzzz] with an HTML <a> tag linking
+ * to http://www.xxxx.yyyy[/zzzz]
+ * - Goes through the given string, and replaces xxxx@yyyy with an HTML mailto: tag linking
+ * to that email address
+ * - Only matches these 2 patterns either after a space, or at the beginning of a line
+ *
+ * Notes: the email one might get annoying - it's easy to make it more restrictive, though.. maybe
+ * have it require something like xxxx@yyyy.zzzz or such. We'll see.
+ */
+function make_clickable($text)
+{
+ $text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $text);
+
+ // pad it with a space so we can match things at the start of the 1st line.
+ $ret = ' ' . $text;
+
+ // matches an "xxxx://yyyy" URL at the start of a line, or after a space.
+ // xxxx can only be alpha characters.
+ // yyyy is anything up to the first space, newline, comma, double quote or <
+ //$ret = preg_replace("#(^|[\n ])([\w]+?://[\w\#$%&~/.\-;:=,?@\[\]+]*)#is", "\\1<a href=\"\\2\" target=\"_blank\">\\2</a>", $ret);
+ $ret = preg_replace("#(^|[\n \]])([\w]+?://[\w\#$%&~/.\-;:=,?@+]*)#is", "\\1<a href=\"\\2\" target=\"_blank\">\\2</a>", $ret);
+
+ // matches a "www|ftp.xxxx.yyyy[/zzzz]" kinda lazy URL thing
+ // Must contain at least 2 dots. xxxx contains either alphanum, or "-"
+ // zzzz is optional.. will contain everything up to the first space, newline,
+ // comma, double quote or <.
+ //$ret = preg_replace("#(^|[\n ])((www|ftp)\.[\w\#$%&~/.\-;:=,?@\[\]+]*)#is", "\\1<a href=\"http://\\2\" target=\"_blank\">\\2</a>", $ret);
+ $ret = preg_replace("#(^|[\n \]])((www|ftp)\.[\w\#$%&~/.\-;:=,?@+]*)#is", "\\1<a href=\"http://\\2\" target=\"_blank\">\\2</a>", $ret);
+
+ // matches an email@domain type address at the start of a line, or after a space.
+ // Note: Only the followed chars are valid; alphanums, "-", "_" and or ".".
+ //$ret = preg_replace("#(^|[\n ])([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret);
+ $ret = preg_replace("#(^|[\n \]])([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret);
+
+ // Remove our padding..
+ $ret = substr($ret, 1);
+
+ return($ret);
+}
+
+/**
+ * Nathan Codding - Feb 6, 2001
+ * Reverses the effects of make_clickable(), for use in editpost.
+ * - Does not distinguish between "www.xxxx.yyyy" and "http://aaaa.bbbb" type URLs.
+ *
+ */
+function undo_make_clickable($text)
+{
+ $text = preg_replace("#<!-- BBCode auto-link start --><a href=\"(.*?)\" target=\"_blank\">.*?</a><!-- BBCode auto-link end -->#i", "\\1", $text);
+ $text = preg_replace("#<!-- BBcode auto-mailto start --><a href=\"mailto:(.*?)\">.*?</a><!-- BBCode auto-mailto end -->#i", "\\1", $text);
+
+ return $text;
+
+}
+
+?>
Modified: trunk/themes/default/chat.html.tpl.php
===================================================================
--- trunk/themes/default/chat.html.tpl.php 2007-08-20 02:19:47 UTC (rev 1132)
+++ trunk/themes/default/chat.html.tpl.php 2007-08-20 17:41:46 UTC (rev 1133)
@@ -127,6 +127,7 @@
class="pfc_bt_delete"
onclick="pfc.insert_text('[s]','[/s]',true)" />
</div>
+<!--
<div id="pfc_bt_mail_btn" class="pfc_btn">
<img src="<?php echo $c->getFileUrlFromTheme('images/bt_mail.gif'); ?>"
id="pfc_bt_mail"
@@ -135,6 +136,7 @@
class="pfc_bt_mail"
onclick="pfc.insert_text('[email]','[/email]',true)" />
</div>
+-->
<div id="pfc_bt_color_btn" class="pfc_btn">
<img src="<?php echo $c->getFileUrlFromTheme('images/bt_color.gif'); ?>"
alt="<?php echo _pfc("Color"); ?>"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ke...@us...> - 2007-08-29 12:23:02
|
Revision: 1156
http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1156&view=rev
Author: kerphi
Date: 2007-08-29 05:23:00 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
remove pxlog calls
Modified Paths:
--------------
trunk/demo/demo27_customized_command.php
trunk/src/commands/me.class.php
trunk/src/commands/nick.class.php
trunk/src/commands/notice.class.php
trunk/src/commands/quit.class.php
trunk/src/commands/send.class.php
trunk/src/phpfreechat.class.php
trunk/src/proxies/checknickchange.class.php
Modified: trunk/demo/demo27_customized_command.php
===================================================================
--- trunk/demo/demo27_customized_command.php 2007-08-29 12:22:44 UTC (rev 1155)
+++ trunk/demo/demo27_customized_command.php 2007-08-29 12:23:00 UTC (rev 1156)
@@ -35,7 +35,6 @@
$result = $dice->roll();
$ct->write($recipient, $nick, "send", $result);
}
- if ($c->debug) pxlog("Cmd_roll[".$c->sessionid."]: msg=".$result, "chat", $c->getId());
}
}
@@ -76,4 +75,4 @@
?>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/src/commands/me.class.php
===================================================================
--- trunk/src/commands/me.class.php 2007-08-29 12:22:44 UTC (rev 1155)
+++ trunk/src/commands/me.class.php 2007-08-29 12:23:00 UTC (rev 1156)
@@ -31,9 +31,7 @@
$msg = phpFreeChat::PreFilterMsg($param);
$ct->write($recipient, "*me*", $this->name, $u->getNickname()." ".$msg);
-
- if ($c->debug) pxlog("/me ".$msg, "chat", $c->getId());
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/src/commands/nick.class.php
===================================================================
--- trunk/src/commands/nick.class.php 2007-08-29 12:22:44 UTC (rev 1155)
+++ trunk/src/commands/nick.class.php 2007-08-29 12:23:00 UTC (rev 1156)
@@ -35,8 +35,6 @@
$newnickid = $ct->getNickId($newnick);
$oldnickid = $u->nickid;
- if ($c->debug) pxlog("/nick ".$newnick, "chat", $c->getId());
-
// new nickname is undefined (not used) and
// current nickname (oldnick) is mine and
// oldnick is different from new nick
@@ -84,8 +82,6 @@
$xml_reponse->script("pfc.handleResponse('nick', 'connected', '".addslashes($newnick)."');");
- if ($c->debug)
- pxlog("/nick ".$newnick." (first connection, oldnick=".$oldnick.")", "chat", $c->getId());
return true;
}
@@ -93,4 +89,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/src/commands/notice.class.php
===================================================================
--- trunk/src/commands/notice.class.php 2007-08-29 12:22:44 UTC (rev 1155)
+++ trunk/src/commands/notice.class.php 2007-08-29 12:23:00 UTC (rev 1156)
@@ -32,7 +32,6 @@
return;
}
}
- if ($c->debug) pxlog("/notice ".$msg." (flag=".$flag.")", "chat", $c->getId());
}
}
Modified: trunk/src/commands/quit.class.php
===================================================================
--- trunk/src/commands/quit.class.php 2007-08-29 12:22:44 UTC (rev 1155)
+++ trunk/src/commands/quit.class.php 2007-08-29 12:23:00 UTC (rev 1156)
@@ -50,9 +50,7 @@
*/
$xml_reponse->script("pfc.handleResponse('quit', 'ok', '');");
-
- if ($c->debug) pxlog("/quit (a user just quit -> nick=".$nick.")", "chat", $c->getId());
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/src/commands/send.class.php
===================================================================
--- trunk/src/commands/send.class.php 2007-08-29 12:22:44 UTC (rev 1155)
+++ trunk/src/commands/send.class.php 2007-08-29 12:23:00 UTC (rev 1156)
@@ -52,8 +52,6 @@
if (count($errors) > 0)
{
// an error occured, just ignore the message and display errors
- foreach($errors as $e)
- if ($c->debug) pxlog("error /send, user can't send a message -> nick=".$nick." err=".$e, "chat", $c->getId());
$cmdp = $p;
$cmdp["param"] = $errors;
$cmd =& pfcCommand::Factory("error");
@@ -90,4 +88,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php 2007-08-29 12:22:44 UTC (rev 1155)
+++ trunk/src/phpfreechat.class.php 2007-08-29 12:23:00 UTC (rev 1156)
@@ -334,7 +334,9 @@
// if a content not empty is captured it is a php error in the code
$data = ob_get_contents();
if ($data != "")
- pxlog("HandleRequest: content=".$data, "chat", $c->getId());
+ {
+ // todo : display the $data somewhere to warn the user
+ }
ob_end_clean();
}
Modified: trunk/src/proxies/checknickchange.class.php
===================================================================
--- trunk/src/proxies/checknickchange.class.php 2007-08-29 12:22:44 UTC (rev 1155)
+++ trunk/src/proxies/checknickchange.class.php 2007-08-29 12:23:00 UTC (rev 1156)
@@ -68,8 +68,6 @@
$newnickid == $oldnickid)
{
$xml_reponse->script("pfc.handleResponse('".$this->name."', 'notchanged', '".addslashes($newnick)."');");
- if ($c->debug)
- pxlog("/nick ".$newnick." (user just reloded the page so let him keep his nickname without any warnings)", "chat", $c->getId());
return true;
}
@@ -82,8 +80,6 @@
$xml_reponse->script("pfc.handleResponse('nick', 'notallowed', '".addslashes($newnick)."');");
else
$xml_reponse->script("pfc.handleResponse('nick', 'isused', '".addslashes($newnick)."');");
- if ($c->debug)
- pxlog("/nick ".$newnick." (wanted nick is already in use -> wantednickid=".$newnickid.")", "chat", $c->getId());
return false;
}
}
@@ -127,4 +123,4 @@
}
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gpi...@us...> - 2007-08-29 14:59:31
|
Revision: 1159
http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1159&view=rev
Author: gpinzone
Date: 2007-08-29 07:59:02 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/README.txt
trunk/conf/
trunk/conf/authz
trunk/conf/passwd
trunk/conf/svnserve.conf
trunk/dav/
trunk/db/
trunk/db/current
trunk/db/format
trunk/db/fs-type
trunk/db/revprops/
trunk/db/revprops/0
trunk/db/revs/
trunk/db/revs/0
trunk/db/transactions/
trunk/db/uuid
trunk/db/write-lock
trunk/format
trunk/hooks/
trunk/hooks/post-commit.tmpl
trunk/hooks/post-lock.tmpl
trunk/hooks/post-revprop-change.tmpl
trunk/hooks/post-unlock.tmpl
trunk/hooks/pre-commit.tmpl
trunk/hooks/pre-lock.tmpl
trunk/hooks/pre-revprop-change.tmpl
trunk/hooks/pre-unlock.tmpl
trunk/hooks/start-commit.tmpl
trunk/locks/
trunk/locks/db-logs.lock
trunk/locks/db.lock
Added: trunk/README.txt
===================================================================
--- trunk/README.txt (rev 0)
+++ trunk/README.txt 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,5 @@
+This is a Subversion repository; use the 'svnadmin' tool to examine
+it. Do not add, delete, or modify files here unless you know how
+to avoid corrupting the repository.
+
+Visit http://subversion.tigris.org/ for more information.
Added: trunk/conf/authz
===================================================================
--- trunk/conf/authz (rev 0)
+++ trunk/conf/authz 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,21 @@
+### This file is an example authorization file for svnserve.
+### Its format is identical to that of mod_authz_svn authorization
+### files.
+### As shown below each section defines authorizations for the path and
+### (optional) repository specified by the section name.
+### The authorizations follow. An authorization line can refer to a
+### single user, to a group of users defined in a special [groups]
+### section, or to anyone using the '*' wildcard. Each definition can
+### grant read ('r') access, read-write ('rw') access, or no access
+### ('').
+
+[groups]
+# harry_and_sally = harry,sally
+
+# [/foo/bar]
+# harry = rw
+# * =
+
+# [repository:/baz/fuz]
+# @harry_and_sally = rw
+# * = r
Added: trunk/conf/passwd
===================================================================
--- trunk/conf/passwd (rev 0)
+++ trunk/conf/passwd 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,8 @@
+### This file is an example password file for svnserve.
+### Its format is similar to that of svnserve.conf. As shown in the
+### example below it contains one section labelled [users].
+### The name and password for each user follow, one account per line.
+
+[users]
+# harry = harryssecret
+# sally = sallyssecret
Added: trunk/conf/svnserve.conf
===================================================================
--- trunk/conf/svnserve.conf (rev 0)
+++ trunk/conf/svnserve.conf 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,30 @@
+### This file controls the configuration of the svnserve daemon, if you
+### use it to allow access to this repository. (If you only allow
+### access through http: and/or file: URLs, then this file is
+### irrelevant.)
+
+### Visit http://subversion.tigris.org/ for more information.
+
+[general]
+### These options control access to the repository for unauthenticated
+### and authenticated users. Valid values are "write", "read",
+### and "none". The sample settings below are the defaults.
+# anon-access = read
+# auth-access = write
+### The password-db option controls the location of the password
+### database file. Unless you specify a path starting with a /,
+### the file's location is relative to the conf directory.
+### Uncomment the line below to use the default password file.
+# password-db = passwd
+### The authz-db option controls the location of the authorization
+### rules for path-based access control. Unless you specify a path
+### starting with a /, the file's location is relative to the conf
+### directory. If you don't specify an authz-db, no path-based access
+### control is done.
+### Uncomment the line below to use the default authorization file.
+# authz-db = authz
+### This option specifies the authentication realm of the repository.
+### If two repositories have the same authentication realm, they should
+### have the same password database, and vice versa. The default realm
+### is repository's uuid.
+# realm = My First Repository
Added: trunk/db/current
===================================================================
--- trunk/db/current (rev 0)
+++ trunk/db/current 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1 @@
+0 1 1
Added: trunk/db/format
===================================================================
--- trunk/db/format (rev 0)
+++ trunk/db/format 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1 @@
+2
Added: trunk/db/fs-type
===================================================================
--- trunk/db/fs-type (rev 0)
+++ trunk/db/fs-type 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1 @@
+fsfs
Added: trunk/db/revprops/0
===================================================================
--- trunk/db/revprops/0 (rev 0)
+++ trunk/db/revprops/0 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,5 @@
+K 8
+svn:date
+V 27
+2007-08-29T14:57:24.984375Z
+END
Added: trunk/db/revs/0
===================================================================
--- trunk/db/revs/0 (rev 0)
+++ trunk/db/revs/0 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,11 @@
+PLAIN
+END
+ENDREP
+id: 0.0.r0/17
+type: dir
+count: 0
+text: 0 0 4 4 2d2977d1c96f487abe4a1e202dd03b4e
+cpath: /
+
+
+17 107
Added: trunk/db/uuid
===================================================================
--- trunk/db/uuid (rev 0)
+++ trunk/db/uuid 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1 @@
+31df5a85-8863-b941-952f-394f9b25e79b
Added: trunk/db/write-lock
===================================================================
Added: trunk/format
===================================================================
--- trunk/format (rev 0)
+++ trunk/format 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1 @@
+5
Added: trunk/hooks/post-commit.tmpl
===================================================================
--- trunk/hooks/post-commit.tmpl (rev 0)
+++ trunk/hooks/post-commit.tmpl 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# POST-COMMIT HOOK
+#
+# The post-commit hook is invoked after a commit. Subversion runs
+# this hook by invoking a program (script, executable, binary, etc.)
+# named 'post-commit' (for which this file is a template) with the
+# following ordered arguments:
+#
+# [1] REPOS-PATH (the path to this repository)
+# [2] REV (the number of the revision just committed)
+#
+# The default working directory for the invocation is undefined, so
+# the program should set one explicitly if it cares.
+#
+# Because the commit has already completed and cannot be undone,
+# the exit code of the hook program is ignored. The hook program
+# can use the 'svnlook' utility to help it examine the
+# newly-committed tree.
+#
+# On a Unix system, the normal procedure is to have 'post-commit'
+# invoke other programs to do the real work, though it may do the
+# work itself too.
+#
+# Note that 'post-commit' must be executable by the user(s) who will
+# invoke it (typically the user httpd runs as), and that user must
+# have filesystem-level permission to access the repository.
+#
+# On a Windows system, you should name the hook program
+# 'post-commit.bat' or 'post-commit.exe',
+# but the basic idea is the same.
+#
+# The hook program typically does not inherit the environment of
+# its parent process. For example, a common problem is for the
+# PATH environment variable to not be set to its usual value, so
+# that subprograms fail to launch unless invoked via absolute path.
+# If you're having unexpected problems with a hook program, the
+# culprit may be unusual (or missing) environment variables.
+#
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
+# the Subversion repository at
+# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
+# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
+
+
+REPOS="$1"
+REV="$2"
+
+commit-email.pl "$REPOS" "$REV" com...@ex...
+log-commit.py --repository "$REPOS" --revision "$REV"
Added: trunk/hooks/post-lock.tmpl
===================================================================
--- trunk/hooks/post-lock.tmpl (rev 0)
+++ trunk/hooks/post-lock.tmpl 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# POST-LOCK HOOK
+#
+# The post-lock hook is run after a path is locked. Subversion runs
+# this hook by invoking a program (script, executable, binary, etc.)
+# named 'post-lock' (for which this file is a template) with the
+# following ordered arguments:
+#
+# [1] REPOS-PATH (the path to this repository)
+# [2] USER (the user who created the lock)
+#
+# The paths that were just locked are passed to the hook via STDIN (as
+# of Subversion 1.2, only one path is passed per invocation, but the
+# plan is to pass all locked paths at once, so the hook program
+# should be written accordingly).
+#
+# The default working directory for the invocation is undefined, so
+# the program should set one explicitly if it cares.
+#
+# Because the lock has already been created and cannot be undone,
+# the exit code of the hook program is ignored. The hook program
+# can use the 'svnlook' utility to help it examine the
+# newly-created lock.
+#
+# On a Unix system, the normal procedure is to have 'post-lock'
+# invoke other programs to do the real work, though it may do the
+# work itself too.
+#
+# Note that 'post-lock' must be executable by the user(s) who will
+# invoke it (typically the user httpd runs as), and that user must
+# have filesystem-level permission to access the repository.
+#
+# On a Windows system, you should name the hook program
+# 'post-lock.bat' or 'post-lock.exe',
+# but the basic idea is the same.
+#
+# Here is an example hook script, for a Unix /bin/sh interpreter:
+
+REPOS="$1"
+USER="$2"
+
+# Send email to interested parties, let them know a lock was created:
+mailer.py lock "$REPOS" "$USER" /path/to/mailer.conf
Added: trunk/hooks/post-revprop-change.tmpl
===================================================================
--- trunk/hooks/post-revprop-change.tmpl (rev 0)
+++ trunk/hooks/post-revprop-change.tmpl 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# POST-REVPROP-CHANGE HOOK
+#
+# The post-revprop-change hook is invoked after a revision property
+# has been added, modified or deleted. Subversion runs this hook by
+# invoking a program (script, executable, binary, etc.) named
+# 'post-revprop-change' (for which this file is a template), with the
+# following ordered arguments:
+#
+# [1] REPOS-PATH (the path to this repository)
+# [2] REV (the revision that was tweaked)
+# [3] USER (the username of the person tweaking the property)
+# [4] PROPNAME (the property that was changed)
+# [5] ACTION (the property was 'A'dded, 'M'odified, or 'D'eleted)
+#
+# [STDIN] PROPVAL ** the old property value is passed via STDIN.
+#
+# Because the propchange has already completed and cannot be undone,
+# the exit code of the hook program is ignored. The hook program
+# can use the 'svnlook' utility to help it examine the
+# new property value.
+#
+# On a Unix system, the normal procedure is to have 'post-revprop-change'
+# invoke other programs to do the real work, though it may do the
+# work itself too.
+#
+# Note that 'post-revprop-change' must be executable by the user(s) who will
+# invoke it (typically the user httpd runs as), and that user must
+# have filesystem-level permission to access the repository.
+#
+# On a Windows system, you should name the hook program
+# 'post-revprop-change.bat' or 'post-revprop-change.exe',
+# but the basic idea is the same.
+#
+# The hook program typically does not inherit the environment of
+# its parent process. For example, a common problem is for the
+# PATH environment variable to not be set to its usual value, so
+# that subprograms fail to launch unless invoked via absolute path.
+# If you're having unexpected problems with a hook program, the
+# culprit may be unusual (or missing) environment variables.
+#
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
+# the Subversion repository at
+# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
+# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
+
+
+REPOS="$1"
+REV="$2"
+USER="$3"
+PROPNAME="$4"
+ACTION="$5"
+
+propchange-email.pl "$REPOS" "$REV" "$USER" "$PROPNAME" wat...@ex...
Added: trunk/hooks/post-unlock.tmpl
===================================================================
--- trunk/hooks/post-unlock.tmpl (rev 0)
+++ trunk/hooks/post-unlock.tmpl 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# POST-UNLOCK HOOK
+#
+# The post-unlock hook runs after a path is unlocked. Subversion runs
+# this hook by invoking a program (script, executable, binary, etc.)
+# named 'post-unlock' (for which this file is a template) with the
+# following ordered arguments:
+#
+# [1] REPOS-PATH (the path to this repository)
+# [2] USER (the user who destroyed the lock)
+#
+# The paths that were just unlocked are passed to the hook via STDIN
+# (as of Subversion 1.2, only one path is passed per invocation, but
+# the plan is to pass all unlocked paths at once, so the hook program
+# should be written accordingly).
+#
+# The default working directory for the invocation is undefined, so
+# the program should set one explicitly if it cares.
+#
+# Because the lock has already been destroyed and cannot be undone,
+# the exit code of the hook program is ignored.
+#
+# On a Unix system, the normal procedure is to have 'post-unlock'
+# invoke other programs to do the real work, though it may do the
+# work itself too.
+#
+# Note that 'post-unlock' must be executable by the user(s) who will
+# invoke it (typically the user httpd runs as), and that user must
+# have filesystem-level permission to access the repository.
+#
+# On a Windows system, you should name the hook program
+# 'post-unlock.bat' or 'post-unlock.exe',
+# but the basic idea is the same.
+#
+# Here is an example hook script, for a Unix /bin/sh interpreter:
+
+REPOS="$1"
+USER="$2"
+
+# Send email to interested parties, let them know a lock was removed:
+mailer.py unlock "$REPOS" "$USER" /path/to/mailer.conf
Added: trunk/hooks/pre-commit.tmpl
===================================================================
--- trunk/hooks/pre-commit.tmpl (rev 0)
+++ trunk/hooks/pre-commit.tmpl 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# PRE-COMMIT HOOK
+#
+# The pre-commit hook is invoked before a Subversion txn is
+# committed. Subversion runs this hook by invoking a program
+# (script, executable, binary, etc.) named 'pre-commit' (for which
+# this file is a template), with the following ordered arguments:
+#
+# [1] REPOS-PATH (the path to this repository)
+# [2] TXN-NAME (the name of the txn about to be committed)
+#
+# The default working directory for the invocation is undefined, so
+# the program should set one explicitly if it cares.
+#
+# If the hook program exits with success, the txn is committed; but
+# if it exits with failure (non-zero), the txn is aborted, no commit
+# takes place, and STDERR is returned to the client. The hook
+# program can use the 'svnlook' utility to help it examine the txn.
+#
+# On a Unix system, the normal procedure is to have 'pre-commit'
+# invoke other programs to do the real work, though it may do the
+# work itself too.
+#
+# *** NOTE: THE HOOK PROGRAM MUST NOT MODIFY THE TXN, EXCEPT ***
+# *** FOR REVISION PROPERTIES (like svn:log or svn:author). ***
+#
+# This is why we recommend using the read-only 'svnlook' utility.
+# In the future, Subversion may enforce the rule that pre-commit
+# hooks should not modify the versioned data in txns, or else come
+# up with a mechanism to make it safe to do so (by informing the
+# committing client of the changes). However, right now neither
+# mechanism is implemented, so hook writers just have to be careful.
+#
+# Note that 'pre-commit' must be executable by the user(s) who will
+# invoke it (typically the user httpd runs as), and that user must
+# have filesystem-level permission to access the repository.
+#
+# On a Windows system, you should name the hook program
+# 'pre-commit.bat' or 'pre-commit.exe',
+# but the basic idea is the same.
+#
+# The hook program typically does not inherit the environment of
+# its parent process. For example, a common problem is for the
+# PATH environment variable to not be set to its usual value, so
+# that subprograms fail to launch unless invoked via absolute path.
+# If you're having unexpected problems with a hook program, the
+# culprit may be unusual (or missing) environment variables.
+#
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
+# the Subversion repository at
+# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
+# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
+
+
+REPOS="$1"
+TXN="$2"
+
+# Make sure that the log message contains some text.
+SVNLOOK=/usr/local/bin/svnlook
+$SVNLOOK log -t "$TXN" "$REPOS" | \
+ grep "[a-zA-Z0-9]" > /dev/null || exit 1
+
+# Check that the author of this commit has the rights to perform
+# the commit on the files and directories being modified.
+commit-access-control.pl "$REPOS" "$TXN" commit-access-control.cfg || exit 1
+
+# All checks passed, so allow the commit.
+exit 0
Added: trunk/hooks/pre-lock.tmpl
===================================================================
--- trunk/hooks/pre-lock.tmpl (rev 0)
+++ trunk/hooks/pre-lock.tmpl 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# PRE-LOCK HOOK
+#
+# The pre-lock hook is invoked before an exclusive lock is
+# created. Subversion runs this hook by invoking a program
+# (script, executable, binary, etc.) named 'pre-lock' (for which
+# this file is a template), with the following ordered arguments:
+#
+# [1] REPOS-PATH (the path to this repository)
+# [2] PATH (the path in the repository about to be locked)
+# [3] USER (the user creating the lock)
+#
+# The default working directory for the invocation is undefined, so
+# the program should set one explicitly if it cares.
+#
+# If the hook program exits with success, the lock is created; but
+# if it exits with failure (non-zero), the lock action is aborted
+# and STDERR is returned to the client.
+
+# On a Unix system, the normal procedure is to have 'pre-lock'
+# invoke other programs to do the real work, though it may do the
+# work itself too.
+#
+# Note that 'pre-lock' must be executable by the user(s) who will
+# invoke it (typically the user httpd runs as), and that user must
+# have filesystem-level permission to access the repository.
+#
+# On a Windows system, you should name the hook program
+# 'pre-lock.bat' or 'pre-lock.exe',
+# but the basic idea is the same.
+#
+# Here is an example hook script, for a Unix /bin/sh interpreter:
+
+REPOS="$1"
+PATH="$2"
+USER="$3"
+
+# If a lock exists and is owned by a different person, don't allow it
+# to be stolen (e.g., with 'svn lock --force ...').
+
+# (Maybe this script could send email to the lock owner?)
+SVNLOOK=/usr/local/bin/svnlook
+GREP=/bin/grep
+SED=/bin/sed
+
+LOCK_OWNER=`$SVNLOOK lock "$REPOS" "$PATH" | \
+ $GREP '^Owner: ' | $SED 's/Owner: //'`
+
+# If we get no result from svnlook, there's no lock, allow the lock to
+# happen:
+if [ "$LOCK_OWNER" = "" ]; then
+ exit 0
+fi
+
+# If the person locking matches the lock's owner, allow the lock to
+# happen:
+if [ "$LOCK_OWNER" = "$USER" ]; then
+ exit 0
+fi
+
+# Otherwise, we've got an owner mismatch, so return failure:
+echo "Error: $PATH already locked by ${LOCK_OWNER}." 1>&2
+exit 1
Added: trunk/hooks/pre-revprop-change.tmpl
===================================================================
--- trunk/hooks/pre-revprop-change.tmpl (rev 0)
+++ trunk/hooks/pre-revprop-change.tmpl 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# PRE-REVPROP-CHANGE HOOK
+#
+# The pre-revprop-change hook is invoked before a revision property
+# is added, modified or deleted. Subversion runs this hook by invoking
+# a program (script, executable, binary, etc.) named 'pre-revprop-change'
+# (for which this file is a template), with the following ordered
+# arguments:
+#
+# [1] REPOS-PATH (the path to this repository)
+# [2] REVISION (the revision being tweaked)
+# [3] USER (the username of the person tweaking the property)
+# [4] PROPNAME (the property being set on the revision)
+# [5] ACTION (the property is being 'A'dded, 'M'odified, or 'D'eleted)
+#
+# [STDIN] PROPVAL ** the new property value is passed via STDIN.
+#
+# If the hook program exits with success, the propchange happens; but
+# if it exits with failure (non-zero), the propchange doesn't happen.
+# The hook program can use the 'svnlook' utility to examine the
+# existing value of the revision property.
+#
+# WARNING: unlike other hooks, this hook MUST exist for revision
+# properties to be changed. If the hook does not exist, Subversion
+# will behave as if the hook were present, but failed. The reason
+# for this is that revision properties are UNVERSIONED, meaning that
+# a successful propchange is destructive; the old value is gone
+# forever. We recommend the hook back up the old value somewhere.
+#
+# On a Unix system, the normal procedure is to have 'pre-revprop-change'
+# invoke other programs to do the real work, though it may do the
+# work itself too.
+#
+# Note that 'pre-revprop-change' must be executable by the user(s) who will
+# invoke it (typically the user httpd runs as), and that user must
+# have filesystem-level permission to access the repository.
+#
+# On a Windows system, you should name the hook program
+# 'pre-revprop-change.bat' or 'pre-revprop-change.exe',
+# but the basic idea is the same.
+#
+# The hook program typically does not inherit the environment of
+# its parent process. For example, a common problem is for the
+# PATH environment variable to not be set to its usual value, so
+# that subprograms fail to launch unless invoked via absolute path.
+# If you're having unexpected problems with a hook program, the
+# culprit may be unusual (or missing) environment variables.
+#
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
+# the Subversion repository at
+# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
+# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
+
+
+REPOS="$1"
+REV="$2"
+USER="$3"
+PROPNAME="$4"
+ACTION="$5"
+
+if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi
+
+echo "Changing revision properties other than svn:log is prohibited" >&2
+exit 1
Added: trunk/hooks/pre-unlock.tmpl
===================================================================
--- trunk/hooks/pre-unlock.tmpl (rev 0)
+++ trunk/hooks/pre-unlock.tmpl 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+# PRE-UNLOCK HOOK
+#
+# The pre-unlock hook is invoked before an exclusive lock is
+# destroyed. Subversion runs this hook by invoking a program
+# (script, executable, binary, etc.) named 'pre-unlock' (for which
+# this file is a template), with the following ordered arguments:
+#
+# [1] REPOS-PATH (the path to this repository)
+# [2] PATH (the path in the repository about to be unlocked)
+# [3] USER (the user destroying the lock)
+#
+# The default working directory for the invocation is undefined, so
+# the program should set one explicitly if it cares.
+#
+# If the hook program exits with success, the lock is destroyed; but
+# if it exits with failure (non-zero), the unlock action is aborted
+# and STDERR is returned to the client.
+
+# On a Unix system, the normal procedure is to have 'pre-unlock'
+# invoke other programs to do the real work, though it may do the
+# work itself too.
+#
+# Note that 'pre-unlock' must be executable by the user(s) who will
+# invoke it (typically the user httpd runs as), and that user must
+# have filesystem-level permission to access the repository.
+#
+# On a Windows system, you should name the hook program
+# 'pre-unlock.bat' or 'pre-unlock.exe',
+# but the basic idea is the same.
+#
+# Here is an example hook script, for a Unix /bin/sh interpreter:
+
+REPOS="$1"
+PATH="$2"
+USER="$3"
+
+# If a lock is owned by a different person, don't allow it be broken.
+# (Maybe this script could send email to the lock owner?)
+
+SVNLOOK=/usr/local/bin/svnlook
+GREP=/bin/grep
+SED=/bin/sed
+
+LOCK_OWNER=`$SVNLOOK lock "$REPOS" "$PATH" | \
+ $GREP '^Owner: ' | $SED 's/Owner: //'`
+
+# If we get no result from svnlook, there's no lock, return success:
+if [ "$LOCK_OWNER" = "" ]; then
+ exit 0
+fi
+# If the person unlocking matches the lock's owner, return success:
+if [ "$LOCK_OWNER" = "$USER" ]; then
+ exit 0
+fi
+
+# Otherwise, we've got an owner mismatch, so return failure:
+echo "Error: $PATH locked by ${LOCK_OWNER}." 1>&2
+exit 1
Added: trunk/hooks/start-commit.tmpl
===================================================================
--- trunk/hooks/start-commit.tmpl (rev 0)
+++ trunk/hooks/start-commit.tmpl 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# START-COMMIT HOOK
+#
+# The start-commit hook is invoked before a Subversion txn is created
+# in the process of doing a commit. Subversion runs this hook
+# by invoking a program (script, executable, binary, etc.) named
+# 'start-commit' (for which this file is a template)
+# with the following ordered arguments:
+#
+# [1] REPOS-PATH (the path to this repository)
+# [2] USER (the authenticated user attempting to commit)
+#
+# The default working directory for the invocation is undefined, so
+# the program should set one explicitly if it cares.
+#
+# If the hook program exits with success, the commit continues; but
+# if it exits with failure (non-zero), the commit is stopped before
+# a Subversion txn is created, and STDERR is returned to the client.
+#
+# On a Unix system, the normal procedure is to have 'start-commit'
+# invoke other programs to do the real work, though it may do the
+# work itself too.
+#
+# Note that 'start-commit' must be executable by the user(s) who will
+# invoke it (typically the user httpd runs as), and that user must
+# have filesystem-level permission to access the repository.
+#
+# On a Windows system, you should name the hook program
+# 'start-commit.bat' or 'start-commit.exe',
+# but the basic idea is the same.
+#
+# The hook program typically does not inherit the environment of
+# its parent process. For example, a common problem is for the
+# PATH environment variable to not be set to its usual value, so
+# that subprograms fail to launch unless invoked via absolute path.
+# If you're having unexpected problems with a hook program, the
+# culprit may be unusual (or missing) environment variables.
+#
+# Here is an example hook script, for a Unix /bin/sh interpreter.
+# For more examples and pre-written hooks, see those in
+# the Subversion repository at
+# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and
+# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/
+
+
+REPOS="$1"
+USER="$2"
+
+commit-allower.pl --repository "$REPOS" --user "$USER" || exit 1
+special-auth-check.py --user "$USER" --auth-level 3 || exit 1
+
+# All checks passed, so allow the commit.
+exit 0
Added: trunk/locks/db-logs.lock
===================================================================
--- trunk/locks/db-logs.lock (rev 0)
+++ trunk/locks/db-logs.lock 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,3 @@
+This file is not used by Subversion 1.3.x or later.
+However, its existence is required for compatibility with
+Subversion 1.2.x or earlier.
Added: trunk/locks/db.lock
===================================================================
--- trunk/locks/db.lock (rev 0)
+++ trunk/locks/db.lock 2007-08-29 14:59:02 UTC (rev 1159)
@@ -0,0 +1,3 @@
+This file is not used by Subversion 1.3.x or later.
+However, its existence is required for compatibility with
+Subversion 1.2.x or earlier.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X