From: x2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Wed, 26 Oct 2005 07:18:53 +0000 (+0000)
Subject: unbloat code
X-Git-Tag: xorg/0.9.9~66
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c36b9cb0304227992feed89d7d8c383bc369ed37;p=platal.git

unbloat code

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@144 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/include/platal/xmlrpc-client.inc.php b/include/platal/xmlrpc-client.inc.php
index a8adb92..4d5fa88 100644
--- a/include/platal/xmlrpc-client.inc.php
+++ b/include/platal/xmlrpc-client.inc.php
@@ -51,12 +51,11 @@ class xmlrpc_client
         $requestprms['host']    = $this->urlparts['host'];
         $requestprms['port']    = $this->urlparts['port'];
         $requestprms['uri']     = $this->urlparts['path'];
+        $requestprms['user']    = $this->urlparts['user'];
+        $requestprms['pass']    = $this->urlparts['pass'];
         $requestprms['method']  = $function;
         $requestprms['args']    = $arguments;
-        $requestprms['debug']   = 0;
         $requestprms['timeout'] = 0;
-        $requestprms['user']    = $this->urlparts['user'];
-        $requestprms['pass']    = $this->urlparts['pass'];
         $requestprms['secure']  = 0;
 
         $result = xu_rpc_http_concise($requestprms);
diff --git a/include/platal/xmlrpc-server.inc.php b/include/platal/xmlrpc-server.inc.php
index 3a57f9f..23b12d5 100644
--- a/include/platal/xmlrpc-server.inc.php
+++ b/include/platal/xmlrpc-server.inc.php
@@ -47,22 +47,20 @@
  */
 
 /* generic function to call an http server with post method */
