- replace all usage of '= & new' with '= new', as this is deprecated in php 5 and...
[plcapi.git] / lib / xmlrpcs.inc
index 9fc4d0c..8111e1c 100644 (file)
                $outAr=array();\r
                foreach($server->dmap as $key => $val)\r
                {\r
-                       $outAr[]=&new xmlrpcval($key, 'string');\r
+                       $outAr[]=new xmlrpcval($key, 'string');\r
                }\r
                if($server->allow_system_funcs)\r
                {\r
                        foreach($GLOBALS['_xmlrpcs_dmap'] as $key => $val)\r
                        {\r
-                               $outAr[]=&new xmlrpcval($key, 'string');\r
+                               $outAr[]=new xmlrpcval($key, 'string');\r
                        }\r
                }\r
                return new xmlrpcresp(new xmlrpcval($outAr, 'array'));\r
                                        $cursig=array();\r
                                        foreach($inSig as $sig)\r
                                        {\r
-                                               $cursig[]=&new xmlrpcval($sig, 'string');\r
+                                               $cursig[]=new xmlrpcval($sig, 'string');\r
                                        }\r
-                                       $sigs[]=&new xmlrpcval($cursig, 'array');\r
+                                       $sigs[]=new xmlrpcval($cursig, 'array');\r
                                }\r
-                               $r=&new xmlrpcresp(new xmlrpcval($sigs, 'array'));\r
+                               $r=new xmlrpcresp(new xmlrpcval($sigs, 'array'));\r
                        }\r
                        else\r
                        {\r
                                // NB: according to the official docs, we should be returning a\r
                                // "none-array" here, which means not-an-array\r
-                               $r=&new xmlrpcresp(new xmlrpcval('undef', 'string'));\r
+                               $r=new xmlrpcresp(new xmlrpcval('undef', 'string'));\r
                        }\r
                }\r
                else\r
                {\r
-                       $r=&new xmlrpcresp(0,$GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);\r
+                       $r=new xmlrpcresp(0,$GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);\r
                }\r
                return $r;\r
        }\r
                {\r
                        if(isset($dmap[$methName]['docstring']))\r
                        {\r
-                               $r=&new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string');\r
+                               $r=new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string');\r
                        }\r
                        else\r
                        {\r
-                               $r=&new xmlrpcresp(new xmlrpcval('', 'string'));\r
+                               $r=new xmlrpcresp(new xmlrpcval('', 'string'));\r
                        }\r
                }\r
                else\r
                {\r
-                       $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);\r
+                       $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);\r
                }\r
                return $r;\r
        }\r
                        $str = $err->faultString();\r
                }\r
                $struct = array();\r
-               $struct['faultCode'] =& new xmlrpcval($code, 'int');\r
-               $struct['faultString'] =& new xmlrpcval($str, 'string');\r
+               $struct['faultCode'] = new xmlrpcval($code, 'int');\r
+               $struct['faultString'] = new xmlrpcval($str, 'string');\r
                return new xmlrpcval($struct, 'struct');\r
        }\r
 \r
                }\r
                $numParams = $params->arraysize();\r
 \r
-               $msg =& new xmlrpcmsg($methName->scalarval());\r
+               $msg = new xmlrpcmsg($methName->scalarval());\r
                for($i = 0; $i < $numParams; $i++)\r
                {\r
                        if(!$msg->addParam($params->arraymem($i)))\r
                                                }\r
                                                else\r
                                                {\r
-                                                       $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_decompress_fail'], $GLOBALS['xmlrpcstr']['server_decompress_fail']);\r
+                                                       $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_decompress_fail'], $GLOBALS['xmlrpcstr']['server_decompress_fail']);\r
                                                        return $r;\r
                                                }\r
                                        }\r
                                        else\r
                                        {\r
                                                //error_log('The server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');\r
-                                               $r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_cannot_decompress'], $GLOBALS['xmlrpcstr']['server_cannot_decompress']);\r
+                                               $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_cannot_decompress'], $GLOBALS['xmlrpcstr']['server_cannot_decompress']);\r
                                                return $r;\r
                                        }\r
                                }\r
                        if(!xml_parse($parser, $data, 1))\r
                        {\r
                                // return XML error as a faultCode\r
-                               $r=&new xmlrpcresp(0,\r
+                               $r=new xmlrpcresp(0,\r
                                $GLOBALS['xmlrpcerrxml']+xml_get_error_code($parser),\r
                                sprintf('XML error: %s at line %d, column %d',\r
                                        xml_error_string(xml_get_error_code($parser)),\r
                        elseif ($GLOBALS['_xh']['isf'])\r
                        {\r
                                xml_parser_free($parser);\r
-                               $r=&new xmlrpcresp(0,\r
+                               $r=new xmlrpcresp(0,\r
                                        $GLOBALS['xmlrpcerr']['invalid_request'],\r
                                        $GLOBALS['xmlrpcstr']['invalid_request'] . ' ' . $GLOBALS['_xh']['isf_reason']);\r
                        }\r
                                else\r
                                {\r
                                        // build an xmlrpcmsg object with data parsed from xml\r
-                                       $m=&new xmlrpcmsg($GLOBALS['_xh']['method']);\r
+                                       $m=new xmlrpcmsg($GLOBALS['_xh']['method']);\r
                                        // now add parameters in\r
                                        for($i=0; $i<count($GLOBALS['_xh']['params']); $i++)\r
                                        {\r
                                        error_log("XML-RPC: xmlrpc_server::execute: function $func registered as method handler does not return an xmlrpcresp object");\r
                                        if (is_a($r, 'xmlrpcval'))\r
                                        {\r
-                                               $r =& new xmlrpcresp($r);\r
+                                               $r = new xmlrpcresp($r);\r
                                        }\r
                                        else\r
                                        {\r
-                                               $r =& new xmlrpcresp(\r
+                                               $r = new xmlrpcresp(\r
                                                        0,\r
                                                        $GLOBALS['xmlrpcerr']['server_error'],\r
                                                        $GLOBALS['xmlrpcstr']['server_error'] . ": function does not return xmlrpcresp object"\r
                                                // an eror response\r
                                                if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r))\r
                                                {\r
-                                                       $r =& new xmlrpcresp(0, (integer)$r['faultCode'], (string)$r['faultString']);\r
+                                                       $r = new xmlrpcresp(0, (integer)$r['faultCode'], (string)$r['faultString']);\r
                                                }\r
                                                else\r
                                                {\r
                                                        // functions using EPI api should NOT return resp objects,\r
                                                        // so make sure we encode the return type correctly\r
-                                                       $r =& new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api')));\r
+                                                       $r = new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api')));\r
                                                }\r
                                        }\r
                                        else\r
                                {\r
                                        // what should we assume here about automatic encoding of datetimes\r
                                        // and php classes instances???\r
-                                       $r =& new xmlrpcresp(php_xmlrpc_encode($r, array('auto_dates')));\r
+                                       $r = new xmlrpcresp(php_xmlrpc_encode($r, array('auto_dates')));\r
                                }\r
                        }\r
                        if($this->debug > 2)\r
                */\r
                function echoInput()\r
                {\r
-                       $r=&new xmlrpcresp(new xmlrpcval( "'Aha said I: '" . $GLOBALS['HTTP_RAW_POST_DATA'], 'string'));\r
+                       $r=new xmlrpcresp(new xmlrpcval( "'Aha said I: '" . $GLOBALS['HTTP_RAW_POST_DATA'], 'string'));\r
                        print $r->serialize();\r
                }\r
        }\r