diff options
Diffstat (limited to 'lib/class/xmlrpcclient.class.php')
| -rw-r--r-- | lib/class/xmlrpcclient.class.php | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/lib/class/xmlrpcclient.class.php b/lib/class/xmlrpcclient.class.php index 361d7e94..9ae66c4c 100644 --- a/lib/class/xmlrpcclient.class.php +++ b/lib/class/xmlrpcclient.class.php @@ -26,7 +26,6 @@ */ class xmlRpcClient { - /** * construtor * not used @@ -54,20 +53,21 @@ class xmlRpcClient { $timestamp = time(); $handshake_key = md5($timestamp . $key); - $encoded_key = new xmlrpcval($handshake_key,'string'); - $timestamp = new xmlrpcval($timestamp,'int'); - $xmlrpc_message = new xmlrpcmsg('xmlrpcserver.handshake',array($encoded_key,$timestamp)); - + $encoded_key = new XML_RPC_Value($handshake_key,'string'); + $timestamp = new XML_RPC_Value($timestamp,'int'); + $xmlrpc_message = new XML_RPC_Message('xmlrpcserver.handshake',array($encoded_key,$timestamp)); + // Send it off $response = $client->send($xmlrpc_message,10); + if ($response->faultCode()) { $error_msg = _('Error connecting to') . " " . $server . " " . _("Code") . ": " . $response->faultCode() . " " . _("Reason") . ": " . $response->faultString(); debug_event('XMLCLIENT',$error_msg,'1'); - Error::add('general',$error_msg); + Error::add('general',$error_msg); return; } - $token = php_xmlrpc_decode($response->value()); + $token = XML_RPC_Decode($response->value()); debug_event('XML-RPC',$token . ' returned from ' . $server,'3'); @@ -88,8 +88,8 @@ class xmlRpcClient { // going to just crash your browser... sorry folks if (Config::get('debug') AND Config::get('debug_level') == '6') { $client->setDebug(1); } - $encoded_key = new xmlrpcval($token,'string'); - $xmlrpc_message = new xmlrpcmsg('xmlrpcserver.create_stream_session',array($encoded_key)); + $encoded_key = new XML_RPC_Value($token,'string'); + $xmlrpc_message = new XML_RPC_Message('xmlrpcserver.create_stream_session',array($encoded_key)); $response = $client->send($xmlrpc_message,4); @@ -99,9 +99,9 @@ class xmlRpcClient { return false; } - $sid = php_xmlrpc_decode($response->value()); + $sid = XML_RPC_Decode($response->value()); - debug_event('XML-RPC',$sid . ' stream session ID returned from ' . $server,'3'); + debug_event('XML-RPC', $sid . ' stream session ID returned from ' . $server,'3'); return $sid; @@ -119,9 +119,10 @@ class xmlRpcClient { $port = $match['2'] ? intval($match['2']) : '80'; $path = $match['3']; - $full_url = ltrim("/$path/server/xmlrpc.server.php",'/'); - $client = new xmlrpc_client($full_url,$server,$port); - + $full_url = "/" . ltrim($path . "/server/xmlrpc.server.php",'/'); + + $client = new XML_RPC_Client($full_url,$server,$port); + return $client; } // create_client |