X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fxmlrpc.inc;h=0ae42fd00cce284a3b08cc61bcc739ab5db497ad;hb=19b99735570521d8172f73124ade5997b9dca75d;hp=9106bd67842d1ff10d5c20223633c8f913d26f2c;hpb=7ef47445e3dc236ef5fea0d3ea5bd0492a83d2a2;p=plcapi.git

diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc
index 9106bd6..0ae42fd 100644
--- a/lib/xmlrpc.inc
+++ b/lib/xmlrpc.inc
@@ -50,13 +50,15 @@ include_once(__DIR__.'/../src/Request.php');
 include_once(__DIR__.'/../src/Response.php');
 include_once(__DIR__.'/../src/Client.php');
 include_once(__DIR__.'/../src/Encoder.php');
-include_once(__DIR__.'/../src/Helper/Date.php');
 include_once(__DIR__.'/../src/Helper/Charset.php');
+include_once(__DIR__.'/../src/Helper/Date.php');
 include_once(__DIR__.'/../src/Helper/Http.php');
+include_once(__DIR__.'/../src/Helper/Logger.php');
 include_once(__DIR__.'/../src/Helper/XMLParser.php');
 
 
 /* Expose the global variables which used to be defined */
+PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'ISO-8859-1'; // old default
 PhpXmlRpc\PhpXmlRpc::exportGlobals();
 
 /* some stuff deprecated enough that we do not want to put it in the new lib version */
@@ -138,16 +140,6 @@ class xmlrpcval extends PhpXmlRpc\Value
 
 class xmlrpcmsg extends PhpXmlRpc\Request
 {
-    /**
-     * Kept the old name even if Request class was renamed, for compatibility.
-     * @deprecated
-     *
-     * @return string
-     */
-    public function kindOf()
-    {
-        return 'msg';
-    }
 }
 
 class xmlrpcresp extends PhpXmlRpc\Response
@@ -168,12 +160,12 @@ function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='')
 
 function iso8601_encode($timeT, $utc=0)
 {
-    return PhpXmlRpc\Helper\Date::iso8601_encode($timeT, $utc);
+    return PhpXmlRpc\Helper\Date::iso8601Encode($timeT, $utc);
 }
 
 function iso8601_decode($iDate, $utc=0)
 {
-    return PhpXmlRpc\Helper\Date::iso8601_decode($iDate, $utc);
+    return PhpXmlRpc\Helper\Date::iso8601Decode($iDate, $utc);
 }
 
 function decode_chunked($buffer)
@@ -196,7 +188,7 @@ function php_xmlrpc_encode($phpVal, $options=array())
 function php_xmlrpc_decode_xml($xmlVal, $options=array())
 {
     $encoder = new PhpXmlRpc\Encoder();
-    return $encoder->decode_xml($xmlVal, $options);
+    return $encoder->decodeXml($xmlVal, $options);
 }
 
 function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null)
@@ -204,7 +196,12 @@ function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null)
     return PhpXmlRpc\Helper\XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs);
 }
 
+function has_encoding($xmlChunk)
+{
+    return PhpXmlRpc\Helper\XMLParser::hasEncoding($xmlChunk);
+}
+
 function is_valid_charset($encoding, $validList)
 {
-    return PhpXmlRpc\Helper\Charset::instance()->is_valid_charset($encoding, $validList);
+    return PhpXmlRpc\Helper\Charset::instance()->isValidCharset($encoding, $validList);
 }