- allow to avoid deps on shared extensions on build time

[m6w6/ext-http] / lib / XmlRpcClient.php

diff --git a/lib/XmlRpcClient.php b/lib/XmlRpcClient.php
index 9cdc7bbd54151115576e730556f6be20a6fb6496..83a154e933448a37883e4d5e1bf3ffbc32f63823 100644 (file)
--- a/lib/XmlRpcClient.php
+++ b/lib/XmlRpcClient.php
@@ -9,10 +9,10 @@
  * Usage:
  * <code>
  * <?php
- * $rpc = new XmlRpcClient('http://mike:secret@example.com/cgi-bin/vpop-xmlrpc', 'vpop');
- * $rpc->options = array(array('compress' => true));
+ * $rpc = new XmlRpcClient('http://mike:secret@example.com/cgi-bin/vpop-xmlrpc');
+ * $rpc->__request->setOptions(array('compress' => true));
  * try {
- *     print_r($rpc->listdomain(array('domain' => 'example.com')));
+ *     print_r($rpc->vpop->listdomain(array('domain' => 'example.com')));
  * } catch (Exception $ex) {
  *     echo $ex;
  * }
@@ -22,87 +22,92 @@
  * @copyright   Michael Wallner, <mike@iworks.at>
  * @license     BSD, revised
  * @package     pecl/http
- * @version     $Revision$
+ * @version     $Revision$
  */
 class XmlRpcClient
 {
-    /**
-     * RPC namespace
-     *
-     * @var string
-     */
-    public $namespace;
-    
-    /**
-     * HttpRequest instance
-     *
-     * @var HttpRequest
-     */
-    public $request;
-
-    /**
-     * Constructor
-     *
-     * @param string $url RPC endpoint
-     * @param string $namespace RPC namespace
-     */
-    public function __construct($url, $namespace = '')
-    {
-        $this->namespace = $namespace;
-        $this->request = new HttpRequest($url, HTTP_METH_POST);
-        $this->request->setContentType('text/xml');
-    }
-
-    /**
-     * RPC method proxy
-     *
-     * @param string $method RPC method name
-     * @param array $params RPC method arguments
-     * @return mixed decoded RPC response
-     * @throws Exception
-     */
-    public function __call($method, array $params)
-    {
-        if ($this->namespace) {
-            $method = $this->namespace .'.'. $method;
-        }
-        
-        $data = xmlrpc_encode_request($method, $params);
-        $this->request->setRawPostData($data);
-        
-        $response = $this->request->send();
-        if ($response->getResponseCode() != 200) {
-            throw new Exception(
-                $response->getResponseStatus(), 
-                $response->getResponseCode()
-            );
-        }
-        $data = xmlrpc_decode($response->getBody(), 'utf-8');
-        
-        if (isset($data['faultCode'], $data['faultString'])) {
-            throw new Exception(
-                $data['faultString'],
-                $data['faultCode']
-            );
-        }
-        
-        return $data;
-    }
-    
-    public function __set($what, $params)
-    {
-        return call_user_func_array(
-            array($this->request, "set$what"),
-            $params
-        );
-    }
-    
-    public function __get($what)
-    {
-        return call_user_func(
-            array($this->request, "get$what")
-        );
-    }
+       /**
+        * RPC namespace
+        *
+        * @var string
+        */
+       public $__namespace;
+       
+       /**
+        * HttpRequest instance
+        *
+        * @var HttpRequest
+        */
+       public $__request;
+       
+       /**
+        * Client charset
+        * 
+        * @var string
+        */
+       public $__encoding = "iso-8859-1";
+       
+       /**
+        * Constructor
+        *
+        * @param string $url RPC endpoint
+        * @param string $namespace RPC namespace
+        * @param array  $options HttpRequest options
+        */
+       public function __construct($url, $namespace = '', array $options = null)
+       {
+               $this->__request = new HttpRequest($url, HTTP_METH_POST);
+               $this->__request->setOptions($options);
+               $this->__namespace = $namespace;
+       }
+       
+       /**
+        * RPC method proxy
+        *
+        * @param string $method RPC method name
+        * @param array $params RPC method arguments
+        * @return mixed decoded RPC response
+        * @throws Exception
+        */
+       public function __call($method, array $params)
+       {
+               if ($this->__namespace) {
+                       $method = $this->__namespace .'.'. $method;
+               }
+               $this->__request->setContentType("text/xml; charset=". $this->__encoding);
+               $request = xmlrpc_encode_request($method, $params, array("encoding" => $this->__encoding));
+               $this->__request->setRawPostData($request);
+               $this->__request->send();
+               $response = $this->__request->getResponseMessage();
+               if ($response->getResponseCode() != 200) {
+                       throw new Exception(
+                               $response->getResponseStatus(), 
+                               $response->getResponseCode()
+                       );
+               }
+               
+               $data = xmlrpc_decode($response->getBody(), $this->__encoding);
+               if (xmlrpc_is_fault($data)) {
+                       throw new Exception(
+                               (string) $data['faultString'],
+                               (int) $data['faultCode']
+                       );
+               }
+               
+               return $data;
+       }
+       
+       /**
+        * Returns self, where namespace is set to variable name
+        *
+        * @param string $ns
+        * @return XmlRpcRequest
+        */
+       public function __get($ns)
+       {
+               $this->__namespace = $ns;
+               return $this;
+       }
 }
 
 ?>