fix last commit: remove warnings

diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc
index 41dae8b..5afcc40 100644 (file)
--- a/lib/xmlrpc.inc
+++ b/lib/xmlrpc.inc
@@ -866,14 +866,6 @@
                */\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
@@ -950,6 +942,14 @@
                        $this->user_agent = $GLOBALS['xmlrpcName'] . ' ' . $GLOBALS['xmlrpcVersion'];\r
                }\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
                * Enables/disables the echoing to screen of the xmlrpc responses received\r
                * @param integer $in values 0, 1 and 2 are supported (2 = echo sent msg too, before received response)\r
@@ -1966,14 +1966,6 @@
                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
@@ -2022,6 +2014,14 @@
                        }\r
                }\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
                * Returns the error code of the response.\r
                * @return integer the error code of this response (0 for not-error responses)\r
@@ -2135,14 +2135,6 @@ 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
@@ -2159,6 +2151,14 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                        }\r
                }\r
 \r
+                               /**\r
+               * @deprecated\r
+               */\r
+               function xmlrpcmsg($meth, $pars=0)\r
+               {\r
+                       self::__construct($meth, $pars);\r
+               }\r
+\r
                /**\r
                * @access private\r
                */\r
@@ -2775,14 +2775,6 @@ 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
@@ -2841,6 +2833,14 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                        }\r
                }\r
 \r
+               /**\r
+               * @deprecated\r
+               */\r
+               function xmlrpcval($val=-1, $type='')\r
+               {\r
+                       self::__construct($val, $type);\r
+               }\r
+\r
                /**\r
                * Add a single php value to an (unitialized) xmlrpcval\r
                * @param mixed $val\r

diff --git a/lib/xmlrpcs.inc b/lib/xmlrpcs.inc
index 0ab6d54..24cba8c 100644 (file)
--- a/lib/xmlrpcs.inc
+++ b/lib/xmlrpcs.inc
@@ -493,14 +493,6 @@
                */\r
                var $user_data = null;\r
 \r
-               /**\r
-               * @deprecated\r
-               */\r
-               function xmlrpc_client($dispMap=null, $serviceNow=true)\r
-               {\r
-                       self::__construct($dispMap, $serviceNow);\r
-               }\r
-\r
                /**\r
                * @param array $dispmap the dispatch map with definition of exposed services\r
                * @param boolean $servicenow set to false to prevent the server from running upon construction\r
@@ -537,6 +529,14 @@
                        }\r
                }\r
 \r
+               /**\r
+               * @deprecated\r
+               */\r
+               function xmlrpc_client($dispMap=null, $serviceNow=true)\r
+               {\r
+                       self::__construct($dispMap, $serviceNow);\r
+               }\r
+\r
                /**\r
                * Set debug level of server.\r
                * @param integer $in debug lvl: determines info added to xmlrpc responses (as xml comments)\r