X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fxmlrpc.inc;h=450e881f4d0e90cf8f4fa410598402db3034c458;hb=62fa838f6c3bababe376b75684d29c699f1fce31;hp=157227987fd31cd1a7206906c49b66ef217baa40;hpb=5be54109b83d6a77f3a2804e7520db9662c53002;p=plcapi.git

diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc
index 1572279..450e881 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
@@ -201,6 +193,12 @@ function php_xmlrpc_decode_xml($xmlVal, $options=array())
 
 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)