Fix constructors to be compliant with php 7

[plcapi.git] / lib / xmlrpc.inc

diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc
index dc2fa61..41dae8b 100644 (file)
--- a/lib/xmlrpc.inc
+++ b/lib/xmlrpc.inc
@@ -866,13 +866,21 @@
                */\r
                var $user_agent;\r
 \r
+               /**\r
+               * @deprecated\r
+               */\r
+               function xmlrpc_client($path, $server='', $port='', $method='')\r
+               {\r
+                       self::__construct($path, $server, $port, $method);\r
+               }\r
+\r
                /**\r
                * @param string $path either the complete server URL or the PATH part of the xmlrc server URL, e.g. /xmlrpc/server.php\r
                * @param string $server the server name / ip address\r
                * @param integer $port the port the server is listening on, defaults to 80 or 443 depending on protocol used\r
                * @param string $method the http protocol variant: defaults to 'http', 'https' and 'http11' can be used if CURL is installed\r
                */\r
-               function xmlrpc_client($path, $server='', $port='', $method='')\r
+               function __construct($path, $server='', $port='', $method='')\r
                {\r
                        // allow user to specify all params in $path\r
                        if($server == '' and $port == '' and $method == '')\r
@@ -1958,6 +1966,14 @@
                var $content_type = 'text/xml';\r
                var $raw_data = '';\r
 \r
+               /**\r
+               * @deprecated\r
+               */\r
+               function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp='')\r
+               {\r
+                       self::__construct($val, $fcode, $fstr, $valtyp);\r
+               }\r
+\r
                /**\r
                * @param mixed $val either an xmlrpcval obj, a php value or the xml serialization of an xmlrpcval (a string)\r
                * @param integer $fcode set it to anything but 0 to create an error response\r
@@ -1968,7 +1984,7 @@
                * NB: as of now we do not do it, since it might be either an xmlrpcval or a plain\r
                * php val, or a complete xml chunk, depending on usage of xmlrpc_client::send() inside which creator is called...\r
                */\r
-               function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp='')\r
+               function __construct($val, $fcode = 0, $fstr = '', $valtyp='')\r
                {\r
                        if($fcode != 0)\r
                        {\r
@@ -2119,11 +2135,19 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                var $debug=0;\r
                var $content_type = 'text/xml';\r
 \r
+               /**\r
+               * @deprecated\r
+               */\r
+               function xmlrpcmsg($meth, $pars=0)\r
+               {\r
+                       self::__construct($meth, $pars);\r
+               }\r
+\r
                /**\r
                * @param string $meth the name of the method to invoke\r
                * @param array $pars array of parameters to be passed to the method (xmlrpcval objects)\r
                */\r
-               function xmlrpcmsg($meth, $pars=0)\r
+               function __construct($meth, $pars=0)\r
                {\r
                        $this->methodname=$meth;\r
                        if(is_array($pars) && count($pars)>0)\r
@@ -2415,7 +2439,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                                                                        {\r
                                                                                if ($tag != 'value')\r
                                                                                {\r
-                                                                                 $GLOBALS['_xh']['cookies'][$cookiename][$tag] = $val;\r
+                                                                                       $GLOBALS['_xh']['cookies'][$cookiename][$tag] = $val;\r
                                                                                }\r
                                                                        }\r
                                                                }\r
@@ -2751,11 +2775,19 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                var $mytype=0;\r
                var $_php_class=null;\r
 \r
+               /**\r
+               * @deprecated\r
+               */\r
+               function xmlrpcval($val=-1, $type='')\r
+               {\r
+                       self::__construct($val, $type);\r
+               }\r
+\r
                /**\r
                * @param mixed $val\r
                * @param string $type any valid xmlrpc type name (lowercase). If null, 'string' is assumed\r
                */\r
-               function xmlrpcval($val=-1, $type='')\r
+               function __construct($val=-1, $type='')\r
                {\r
                        /// @todo: optimization creep - do not call addXX, do it all inline.\r
                        /// downside: booleans will not be coerced anymore\r
@@ -3594,7 +3626,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                        }\r
                }\r
 \r
-        $parser = xml_parser_create();\r
+               $parser = xml_parser_create();\r
                xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);\r
                // What if internal encoding is not in one of the 3 allowed?\r
                // we use the broadest one, ie. utf8!\r
@@ -3831,7 +3863,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
 \r
                // test if encoding is specified in the xml declaration\r
                // Details:\r
-               // SPACE:                (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+\r
+               // SPACE:               (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+\r
                // EQ:                  SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*\r
                if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .\r
                        '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",\r