From fb00930ab81b1d4af935e8bb09c5e90bf6d90814 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Mon, 13 Aug 2001 22:30:50 +0000
Subject: [PATCH] Fix syntax error in client, make non-ssl xmlrpc work

---
 phpgwapi/inc/class.interserver.inc.php   | 11 ++++++-----
 phpgwapi/inc/class.xmlrpc_client.inc.php |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/phpgwapi/inc/class.interserver.inc.php b/phpgwapi/inc/class.interserver.inc.php
index eb502a55ce..dbb9691082 100644
--- a/phpgwapi/inc/class.interserver.inc.php
+++ b/phpgwapi/inc/class.interserver.inc.php
@@ -199,7 +199,9 @@
 
 		function _send_xmlrpc_($method_name, $args, $url, $debug=True)
 		{
-			list($uri,$hostpart) = $this->_split_url($url);
+			list($uri,$hostpart) = $this->_split_url($url . $this->urlparts['xmlrpc']);
+			$hostpart = ereg_replace('https://','',$hostpart);
+			$hostpart = ereg_replace('http://','',$hostpart);
 			if(gettype($args) != 'array')
 			{
 				$arr[] = CreateObject('phpgwapi.xmlrpcval',$args,'string');
@@ -211,10 +213,9 @@
 					$arr[] = CreateObject('phpgwapi.xmlrpcval',$val, 'string');
 				}
 			}
-			_debug_array($arr);
-			$f = CreateObject('phpgwapi.xmlrpcmsg', $method, CreateObject('phpgwapi.xmlrpcval',$arr,'struct'));
-			//echo "<pre>" . htmlentities($f->serialize()) . "</pre>\n";
-			$c = CreateObject('phpgwapi.xmlrpc_client',$this->urlparts['xmlrpc'], $uri, 80);
+			$f = CreateObject('phpgwapi.xmlrpcmsg', $method_name, $arr,'struct');
+			$this->debug("<pre>" . htmlentities($f->serialize()) . "</pre>\n",$debug);
+			$c = CreateObject('phpgwapi.xmlrpc_client',$this->urlparts['xmlrpc'], $hostpart, 80);
 			$c->setDebug(0);
 			$r = $c->send($f);
 			if (!$r)
diff --git a/phpgwapi/inc/class.xmlrpc_client.inc.php b/phpgwapi/inc/class.xmlrpc_client.inc.php
index 75d3360538..2a37de0320 100644
--- a/phpgwapi/inc/class.xmlrpc_client.inc.php
+++ b/phpgwapi/inc/class.xmlrpc_client.inc.php
@@ -95,7 +95,7 @@
 			}
 
 			$op = "POST " . $this->path . " HTTP/1.0\r\nUser-Agent: PHP XMLRPC 1.0\r\n"
-				. "Host: ". $this->server . "\r\n" .
+				. "Host: ". $this->server . "\r\n"
 				. 'X-PHPGW-Server: '  . $this->server . ' ' . "\r\n"
 				. 'X-PHPGW-Version: ' . $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] . "\r\n"
 				. $credentials