' . $rex->error . '
'; echo '' . intl_get ('The following items were not deleted') . ':
'; @@ -124,7 +127,7 @@ session_set ('sitellite_alert', intl_get ('The items have been deleted.')); -if (! empty ($parameters['_return']) && $parameters['_return'] != site_prefix () . '/index/' . $parameters['_key'][0] && ! strpos ($parameters['_return'], $parameters['_key'][0])) { +if (! empty ($parameters['_return']) && $parameters['_return'] != site_prefix () . '/index/' . $parameters['_key'][0] && ! ('' !== $parameters['_key'][0] && strpos ($parameters['_return'], $parameters['_key'][0]))) { header ('Location: ' . $parameters['_return']); exit; } diff --git a/inc/app/cms/boxes/services/webhooks/index.php b/inc/app/cms/boxes/services/webhooks/index.php index 3ee55218..3aa02ee9 100644 --- a/inc/app/cms/boxes/services/webhooks/index.php +++ b/inc/app/cms/boxes/services/webhooks/index.php @@ -56,7 +56,7 @@ foreach (explode ("\n", appconf ('cms_webhooks')) as $url) { $url = trim ($url); if (! empty ($url)) { - $req =& new HTTP_request ($url); + $req = new HTTP_request ($url); $req->setMethod ('POST'); $req->addPostData ('event', $parameters['transition']); $req->addPostData ('summary', $parameters['message']); diff --git a/inc/app/cms/forms/add/sitellite_filesystem/index.php b/inc/app/cms/forms/add/sitellite_filesystem/index.php index 1acaf105..94a8a67d 100644 --- a/inc/app/cms/forms/add/sitellite_filesystem/index.php +++ b/inc/app/cms/forms/add/sitellite_filesystem/index.php @@ -116,7 +116,7 @@ function cms_cancel_action (f) { $this->widgets['submit_button']->buttons[2]->extra = 'onclick="return cms_cancel (this.form)"'; } - function show () { + function show ($template = '') { return loader_box ('cms/user/preferences/level') . parent::show (); } diff --git a/inc/app/cms/forms/edit/sitellite_filesystem/index.php b/inc/app/cms/forms/edit/sitellite_filesystem/index.php index 3b4ab991..1af6aff0 100644 --- a/inc/app/cms/forms/edit/sitellite_filesystem/index.php +++ b/inc/app/cms/forms/edit/sitellite_filesystem/index.php @@ -180,7 +180,7 @@ function cms_cancel_action (f) { }*/ } - function show () { + function show ($template = '') { return loader_box ('cms/user/preferences/level') . parent::show (); } diff --git a/inc/app/multilingual/boxes/index/index.php b/inc/app/multilingual/boxes/index/index.php index 7daf5b3f..6ec518c3 100644 --- a/inc/app/multilingual/boxes/index/index.php +++ b/inc/app/multilingual/boxes/index/index.php @@ -104,8 +104,14 @@ foreach ($list as $item) { $parameters['list'][$item->{$r->key}] = $tr->get ($item->{$r->key}); if ($parameters['list'][$item->{$r->key}]->collection) { + if (! is_object ($parameters['list'][$item->{$r->key}])) { + $parameters['list'][$item->{$r->key}] = new stdClass; + } $parameters['list'][$item->{$r->key}]->title = multilingual_filter_title ($parameters['list'][$item->{$r->key}]->collection, $item->{$r->key}); } else { + if (! is_object ($parameters['list'][$item->{$r->key}])) { + $parameters['list'][$item->{$r->key}] = new stdClass; + } $parameters['list'][$item->{$r->key}]->title = multilingual_filter_title ($cgi->_collection, $item->{$r->key}); } } diff --git a/inc/app/myadm/docs/fr/001-about-myadm.html b/inc/app/myadm/docs/fr/001-about-myadm.html index 306686ab..587635fb 100644 --- a/inc/app/myadm/docs/fr/001-about-myadm.html +++ b/inc/app/myadm/docs/fr/001-about-myadm.html @@ -1,12 +1,12 @@ -Le gestionnaire de base de données est une couche d'accès direct à
-la base de données fondamentale de MySQL sous Sitellite. Il vient
-préinstallé, et est très maniable pour des utilisateurs de puissance et
-les lotisseurs en faisant de bas niveau rapide et sale édite.
+
Le gestionnaire de base de données est une couche d'accès direct Ã
+la base de données fondamentale de MySQL sous Sitellite. Il vient
+préinstallé, et est très maniable pour des utilisateurs de puissance et
+les lotisseurs en faisant de bas niveau rapide et sale édite.
La -partie la plus maniable du gestionnaire de base de données est -probablement la coquille de SQL, qui vous permet d'exécuter des -questions arbitraires de SQL contre la base de données, qui est grande -pour examiner hors du nouveaux code et idées.
+partie la plus maniable du gestionnaire de base de données est +probablement la coquille de SQL, qui vous permet d'exécuter des +questions arbitraires de SQL contre la base de données, qui est grande +pour examiner hors du nouveaux code et idées. diff --git a/inc/app/myadm/docs/languages.php b/inc/app/myadm/docs/languages.php index ee5592d3..d875585a 100644 --- a/inc/app/myadm/docs/languages.php +++ b/inc/app/myadm/docs/languages.php @@ -10,7 +10,7 @@ en = English -fr = "Français" +fr = "Français" ; ; THE END diff --git a/inc/app/siteblog/forms/edit/settings.php b/inc/app/siteblog/forms/edit/settings.php index 61373e89..850b4207 100644 --- a/inc/app/siteblog/forms/edit/settings.php +++ b/inc/app/siteblog/forms/edit/settings.php @@ -73,7 +73,7 @@ [created] type = calendar -alt = Posted On +alt = "Posted On" setValue = "eval: date ('Y-m-d H:i:s')" nullable = false showsTime = true diff --git a/inc/app/siteconnector/lib/Ext/PEAR/HTTP/docs/download-progress.php b/inc/app/siteconnector/lib/Ext/PEAR/HTTP/docs/download-progress.php index c4a0791a..1e4db67c 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/HTTP/docs/download-progress.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/HTTP/docs/download-progress.php @@ -78,7 +78,7 @@ function update(&$subject, $event, $data = null) } else { $this->setTarget($this->_target); } - $this->_bar =& new Console_ProgressBar( + $this->_bar = new Console_ProgressBar( '* ' . $this->_target . ' %fraction% KB [%bar%] %percent%', '=>', '-', 79, (isset($data['content-length'])? round($data['content-length'] / 1024): 100) ); @@ -105,9 +105,9 @@ function update(&$subject, $event, $data = null) // to be able to see the progress bar $url = 'http://pear.php.net/get/HTML_QuickForm-stable'; -$req =& new HTTP_Request($url); +$req = new HTTP_Request($url); -$download =& new HTTP_Request_DownloadListener(); +$download = new HTTP_Request_DownloadListener(); $req->attach($download); $req->sendRequest(false); ?> diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Base.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Base.php index f18ae359..c4d3876b 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Base.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Base.php @@ -191,7 +191,7 @@ function &_raiseSoapFault($str, $detail = '', $actorURI = '', $code = null, $mod $fault =& $str; } else { if (!$code) $code = $is_instance?$this->_myfaultcode:'Client'; - $fault =& new SOAP_Fault($str, + $fault = new SOAP_Fault($str, $code, $actorURI, $detail, @@ -454,7 +454,7 @@ function _serializeValue(&$value, $name = '', $type = false, $elNamespace = NULL $array_type = $array_type_prefix = ''; if ($numtypes != 1) { - $arrayTypeQName =& new QName($arrayType); + $arrayTypeQName = new QName($arrayType); $arrayType = $arrayTypeQName->name; $array_types = array(); $array_val = NULL; @@ -540,8 +540,8 @@ function _serializeValue(&$value, $name = '', $type = false, $elNamespace = NULL $xml_attr = ''; if (count($attributes) > 0) { foreach ($attributes as $k => $v) { - $kqn =& new QName($k); - $vqn =& new QName($v); + $kqn = new QName($k); + $vqn = new QName($v); $xml_attr .= ' '.$kqn->fqn().'="'.$vqn->fqn().'"'; } } @@ -637,7 +637,7 @@ function _getType(&$value) { if ($this->_isBase64($value)) { $type = 'base64Binary'; } else { - $dt =& new SOAP_Type_dateTime($value); + $dt = new SOAP_Type_dateTime($value); if ($dt->toUnixtime() != -1) { $type = 'dateTime'; #$value = $dt->toSOAP(); @@ -751,7 +751,7 @@ function &_decode(&$soapval) if ($t && class_exists($t)) $classname = $t; } } - $return =& new $classname; + $return = new $classname; } else { $return = array(); } @@ -893,7 +893,7 @@ function &_makeMimeMessage(&$xml, $encoding = SOAP_DEFAULT_ENCODING) // see http://www.w3.org/TR/SOAP-attachments // now we have to mime encode the message $params = array('content_type' => 'multipart/related; type=text/xml'); - $msg =& new Mail_mimePart('', $params); + $msg = new Mail_mimePart('', $params); // add the xml part $params['content_type'] = 'text/xml'; $params['charset'] = $encoding; @@ -921,7 +921,7 @@ function &_makeDIMEMessage(&$xml) // encode any attachments // see http://search.ietf.org/internet-drafts/draft-nielsen-dime-soap-00.txt // now we have to DIME encode the message - $dime =& new Net_DIME_Message(); + $dime = new Net_DIME_Message(); $msg =& $dime->encodeData($xml,SOAP_ENVELOP,NULL,NET_DIME_TYPE_URI); // add the attachements @@ -947,7 +947,7 @@ function _decodeMimeMessage(&$data, &$headers, &$attachments) $params['decode_headers'] = TRUE; // XXX lame thing to have to do for decoding - $decoder =& new Mail_mimeDecode($data); + $decoder = new Mail_mimeDecode($data); $structure = $decoder->decode($params); if (isset($structure->body)) { @@ -989,7 +989,7 @@ function _decodeDIMEMessage(&$data, &$headers, &$attachments) // XXX this SHOULD be moved to the transport layer, e.g. PHP itself // should handle parsing DIME ;) - $dime =& new Net_DIME_Message(); + $dime = new Net_DIME_Message(); $err = $dime->decodeData($data); if ( PEAR::isError($err) ) { $this->_raiseSoapFault('Failed to decode the DIME message!','','','Server'); @@ -1013,7 +1013,7 @@ function _decodeDIMEMessage(&$data, &$headers, &$attachments) function __set_type_translation($type, $class=NULL) { - $tq =& new QName($type); + $tq = new QName($type); if (!$class) { $class = $tq->name; } diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Client.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Client.php index 61f16a9e..4fd2fae3 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Client.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Client.php @@ -146,7 +146,7 @@ function SOAP_Client($endpoint, $wsdl = false, $portName = false, $proxy_params= if ($wsdl) { $this->__endpointType = 'wsdl'; // instantiate wsdl class - $this->_wsdl =& new SOAP_WSDL($this->_endpoint, $this->__proxy_params); + $this->_wsdl = new SOAP_WSDL($this->_endpoint, $this->__proxy_params); if ($this->_wsdl->fault) { $this->_raiseSoapFault($this->_wsdl->fault); } @@ -197,7 +197,7 @@ function addHeader(&$soap_value) $this->headersOut[] =& $soap_value; } else if (gettype($soap_value) == 'array') { // name, value, namespace, mustunderstand, actor - $this->headersOut[] =& new SOAP_Header($soap_value[0], NULL, $soap_value[1], $soap_value[2], $soap_value[3]);; + $this->headersOut[] = new SOAP_Header($soap_value[0], NULL, $soap_value[1], $soap_value[2], $soap_value[3]);; } else { $this->_raiseSoapFault("Don't understand the header info you provided. Must be array or SOAP_Header."); } @@ -434,7 +434,7 @@ function &__generate($method, &$params, $namespace = false, $soapAction = false) if (gettype($nparams[$name]) != 'object' || !is_a($nparams[$name],'soap_value')) { // type is a qname likely, split it apart, and get the type namespace from wsdl - $qname =& new QName($part['type']); + $qname = new QName($part['type']); if ($qname->ns) $type_namespace = $this->_wsdl->namespaces[$qname->ns]; else if (isset($part['namespace'])) @@ -445,7 +445,7 @@ function &__generate($method, &$params, $namespace = false, $soapAction = false) $type = $qname->name; $pqname = $name; if ($xmlns) $pqname = '{'.$xmlns.'}'.$name; - $nparams[$name] =& new SOAP_Value($pqname, $qname->fqn(), $nparams[$name],$attrs); + $nparams[$name] = new SOAP_Value($pqname, $qname->fqn(), $nparams[$name],$attrs); } else { // wsdl fixups to the soap value } @@ -465,21 +465,21 @@ function &__generate($method, &$params, $namespace = false, $soapAction = false) if (!isset($this->__options['style']) || $this->__options['style'] == 'rpc') { $this->__options['style'] = 'rpc'; $this->docparams = true; - $mqname =& new QName($method, $namespace); - $methodValue =& new SOAP_Value($mqname->fqn(), 'Struct', $params); + $mqname = new QName($method, $namespace); + $methodValue = new SOAP_Value($mqname->fqn(), 'Struct', $params); $soap_msg =& $this->_makeEnvelope($methodValue, $this->headersOut, $this->_encoding,$this->__options); } else { if (!$params) { - $mqname =& new QName($method, $namespace); + $mqname = new QName($method, $namespace); $mynull = NULL; - $params =& new SOAP_Value($mqname->fqn(), 'Struct', $mynull); + $params = new SOAP_Value($mqname->fqn(), 'Struct', $mynull); } elseif ($this->__options['input'] == 'parse') { if (is_array($params)) { $nparams = array(); $keys = array_keys($params); foreach ($keys as $k) { if (gettype($params[$k]) != 'object') { - $nparams[] =& new SOAP_Value($k, false, $params[$k]); + $nparams[] = new SOAP_Value($k, false, $params[$k]); } else { $nparams[] =& $params[$k]; } @@ -487,8 +487,8 @@ function &__generate($method, &$params, $namespace = false, $soapAction = false) $params =& $nparams; } if ($this->__options['parameters']) { - $mqname =& new QName($method, $namespace); - $params =& new SOAP_Value($mqname->fqn(), 'Struct', $params); + $mqname = new QName($method, $namespace); + $params = new SOAP_Value($mqname->fqn(), 'Struct', $params); } } $soap_msg =& $this->_makeEnvelope($params, $this->headersOut, $this->_encoding,$this->__options); @@ -534,7 +534,7 @@ function &__generate($method, &$params, $namespace = false, $soapAction = false) function &__parse(&$response, $encoding, &$attachments) { // parse the response - $response =& new SOAP_Parser($response, $encoding, $attachments); + $response = new SOAP_Parser($response, $encoding, $attachments); if ($response->fault) { return $this->_raiseSoapFault($response->fault); } diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Fault.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Fault.php index d3b09bd2..a354b231 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Fault.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Fault.php @@ -60,18 +60,18 @@ function SOAP_Fault($faultstring = 'unknown error', $faultcode = 'Client', $faul */ function message() { - $msg =& new SOAP_Base(); + $msg = new SOAP_Base(); $params = array(); - $params[] =& new SOAP_Value('faultcode', 'QName', 'SOAP-ENV:'.$this->code); - $params[] =& new SOAP_Value('faultstring', 'string', $this->message); - $params[] =& new SOAP_Value('faultactor', 'anyURI', $this->error_message_prefix); + $params[] = new SOAP_Value('faultcode', 'QName', 'SOAP-ENV:'.$this->code); + $params[] = new SOAP_Value('faultstring', 'string', $this->message); + $params[] = new SOAP_Value('faultactor', 'anyURI', $this->error_message_prefix); if (isset($this->backtrace)) { - $params[] =& new SOAP_Value('detail', 'string', $this->backtrace); + $params[] = new SOAP_Value('detail', 'string', $this->backtrace); } else { - $params[] =& new SOAP_Value('detail', 'string', $this->userinfo); + $params[] = new SOAP_Value('detail', 'string', $this->userinfo); } - $methodValue =& new SOAP_Value('{'.SOAP_ENVELOP.'}Fault', 'Struct', $params); + $methodValue = new SOAP_Value('{'.SOAP_ENVELOP.'}Fault', 'Struct', $params); $headers = NULL; return $msg->_makeEnvelope($methodValue, $headers); } @@ -88,7 +88,7 @@ function getFault() { global $SOAP_OBJECT_STRUCT; if ($SOAP_OBJECT_STRUCT) { - $fault =& new stdClass(); + $fault = new stdClass(); $fault->faultcode = $this->code; $fault->faultstring = $this->message; $fault->faultactor = $this->error_message_prefix; diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Parser.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Parser.php index 1a16b7d7..58f20645 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Parser.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Parser.php @@ -182,14 +182,14 @@ function &buildResponse($pos) } // add current node's value if ($response) { - $nqn =& new Qname($this->message[$pos]['name'],$this->message[$pos]['namespace']); - $tqn =& new Qname($this->message[$pos]['type'],$this->message[$pos]['type_namespace']); - $response =& new SOAP_Value($nqn->fqn(), $tqn->fqn(), $response, $attrs); + $nqn = new Qname($this->message[$pos]['name'],$this->message[$pos]['namespace']); + $tqn = new Qname($this->message[$pos]['type'],$this->message[$pos]['type_namespace']); + $response = new SOAP_Value($nqn->fqn(), $tqn->fqn(), $response, $attrs); if (isset($this->message[$pos]['arrayType'])) $response->arrayType = $this->message[$pos]['arrayType']; } else { - $nqn =& new Qname($this->message[$pos]['name'],$this->message[$pos]['namespace']); - $tqn =& new Qname($this->message[$pos]['type'],$this->message[$pos]['type_namespace']); - $response =& new SOAP_Value($nqn->fqn(), $tqn->fqn(), $this->message[$pos]['cdata'], $attrs); + $nqn = new Qname($this->message[$pos]['name'],$this->message[$pos]['namespace']); + $tqn = new Qname($this->message[$pos]['type'],$this->message[$pos]['type_namespace']); + $response = new SOAP_Value($nqn->fqn(), $tqn->fqn(), $this->message[$pos]['cdata'], $attrs); } // handle header attribute that we need if (array_key_exists('actor',$this->message[$pos])) { @@ -242,7 +242,7 @@ function startElement($parser, $name, $attrs) $this->depth_array[$this->depth] = $pos; // set self as current parent $this->parent = $pos; - $qname =& new QName($name); + $qname = new QName($name); // set status if (strcasecmp('envelope',$qname->name)==0) { $this->status = 'envelope'; @@ -287,7 +287,7 @@ function startElement($parser, $name, $attrs) // loop through atts, logging ns and type declarations foreach ($attrs as $key => $value) { // if ns declarations, add to class level array of valid namespaces - $kqn =& new QName($key); + $kqn = new QName($key); if ($kqn->ns == 'xmlns') { $prefix = $kqn->name; @@ -312,14 +312,14 @@ function startElement($parser, $name, $attrs) // if it's a type declaration, set type } elseif ($kqn->name == 'type') { - $vqn =& new QName($value); + $vqn = new QName($value); $this->message[$pos]['type'] = $vqn->name; $this->message[$pos]['type_namespace'] = $this->_getNamespaceForPrefix($vqn->ns); #print "set type for {$this->message[$pos]['name']} to {$this->message[$pos]['type']}\n"; // should do something here with the namespace of specified type? } elseif ($kqn->name == 'arrayType') { - $vqn =& new QName($value); + $vqn = new QName($value); $this->message[$pos]['type'] = 'Array'; #$type = $vqn->name; if (isset($vqn->arraySize)) @@ -385,7 +385,7 @@ function endElement($parser, $name) $pos = $this->depth_array[$this->depth]; // bring depth down a notch $this->depth--; - $qname =& new QName($name); + $qname = new QName($name); // get type if not explicitly declared in an xsi:type attribute // XXX check on integrating wsdl validation here diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Server.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Server.php index 4554c45f..f39d0dd7 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Server.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Server.php @@ -271,8 +271,8 @@ function buildResult(&$method_response, &$return_type, $return_name='return', $n if (is_a($method_response[$i],'soap_value')) { $return_val[] = $method_response[$i++]; } else { - $qn =& new QName($key, $namespace); - $return_val[] =& new SOAP_Value($qn->fqn(),$type,$method_response[$i++]); + $qn = new QName($key, $namespace); + $return_val[] = new SOAP_Value($qn->fqn(),$type,$method_response[$i++]); } } } else { @@ -282,9 +282,9 @@ function buildResult(&$method_response, &$return_type, $return_name='return', $n $values = array_values($return_type); $return_type = $values[0]; } - $qn =& new QName($return_name, $namespace); + $qn = new QName($return_name, $namespace); $return_val = array(); - $return_val[] =& new SOAP_Value($qn->fqn(),$return_type,$method_response); + $return_val[] = new SOAP_Value($qn->fqn(),$return_type,$method_response); } } return $return_val; @@ -293,7 +293,7 @@ function buildResult(&$method_response, &$return_type, $return_name='return', $n function parseRequest($data = '', $attachments = null) { // parse response, get soap parser obj - $parser =& new SOAP_Parser($data,$this->xml_encoding,$attachments); + $parser = new SOAP_Parser($data,$this->xml_encoding,$attachments); // if fault occurred during message parsing if ($parser->fault) { $this->fault = $parser->fault; @@ -415,8 +415,8 @@ function parseRequest($data = '', $attachments = null) else $return_val = $this->buildResult($method_response, $this->return_type); - $qn =& new QName($this->methodname.'Response',$this->method_namespace); - $methodValue =& new SOAP_Value($qn->fqn(), 'Struct', $return_val); + $qn = new QName($this->methodname.'Response',$this->method_namespace); + $methodValue = new SOAP_Value($qn->fqn(), 'Struct', $return_val); } else { $methodValue =& $method_response; } @@ -668,7 +668,7 @@ function bind($wsdl_url) { */ function bindWSDL($wsdl_url) { // instantiate wsdl class - $this->_wsdl =& new SOAP_WSDL($wsdl_url); + $this->_wsdl = new SOAP_WSDL($wsdl_url); if ($this->_wsdl->fault) { $this->_raiseSoapFault($this->_wsdl->fault); } @@ -679,7 +679,7 @@ function bindWSDL($wsdl_url) { */ function addObjectWSDL(&$wsdl_obj, $targetNamespace, $service_name, $service_desc = '') { if (!isset($this->_wsdl)) { - $this->_wsdl =& new SOAP_WSDL; + $this->_wsdl = new SOAP_WSDL; } $this->_wsdl->parseObject($wsdl_obj, $targetNamespace, $service_name, $service_desc); diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Server/Email.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Server/Email.php index 2dc9041f..7040c3b7 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Server/Email.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Server/Email.php @@ -124,7 +124,7 @@ function client(&$data) if ($this->soapfault) { return $this->soapfault->getFault(); } - $client =& new SOAP_Client(NULL); + $client = new SOAP_Client(NULL); return $client->__parse($data, $this->xml_encoding, $this->attachments); } diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Transport/SMTP.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Transport/SMTP.php index 07691fc6..19b5057e 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Transport/SMTP.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Transport/SMTP.php @@ -150,20 +150,20 @@ function send(&$msg, /*array*/ $options = NULL) 'password' => $this->password, 'auth' => $this->auth ); - $mailer =& new Mail_smtp($mailer_params); + $mailer = new Mail_smtp($mailer_params); $result = $mailer->send($this->urlparts['path'], $headers, $out); #$result = mail($this->urlparts['path'], $headers['Subject'], $out, $header_text); if (!PEAR::isError($result)) { - $val =& new SOAP_Value('Message-ID','string',$headers['Message-ID']); + $val = new SOAP_Value('Message-ID','string',$headers['Message-ID']); } else { - $sval[] =& new SOAP_Value('faultcode','QName','SOAP-ENV:Client'); - $sval[] =& new SOAP_Value('faultstring','string',"couldn't send SMTP message to {$this->urlparts['path']}"); - $val =& new SOAP_Value('Fault','Struct',$sval); + $sval[] = new SOAP_Value('faultcode','QName','SOAP-ENV:Client'); + $sval[] = new SOAP_Value('faultstring','string',"couldn't send SMTP message to {$this->urlparts['path']}"); + $val = new SOAP_Value('Fault','Struct',$sval); } - $mqname =& new QName($method, $namespace); - $methodValue =& new SOAP_Value('Response', 'Struct', array($val)); + $mqname = new QName($method, $namespace); + $methodValue = new SOAP_Value('Response', 'Struct', array($val)); $this->incoming_payload =& $this->_makeEnvelope($methodValue, $this->headers, $this->encoding); diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Value.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Value.php index 4dc28172..aa779678 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Value.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/Value.php @@ -84,10 +84,10 @@ class SOAP_Value function SOAP_Value($name = '', $type = false, $value=NULL, $attributes = array()) { // detect type if not passed - $this->nqn =& new QName($name); + $this->nqn = new QName($name); $this->name = $this->nqn->name; $this->namespace = $this->nqn->namespace; - $this->tqn =& new QName($type); + $this->tqn = new QName($type); $this->type = $this->tqn->name; $this->type_prefix = $this->tqn->ns; $this->type_namespace = $this->tqn->namespace; diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/WSDL.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/WSDL.php index eec1f419..5c982296 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/WSDL.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/WSDL.php @@ -129,7 +129,7 @@ function parse($wsdl_uri, $proxy = array()) { * @return void */ function parseURL($wsdl_uri, $proxy = array()) { - $parser =& new SOAP_WSDL_Parser($wsdl_uri, $this); + $parser = new SOAP_WSDL_Parser($wsdl_uri, $this); if ($parser->fault) { $this->_raiseSoapFault($parser->fault); @@ -146,7 +146,7 @@ function parseURL($wsdl_uri, $proxy = array()) { */ function parseObject(&$wsdl_obj, $targetNamespace, $service_name, $service_desc = '') { - $parser =& new SOAP_WSDL_ObjectParser($wsdl_obj, $this, $targetNamespace, $service_name, $service_desc); + $parser = new SOAP_WSDL_ObjectParser($wsdl_obj, $this, $targetNamespace, $service_name, $service_desc); if ($parser->fault) { $this->_raiseSoapFault($parser->fault); @@ -391,7 +391,7 @@ function _elementArg(&$args, &$argarray, &$_argtype, $_argname) $comments .= " // {$el['type']} may require attributes, refer to wsdl for more info\n"; } $comments .= " \${$attrname}['xmlns'] = '{$this->namespaces[$_argtype['namespace']]}';\n"; - $comments .= " \${$_argtype['type']} =& new SOAP_Value('{$_argtype['type']}',false,\${$_argtype['type']},\$$attrname);\n"; + $comments .= " \${$_argtype['type']} = new SOAP_Value('{$_argtype['type']}',false,\${$_argtype['type']},\$$attrname);\n"; $this->_addArg($args,$argarray,$_argtype['type']); if (isset($this->complexTypes[$tns][$el['type']]['attribute'])) { if ($args) $args .= ", "; @@ -400,12 +400,12 @@ function _elementArg(&$args, &$argarray, &$_argtype, $_argname) #$comments = $this->_complexTypeArg($args,$argarray,$el,$_argtype['type']); } else if (isset($el['elements'])) { foreach ($el['elements'] as $ename => $element) { - $comments .= " \$$ename =& new SOAP_Value('{{$this->namespaces[$element['namespace']]}}$ename','{$element['type']}',\$$ename);\n"; + $comments .= " \$$ename = new SOAP_Value('{{$this->namespaces[$element['namespace']]}}$ename','{$element['type']}',\$$ename);\n"; $this->_addArg($args,$argarray,$ename); } } else { - #$echoStringParam =& new SOAP_Value('{http://soapinterop.org/xsd}echoStringParam',false,$echoStringParam); - $comments .= " \$$_argname =& new SOAP_Value('{{$this->namespaces[$tns]}}$_argname','{$el['type']}',\$$_argname);\n"; + #$echoStringParam = new SOAP_Value('{http://soapinterop.org/xsd}echoStringParam',false,$echoStringParam); + $comments .= " \$$_argname = new SOAP_Value('{{$this->namespaces[$tns]}}$_argname','{$el['type']}',\$$_argname);\n"; $this->_addArg($args,$argarray,$_argname); } return $comments; @@ -421,7 +421,7 @@ function _complexTypeArg(&$args, &$argarray, &$_argtype, $_argname) $comments .= " // $_argname may require attributes, refer to wsdl for more info\n"; } $wrapname = '{'.$this->namespaces[$_argtype['namespace']].'}'.$_argtype['type']; - $comments .= " \$$_argname =& new SOAP_Value('$_argname','$wrapname',\$$_argname);\n"; + $comments .= " \$$_argname = new SOAP_Value('$_argname','$wrapname',\$$_argname);\n"; } $this->_addArg($args,$argarray,$_argname); @@ -538,7 +538,7 @@ function generateProxyCode($port = '', $classname='') }*/ if($el['complex'] && $argarray) { $wrapname = '{'.$this->namespaces[$_argtype['namespace']].'}'.$el['name']; - $comments .= " \${$el['name']} =& new SOAP_Value('$wrapname',false,\$v=array($argarray));\n"; + $comments .= " \${$el['name']} = new SOAP_Value('$wrapname',false,\$v=array($argarray));\n"; $argarray = "'{$el['name']}'=>\${$el['name']}"; } } else @@ -849,7 +849,7 @@ function get($wsdl_fname, $proxy_params = array(), $cache = 0) { } } else { $uri = explode('?',$wsdl_fname); - $rq =& new HTTP_Request($uri[0], $proxy_params); + $rq = new HTTP_Request($uri[0], $proxy_params); // the user agent HTTP_Request uses fouls things up if (isset($uri[1])) { $rq->addRawQueryString($uri[1]); @@ -916,7 +916,7 @@ class SOAP_WSDL_Parser extends SOAP_Base // constructor function SOAP_WSDL_Parser($uri, &$wsdl, $docs = false) { parent::SOAP_Base('WSDLPARSER'); - $this->cache =& new SOAP_WSDL_Cache($wsdl->cacheUse, $wsdl->cacheMaxAge); + $this->cache = new SOAP_WSDL_Cache($wsdl->cacheUse, $wsdl->cacheMaxAge); $this->uri = $uri; $this->wsdl = &$wsdl; $this->docs = $docs; @@ -953,7 +953,7 @@ function parse($uri) { // start-element handler function startElement($parser, $name, $attrs) { // get element prefix - $qname =& new QName($name); + $qname = new QName($name); if ($qname->ns) { $ns = $qname->ns; if ($ns && ((!$this->tns && strcasecmp($qname->name,'definitions') == 0) || $ns == $this->tns)) { @@ -998,7 +998,7 @@ function startElement($parser, $name, $attrs) { if (!isset($attrs['namespace'])) $attrs['namespace'] = $this->schema; $this->wsdl->complexTypes[$this->schema][$this->currentComplexType] = $attrs; if (array_key_exists('base',$attrs)) { - $qn =& new QName($attrs['base']); + $qn = new QName($attrs['base']); $this->wsdl->complexTypes[$this->schema][$this->currentComplexType]['type'] = $qn->name; $this->wsdl->complexTypes[$this->schema][$this->currentComplexType]['namespace'] = $qn->ns; } else { @@ -1011,7 +1011,7 @@ function startElement($parser, $name, $attrs) { break; case 'element': if (isset($attrs['type'])) { - $qn =& new QName($attrs['type']); + $qn = new QName($attrs['type']); $attrs['type'] = $qn->name; #$this->wsdl->getNamespaceAttributeName if ($qn->ns && array_key_exists($qn->ns, $this->wsdl->namespaces)) { @@ -1056,7 +1056,7 @@ function startElement($parser, $name, $attrs) { case 'restriction': if ($this->schemaStatus == 'complexType') { if ($attrs['base']) { - $qn =& new QName($attrs['base']); + $qn = new QName($attrs['base']); $this->wsdl->complexTypes[$this->schema][$this->currentComplexType]['type'] = $qn->name; $this->wsdl->complexTypes[$this->schema][$this->currentComplexType]['namespace'] = $qn->ns; } else { @@ -1089,10 +1089,10 @@ function startElement($parser, $name, $attrs) { $this->wsdl->complexTypes[$this->schema][$this->currentComplexType]['attribute'][$attrs['name']] = $attrs; } else if (isset($attrs['ref'])) { - $q =& new QName($attrs['ref']); + $q = new QName($attrs['ref']); foreach ($attrs as $k => $v) { if ($k != 'ref' && strstr($k, $q->name)) { - $vq =& new QName($v); + $vq = new QName($v); if ($q->name == 'arrayType') { $this->wsdl->complexTypes[$this->schema][$this->currentComplexType][$q->name] = $vq->name.$vq->arrayInfo; $this->wsdl->complexTypes[$this->schema][$this->currentComplexType]['type'] = 'Array'; @@ -1116,9 +1116,9 @@ function startElement($parser, $name, $attrs) { case 'part': $qn = NULL; if (isset($attrs['type'])) { - $qn =& new QName($attrs['type']); + $qn = new QName($attrs['type']); } else if (isset($attrs['element'])) { - $qn =& new QName($attrs['element']); + $qn = new QName($attrs['element']); } if ($qn) { $attrs['type'] = $qn->name; @@ -1154,7 +1154,7 @@ function startElement($parser, $name, $attrs) { $this->wsdl->portTypes[$this->currentPortType][$this->currentOperation][$name] = $attrs; } if (array_key_exists('message',$attrs)) { - $qn =& new QName($attrs['message']); + $qn = new QName($attrs['message']); $this->wsdl->portTypes[$this->currentPortType][$this->currentOperation][$name]['message'] = $qn->name; $this->wsdl->portTypes[$this->currentPortType][$this->currentOperation][$name]['namespace'] = $qn->ns; } @@ -1330,7 +1330,7 @@ function startElement($parser, $name, $attrs) { $this->currentPort = $attrs['name']; $this->wsdl->services[$this->currentService]['ports'][$this->currentPort] = $attrs; // XXX hack to deal with binding namespaces - $qn =& new QName($attrs['binding']); + $qn = new QName($attrs['binding']); $this->wsdl->services[$this->currentService]['ports'][$this->currentPort]['binding'] = $qn->name; $this->wsdl->services[$this->currentService]['ports'][$this->currentPort]['namespace'] = $qn->ns; break; @@ -1371,7 +1371,7 @@ function startElement($parser, $name, $attrs) { $base = parse_url($this->uri); $uri = $this->merge_url($base,$uri); } - $import_parser =& new SOAP_WSDL_Parser($uri, $this->wsdl); + $import_parser = new SOAP_WSDL_Parser($uri, $this->wsdl); if ($import_parser->fault) { return FALSE; } @@ -1405,7 +1405,7 @@ function startElement($parser, $name, $attrs) { if ($qname->ns && $qname->ns != $this->tns) break; $this->status = 'binding'; $this->currentBinding = $attrs['name']; - $qn =& new QName($attrs['type']); + $qn = new QName($attrs['type']); $this->wsdl->bindings[$this->currentBinding]['type'] = $qn->name; $this->wsdl->bindings[$this->currentBinding]['namespace'] = $qn->ns; break; @@ -1423,7 +1423,7 @@ function startElement($parser, $name, $attrs) { $this->wsdl->definition = $attrs; foreach ($attrs as $key => $value) { if (strstr($key,'xmlns:') !== FALSE) { - $qn =& new QName($key); + $qn = new QName($key); // XXX need to refactor ns handling $this->wsdl->namespaces[$qn->name] = $value; $this->wsdl->ns[$value] = $qn->name; diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/email_pop_gateway.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/email_pop_gateway.php index ea190190..72d767ff 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/email_pop_gateway.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/email_pop_gateway.php @@ -43,7 +43,7 @@ /* Connect to a POP3 server and read the messages */ -$pop3 =& new Net_POP3(); +$pop3 = new Net_POP3(); if ($pop3->connect('localhost', 110)) { if ($pop3->login('username', 'password')) { $listing = $pop3->getListing(); diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/email_pop_server.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/email_pop_server.php index 360a02fe..87439f0f 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/email_pop_server.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/email_pop_server.php @@ -43,7 +43,7 @@ /* Connect to a POP3 server and read the messages */ -$pop3 =& new Net_POP3(); +$pop3 = new Net_POP3(); if ($pop3->connect('localhost', 110)) { if ($pop3->login('username', 'password')) { $listing = $pop3->getListing(); diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/example_types.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/example_types.php index 1f1b91b7..5277fe2e 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/example_types.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/example/example_types.php @@ -25,9 +25,9 @@ function SOAPStruct($s=NULL, $i=NULL, $f=NULL) { function &__to_soap($name = 'inputStruct', $header=false, $mustUnderstand=0, $actor='http://schemas.xmlsoap.org/soap/actor/next') { - $inner[] =& new SOAP_Value('varString','string',$this->varString); - $inner[] =& new SOAP_Value('varInt','int',$this->varInt); - $inner[] =& new SOAP_Value('varFloat','float',$this->varFloat); + $inner[] = new SOAP_Value('varString','string',$this->varString); + $inner[] = new SOAP_Value('varInt','int',$this->varInt); + $inner[] = new SOAP_Value('varFloat','float',$this->varFloat); if ($header) { return new SOAP_Header($name,'{http://soapinterop.org/xsd}SOAPStruct',$inner,$mustUnderstand,$actor); } diff --git a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/tools/genproxy.php b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/tools/genproxy.php index 8a334e1e..ad43f7bc 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/SOAP/tools/genproxy.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/SOAP/tools/genproxy.php @@ -12,7 +12,7 @@ */ function do_wsdl($uri) { - $wsdl =& new SOAP_WSDL($uri); + $wsdl = new SOAP_WSDL($uri); print $wsdl->generateAllProxies(); } echo "" ); $start = getmicrotime(); -$parser =& new XML_HTMLSax(); +$parser = new XML_HTMLSax(); $parser->set_object($handler); $parser->set_element_handler('openHandler','closeHandler'); $parser->set_data_handler('dataHandler'); diff --git a/inc/app/siteconnector/lib/Ext/PEAR/XML/HTMLSax/docs/examples/HTMLtoXHTML.php b/inc/app/siteconnector/lib/Ext/PEAR/XML/HTMLSax/docs/examples/HTMLtoXHTML.php index e79e5ce2..ec7bcfc7 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/XML/HTMLSax/docs/examples/HTMLtoXHTML.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/XML/HTMLSax/docs/examples/HTMLtoXHTML.php @@ -97,10 +97,10 @@ function getXHTML () { $doc=file_get_contents('example.html'); // Instantiate the handler -$handler=& new HTMLtoXHTMLHandler(); +$handler= new HTMLtoXHTMLHandler(); // Instantiate the parser -$parser=& new XML_HTMLSax(); +$parser= new XML_HTMLSax(); // Register the handler with the parser $parser->set_object($handler); diff --git a/inc/app/siteconnector/lib/Ext/PEAR/XML/HTMLSax/docs/examples/SimpleExample.php b/inc/app/siteconnector/lib/Ext/PEAR/XML/HTMLSax/docs/examples/SimpleExample.php index f7d9b9c2..7fde00ba 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/XML/HTMLSax/docs/examples/SimpleExample.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/XML/HTMLSax/docs/examples/SimpleExample.php @@ -60,7 +60,7 @@ function jaspHandler(& $parser,$data) { $handler=new MyHandler(); // Instantiate the parser -$parser=& new XML_HTMLSax(); +$parser= new XML_HTMLSax(); // Register the handler with the parser $parser->set_object($handler); diff --git a/inc/app/siteconnector/lib/Ext/PEAR/XML/SaxFilters/HTMLSaxParser.php b/inc/app/siteconnector/lib/Ext/PEAR/XML/SaxFilters/HTMLSaxParser.php index be87022d..071f067c 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/XML/SaxFilters/HTMLSaxParser.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/XML/SaxFilters/HTMLSaxParser.php @@ -60,7 +60,7 @@ class XML_SaxFilters_HtmlSaxParser extends XML_SaxFilters_AbstractParser /* impl function XML_SaxFilters_HtmlSaxParser(& $reader) { parent::XML_SaxFilters_AbstractParser($reader); - $this->parser=& new XML_HTMLSax(); + $this->parser= new XML_HTMLSax(); $this->parser->set_object($this); $this->parser->set_element_handler('startElementHandler','endElementHandler'); $this->parser->set_data_handler('characterDataHandler'); diff --git a/inc/app/siteconnector/lib/Ext/PEAR/XML/XML_HTMLSax.php b/inc/app/siteconnector/lib/Ext/PEAR/XML/XML_HTMLSax.php index 8a64febb..c3e67043 100644 --- a/inc/app/siteconnector/lib/Ext/PEAR/XML/XML_HTMLSax.php +++ b/inc/app/siteconnector/lib/Ext/PEAR/XML/XML_HTMLSax.php @@ -158,15 +158,15 @@ class XML_HTMLSax_StateParser { */ function XML_HTMLSax_StateParser (& $htmlsax) { $this->htmlsax = & $htmlsax; - $this->State[XML_HTMLSAX_STATE_START] =& new XML_HTMLSax_StartingState(); + $this->State[XML_HTMLSAX_STATE_START] = new XML_HTMLSax_StartingState(); - $this->State[XML_HTMLSAX_STATE_CLOSING_TAG] =& new XML_HTMLSax_ClosingTagState(); - $this->State[XML_HTMLSAX_STATE_TAG] =& new XML_HTMLSax_TagState(); - $this->State[XML_HTMLSAX_STATE_OPENING_TAG] =& new XML_HTMLSax_OpeningTagState(); + $this->State[XML_HTMLSAX_STATE_CLOSING_TAG] = new XML_HTMLSax_ClosingTagState(); + $this->State[XML_HTMLSAX_STATE_TAG] = new XML_HTMLSax_TagState(); + $this->State[XML_HTMLSAX_STATE_OPENING_TAG] = new XML_HTMLSax_OpeningTagState(); - $this->State[XML_HTMLSAX_STATE_PI] =& new XML_HTMLSax_PiState(); - $this->State[XML_HTMLSAX_STATE_JASP] =& new XML_HTMLSax_JaspState(); - $this->State[XML_HTMLSAX_STATE_ESCAPE] =& new XML_HTMLSax_EscapeState(); + $this->State[XML_HTMLSAX_STATE_PI] = new XML_HTMLSax_PiState(); + $this->State[XML_HTMLSAX_STATE_JASP] = new XML_HTMLSax_JaspState(); + $this->State[XML_HTMLSAX_STATE_ESCAPE] = new XML_HTMLSax_EscapeState(); } /** @@ -241,14 +241,14 @@ function ignoreWhitespace() {} */ function parse($data) { if ($this->parser_options['XML_OPTION_TRIM_DATA_NODES']==1) { - $decorator =& new XML_HTMLSax_Trim( + $decorator = new XML_HTMLSax_Trim( $this->handler_object_data, $this->handler_method_data); $this->handler_object_data =& $decorator; $this->handler_method_data = 'trimData'; } if ($this->parser_options['XML_OPTION_CASE_FOLDING']==1) { - $open_decor =& new XML_HTMLSax_CaseFolding( + $open_decor = new XML_HTMLSax_CaseFolding( $this->handler_object_element, $this->handler_method_opening, $this->handler_method_closing); @@ -257,28 +257,28 @@ function parse($data) { $this->handler_method_closing ='foldClose'; } if ($this->parser_options['XML_OPTION_LINEFEED_BREAK']==1) { - $decorator =& new XML_HTMLSax_Linefeed( + $decorator = new XML_HTMLSax_Linefeed( $this->handler_object_data, $this->handler_method_data); $this->handler_object_data =& $decorator; $this->handler_method_data = 'breakData'; } if ($this->parser_options['XML_OPTION_TAB_BREAK']==1) { - $decorator =& new XML_HTMLSax_Tab( + $decorator = new XML_HTMLSax_Tab( $this->handler_object_data, $this->handler_method_data); $this->handler_object_data =& $decorator; $this->handler_method_data = 'breakData'; } if ($this->parser_options['XML_OPTION_ENTITIES_UNPARSED']==1) { - $decorator =& new XML_HTMLSax_Entities_Unparsed( + $decorator = new XML_HTMLSax_Entities_Unparsed( $this->handler_object_data, $this->handler_method_data); $this->handler_object_data =& $decorator; $this->handler_method_data = 'breakData'; } if ($this->parser_options['XML_OPTION_ENTITIES_PARSED']==1) { - $decorator =& new XML_HTMLSax_Entities_Parsed( + $decorator = new XML_HTMLSax_Entities_Parsed( $this->handler_object_data, $this->handler_method_data); $this->handler_object_data =& $decorator; @@ -475,11 +475,11 @@ class XML_HTMLSax extends Pear { */ function XML_HTMLSax() { if (version_compare(phpversion(), '4.3', 'ge')) { - $this->state_parser =& new XML_HTMLSax_StateParser_Gtet430($this); + $this->state_parser = new XML_HTMLSax_StateParser_Gtet430($this); } else { - $this->state_parser =& new XML_HTMLSax_StateParser_Lt430($this); + $this->state_parser = new XML_HTMLSax_StateParser_Lt430($this); } - $nullhandler =& new XML_HTMLSax_NullHandler(); + $nullhandler = new XML_HTMLSax_NullHandler(); $this->set_object($nullhandler); $this->set_element_handler('DoNothing', 'DoNothing'); $this->set_data_handler('DoNothing'); diff --git a/inc/app/siteinvoice/lib/PEAR/HTTP/docs/download-progress.php b/inc/app/siteinvoice/lib/PEAR/HTTP/docs/download-progress.php index 705e1f45..bb88c9a7 100644 --- a/inc/app/siteinvoice/lib/PEAR/HTTP/docs/download-progress.php +++ b/inc/app/siteinvoice/lib/PEAR/HTTP/docs/download-progress.php @@ -78,7 +78,7 @@ function update(&$subject, $event, $data = null) } else { $this->setTarget($this->_target); } - $this->_bar =& new Console_ProgressBar( + $this->_bar = new Console_ProgressBar( '* ' . $this->_target . ' %fraction% KB [%bar%] %percent%', '=>', '-', 79, (isset($data['content-length'])? round($data['content-length'] / 1024): 100) ); @@ -105,9 +105,9 @@ function update(&$subject, $event, $data = null) // to be able to see the progress bar $url = 'http://pear.php.net/get/HTML_QuickForm-stable'; -$req =& new HTTP_Request($url); +$req = new HTTP_Request($url); -$download =& new HTTP_Request_DownloadListener(); +$download = new HTTP_Request_DownloadListener(); $req->attach($download); $req->sendRequest(false); ?> diff --git a/inc/app/siteinvoice/lib/PEAR/PEAR.php b/inc/app/siteinvoice/lib/PEAR/PEAR.php index 8376c19f..0da7f2e9 100644 --- a/inc/app/siteinvoice/lib/PEAR/PEAR.php +++ b/inc/app/siteinvoice/lib/PEAR/PEAR.php @@ -84,7 +84,7 @@ * destructor, use error_log(), syslog() or something similar. * * IMPORTANT! To use the emulated destructors you need to create the - * objects by reference: $obj =& new PEAR_child; + * objects by reference: $obj = new PEAR_child; * * @category pear * @package PEAR diff --git a/inc/app/siteinvoice/lib/PEAR/PEAR/Autoloader.php b/inc/app/siteinvoice/lib/PEAR/PEAR/Autoloader.php index bcedcbbb..4de78fe1 100644 --- a/inc/app/siteinvoice/lib/PEAR/PEAR/Autoloader.php +++ b/inc/app/siteinvoice/lib/PEAR/PEAR/Autoloader.php @@ -149,7 +149,7 @@ function addAggregateObject($classname) $include_file = preg_replace('/[^a-z0-9]/i', '_', $classname); include_once $include_file; } - $obj =& new $classname; + $obj = new $classname; $methods = get_class_methods($classname); foreach ($methods as $method) { // don't import priviate methods and constructors diff --git a/inc/app/siteinvoice/lib/PEAR/PEAR/PackageFile/Generator/v1.php b/inc/app/siteinvoice/lib/PEAR/PEAR/PackageFile/Generator/v1.php index 32ac7fd3..bba20e37 100644 --- a/inc/app/siteinvoice/lib/PEAR/PEAR/PackageFile/Generator/v1.php +++ b/inc/app/siteinvoice/lib/PEAR/PEAR/PackageFile/Generator/v1.php @@ -115,7 +115,7 @@ function toTgz(&$packager, $compress = true, $where = null) // }}} $packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, 'package.xml', true); if ($packagexml) { - $tar =& new Archive_Tar($dest_package, $compress); + $tar = new Archive_Tar($dest_package, $compress); $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors // ----- Creates with the package.xml file $ok = $tar->createModify(array($packagexml), '', $where); diff --git a/inc/app/siteinvoice/lib/PEAR/PEAR/PackageFile/Generator/v2.php b/inc/app/siteinvoice/lib/PEAR/PEAR/PackageFile/Generator/v2.php index 0b018f7a..b703839b 100644 --- a/inc/app/siteinvoice/lib/PEAR/PEAR/PackageFile/Generator/v2.php +++ b/inc/app/siteinvoice/lib/PEAR/PEAR/PackageFile/Generator/v2.php @@ -258,7 +258,7 @@ function toTgz2(&$packager, &$pf1, $compress = true, $where = null) } $packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, $name); if ($packagexml) { - $tar =& new Archive_Tar($dest_package, $compress); + $tar = new Archive_Tar($dest_package, $compress); $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors // ----- Creates with the package.xml file $ok = $tar->createModify(array($packagexml), '', $where); diff --git a/inc/app/siteinvoice/lib/PEAR/Services/ExchangeRates/Common.php b/inc/app/siteinvoice/lib/PEAR/Services/ExchangeRates/Common.php index 0736c031..356a0178 100644 --- a/inc/app/siteinvoice/lib/PEAR/Services/ExchangeRates/Common.php +++ b/inc/app/siteinvoice/lib/PEAR/Services/ExchangeRates/Common.php @@ -66,7 +66,7 @@ function retrieveFile($url, $cacheLength, $cacheDir) { include_once 'HTTP/Request.php'; // HTTP_Request has moronic redirect "handling", turn that off (Alexey Borzov) - $req =& new HTTP_Request($url, array('allowRedirects' => false)); + $req = new HTTP_Request($url, array('allowRedirects' => false)); // if $cache->get($cacheID) found the file, but it was expired, // $cache->_file will exist diff --git a/inc/app/siteinvoice/lib/PEAR/Services/ExchangeRates/Rates_NBI.php b/inc/app/siteinvoice/lib/PEAR/Services/ExchangeRates/Rates_NBI.php index c4f40d62..3eda4396 100644 --- a/inc/app/siteinvoice/lib/PEAR/Services/ExchangeRates/Rates_NBI.php +++ b/inc/app/siteinvoice/lib/PEAR/Services/ExchangeRates/Rates_NBI.php @@ -13,7 +13,7 @@ // | obtain it through the world-wide-web, please send a note to | // | license@php.net so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ -// | Author: Simon Brüchner