Increase backwards compatibility with version 3: make ALL global vars available which...

[plcapi.git] / lib / xmlrpc.inc

diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc
index 51b175d..1572279 100644 (file)
--- a/lib/xmlrpc.inc
+++ b/lib/xmlrpc.inc
@@ -36,7 +36,7 @@
 
 /******************************************************************************
  *
- *** DEPRECATED ***
+ * *** DEPRECATED ***
  *
  * This file is only used to insure backwards compatibility
  * with the API of the library <= rev. 3
@@ -55,9 +55,26 @@ include_once(__DIR__.'/../src/Helper/Charset.php');
 include_once(__DIR__.'/../src/Helper/Http.php');
 include_once(__DIR__.'/../src/Helper/XMLParser.php');
 
+
 /* Expose the global variables which used to be defined */
 PhpXmlRpc\PhpXmlRpc::exportGlobals();
 
+/* some stuff deprecated enough that we do not want to put it in the new lib version */
+
+/// @deprecated
+$GLOBALS['xmlEntities'] = array(
+    'amp'  => '&',
+    'quot' => '"',
+    'lt'   => '<',
+    'gt'   => '>',
+    'apos' => "'"
+);
+
+// formulate backslashes for escaping regexp
+// Not in use anymore since 2.0. Shall we remove it?
+/// @deprecated
+$GLOBALS['xmlrpc_backslash'] = chr(92).chr(92);
+
 /* Expose with the old names the classes which have been namespaced */
 
 class xmlrpcval extends PhpXmlRpc\Value
@@ -143,9 +160,10 @@ class xmlrpc_client extends PhpXmlRpc\Client
 
 /* Expose as global functions the ones which are now class methods */
 
+/// Wrong speling, but we are adamant on backwards compatibility!
 function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='')
 {
-    return PhpXmlRpc\Helper\Charset::instance()->encode_entitites($data, $srcEncoding, $destEncoding);
+    return PhpXmlRpc\Helper\Charset::instance()->encodeEntitites($data, $srcEncoding, $destEncoding);
 }
 
 function iso8601_encode($timeT, $utc=0)
@@ -160,7 +178,7 @@ function iso8601_decode($iDate, $utc=0)
 
 function decode_chunked($buffer)
 {
-    return PhpXmlRpc\Helper\Http::decode_chunked($buffer);
+    return PhpXmlRpc\Helper\Http::decodeChunked($buffer);
 }
 
 function php_xmlrpc_decode($xmlrpcVal, $options=array())
@@ -188,4 +206,4 @@ function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null)
 function is_valid_charset($encoding, $validList)
 {
     return PhpXmlRpc\Helper\Charset::instance()->is_valid_charset($encoding, $validList);
-}
\ No newline at end of file
+}