Code cleaning on pfcglobalconfig and pfccontainer singleton instances

git-svn-id: https://phpfreechat.svn.sourceforge.net/svnroot/phpfreechat/trunk@956 2772adf2-ac07-0410-9d30-e29d8120292e

demo/demo27_customized_command.php

@@ -13,11 +13,11 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
+    $c =& pfcGlobalConfig::Instance();
 
-    $nick      = $c->nick;
-    $container =& $c->getContainerInstance();
-    $text      = trim($param);
+    $nick = $c->nick;
+    $ct   =& pfcContainer::Instance();
+    $text = trim($param);
 
     // Call parse roll
     require_once dirname(__FILE__).'/demo27_dice.class.php';
@@ -33,7 +33,7 @@ function run(&$xml_reponse, $p)
     else
     {
       $result = $dice->roll();
-      $container->write($recipient, $nick, "send", $result);
+      $ct->write($recipient, $nick, "send", $result);
     }
     if ($c->debug) pxlog("Cmd_roll[".$c->sessionid."]: msg=".$result, "chat", $c->getId());
   }

demo/demo55_mysql_container.php

@@ -1,6 +1,7 @@
 <?php
 
 require_once dirname(__FILE__)."/../src/phpfreechat.class.php";
+$params = array();
 $params["serverid"] = md5(__FILE__); // calculate a unique id for this chat
 $params["nick"] = "guest".rand(1,1000);
 $params["container_type"] = "mysql";

demo/demo5_customized_style_data/mytheme/style.css → demo/demo5_customized_style_data/mytheme/style.css.php

@@ -1,7 +1,7 @@
 
 div#pfc_container {
   border: black double 5px;
-  background-image: url("proxy.php?p=mytheme/images/brick.jpg");
+  background-image: url("<?php echo $c->getFileUrlFromTheme('images/brick.jpg'); ?>");
   background-repeat: repeat;
   padding: 20px;
   color: black;
@@ -17,13 +17,13 @@
 
 div.pfc_message {
   background-color: transparent;
-  background-image: url("proxy.php?p=mytheme/images/newmsg.gif");
+  background-image: url("<?php echo $c->getFileUrlFromTheme('images/newmsg.gif'); ?>");
   background-repeat: no-repeat;
   background-position: right center;
 }
 
 div.pfc_oldmsg {
-  background-image: url("proxy.php?p=mytheme/images/oldmsg.gif");
+  background-image: url("<?php echo $c->getFileUrlFromTheme('images/oldmsg.gif'); ?>");
 }
 
 span.pfc_heure {

src/commands/asknick.class.php

@@ -12,8 +12,8 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     $nicktochange = phpFreeChat::FilterNickname($param);
 

src/commands/ban.class.php

@@ -15,8 +15,8 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     $nick   = isset($params[0]) ? $params[0] : '';
     $reason = isset($params[1]) ? $params[1] : '';
@@ -34,7 +34,7 @@ function run(&$xml_reponse, $p)
       return;
     }
 
-    $ct =& $c->getContainerInstance();
+    $ct =& pfcContainer::Instance();
     $nickidtoban = $ct->getNickId($nick);
 
     // notify all the channel

src/commands/banlist.class.php