-function xu_query_http_post($request, $host, $uri, $port, $debug, 
-                            $timeout, $user, $pass, $secure=false) {
-    $response_buf = "";
+function xu_query_http_post($request, $host, $uri, $port, $timeout, $user,
+        $pass, $secure=false)
+{
+    $response_buf = '';
     if ($host && $uri && $port) {
 	$content_len = strlen($request);
-
-	$fsockopen = $secure ? "fsockopen_ssl" : "fsockopen";
-
-	dbg1("opening socket to host: $host, port: $port, uri: $uri", $debug);
-	$query_fd = $fsockopen($host, $port, $errno, $errstr, 10);
+	$fsockopen   = $secure ? 'fsockopen_ssl' : 'fsockopen';
+	$query_fd    = $fsockopen($host, $port, $errno, $errstr, 10);
 
 	if ($query_fd) {
 
-	    $auth = "";
+	    $auth = '';
 	    if ($user) {
-		$auth = "Authorization: Basic " .  base64_encode($user . ":" . $pass) . "\r\n";
+		$auth = 'Authorization: Basic ' .  base64_encode($user . ':' . $pass) . "\r\n";
 	    }
 
 	    $http_request =
@@ -76,182 +74,71 @@ function xu_query_http_post($request, $host, $uri, $port, $debug,
 		"\r\n" .
 		$request;
 
-	    dbg1("sending http request:</h3> <xmp>\n$http_request\n</xmp>", $debug);
-
 	    fputs($query_fd, $http_request, strlen($http_request));
 
-	    dbg1("receiving response...", $debug);
-
 	    $header_parsed = false;
-
 	    while (!feof($query_fd)) {
 		$line = fgets($query_fd, 4096);
 		if (!$header_parsed) {
 		    if ($line === "\r\n" || $line === "\n") {
 			$header_parsed = 1;
 		    }
-		    dbg2("got header - $line", $debug);
-		}
-		else {
+		} else {
 		    $response_buf .= $line;
 		}
 	    }
 
 	    fclose($query_fd);
 	}
-	else {
-	    dbg1("socket open failed", $debug);
-	}
-    }
-    else {
-	dbg1("missing param(s)", $debug);
     }
 
-    dbg1("got response:</h3>. <xmp>\n$response_buf\n</xmp>\n", $debug);
-
     return $response_buf;
 }
 
-function xu_fault_code($code, $string) {
-   return array('faultCode' => $code,
-                'faultString' => $string);
-}
-
-
-function find_and_decode_xml($buf, $debug) {
-   if (strlen($buf)) {
-      $xml_begin = substr($buf, strpos($buf, "<?xml"));
-      if (strlen($xml_begin)) {
-
-         $retval = xmlrpc_decode($xml_begin);
-      }
-      else {
-         dbg1("xml start token not found", $debug);
-      }
-   }
-   else {
-      dbg1("no data", $debug);
-   }
-   return $retval;
+function find_and_decode_xml($buf)
+{
+    if (strlen($buf)) {
+        $xml_begin = substr($buf, strpos($buf, '<?xml'));
+        if (strlen($xml_begin)) {
+            $retval = xmlrpc_decode($xml_begin);
+        }
+    }
+    return $retval;
 }
 
  
 /**
- * @param params   a struct containing 3 or more of these key/val pairs:
- * @param host		 remote host (required)
- * @param uri		 remote uri	 (required)
- * @param port		 remote port (required)
- * @param method   name of method to call
- * @param args	    arguments to send (parameters to remote xmlrpc server)
- * @param debug	 debug level (0 none, 1, some, 2 more)
- * @param timeout	 timeout in secs.  (0 = never)
+ * @param params         a struct containing 3 or more of these key/val pairs:
+ * @param host		 remote host             (required)
+ * @param uri		 remote uri	         (required)
+ * @param port		 remote port             (required)
+ * @param method         name of method to call
+ * @param args	         arguments to send       (parameters to remote xmlrpc server)
+ * @param timeout	 timeout in secs.        (0 = never)
  * @param user		 user name for authentication.  
  * @param pass		 password for authentication
  * @param secure	 secure. wether to use fsockopen_ssl. (requires special php build).
- * @param output	 array. xml output options. can be null.  details below:
- *
- *     output_type: return data as either php native data types or xml
- *                  encoded. ifphp is used, then the other values are ignored. default = xml
- *     verbosity:   determine compactness of generated xml. options are
- *                  no_white_space, newlines_only, and pretty. default = pretty
- *     escaping:    determine how/whether to escape certain characters. 1 or
- *                  more values are allowed. If multiple, they need to be specified as
- *                  a sub-array. options are: cdata, non-ascii, non-print, and
- *                  markup. default = non-ascii | non-print | markup
- *     version:     version of xml vocabulary to use. currently, three are
- *                  supported: xmlrpc, soap 1.1, and simple. The keyword auto is also
- *                  recognized to mean respond in whichever version the request came
- *                  in. default = auto (when applicable), xmlrpc
- *     encoding:    the encoding that the data is in. Since PHP defaults to
- *                  iso-8859-1 you will usually want to use that. Change it if you know
- *                  what you are doing. default=iso-8859-1
- *
- *   example usage
- *
- *                   $output_options = array('output_type' => 'xml',
- *                                           'verbosity' => 'pretty',
- *                                           'escaping' => array('markup', 'non-ascii', 'non-print'),
- *                                           'version' => 'xmlrpc',
- *                                           'encoding' => 'utf-8'
- *                                         );
- *                   or
- *
- *                   $output_options = array('output_type' => 'php');
  */
 function xu_rpc_http_concise($params) {
-   $output = $host = $uri = $port = $method = $args = $debug = null;
-   $timeout = $user = $pass = $secure = $debug = null;
-
-	extract($params);
+    $host = $uri = $port = $method = $args = null;
+    $timeout = $user = $pass = $secure = null;
 
-	// default values
-	if(!$port) {
-		$port = 80;
-	}
-	if(!$uri) {
-		$uri = '/';
-	}
-	if(!$output) {
-		$output = array('version' => 'xmlrpc');
-	}
+    extract($params);
 
-   $response_buf = "";
-   if ($host && $uri && $port) {
-      $request_xml = xmlrpc_encode_request($method, $args, $output);
-      $response_buf = xu_query_http_post($request_xml, $host, $uri, $port, $debug,
-                                         $timeout, $user, $pass, $secure);
-
-      $retval = find_and_decode_xml($response_buf, $debug);
+    // default values
+    if (!$port) {
+        $port = 80;
+    }
+    if (!$uri) {
+        $uri = '/';
+    }
+    if ($host && $uri && $port) {
+        $request_xml  = xmlrpc_encode_request($method, $args);
+        $response_buf = xu_query_http_post($request_xml, $host, $uri, $port,
+                $timeout, $user, $pass, $secure);
+        $retval       = find_and_decode_xml($response_buf);
    }
    return $retval;
 }
 
-/* call an xmlrpc method on a remote http server. legacy support. */
-function xu_rpc_http($method, $args, $host, $uri="/", $port=80, $debug=false, 
-                     $timeout=0, $user=false, $pass=false, $secure=false) {
-	return xu_rpc_http_concise(
-		array(
-			'method'  => $method,
-			'args'    => $args,
-			'host'    => $host,
-			'uri'     => $uri,
-			'port'    => $port,
-			'debug'   => $debug,
-			'timeout' => $timeout,
-			'user'    => $user,
-			'pass'    => $pass,
-			'secure'  => $secure
-		));
-}
-
-
-
-function xu_is_fault($arg) {
-   // xmlrpc extension finally supports this.
-   return is_array($arg) ? xmlrpc_is_fault($arg) : false;
-}
-
-/* sets some http headers and prints xml */
-function xu_server_send_http_response($xml) {
-    header("Content-type: text/xml");
-    header("Content-length: " . strlen($xml) );
-    echo $xml;
-}
-
-
-function dbg($msg) {
-   echo "<h3>$msg</h3>"; flush();
-}
-function dbg1($msg, $debug_level) {
-   if ($debug_level >= 1) {
-      dbg($msg);
-   }
-}
-function dbg2($msg, $debug_level) {
-   if ($debug_level >= 2) {
-      dbg($msg);
-   }
-}
-
-
 ?>