diff --git a/src/pfccommand.class.php b/src/pfccommand.class.php index 00b2d193..44d24e6b 100644 --- a/src/pfccommand.class.php +++ b/src/pfccommand.class.php @@ -67,11 +67,11 @@ function &Factory($name) if (!class_exists($cmd_classname)) { $tmp = NULL; return $tmp; } - $cmd =& new $cmd_classname; - $cmd->name = $cmd_name; - + $firstproxy = new $cmd_classname; + $firstproxy->name = $cmd_name; + // instanciate the proxies chaine - $firstproxy =& $cmd; + $proxies = array(); for($i = count($c->proxies)-1; $i >= 0; $i--) { $proxy_name = $c->proxies[$i]; @@ -87,11 +87,11 @@ function &Factory($name) return $firstproxy; // instanciate the proxy - $proxy =& new $proxy_classname; - $proxy->name = $cmd_name; - $proxy->proxyname = $proxy_name; - $proxy->linkTo($firstproxy); - $firstproxy =& $proxy; + $proxies[$i] = new $proxy_classname; + $proxies[$i]->name = $cmd_name; + $proxies[$i]->proxyname = $proxy_name; + $proxies[$i]->linkTo($firstproxy); + $firstproxy =& $proxies[$i]; } /* diff --git a/src/pfccontainer.class.php b/src/pfccontainer.class.php index ce901480..30b22465 100644 --- a/src/pfccontainer.class.php +++ b/src/pfccontainer.class.php @@ -2,7 +2,7 @@ /** * pfccontainer.class.php * - * Copyright © 2006 Stephane Gully + * Copyright � 2006 Stephane Gully * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,7 +54,7 @@ function pfcContainer($type = 'File', $usememorycache = true) // create the concrete container instance require_once dirname(__FILE__)."/containers/".$type.".class.php"; $container_classname = "pfcContainer_".$type; - $this->_container =& new $container_classname(); + $this->_container = new $container_classname(); } function getDefaultConfig() { diff --git a/src/pfcproxycommand.class.php b/src/pfcproxycommand.class.php index 9a0882e9..59075e80 100644 --- a/src/pfcproxycommand.class.php +++ b/src/pfcproxycommand.class.php @@ -50,7 +50,7 @@ function pfcProxyCommand() function linkTo(&$cmd) { - $this->next =& $cmd; + $this->next = $cmd; } } diff --git a/src/phpfreechat.class.php b/src/phpfreechat.class.php index cf6cbe4c..2fd9eafd 100644 --- a/src/phpfreechat.class.php +++ b/src/phpfreechat.class.php @@ -219,7 +219,7 @@ function &handleRequest($request) if ($c->debug) ob_start(); // capture output - $xml_reponse =& new pfcResponse(); + $xml_reponse = new pfcResponse(); // check the command $cmdstr = ""; @@ -348,7 +348,7 @@ function &handleRequest($request) function &loadStyles($theme = 'default', &$xml_reponse) { - if ($xml_reponse == null) $xml_reponse =& new pfcResponse(); + if ($xml_reponse == null) $xml_reponse = new pfcResponse(); $c =& pfcGlobalConfig::Instance(); @@ -398,7 +398,7 @@ function &loadStyles($theme = 'default', &$xml_reponse) function &loadScripts($theme, &$xml_reponse) { - if ($xml_reponse == null) $xml_reponse =& new pfcResponse(); + if ($xml_reponse == null) $xml_reponse = new pfcResponse(); $c =& pfcGlobalConfig::Instance(); @@ -529,7 +529,7 @@ function &loadScripts($theme, &$xml_reponse) function loadInterface($theme = 'default', &$xml_reponse) { - if ($xml_reponse == null) $xml_reponse =& new pfcResponse(); + if ($xml_reponse == null) $xml_reponse = new pfcResponse(); $c =& pfcGlobalConfig::Instance(); @@ -559,7 +559,7 @@ function loadInterface($theme = 'default', &$xml_reponse) function &loadChat($theme = 'default') { - $xml_reponse =& new pfcResponse(); + $xml_reponse = new pfcResponse(); $this->loadInterface($theme,$xml_reponse); $this->loadStyles($theme,$xml_reponse);