[Phpgroupware-cvs] api/interface/class.interface_xmlrpc.php, 1.1.2.14

[nomail]

Update of /api/interface
Modified Files:
        Branch: proposal-branch
          class.interface_xmlrpc.php

date: 2004/06/16 15:37:35;  author: dcech;  state: Exp;  lines: +28 -32

Log Message:
more cleanups, now adheres more closely to the standard (all arrays and structs 
wrapped in value tags)
=====================================================================
Index: api/interface/class.interface_xmlrpc.php
diff -u api/interface/class.interface_xmlrpc.php:1.1.2.13 
api/interface/class.interface_xmlrpc.php:1.1.2.14
--- api/interface/class.interface_xmlrpc.php:1.1.2.13   Wed Jun 16 15:13:32 2004
+++ api/interface/class.interface_xmlrpc.php    Wed Jun 16 15:37:35 2004
@@ -30,7 +30,7 @@
                var $op;
                var $inputs;
                var $method_result;
-               var $indent = '  ';
+               var $indent = ' ';
                var $first_input = true;
                
                function api_interface()
@@ -147,7 +147,7 @@
 
                        if(!empty($this->method_result))
                        {
-                               $response_packet .= 
str_repeat($this->indent,1)."<params>\n";
+                               $response_packet .= $this->indent."<params>\n";
 
                                if(!is_array($this->method_result))
                                {
@@ -170,13 +170,11 @@
                                        else
                                        {
                                                $response_packet .= 
str_repeat($this->indent,2)."<param>\n";
-                                               $response_packet .= 
str_repeat($this->indent,3)."<value>\n";
-                                               $response_packet .= 
$this->add_vars($this->method_result,4);
-                                               $response_packet .= 
str_repeat($this->indent,3)."</value>\n";
+                                               $response_packet .= 
$this->add_vars($this->method_result,3);
                                                $response_packet .= 
str_repeat($this->indent,2)."</param>\n";
                                        }
                                }
-                               $response_packet .= 
str_repeat($this->indent,1)."</params>\n";
+                               $response_packet .= $this->indent."</params>\n";
                        }
                        
                        $response_packet .= '</methodResponse>';
@@ -437,27 +435,31 @@
                        
                        if(array_key_exists(0,$params) || empty($params))
                        {
-                               $result = 
str_repeat($this->indent,$level)."<array>\n";
-                               $result .= 
str_repeat($this->indent,$level+1)."<data>\n";
+                               $result  = 
str_repeat($this->indent,$level)."<value>\n";
+                               $result .= 
str_repeat($this->indent,$level+1)."<array>\n";
+                               $result .= 
str_repeat($this->indent,$level+2)."<data>\n";
                                foreach ($params as $val)
                                {
-                                       $result .= 
$this->add_vars($val,$level+2);
+                                       $result .= 
$this->add_vars($val,$level+3);
                                }
                                
-                               $result .= 
str_repeat($this->indent,$level+1)."</data>\n";
-                               $result .= 
str_repeat($this->indent,$level)."</array>\n";
+                               $result .= 
str_repeat($this->indent,$level+2)."</data>\n";
+                               $result .= 
str_repeat($this->indent,$level+1)."</array>\n";
+                               $result .= 
str_repeat($this->indent,$level)."</value>\n";
                        }
                        else
                        {
-                               $result = 
str_repeat($this->indent,$level)."<struct>\n";
+                               $result  = 
str_repeat($this->indent,$level)."<value>\n";
+                               $result .= 
str_repeat($this->indent,$level+1)."<struct>\n";
                                foreach ($params as $key => $val)
                                {
-                                       $result .= 
str_repeat($this->indent,$level+1)."<member>\n";
-                                       $result .= 
str_repeat($this->indent,$level+2)."<name>".$key."</name>\n";
-                                       $result .= 
$this->add_vars($val,$level+2);
-                                       $result .= 
str_repeat($this->indent,$level+1)."</member>\n";
+                                       $result .= 
str_repeat($this->indent,$level+2)."<member>\n";
+                                       $result .= 
str_repeat($this->indent,$level+3)."<name>".$key."</name>\n";
+                                       $result .= 
$this->add_vars($val,$level+3);
+                                       $result .= 
str_repeat($this->indent,$level+2)."</member>\n";
                                }
-                               $result .= 
str_repeat($this->indent,$level)."</struct>\n";
+                               $result .= 
str_repeat($this->indent,$level+1)."</struct>\n";
+                               $result .= 
str_repeat($this->indent,$level)."</value>\n";
                        }
                        return $result;
                }
@@ -611,22 +613,16 @@
                
                function xmlrpc_fault($code, $text)
                {
+                       $fault = array(
+                               'faultCode' => intval($code),
+                               'faultString' => strval($text)
+                       );
+                       
                        $error_result = "<?xml version=\"1.0\"?>\n";
                        $error_result .= "<methodResponse>\n";
-                       $error_result .= "      <fault>\n";
-                       $error_result .= "              <value>\n";
-                       $error_result .= "                      <struct>\n";
-                       $error_result .= "                              
<member>\n";
-                       $error_result .= "                                      
<name>faultCode</name>\n";
-                       $error_result .= "                                      
<value><int>$code</int></value>\n";
-                       $error_result .= "                              
</member>\n";
-                       $error_result .= "                              
<member>\n";
-                       $error_result .= "                                      
<name>faultString</name>\n";
-                       $error_result .= "                                      
<value><string>$text</string></value>\n";
-                       $error_result .= "                              
</member>\n";
-                       $error_result .= "                      </struct>\n";
-                       $error_result .= "              </value>\n";
-                       $error_result .= "      </fault>\n";
+                       $error_result .= $this->indent."<fault>\n";
+                       $error_result .= $this->add_vars($fault,2);
+                       $error_result .= $this->indent."</fault>\n";
                        $error_result .= "</methodResponse>\n";
                        echo $this->output($error_result);
                        exit;