@@ -13,10 +13,10 @@ class pfcCommand_banlist extends pfcCommand
 
   function run(&$xml_reponse, $p)
   {
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
-    $ct =& $c->getContainerInstance();
+    $ct =& pfcContainer::Instance();
     $banlist = $ct->getChanMeta($p["recipient"], 'banlist_nickid');
 
     if ($banlist == NULL) $banlist = array(); else $banlist = unserialize($banlist);

src/commands/clear.class.php

@@ -6,8 +6,8 @@ class pfcCommand_clear extends pfcCommand
 {
   function run(&$xml_reponse, $p)
   {
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     $xml_reponse->script("pfc.handleResponse('".$this->name."', 'ok', '');");
   }

src/commands/connect.class.php

@@ -13,9 +13,9 @@ function run(&$xml_reponse, $p)
     $recipientid = $p["recipientid"];
     $getoldmsg   = isset($p["getoldmsg"]) ? $p["getoldmsg"] : true;
 
-    $c =& $this->c;
-    $u =& $this->u;
-    $ct =& $c->getContainerInstance();
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
 
     // reset the message id indicator (see getnewmsg.class.php)
     // i.e. be ready to re-get all last posted messages

src/commands/debug.class.php

@@ -6,8 +6,8 @@ class pfcCommand_debug extends pfcCommand
 {
   function run(&$xml_reponse, $p)
   {
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     if ($p["param"] == "userconfig")
     {

src/commands/deop.class.php

@@ -8,8 +8,8 @@ class pfcCommand_deop extends pfcCommand
 
   function run(&$xml_reponse, $p)
   {
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     if (trim($p["param"]) == "")
     {
@@ -24,7 +24,7 @@ function run(&$xml_reponse, $p)
 
     // just change the "isadmin" meta flag
     $nicktodeop   = trim($p["param"]);
-    $container  =& $c->getContainerInstance();
+    $container  =& pfcContainer::Instance();
     $nicktodeopid = $container->getNickId($nicktodeop);
     $container->setUserMeta($nicktodeopid, 'isadmin', false);
 

src/commands/error.class.php

@@ -6,7 +6,7 @@ class pfcCommand_error extends pfcCommand
 {
   function run(&$xml_reponse, $p)
   {
-    $c =& $this->c;
+    $c =& pfcGlobalConfig::Instance();
     $errors = $p["param"];
     if (is_array($errors))
     {

src/commands/getnewmsg.class.php

@@ -32,7 +32,7 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
+    $c =& pfcGlobalConfig::Instance();
     // do nothing if the recipient is not defined
     if ($recipient == "") return;
 
@@ -50,7 +50,7 @@ function run(&$xml_reponse, $p)
 
 
     // read the last from_id value
-    $container =& $c->getContainerInstance();
+    $container =& pfcContainer::Instance();
     $from_id_sid = "pfc_from_id_".$c->getId()."_".$clientid."_".$recipientid;
     $from_id = 0;
     if (isset($_SESSION[$from_id_sid]))

src/commands/help.class.php

@@ -14,8 +14,8 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     $ignore = array("updatemynick", "getnewmsg", "notice", "getonlinenick", "error", "update", "asknick");
 

src/commands/identify.class.php

@@ -39,8 +39,8 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     $password = trim($param);
     $isadmin = false;
@@ -57,7 +57,7 @@ function run(&$xml_reponse, $p)
     if ($isadmin)
     {
       // ok the current user is an admin, just save the isadmin flag in the metadata
-      $ct =& $c->getContainerInstance();
+      $ct =& pfcContainer::Instance();
       $ct->setUserMeta($u->nickid, 'isadmin', $isadmin);
       $this->forceWhoisReload($u->nick);
 

src/commands/init.class.php

@@ -12,8 +12,8 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     $cmd =& pfcCommand::Factory("quit");
     $cmd->run($xml_reponse, $p);

src/commands/invite.class.php

@@ -46,9 +46,9 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;   // pfcGlobalConfig
-    $u =& $this->u;   // pfcUserConfig
-    $ct =& $c->getContainerInstance(); // Connection to the chatbackend
+    $c =& pfcGlobalConfig::Instance();   // pfcGlobalConfig
+    $u =& pfcUserConfig::Instance();   // pfcUserConfig
+    $ct =& pfcContainer::Instance(); // Connection to the chatbackend
 
     $nicktoinvite  = isset($params[0]) ? $params[0] : '';
     $channeltarget = isset($params[1]) ? $params[1] : $u->channels[$recipientid]["name"]; // Default: current channel

src/commands/join.class.php

@@ -14,8 +14,8 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     $channame  = trim($param);
     $chanrecip = pfcCommand_join::GetRecipient($channame);
@@ -55,7 +55,7 @@ function run(&$xml_reponse, $p)
     }
 
     // register the user (and his metadata) in the channel
-    $ct =& $c->getContainerInstance();
+    $ct =& pfcContainer::Instance();
     $ct->createNick($chanrecip, $u->nick, $u->nickid);
     $this->forceWhoisReload($u->nick);
 

src/commands/kick.class.php

@@ -15,8 +15,8 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     $nick   = isset($params[0]) ? $params[0] : '';
     $reason = isset($params[1]) ? $params[1] : '';
@@ -34,7 +34,7 @@ function run(&$xml_reponse, $p)
     }
 
     // kicking a user just add a command to play to the aimed user metadata.
-    $ct =& $c->getContainerInstance();
+    $ct =& pfcContainer::Instance();
     $otherid  = $ct->getNickId($nick);
     $channame = $u->channels[$recipientid]["name"];
     $cmdstr = 'leave';

src/commands/leave.class.php

@@ -15,9 +15,9 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
-    $ct =& $c->getContainerInstance();
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
+    $ct =& pfcContainer::Instance();
 
     $type   = isset($params[0]) ? $params[0] : '';
     $name   = isset($params[1]) ? $params[1] : '';

src/commands/me.class.php

@@ -14,8 +14,8 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     if (trim($param) == "")
     {
@@ -28,7 +28,7 @@ function run(&$xml_reponse, $p)
       return;
     }
 
-    $container =& $c->getContainerInstance();
+    $container =& pfcContainer::Instance();
     $msg = phpFreeChat::PreFilterMsg($param);
     $container->write($recipient, "*me*", $this->name, $u->nick." ".$msg);
 

src/commands/nick.class.php

@@ -14,8 +14,8 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     if (trim($param) == "")
     {
@@ -31,7 +31,7 @@ function run(&$xml_reponse, $p)
     $newnick = phpFreeChat::FilterNickname($param);
     $oldnick = $u->nick;
 
-    $container =& $c->getContainerInstance();
+    $container =& pfcContainer::Instance();
     $newnickid = $container->getNickId($newnick);
     $oldnickid = $container->getNickId($oldnick);
 

src/commands/notice.class.php

@@ -13,13 +13,13 @@ function run(&$xml_reponse, $p)
     $recipientid = $p["recipientid"];
     $flag        = isset($p["flag"]) ? $p["flag"] : 3;
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     if ($c->shownotice > 0 &&
         ($c->shownotice & $flag) == $flag)
     {
-      $container =& $c->getContainerInstance();
+      $container =& pfcContainer::Instance();
       $msg = phpFreeChat::FilterSpecialChar($msg);
       $res = $container->write($recipient, $u->nick, "notice", $msg);
       if (is_array($res))

src/commands/op.class.php

@@ -14,8 +14,8 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     if (trim($param) == "")
     {
@@ -30,7 +30,7 @@ function run(&$xml_reponse, $p)
 
     // just change the "isadmin" meta flag
     $nicktoop   = trim($param);
-    $container  =& $c->getContainerInstance();
+    $container  =& pfcContainer::Instance();
     $nicktoopid = $container->getNickId($nicktoop);
     $container->setUserMeta($nicktoopid, 'isadmin', true);
 

src/commands/privmsg.class.php

@@ -12,13 +12,13 @@ function run(&$xml_reponse, $p)
     $recipient   = $p["recipient"];
     $recipientid = $p["recipientid"];
 
-    $c =& $this->c;
-    $u =& $this->u;
+    $c =& pfcGlobalConfig::Instance();
+    $u =& pfcUserConfig::Instance();
 
     $pvname = $param;
 
     // check the pvname exists on the server
-    $container =& $c->getContainerInstance();
+    $container =& pfcContainer::Instance();
     $pvnickid = $container->getNickId($pvname);
     $nickid   = $u->nickid;
 
@@ -83,7 +83,7 @@ function run(&$xml_reponse, $p)
     }
 
     // register the user (and his metadata) in this pv
-    $ct =& $c->getContainerInstance();
+    $ct =& pfcContainer::Instance();
     $ct->createNick($pvrecipient, $u->nick, $u->nickid);
     $this->forceWhoisReload($u->nick);