gggeek / phpxmlrpc

debugger/common.php

Indentation +43 added lines, -43 removed lines

@@ -9,8 +9,8 @@ 
  */
 
 // work around magic quotes
-  if (get_magic_quotes_gpc())
-  {
+    if (get_magic_quotes_gpc())
+    {
     function stripslashes_deep($value)
     {
         $value = is_array($value) ?
@@ -20,64 +20,64 @@ 
         return $value;
     }
     $_GET = array_map('stripslashes_deep', $_GET);
-  }
+    }
 
-  $preferredEncodings = 'UTF-8, ASCII, ISO-8859-1, UTF-7, EUC-JP, SJIS, eucJP-win, SJIS-win, JIS, ISO-2022-JP';
-  $inputcharset = mb_detect_encoding(urldecode($_SERVER['REQUEST_URI']), $preferredEncodings);
+    $preferredEncodings = 'UTF-8, ASCII, ISO-8859-1, UTF-7, EUC-JP, SJIS, eucJP-win, SJIS-win, JIS, ISO-2022-JP';
+    $inputcharset = mb_detect_encoding(urldecode($_SERVER['REQUEST_URI']), $preferredEncodings);
 
-  if ( isset( $_GET['usepost'] ) && $_GET['usepost'] === 'true' )
-  {
-      $_GET = $_POST;
-      $inputcharset = mb_detect_encoding(implode('', $_GET), $preferredEncodings);
-  }
+    if ( isset( $_GET['usepost'] ) && $_GET['usepost'] === 'true' )
+    {
+        $_GET = $_POST;
+        $inputcharset = mb_detect_encoding(implode('', $_GET), $preferredEncodings);
+    }
 
 // recover input parameters
-  $debug = false;
-  $protocol = 0;
-  $run = false;
-  $wstype = 0;
-  $id = '';
-  if (isset($_GET['action']))
-  {
+    $debug = false;
+    $protocol = 0;
+    $run = false;
+    $wstype = 0;
+    $id = '';
+    if (isset($_GET['action']))
+    {
     if (isset($_GET['wstype']) && $_GET['wstype'] == '1')
     {
-      $wstype = 1;
-      if (isset($_GET['id']))
+        $wstype = 1;
+        if (isset($_GET['id']))
         $id = $_GET['id'];
     }
     $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xmlrpc error...
     if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2'))
-      $protocol = $_GET['protocol'];
+        $protocol = $_GET['protocol'];
     if (strpos($host, 'http://') === 0)
-      $host = substr($host, 7);
+        $host = substr($host, 7);
     else if (strpos($host, 'https://') === 0)
     {
-      $host = substr($host, 8);
-      $protocol = 2;
+        $host = substr($host, 8);
+        $protocol = 2;
     }
     $port = isset($_GET['port']) ? $_GET['port'] : '';
     $path = isset($_GET['path']) ? $_GET['path'] : '';
     // in case user forgot initial '/' in xmlrpc server path, add it back
     if ($path && ($path[0]) != '/')
-      $path = '/'.$path;
+        $path = '/'.$path;
 
     if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2'))
-      $debug = $_GET['debug'];
+        $debug = $_GET['debug'];
 
     $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0;
     if (isset($_GET['verifypeer']) && $_GET['verifypeer'] == '1')
-      $verifypeer = true;
+        $verifypeer = true;
     else
-      $verifypeer = false;
+        $verifypeer = false;
     $cainfo= isset($_GET['cainfo']) ? $_GET['cainfo'] : '';
     $proxy = isset($_GET['proxy']) ? $_GET['proxy'] : 0;
     if (strpos($proxy, 'http://') === 0)
-      $proxy = substr($proxy, 7);
+        $proxy = substr($proxy, 7);
     $proxyuser= isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
     $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : '';
     $timeout = isset($_GET['timeout']) ? $_GET['timeout'] : 0;
     if (!is_numeric($timeout))
-      $timeout = 0;
+        $timeout = 0;
     $action = $_GET['action'];
 
     $method = isset($_GET['method']) ? $_GET['method'] : '';
@@ -86,7 +86,7 @@ 
     $alt_payload = isset($_GET['altmethodpayload']) ? $_GET['altmethodpayload'] : '';
 
     if (isset($_GET['run']) && $_GET['run'] == 'now')
-      $run = true;
+        $run = true;
 
     $username = isset($_GET['username']) ? $_GET['username'] : '';
     $password = isset($_GET['password']) ? $_GET['password'] : '';
@@ -94,18 +94,18 @@ 
     $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? $_GET['authtype'] : 1;
 
     if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2'))
-      $requestcompression = $_GET['requestcompression'];
+        $requestcompression = $_GET['requestcompression'];
     else
-      $requestcompression = 0;
+        $requestcompression = 0;
     if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3'))
-      $responsecompression = $_GET['responsecompression'];
+        $responsecompression = $_GET['responsecompression'];
     else
-      $responsecompression = 0;
+        $responsecompression = 0;
 
     $clientcookies = isset($_GET['clientcookies']) ? $_GET['clientcookies'] : '';
-  }
-  else
-  {
+    }
+    else
+    {
     $host = '';
     $port = '';
     $path = '';
@@ -127,11 +127,11 @@ 
     $requestcompression = 0;
     $responsecompression = 0;
     $clientcookies = '';
-  }
+    }
 
-  // check input for known XMLRPC attacks against this or other libs
-  function payload_is_safe($input)
-  {
-      return true;
-  }
+    // check input for known XMLRPC attacks against this or other libs
+    function payload_is_safe($input)
+    {
+        return true;
+    }
 ?>
\ No newline at end of file

Spacing +4 added lines, -5 removed lines

@@ -14,8 +14,7 @@ 
     function stripslashes_deep($value)
     {
         $value = is_array($value) ?
-                    array_map('stripslashes_deep', $value) :
-                    stripslashes($value);
+                    array_map('stripslashes_deep', $value) : stripslashes($value);
 
         return $value;
     }
@@ -25,7 +24,7 @@ 
   $preferredEncodings = 'UTF-8, ASCII, ISO-8859-1, UTF-7, EUC-JP, SJIS, eucJP-win, SJIS-win, JIS, ISO-2022-JP';
   $inputcharset = mb_detect_encoding(urldecode($_SERVER['REQUEST_URI']), $preferredEncodings);
 
-  if ( isset( $_GET['usepost'] ) && $_GET['usepost'] === 'true' )
+  if (isset($_GET['usepost']) && $_GET['usepost'] === 'true')
   {
       $_GET = $_POST;
       $inputcharset = mb_detect_encoding(implode('', $_GET), $preferredEncodings);
@@ -69,11 +68,11 @@ 
       $verifypeer = true;
     else
       $verifypeer = false;
-    $cainfo= isset($_GET['cainfo']) ? $_GET['cainfo'] : '';
+    $cainfo = isset($_GET['cainfo']) ? $_GET['cainfo'] : '';
     $proxy = isset($_GET['proxy']) ? $_GET['proxy'] : 0;
     if (strpos($proxy, 'http://') === 0)
       $proxy = substr($proxy, 7);
-    $proxyuser= isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
+    $proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
     $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : '';
     $timeout = isset($_GET['timeout']) ? $_GET['timeout'] : 0;
     if (!is_numeric($timeout))

Braces +40 added lines, -31 removed lines

@@ -42,15 +42,17 @@ 
     if (isset($_GET['wstype']) && $_GET['wstype'] == '1')
     {
       $wstype = 1;
-      if (isset($_GET['id']))
-        $id = $_GET['id'];
+      if (isset($_GET['id'])) {
+              $id = $_GET['id'];
+      }
     }
     $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xmlrpc error...
-    if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2'))
-      $protocol = $_GET['protocol'];
-    if (strpos($host, 'http://') === 0)
-      $host = substr($host, 7);
-    else if (strpos($host, 'https://') === 0)
+    if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2')) {
+          $protocol = $_GET['protocol'];
+    }
+    if (strpos($host, 'http://') === 0) {
+          $host = substr($host, 7);
+    } else if (strpos($host, 'https://') === 0)
     {
       $host = substr($host, 8);
       $protocol = 2;
@@ -58,26 +60,31 @@ 
     $port = isset($_GET['port']) ? $_GET['port'] : '';
     $path = isset($_GET['path']) ? $_GET['path'] : '';
     // in case user forgot initial '/' in xmlrpc server path, add it back
-    if ($path && ($path[0]) != '/')
-      $path = '/'.$path;
+    if ($path && ($path[0]) != '/') {
+          $path = '/'.$path;
+    }
 
-    if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2'))
-      $debug = $_GET['debug'];
+    if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) {
+          $debug = $_GET['debug'];
+    }
 
     $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0;
-    if (isset($_GET['verifypeer']) && $_GET['verifypeer'] == '1')
-      $verifypeer = true;
-    else
-      $verifypeer = false;
+    if (isset($_GET['verifypeer']) && $_GET['verifypeer'] == '1') {
+          $verifypeer = true;
+    } else {
+          $verifypeer = false;
+    }
     $cainfo= isset($_GET['cainfo']) ? $_GET['cainfo'] : '';
     $proxy = isset($_GET['proxy']) ? $_GET['proxy'] : 0;
-    if (strpos($proxy, 'http://') === 0)
-      $proxy = substr($proxy, 7);
+    if (strpos($proxy, 'http://') === 0) {
+          $proxy = substr($proxy, 7);
+    }
     $proxyuser= isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
     $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : '';
     $timeout = isset($_GET['timeout']) ? $_GET['timeout'] : 0;
-    if (!is_numeric($timeout))
-      $timeout = 0;
+    if (!is_numeric($timeout)) {
+          $timeout = 0;
+    }
     $action = $_GET['action'];
 
     $method = isset($_GET['method']) ? $_GET['method'] : '';
@@ -85,26 +92,28 @@ 
     $payload = isset($_GET['methodpayload']) ? $_GET['methodpayload'] : '';
     $alt_payload = isset($_GET['altmethodpayload']) ? $_GET['altmethodpayload'] : '';
 
-    if (isset($_GET['run']) && $_GET['run'] == 'now')
-      $run = true;
+    if (isset($_GET['run']) && $_GET['run'] == 'now') {
+          $run = true;
+    }
 
     $username = isset($_GET['username']) ? $_GET['username'] : '';
     $password = isset($_GET['password']) ? $_GET['password'] : '';
 
     $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? $_GET['authtype'] : 1;
 
-    if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2'))
-      $requestcompression = $_GET['requestcompression'];
-    else
-      $requestcompression = 0;
-    if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3'))
-      $responsecompression = $_GET['responsecompression'];
-    else
-      $responsecompression = 0;
+    if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2')) {
+          $requestcompression = $_GET['requestcompression'];
+    } else {
+          $requestcompression = 0;
+    }
+    if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3')) {
+          $responsecompression = $_GET['responsecompression'];
+    } else {
+          $responsecompression = 0;
+    }
 
     $clientcookies = isset($_GET['clientcookies']) ? $_GET['clientcookies'] : '';
-  }
-  else
+  } else
   {
     $host = '';
     $port = '';

debugger/action.php

Indentation +170 added lines, -170 removed lines

@@ -36,101 +36,101 @@ 
 <body>
 <?php
 
-  include(dirname(__FILE__).'/common.php');
-  if ($action)
-  {
+    include(dirname(__FILE__).'/common.php');
+    if ($action)
+    {
 
     // make sure the script waits long enough for the call to complete...
     if ($timeout)
-      set_time_limit($timeout+10);
+        set_time_limit($timeout+10);
 
     include('xmlrpc.inc');
     if ($wstype == 1)
     {
-      @include('jsonrpc.inc');
-      if (!class_exists('jsonrpc_client'))
-      {
+        @include('jsonrpc.inc');
+        if (!class_exists('jsonrpc_client'))
+        {
         die('Error: to debug the jsonrpc protocol the jsonrpc.inc file is needed');
-      }
-      $clientclass = 'jsonrpc_client';
-      $msgclass = 'jsonrpcmsg';
-      $protoname = 'JSONRPC';
+        }
+        $clientclass = 'jsonrpc_client';
+        $msgclass = 'jsonrpcmsg';
+        $protoname = 'JSONRPC';
     }
     else
     {
-      $clientclass = 'xmlrpc_client';
-      $msgclass = 'xmlrpcmsg';
-      $protoname = 'XMLRPC';
+        $clientclass = 'xmlrpc_client';
+        $msgclass = 'xmlrpcmsg';
+        $protoname = 'XMLRPC';
     }
 
     if ($port != "")
     {
-      $client = new $clientclass($path, $host, $port);
-      $server = "$host:$port$path";
+        $client = new $clientclass($path, $host, $port);
+        $server = "$host:$port$path";
     } else {
-      $client = new $clientclass($path, $host);
-      $server = "$host$path";
+        $client = new $clientclass($path, $host);
+        $server = "$host$path";
     }
     if ($protocol == 2)
     {
-      $server = 'https://'.$server;
+        $server = 'https://'.$server;
     }
     else
     {
-      $server = 'http://'.$server;
+        $server = 'http://'.$server;
     }
     if ($proxy != '') {
-      $pproxy = explode(':', $proxy);
-      if (count($pproxy) > 1)
+        $pproxy = explode(':', $proxy);
+        if (count($pproxy) > 1)
         $pport = $pproxy[1];
-      else
+        else
         $pport = 8080;
-      $client->setProxy($pproxy[0], $pport, $proxyuser, $proxypwd);
+        $client->setProxy($pproxy[0], $pport, $proxyuser, $proxypwd);
     }
 
     if ($protocol == 2)
     {
-      $client->setSSLVerifyPeer($verifypeer);
-      $client->setSSLVerifyHost($verifyhost);
-      if ($cainfo)
-      {
+        $client->setSSLVerifyPeer($verifypeer);
+        $client->setSSLVerifyHost($verifyhost);
+        if ($cainfo)
+        {
         $client->setCaCertificate($cainfo);
-      }
-      $httpprotocol = 'https';
+        }
+        $httpprotocol = 'https';
     }
     else if ($protocol == 1)
-      $httpprotocol = 'http11';
+        $httpprotocol = 'http11';
     else
-      $httpprotocol = 'http';
+        $httpprotocol = 'http';
 
     if ($username)
-      $client->setCredentials($username, $password, $authtype);
+        $client->setCredentials($username, $password, $authtype);
 
     $client->setDebug($debug);
 
     switch ($requestcompression) {
-      case 0:
+        case 0:
         $client->request_compression = '';
         break;
-      case 1:
+        case 1:
         $client->request_compression = 'gzip';
         break;
-      case 2:
+        case 2:
         $client->request_compression = 'deflate';
         break;
     }
 
     switch ($responsecompression) {
-      case 0:
+        case 0:
         $client->accepted_compression = '';
         break;
-      case 1:
+        case 1:
         $client->accepted_compression = array('gzip');
         break;
-      case 2:
+        case 2:
         $client->accepted_compression = array('deflate');
         break;
-      case 3:
+        case 3:
         $client->accepted_compression = array('gzip', 'deflate');
         break;
     }
@@ -138,24 +138,24 @@ 
     $cookies = explode(',', $clientcookies);
     foreach ($cookies as $cookie)
     {
-      if (strpos($cookie, '='))
-      {
+        if (strpos($cookie, '='))
+        {
         $cookie = explode('=', $cookie);
         $client->setCookie(trim($cookie[0]), trim(@$cookie[1]));
-      }
+        }
     }
 
     $msg = array();
     switch ($action) {
 
-      case 'wrap':
+        case 'wrap':
         @include('xmlrpc_wrappers.inc');
         if (!function_exists('build_remote_method_wrapper_code'))
         {
-          die('Error: to enable creation of method stubs the xmlrpc_wrappers.inc file is needed');
+            die('Error: to enable creation of method stubs the xmlrpc_wrappers.inc file is needed');
         }
         // fall thru intentionally
-      case 'describe':
+        case 'describe':
       case 'wrap':
         $msg[0] = new $msgclass('system.methodHelp', null, $id);
         $msg[0]->addparam(new xmlrpcval($method));
@@ -163,18 +163,18 @@ 
         $msg[1]->addparam(new xmlrpcval($method));
         $actionname = 'Description of method "'.$method.'"';
         break;
-      case 'list':
+        case 'list':
         $msg[0] = new $msgclass('system.listMethods', null, $id);
         $actionname = 'List of available methods';
         break;
-      case 'execute':
+        case 'execute':
         if (!payload_is_safe($payload))
-          die("Tsk tsk tsk, please stop it or I will have to call in the cops!");
+            die("Tsk tsk tsk, please stop it or I will have to call in the cops!");
         $msg[0] = new $msgclass($method, null, $id);
         // hack! build xml payload by hand
         if ($wstype == 1)
         {
-          $msg[0]->payload = "{\n".
+            $msg[0]->payload = "{\n".
             '"method": "' . $method . "\",\n\"params\": [" .
             $payload .
             "\n],\n\"id\": ";
@@ -185,24 +185,24 @@ 
             }
             else
             {
-              if (is_numeric($id) || $id == 'false' || $id == 'true' || $id == 'null')
-              {
+                if (is_numeric($id) || $id == 'false' || $id == 'true' || $id == 'null')
+                {
                 $msg[0]->payload .= "$id\n}";
-              }
-              else
-              {
+                }
+                else
+                {
                 $msg[0]->payload .= "\"$id\"\n}";
-              }
+                }
             }
         }
         else
-          $msg[0]->payload = $msg[0]->xml_header($inputcharset) .
+            $msg[0]->payload = $msg[0]->xml_header($inputcharset) .
             '<methodName>' . $method . "</methodName>\n<params>" .
             $payload .
             "</params>\n" . $msg[0]->xml_footer();
         $actionname = 'Execution of method '.$method;
         break;
-      default: // give a warning
+        default: // give a warning
         $actionname = '[ERROR: unknown action] "'.$action.'"';
     }
 
@@ -214,81 +214,81 @@ 
     $response = null;
     // execute method(s)
     if ($debug)
-      echo '<div class="dbginfo"><h2>Debug info:</h2>';  /// @todo use ob_start instead
+        echo '<div class="dbginfo"><h2>Debug info:</h2>';  /// @todo use ob_start instead
     $resp = array();
     $mtime = explode(' ',microtime());
     $time = (float)$mtime[0] + (float)$mtime[1];
     foreach ($msg as $message)
     {
-      // catch errors: for older xmlrpc libs, send does not return by ref
-      @$response =& $client->send($message, $timeout, $httpprotocol);
-      $resp[] = $response;
-      if (!$response || $response->faultCode())
+        // catch errors: for older xmlrpc libs, send does not return by ref
+        @$response =& $client->send($message, $timeout, $httpprotocol);
+        $resp[] = $response;
+        if (!$response || $response->faultCode())
         break;
     }
     $mtime = explode(' ',microtime());
     $time = (float)$mtime[0] + (float)$mtime[1] - $time;
     if ($debug)
-      echo "</div>\n";
+        echo "</div>\n";
 
     if ($response)
     {
 
     if ($response->faultCode())
     {
-      // call failed! echo out error msg!
-      //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
-      echo "<h3>$protoname call FAILED!</h3>\n";
-      echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) .
+        // call failed! echo out error msg!
+        //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
+        echo "<h3>$protoname call FAILED!</h3>\n";
+        echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) .
         "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) . "'</p>\n";
-      echo (strftime("%d/%b/%Y:%H:%M:%S\n"));
+        echo (strftime("%d/%b/%Y:%H:%M:%S\n"));
     }
     else
     {
-      // call succeeded: parse results
-      //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
-      printf ("<h3>%s call(s) OK (%.2f secs.)</h3>\n", $protoname, $time);
-      echo (strftime("%d/%b/%Y:%H:%M:%S\n"));
+        // call succeeded: parse results
+        //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
+        printf ("<h3>%s call(s) OK (%.2f secs.)</h3>\n", $protoname, $time);
+        echo (strftime("%d/%b/%Y:%H:%M:%S\n"));
 
-      switch ($action)
-      {
+        switch ($action)
+        {
         case 'list':
 
         $v = $response->value();
         if ($v->kindOf()=="array")
         {
-          $max = $v->arraysize();
-          echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
-          echo "<thead>\n<tr><th>Method</th><th>Description</th></tr>\n</thead>\n<tbody>\n";
-          for($i=0; $i < $max; $i++)
-          {
+            $max = $v->arraysize();
+            echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
+            echo "<thead>\n<tr><th>Method</th><th>Description</th></tr>\n</thead>\n<tbody>\n";
+            for($i=0; $i < $max; $i++)
+            {
             $rec = $v->arraymem($i);
             if ($i%2) $class=' class="oddrow"'; else $class = ' class="evenrow"';
             echo ("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">".
-              "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
-              "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
-              "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
-              "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
-              "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
-              "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
-              "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
-              "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
-              "<input type=\"hidden\" name=\"method\" value=\"".$rec->scalarval()."\" />".
-              "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
-              "<input type=\"hidden\" name=\"action\" value=\"describe\" />".
-              "<input type=\"hidden\" name=\"run\" value=\"now\" />".
-              "<input type=\"submit\" value=\"Describe\" /></form></td>");
+                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
+                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
+                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
+                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
+                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
+                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
+                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
+                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
+                "<input type=\"hidden\" name=\"method\" value=\"".$rec->scalarval()."\" />".
+                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
+                "<input type=\"hidden\" name=\"action\" value=\"describe\" />".
+                "<input type=\"hidden\" name=\"run\" value=\"now\" />".
+                "<input type=\"submit\" value=\"Describe\" /></form></td>");
             //echo("</tr>\n");
 
             // generate lo scheletro per il method payload per eventuali test
@@ -303,10 +303,10 @@ 
               "<input type=\"hidden\" name=\"action\" value=\"execute\" />".
               "<input type=\"submit\" value=\"Test\" /></td></form>");*/
             echo("</tr>\n");
-          }
-          echo "</tbody>\n</table>";
+            }
+            echo "</tbody>\n</table>";
         }
-          break;
+            break;
 
         case 'describe':
 
@@ -317,46 +317,46 @@ 
         echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th>&nbsp;</th><th>&nbsp;</th></tr>\n</thead>\n<tbody>\n";
         $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']);
         if ($desc == "")
-          $desc = "-";
+            $desc = "-";
         echo "<tr><td class=\"evenrow\">Description</td><td colspan=\"3\" class=\"evenrow\">$desc</td></tr>\n";
         $payload="";
         $alt_payload="";
         if ($r2->kindOf()!="array")
-          echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
+            echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
         else
         {
-          for($i=0; $i < $r2->arraysize(); $i++)
-          {
+            for($i=0; $i < $r2->arraysize(); $i++)
+            {
             if ($i+1%2) $class=' class="oddrow"'; else $class = ' class="evenrow"';
             echo "<tr><td$class>Signature&nbsp;".($i+1)."</td><td$class>";
             $x = $r2->arraymem($i);
             if ($x->kindOf()=="array")
             {
-              $ret = $x->arraymem(0);
-              echo "<code>OUT:&nbsp;" . htmlspecialchars($ret->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) . "<br />IN: (";
-              if ($x->arraysize() > 1)
-              {
+                $ret = $x->arraymem(0);
+                echo "<code>OUT:&nbsp;" . htmlspecialchars($ret->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) . "<br />IN: (";
+                if ($x->arraysize() > 1)
+                {
                 for($k = 1; $k < $x->arraysize(); $k++)
                 {
-                  $y = $x->arraymem($k);
-                  echo $y->scalarval();
-                  if ($wstype != 1)
-                  {
+                    $y = $x->arraymem($k);
+                    echo $y->scalarval();
+                    if ($wstype != 1)
+                    {
                     $payload = $payload . '<param><value><'.htmlspecialchars($y->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']).'></'.htmlspecialchars($y->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."></value></param>\n";
-                  }
-                  $alt_payload .= $y->scalarval();
-                  if ($k < $x->arraysize()-1)
-                  {
+                    }
+                    $alt_payload .= $y->scalarval();
+                    if ($k < $x->arraysize()-1)
+                    {
                     $alt_payload .= ';';
                     echo ", ";
-                  }
+                    }
                 }
-              }
-              echo ")</code>";
+                }
+                echo ")</code>";
             }
             else
             {
-              echo 'Unknown';
+                echo 'Unknown';
             }
             echo '</td>';
             //bottone per testare questo metodo
@@ -387,7 +387,7 @@ 
             "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
             "<input type=\"hidden\" name=\"action\" value=\"execute\" />";
             if ($wstype != 1)
-              echo "<input type=\"submit\" value=\"Load method synopsis\" />";
+                echo "<input type=\"submit\" value=\"Load method synopsis\" />";
             echo "</form></td>\n";
 
             echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">".
@@ -420,66 +420,66 @@ 
             "<input type=\"submit\" value=\"Generate method call stub code\" />";
             echo "</form></td></tr>\n";
 
-          }
+            }
         }
         echo "</tbody>\n</table>";
 
-          break;
+            break;
 
         case 'wrap':
           $r1 = $resp[0]->value();
-          $r2 = $resp[1]->value();
-          if ($r2->kindOf()!="array" || $r2->arraysize() <= $methodsig)
+            $r2 = $resp[1]->value();
+            if ($r2->kindOf()!="array" || $r2->arraysize() <= $methodsig)
             echo "Error: signature unknown\n";
-          else
-          {
-          $mdesc = $r1->scalarval();
-          $msig = php_xmlrpc_decode($r2);
-          $msig = $msig[$methodsig];
-          $proto = $protocol == 2 ? 'https' : $protocol == 1 ? 'http11' : '';
-          if ($proxy  == '' && $username == '' && !$requestcompression && !$responsecompression &&
+            else
+            {
+            $mdesc = $r1->scalarval();
+            $msig = php_xmlrpc_decode($r2);
+            $msig = $msig[$methodsig];
+            $proto = $protocol == 2 ? 'https' : $protocol == 1 ? 'http11' : '';
+            if ($proxy  == '' && $username == '' && !$requestcompression && !$responsecompression &&
             $clientcookies == '')
-          {
+            {
             $opts = 0; // simple client copy in stub code
-          }
-          else
-          {
+            }
+            else
+            {
             $opts = 1; // complete client copy in stub code
-          }
-          if ($wstype == 1)
-          {
+            }
+            if ($wstype == 1)
+            {
             $prefix = 'jsonrpc';
-          }
-          else
-          {
+            }
+            else
+            {
             $prefix = 'xmlrpc';
-          }
-          //$code = wrap_xmlrpc_method($client, $method, $methodsig, 0, $proto, '', $opts);
-          $code = build_remote_method_wrapper_code($client, $method, str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc, $timeout, $proto, $opts, $prefix);
-          //if ($code)
-          //{
-              echo "<div id=\"phpcode\">\n";
+            }
+            //$code = wrap_xmlrpc_method($client, $method, $methodsig, 0, $proto, '', $opts);
+            $code = build_remote_method_wrapper_code($client, $method, str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc, $timeout, $proto, $opts, $prefix);
+            //if ($code)
+            //{
+                echo "<div id=\"phpcode\">\n";
             highlight_string("<?php\n".$code['docstring'].$code['source'].'?>');
             echo "\n</div>";
-          //}
-          //else
-          //{
-          //  echo 'Error while building php code stub...';
-          }
+            //}
+            //else
+            //{
+            //  echo 'Error while building php code stub...';
+            }
 
-          break;
+            break;
 
         case 'execute':
           echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']).'</div>';
-          break;
+            break;
 
         default: // give a warning
       }
     } // if !$response->faultCode()
     } // if $response
-  }
-  else
-  {
+    }
+    else
+    {
     // no action taken yet: give some instructions on debugger usage
 ?>
 
@@ -490,10 +490,10 @@ 
 <li>To run method: click on 'load method synopsis' for desired method. This will load a skeleton for method call parameters in the form above. Complete all xmlrpc values with appropriate data and click 'Execute'</li>
 </ol>
 <?php
-  if (!extension_loaded('curl'))
-  {
-      echo "<p class=\"evidence\">You will need to enable the CURL extension to use the HTTPS and HTTP 1.1 transports</p>\n";
-  }
+    if (!extension_loaded('curl'))
+    {
+        echo "<p class=\"evidence\">You will need to enable the CURL extension to use the HTTPS and HTTP 1.1 transports</p>\n";
+    }
 ?>
 
 <h3>Example:</h3>
@@ -521,7 +521,7 @@ 
 <li>2005-06-24: fixed error with calling methods having parameters...</li>
 </ul>
 <?php
-  }
+    }
 ?>
 </body>
 </html>

Spacing +32 added lines, -32 removed lines

@@ -81,7 +81,7 @@ 
     }
     if ($proxy != '') {
       $pproxy = explode(':', $proxy);
-      if (count($pproxy) > 1)
+      if (count($pproxy)>1)
         $pport = $pproxy[1];
       else
         $pport = 8080;
@@ -175,8 +175,8 @@ 
         if ($wstype == 1)
         {
           $msg[0]->payload = "{\n".
-            '"method": "' . $method . "\",\n\"params\": [" .
-            $payload .
+            '"method": "'.$method."\",\n\"params\": [".
+            $payload.
             "\n],\n\"id\": ";
             // fix: if user gave an empty string, use NULL, or we'll break json syntax
             if ($id == "")
@@ -196,10 +196,10 @@ 
             }
         }
         else
-          $msg[0]->payload = $msg[0]->xml_header($inputcharset) .
-            '<methodName>' . $method . "</methodName>\n<params>" .
-            $payload .
-            "</params>\n" . $msg[0]->xml_footer();
+          $msg[0]->payload = $msg[0]->xml_header($inputcharset).
+            '<methodName>'.$method."</methodName>\n<params>".
+            $payload.
+            "</params>\n".$msg[0]->xml_footer();
         $actionname = 'Execution of method '.$method;
         break;
       default: // give a warning
@@ -214,20 +214,20 @@ 
     $response = null;
     // execute method(s)
     if ($debug)
-      echo '<div class="dbginfo"><h2>Debug info:</h2>';  /// @todo use ob_start instead
+      echo '<div class="dbginfo"><h2>Debug info:</h2>'; /// @todo use ob_start instead
     $resp = array();
-    $mtime = explode(' ',microtime());
-    $time = (float)$mtime[0] + (float)$mtime[1];
+    $mtime = explode(' ', microtime());
+    $time = (float) $mtime[0]+(float) $mtime[1];
     foreach ($msg as $message)
     {
       // catch errors: for older xmlrpc libs, send does not return by ref
-      @$response =& $client->send($message, $timeout, $httpprotocol);
+      @$response = & $client->send($message, $timeout, $httpprotocol);
       $resp[] = $response;
       if (!$response || $response->faultCode())
         break;
     }
-    $mtime = explode(' ',microtime());
-    $time = (float)$mtime[0] + (float)$mtime[1] - $time;
+    $mtime = explode(' ', microtime());
+    $time = (float) $mtime[0]+(float) $mtime[1]-$time;
     if ($debug)
       echo "</div>\n";
 
@@ -239,15 +239,15 @@ 
       // call failed! echo out error msg!
       //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
       echo "<h3>$protoname call FAILED!</h3>\n";
-      echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) .
-        "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) . "'</p>\n";
+      echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']).
+        "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."'</p>\n";
       echo (strftime("%d/%b/%Y:%H:%M:%S\n"));
     }
     else
     {
       // call succeeded: parse results
       //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
-      printf ("<h3>%s call(s) OK (%.2f secs.)</h3>\n", $protoname, $time);
+      printf("<h3>%s call(s) OK (%.2f secs.)</h3>\n", $protoname, $time);
       echo (strftime("%d/%b/%Y:%H:%M:%S\n"));
 
       switch ($action)
@@ -255,15 +255,15 @@ 
         case 'list':
 
         $v = $response->value();
-        if ($v->kindOf()=="array")
+        if ($v->kindOf() == "array")
         {
           $max = $v->arraysize();
           echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
           echo "<thead>\n<tr><th>Method</th><th>Description</th></tr>\n</thead>\n<tbody>\n";
-          for($i=0; $i < $max; $i++)
+          for ($i = 0; $i<$max; $i++)
           {
             $rec = $v->arraymem($i);
-            if ($i%2) $class=' class="oddrow"'; else $class = ' class="evenrow"';
+            if ($i % 2) $class = ' class="oddrow"'; else $class = ' class="evenrow"';
             echo ("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">".
               "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
               "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
@@ -319,33 +319,33 @@ 
         if ($desc == "")
           $desc = "-";
         echo "<tr><td class=\"evenrow\">Description</td><td colspan=\"3\" class=\"evenrow\">$desc</td></tr>\n";
-        $payload="";
-        $alt_payload="";
-        if ($r2->kindOf()!="array")
+        $payload = "";
+        $alt_payload = "";
+        if ($r2->kindOf() != "array")
           echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
         else
         {
-          for($i=0; $i < $r2->arraysize(); $i++)
+          for ($i = 0; $i<$r2->arraysize(); $i++)
           {
-            if ($i+1%2) $class=' class="oddrow"'; else $class = ' class="evenrow"';
+            if ($i+1 % 2) $class = ' class="oddrow"'; else $class = ' class="evenrow"';
             echo "<tr><td$class>Signature&nbsp;".($i+1)."</td><td$class>";
             $x = $r2->arraymem($i);
-            if ($x->kindOf()=="array")
+            if ($x->kindOf() == "array")
             {
               $ret = $x->arraymem(0);
-              echo "<code>OUT:&nbsp;" . htmlspecialchars($ret->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) . "<br />IN: (";
-              if ($x->arraysize() > 1)
+              echo "<code>OUT:&nbsp;".htmlspecialchars($ret->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."<br />IN: (";
+              if ($x->arraysize()>1)
               {
-                for($k = 1; $k < $x->arraysize(); $k++)
+                for ($k = 1; $k<$x->arraysize(); $k++)
                 {
                   $y = $x->arraymem($k);
                   echo $y->scalarval();
                   if ($wstype != 1)
                   {
-                    $payload = $payload . '<param><value><'.htmlspecialchars($y->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']).'></'.htmlspecialchars($y->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."></value></param>\n";
+                    $payload = $payload.'<param><value><'.htmlspecialchars($y->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']).'></'.htmlspecialchars($y->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."></value></param>\n";
                   }
                   $alt_payload .= $y->scalarval();
-                  if ($k < $x->arraysize()-1)
+                  if ($k<$x->arraysize()-1)
                   {
                     $alt_payload .= ';';
                     echo ", ";
@@ -429,7 +429,7 @@ 
         case 'wrap':
           $r1 = $resp[0]->value();
           $r2 = $resp[1]->value();
-          if ($r2->kindOf()!="array" || $r2->arraysize() <= $methodsig)
+          if ($r2->kindOf() != "array" || $r2->arraysize()<=$methodsig)
             echo "Error: signature unknown\n";
           else
           {
@@ -437,7 +437,7 @@ 
           $msig = php_xmlrpc_decode($r2);
           $msig = $msig[$methodsig];
           $proto = $protocol == 2 ? 'https' : $protocol == 1 ? 'http11' : '';
-          if ($proxy  == '' && $username == '' && !$requestcompression && !$responsecompression &&
+          if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression &&
             $clientcookies == '')
           {
             $opts = 0; // simple client copy in stub code

Braces +62 added lines, -53 removed lines

@@ -41,8 +41,9 @@ 
   {
 
     // make sure the script waits long enough for the call to complete...
-    if ($timeout)
-      set_time_limit($timeout+10);
+    if ($timeout) {
+          set_time_limit($timeout+10);
+    }
 
     include('xmlrpc.inc');
     if ($wstype == 1)
@@ -55,8 +56,7 @@ 
       $clientclass = 'jsonrpc_client';
       $msgclass = 'jsonrpcmsg';
       $protoname = 'JSONRPC';
-    }
-    else
+    } else
     {
       $clientclass = 'xmlrpc_client';
       $msgclass = 'xmlrpcmsg';
@@ -74,17 +74,17 @@ 
     if ($protocol == 2)
     {
       $server = 'https://'.$server;
-    }
-    else
+    } else
     {
       $server = 'http://'.$server;
     }
     if ($proxy != '') {
       $pproxy = explode(':', $proxy);
-      if (count($pproxy) > 1)
-        $pport = $pproxy[1];
-      else
-        $pport = 8080;
+      if (count($pproxy) > 1) {
+              $pport = $pproxy[1];
+      } else {
+              $pport = 8080;
+      }
       $client->setProxy($pproxy[0], $pport, $proxyuser, $proxypwd);
     }
 
@@ -97,14 +97,15 @@ 
         $client->setCaCertificate($cainfo);
       }
       $httpprotocol = 'https';
+    } else if ($protocol == 1) {
+          $httpprotocol = 'http11';
+    } else {
+          $httpprotocol = 'http';
     }
-    else if ($protocol == 1)
-      $httpprotocol = 'http11';
-    else
-      $httpprotocol = 'http';
 
-    if ($username)
-      $client->setCredentials($username, $password, $authtype);
+    if ($username) {
+          $client->setCredentials($username, $password, $authtype);
+    }
 
     $client->setDebug($debug);
 
@@ -168,8 +169,9 @@ 
         $actionname = 'List of available methods';
         break;
       case 'execute':
-        if (!payload_is_safe($payload))
-          die("Tsk tsk tsk, please stop it or I will have to call in the cops!");
+        if (!payload_is_safe($payload)) {
+                  die("Tsk tsk tsk, please stop it or I will have to call in the cops!");
+        }
         $msg[0] = new $msgclass($method, null, $id);
         // hack! build xml payload by hand
         if ($wstype == 1)
@@ -182,24 +184,22 @@ 
             if ($id == "")
             {
                 $msg[0]->payload .= "null\n}";
-            }
-            else
+            } else
             {
               if (is_numeric($id) || $id == 'false' || $id == 'true' || $id == 'null')
               {
                 $msg[0]->payload .= "$id\n}";
-              }
-              else
+              } else
               {
                 $msg[0]->payload .= "\"$id\"\n}";
               }
             }
-        }
-        else
-          $msg[0]->payload = $msg[0]->xml_header($inputcharset) .
+        } else {
+                  $msg[0]->payload = $msg[0]->xml_header($inputcharset) .
             '<methodName>' . $method . "</methodName>\n<params>" .
             $payload .
             "</params>\n" . $msg[0]->xml_footer();
+        }
         $actionname = 'Execution of method '.$method;
         break;
       default: // give a warning
@@ -213,8 +213,10 @@ 
 
     $response = null;
     // execute method(s)
-    if ($debug)
-      echo '<div class="dbginfo"><h2>Debug info:</h2>';  /// @todo use ob_start instead
+    if ($debug) {
+          echo '<div class="dbginfo"><h2>Debug info:</h2>';
+    }
+    /// @todo use ob_start instead
     $resp = array();
     $mtime = explode(' ',microtime());
     $time = (float)$mtime[0] + (float)$mtime[1];
@@ -223,13 +225,15 @@ 
       // catch errors: for older xmlrpc libs, send does not return by ref
       @$response =& $client->send($message, $timeout, $httpprotocol);
       $resp[] = $response;
-      if (!$response || $response->faultCode())
-        break;
+      if (!$response || $response->faultCode()) {
+              break;
+      }
     }
     $mtime = explode(' ',microtime());
     $time = (float)$mtime[0] + (float)$mtime[1] - $time;
-    if ($debug)
-      echo "</div>\n";
+    if ($debug) {
+          echo "</div>\n";
+    }
 
     if ($response)
     {
@@ -242,8 +246,7 @@ 
       echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) .
         "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) . "'</p>\n";
       echo (strftime("%d/%b/%Y:%H:%M:%S\n"));
-    }
-    else
+    } else
     {
       // call succeeded: parse results
       //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
@@ -263,7 +266,11 @@ 
           for($i=0; $i < $max; $i++)
           {
             $rec = $v->arraymem($i);
-            if ($i%2) $class=' class="oddrow"'; else $class = ' class="evenrow"';
+            if ($i%2) {
+                $class=' class="oddrow"';
+            } else {
+                $class = ' class="evenrow"';
+            }
             echo ("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">".
               "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
               "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
@@ -316,18 +323,23 @@ 
         echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
         echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th>&nbsp;</th><th>&nbsp;</th></tr>\n</thead>\n<tbody>\n";
         $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']);
-        if ($desc == "")
-          $desc = "-";
+        if ($desc == "") {
+                  $desc = "-";
+        }
         echo "<tr><td class=\"evenrow\">Description</td><td colspan=\"3\" class=\"evenrow\">$desc</td></tr>\n";
         $payload="";
         $alt_payload="";
-        if ($r2->kindOf()!="array")
-          echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
-        else
+        if ($r2->kindOf()!="array") {
+                  echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
+        } else
         {
           for($i=0; $i < $r2->arraysize(); $i++)
           {
-            if ($i+1%2) $class=' class="oddrow"'; else $class = ' class="evenrow"';
+            if ($i+1%2) {
+                $class=' class="oddrow"';
+            } else {
+                $class = ' class="evenrow"';
+            }
             echo "<tr><td$class>Signature&nbsp;".($i+1)."</td><td$class>";
             $x = $r2->arraymem($i);
             if ($x->kindOf()=="array")
@@ -353,8 +365,7 @@ 
                 }
               }
               echo ")</code>";
-            }
-            else
+            } else
             {
               echo 'Unknown';
             }
@@ -386,8 +397,9 @@ 
             "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />".
             "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
             "<input type=\"hidden\" name=\"action\" value=\"execute\" />";
-            if ($wstype != 1)
-              echo "<input type=\"submit\" value=\"Load method synopsis\" />";
+            if ($wstype != 1) {
+                          echo "<input type=\"submit\" value=\"Load method synopsis\" />";
+            }
             echo "</form></td>\n";
 
             echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">".
@@ -429,9 +441,9 @@ 
         case 'wrap':
           $r1 = $resp[0]->value();
           $r2 = $resp[1]->value();
-          if ($r2->kindOf()!="array" || $r2->arraysize() <= $methodsig)
-            echo "Error: signature unknown\n";
-          else
+          if ($r2->kindOf()!="array" || $r2->arraysize() <= $methodsig) {
+                      echo "Error: signature unknown\n";
+          } else
           {
           $mdesc = $r1->scalarval();
           $msig = php_xmlrpc_decode($r2);
@@ -441,16 +453,14 @@ 
             $clientcookies == '')
           {
             $opts = 0; // simple client copy in stub code
-          }
-          else
+          } else
           {
             $opts = 1; // complete client copy in stub code
           }
           if ($wstype == 1)
           {
             $prefix = 'jsonrpc';
-          }
-          else
+          } else
           {
             $prefix = 'xmlrpc';
           }
@@ -477,8 +487,7 @@ 
       }
     } // if !$response->faultCode()
     } // if $response
-  }
-  else
+  } else
   {
     // no action taken yet: give some instructions on debugger usage
 ?>

debugger/index.php

Indentation +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@
 <?php
-  $query = '';
-  if (isset($_GET['run']))
-  {
+    $query = '';
+    if (isset($_GET['run']))
+    {
     $path = parse_url($_GET['run']);
     if (isset($path['query']))
-      $query = '?'.$path['query'];
-  }
+        $query = '?'.$path['query'];
+    }
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">

Braces +3 added lines, -2 removed lines

@@ -3,8 +3,9 @@
   if (isset($_GET['run']))
   {
     $path = parse_url($_GET['run']);
-    if (isset($path['query']))
-      $query = '?'.$path['query'];
+    if (isset($path['query'])) {
+          $query = '?'.$path['query'];
+    }
   }
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"

debugger/controller.php

Indentation +5 added lines, -5 removed lines

@@ -13,13 +13,13 @@
  * @todo add http no-cache headers
  **/
 
-  include(dirname(__FILE__).'/common.php');
-  if ($action == '')
+    include(dirname(__FILE__).'/common.php');
+    if ($action == '')
     $action = 'list';
 
-  // relative path to the visual xmlrpc editing dialog
-  $editorpath = '../../javascript/debugger/';
-  $editorlibs = '../../javascript/lib/';
+    // relative path to the visual xmlrpc editing dialog
+    $editorpath = '../../javascript/debugger/';
+    $editorlibs = '../../javascript/lib/';
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

Spacing +7 added lines, -7 removed lines

@@ -214,7 +214,7 @@ 
 //-->
 </script>
 </head>
-<body onload="switchtransport(<?php echo $wstype;?>); switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) echo ' document.forms[2].submit();'; ?>">
+<body onload="switchtransport(<?php echo $wstype; ?>); switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) echo ' document.forms[2].submit();'; ?>">
 <h1>XMLRPC <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"/></form>
 /<form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSONRPC Debugger (based on the <a href="http://phpxmlrpc.sourceforge.net">PHP-XMLRPC</a> library)</h1>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"
@@ -232,10 +232,10 @@ 
 <table id="actionblock">
 <tr>
 <td><h2>Action</h2></td>
-<td>List available methods<input type="radio" name="action" value="list"<?php if ($action=='list') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Describe method<input type="radio" name="action" value="describe"<?php if ($action=='describe') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Execute method<input type="radio" name="action" value="execute"<?php if ($action=='execute') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Generate stub for method call<input type="radio" name="action" value="wrap"<?php if ($action=='wrap') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
+<td>List available methods<input type="radio" name="action" value="list"<?php if ($action == 'list') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
+<td>Describe method<input type="radio" name="action" value="describe"<?php if ($action == 'describe') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
+<td>Execute method<input type="radio" name="action" value="execute"<?php if ($action == 'execute') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
+<td>Generate stub for method call<input type="radio" name="action" value="wrap"<?php if ($action == 'wrap') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
 </tr>
 </table>
 <input type="hidden" name="methodsig" value="<?php echo htmlspecialchars($methodsig, ENT_COMPAT, $inputcharset); ?>" />
@@ -246,7 +246,7 @@ 
 <td class="labelcell">Name:</td><td><input type="text" name="method" value="<?php echo htmlspecialchars($method, ENT_COMPAT, $inputcharset); ?>" /></td>
 <td class="labelcell">Payload:<br/><div id="methodpayloadbtn"></div></td><td><textarea id="methodpayload" name="methodpayload" rows="1" cols="40"><?php echo htmlspecialchars($payload, ENT_COMPAT, $inputcharset); ?></textarea></td>
 <td class="labelcell" id="idcell">Msg id: <input type="text" name="id" size="3" value="<?php echo htmlspecialchars($id, ENT_COMPAT, $inputcharset); ?>"/></td>
-<td><input type="hidden" name="wstype" value="<?php echo $wstype;?>" />
+<td><input type="hidden" name="wstype" value="<?php echo $wstype; ?>" />
 <input type="submit" value="Execute" onclick="return verifyserver();"/></td>
 </tr>
 </table>
@@ -260,7 +260,7 @@ 
 <option value="2"<?php if ($debug == 2) echo ' selected="selected"'; ?>>More</option>
 </select>
 </td>
-<td class="labelcell">Timeout:</td><td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) echo $timeout; ?>" /></td>
+<td class="labelcell">Timeout:</td><td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) echo $timeout; ?>" /></td>
 <td class="labelcell">Protocol:</td><td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();">
 <option value="0"<?php if ($protocol == 0) echo ' selected="selected"'; ?>>HTTP 1.0</option>
 <option value="1"<?php if ($protocol == 1) echo ' selected="selected"'; ?>>HTTP 1.1</option>

Braces +107 added lines, -28 removed lines

@@ -14,8 +14,9 @@ 
  **/
 
   include(dirname(__FILE__).'/common.php');
-  if ($action == '')
-    $action = 'list';
+  if ($action == '') {
+      $action = 'list';
+  }
 
   // relative path to the visual xmlrpc editing dialog
   $editorpath = '../../javascript/debugger/';
@@ -214,7 +215,10 @@ 
 //-->
 </script>
 </head>
-<body onload="switchtransport(<?php echo $wstype;?>); switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) echo ' document.forms[2].submit();'; ?>">
+<body onload="switchtransport(<?php echo $wstype;?>); switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
+    echo ' document.forms[2].submit();';
+}
+?>">
 <h1>XMLRPC <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"/></form>
 /<form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSONRPC Debugger (based on the <a href="http://phpxmlrpc.sourceforge.net">PHP-XMLRPC</a> library)</h1>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"
@@ -232,10 +236,22 @@ 
 <table id="actionblock">
 <tr>
 <td><h2>Action</h2></td>
-<td>List available methods<input type="radio" name="action" value="list"<?php if ($action=='list') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Describe method<input type="radio" name="action" value="describe"<?php if ($action=='describe') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Execute method<input type="radio" name="action" value="execute"<?php if ($action=='execute') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Generate stub for method call<input type="radio" name="action" value="wrap"<?php if ($action=='wrap') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
+<td>List available methods<input type="radio" name="action" value="list"<?php if ($action=='list') {
+    echo ' checked="checked"';
+}
+?> onclick="switchaction();" /></td>
+<td>Describe method<input type="radio" name="action" value="describe"<?php if ($action=='describe') {
+    echo ' checked="checked"';
+}
+?> onclick="switchaction();" /></td>
+<td>Execute method<input type="radio" name="action" value="execute"<?php if ($action=='execute') {
+    echo ' checked="checked"';
+}
+?> onclick="switchaction();" /></td>
+<td>Generate stub for method call<input type="radio" name="action" value="wrap"<?php if ($action=='wrap') {
+    echo ' checked="checked"';
+}
+?> onclick="switchaction();" /></td>
 </tr>
 </table>
 <input type="hidden" name="methodsig" value="<?php echo htmlspecialchars($methodsig, ENT_COMPAT, $inputcharset); ?>" />
@@ -255,16 +271,37 @@ 
 <tr>
 <td><h2>Client options</h2></td>
 <td class="labelcell">Show debug info:</td><td><select name="debug">
-<option value="0"<?php if ($debug == 0) echo ' selected="selected"'; ?>>No</option>
-<option value="1"<?php if ($debug == 1) echo ' selected="selected"'; ?>>Yes</option>
-<option value="2"<?php if ($debug == 2) echo ' selected="selected"'; ?>>More</option>
+<option value="0"<?php if ($debug == 0) {
+    echo ' selected="selected"';
+}
+?>>No</option>
+<option value="1"<?php if ($debug == 1) {
+    echo ' selected="selected"';
+}
+?>>Yes</option>
+<option value="2"<?php if ($debug == 2) {
+    echo ' selected="selected"';
+}
+?>>More</option>
 </select>
 </td>
-<td class="labelcell">Timeout:</td><td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) echo $timeout; ?>" /></td>
+<td class="labelcell">Timeout:</td><td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) {
+    echo $timeout;
+}
+?>" /></td>
 <td class="labelcell">Protocol:</td><td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();">
-<option value="0"<?php if ($protocol == 0) echo ' selected="selected"'; ?>>HTTP 1.0</option>
-<option value="1"<?php if ($protocol == 1) echo ' selected="selected"'; ?>>HTTP 1.1</option>
-<option value="2"<?php if ($protocol == 2) echo ' selected="selected"'; ?>>HTTPS</option>
+<option value="0"<?php if ($protocol == 0) {
+    echo ' selected="selected"';
+}
+?>>HTTP 1.0</option>
+<option value="1"<?php if ($protocol == 1) {
+    echo ' selected="selected"';
+}
+?>>HTTP 1.1</option>
+<option value="2"<?php if ($protocol == 2) {
+    echo ' selected="selected"';
+}
+?>>HTTPS</option>
 </select></td>
 </tr>
 <tr>
@@ -272,20 +309,41 @@ 
 <td class="labelcell">Username:</td><td><input type="text" name="username" value="<?php echo htmlspecialchars($username, ENT_COMPAT, $inputcharset); ?>" /></td>
 <td class="labelcell">Pwd:</td><td><input type="password" name="password" value="<?php echo htmlspecialchars($password, ENT_COMPAT, $inputcharset); ?>" /></td>
 <td class="labelcell">Type</td><td><select name="authtype">
-<option value="1"<?php if ($authtype == 1) echo ' selected="selected"'; ?>>Basic</option>
-<option value="2"<?php if ($authtype == 2) echo ' selected="selected"'; ?>>Digest</option>
-<option value="8"<?php if ($authtype == 8) echo ' selected="selected"'; ?>>NTLM</option>
+<option value="1"<?php if ($authtype == 1) {
+    echo ' selected="selected"';
+}
+?>>Basic</option>
+<option value="2"<?php if ($authtype == 2) {
+    echo ' selected="selected"';
+}
+?>>Digest</option>
+<option value="8"<?php if ($authtype == 8) {
+    echo ' selected="selected"';
+}
+?>>NTLM</option>
 </select></td>
 <td></td>
 </tr>
 <tr>
 <td class="labelcell">SSL:</td>
 <td class="labelcell">Verify Host's CN:</td><td><select name="verifyhost">
-<option value="0"<?php if ($verifyhost == 0) echo ' selected="selected"'; ?>>No</option>
-<option value="1"<?php if ($verifyhost == 1) echo ' selected="selected"'; ?>>Check CN existance</option>
-<option value="2"<?php if ($verifyhost == 2) echo ' selected="selected"'; ?>>Check CN match</option>
+<option value="0"<?php if ($verifyhost == 0) {
+    echo ' selected="selected"';
+}
+?>>No</option>
+<option value="1"<?php if ($verifyhost == 1) {
+    echo ' selected="selected"';
+}
+?>>Check CN existance</option>
+<option value="2"<?php if ($verifyhost == 2) {
+    echo ' selected="selected"';
+}
+?>>Check CN match</option>
 </select></td>
-<td class="labelcell">Verify Cert:</td><td><input type="checkbox" value="1" name="verifypeer" onclick="swicthcainfo();"<?php if ($verifypeer) echo ' checked="checked"'; ?> /></td>
+<td class="labelcell">Verify Cert:</td><td><input type="checkbox" value="1" name="verifypeer" onclick="swicthcainfo();"<?php if ($verifypeer) {
+    echo ' checked="checked"';
+}
+?> /></td>
 <td class="labelcell">CA Cert file:</td><td><input type="text" name="cainfo" value="<?php echo htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset); ?>" /></td>
 </tr>
 <tr>
@@ -297,15 +355,36 @@ 
 <tr>
 <td class="labelcell">COMPRESSION:</td>
 <td class="labelcell">Request:</td><td><select name="requestcompression">
-<option value="0"<?php if ($requestcompression == 0) echo ' selected="selected"'; ?>>None</option>
-<option value="1"<?php if ($requestcompression == 1) echo ' selected="selected"'; ?>>Gzip</option>
-<option value="2"<?php if ($requestcompression == 2) echo ' selected="selected"'; ?>>Deflate</option>
+<option value="0"<?php if ($requestcompression == 0) {
+    echo ' selected="selected"';
+}
+?>>None</option>
+<option value="1"<?php if ($requestcompression == 1) {
+    echo ' selected="selected"';
+}
+?>>Gzip</option>
+<option value="2"<?php if ($requestcompression == 2) {
+    echo ' selected="selected"';
+}
+?>>Deflate</option>
 </select></td>
 <td class="labelcell">Response:</td><td><select name="responsecompression">
-<option value="0"<?php if ($responsecompression == 0) echo ' selected="selected"'; ?>>None</option>
-<option value="1"<?php if ($responsecompression == 1) echo ' selected="selected"'; ?>>Gzip</option>
-<option value="2"<?php if ($responsecompression == 2) echo ' selected="selected"'; ?>>Deflate</option>
-<option value="3"<?php if ($responsecompression == 3) echo ' selected="selected"'; ?>>Any</option>
+<option value="0"<?php if ($responsecompression == 0) {
+    echo ' selected="selected"';
+}
+?>>None</option>
+<option value="1"<?php if ($responsecompression == 1) {
+    echo ' selected="selected"';
+}
+?>>Gzip</option>
+<option value="2"<?php if ($responsecompression == 2) {
+    echo ' selected="selected"';
+}
+?>>Deflate</option>
+<option value="3"<?php if ($responsecompression == 3) {
+    echo ' selected="selected"';
+}
+?>>Any</option>
 </select></td>
 <td></td>
 </tr>

demo/server/proxy.php

Indentation +69 added lines, -69 removed lines

@@ -9,77 +9,77 @@
  * @license code licensed under the BSD License: http://phpxmlrpc.sourceforge.net/license.txt
  */
 
-	include("xmlrpc.inc");
-	include("xmlrpcs.inc");
+    include("xmlrpc.inc");
+    include("xmlrpcs.inc");
 
-	/**
-	* Forward an xmlrpc request to another server, and return to client the response received.
-	* @param xmlrpcmsg $m (see method docs below for a description of the expected parameters)
-	* @return xmlrpcresp
-	*/
-	function forward_request($m)
-	{
-		// create client
-		$timeout = 0;
-		$url = php_xmlrpc_decode($m->getParam(0));
-		$c = new xmlrpc_client($url);
-		if ($m->getNumParams() > 3)
-		{
-			// we have to set some options onto the client.
-			// Note that if we do not untaint the received values, warnings might be generated...
-			$options = php_xmlrpc_decode($m->getParam(3));
-			foreach($options as $key => $val)
-			{
-				switch($key)
-				{
-					case 'Cookie':
-						break;
-					case 'Credentials':
-						break;
-					case 'RequestCompression':
-						$c->setRequestCompression($val);
-						break;
-					case 'SSLVerifyHost':
-						$c->setSSLVerifyHost($val);
-						break;
-					case 'SSLVerifyPeer':
-						$c->setSSLVerifyPeer($val);
-						break;
-					case 'Timeout':
-						$timeout = (integer) $val;
-						break;
-				} // switch
-			}
-		}
+    /**
+     * Forward an xmlrpc request to another server, and return to client the response received.
+     * @param xmlrpcmsg $m (see method docs below for a description of the expected parameters)
+     * @return xmlrpcresp
+     */
+    function forward_request($m)
+    {
+        // create client
+        $timeout = 0;
+        $url = php_xmlrpc_decode($m->getParam(0));
+        $c = new xmlrpc_client($url);
+        if ($m->getNumParams() > 3)
+        {
+            // we have to set some options onto the client.
+            // Note that if we do not untaint the received values, warnings might be generated...
+            $options = php_xmlrpc_decode($m->getParam(3));
+            foreach($options as $key => $val)
+            {
+                switch($key)
+                {
+                    case 'Cookie':
+                        break;
+                    case 'Credentials':
+                        break;
+                    case 'RequestCompression':
+                        $c->setRequestCompression($val);
+                        break;
+                    case 'SSLVerifyHost':
+                        $c->setSSLVerifyHost($val);
+                        break;
+                    case 'SSLVerifyPeer':
+                        $c->setSSLVerifyPeer($val);
+                        break;
+                    case 'Timeout':
+                        $timeout = (integer) $val;
+                        break;
+                } // switch
+            }
+        }
 
-		// build call for remote server
-		/// @todo find a weay to forward client info (such as IP) to server, either
-		/// - as xml comments in the payload, or
-		/// - using std http header conventions, such as X-forwarded-for...
-		$method = php_xmlrpc_decode($m->getParam(1));
-		$pars = $m->getParam(2);
-		$m = new xmlrpcmsg($method);
-		for ($i = 0; $i < $pars->arraySize(); $i++)
-		{
-			$m->addParam($pars->arraymem($i));
-		}
+        // build call for remote server
+        /// @todo find a weay to forward client info (such as IP) to server, either
+        /// - as xml comments in the payload, or
+        /// - using std http header conventions, such as X-forwarded-for...
+        $method = php_xmlrpc_decode($m->getParam(1));
+        $pars = $m->getParam(2);
+        $m = new xmlrpcmsg($method);
+        for ($i = 0; $i < $pars->arraySize(); $i++)
+        {
+            $m->addParam($pars->arraymem($i));
+        }
 
-		// add debug info into response we give back to caller
-		xmlrpc_debugmsg("Sending to server $url the payload: ".$m->serialize());
-		return $c->send($m, $timeout);
-	}
+        // add debug info into response we give back to caller
+        xmlrpc_debugmsg("Sending to server $url the payload: ".$m->serialize());
+        return $c->send($m, $timeout);
+    }
 
-	// run the server
-	$server = new xmlrpc_server(
-		array(
-			'xmlrpcproxy.call' => array(
-				'function' => 'forward_request',
-				'signature' => array(
-					array('mixed', 'string', 'string', 'array'),
-					array('mixed', 'string', 'string', 'array', 'stuct'),
-				),
-				'docstring' => 'forwards xmlrpc calls to remote servers. Returns remote method\'s response. Accepts params: remote server url (might include basic auth credentials), method name, array of params, and (optionally) a struct containing call options'
-			)
-		)
-	);
+    // run the server
+    $server = new xmlrpc_server(
+        array(
+            'xmlrpcproxy.call' => array(
+                'function' => 'forward_request',
+                'signature' => array(
+                    array('mixed', 'string', 'string', 'array'),
+                    array('mixed', 'string', 'string', 'array', 'stuct'),
+                ),
+                'docstring' => 'forwards xmlrpc calls to remote servers. Returns remote method\'s response. Accepts params: remote server url (might include basic auth credentials), method name, array of params, and (optionally) a struct containing call options'
+            )
+        )
+    );
 ?>

Spacing +4 added lines, -4 removed lines

@@ -23,14 +23,14 @@ 
 		$timeout = 0;
 		$url = php_xmlrpc_decode($m->getParam(0));
 		$c = new xmlrpc_client($url);
-		if ($m->getNumParams() > 3)
+		if ($m->getNumParams()>3)
 		{
 			// we have to set some options onto the client.
 			// Note that if we do not untaint the received values, warnings might be generated...
 			$options = php_xmlrpc_decode($m->getParam(3));
-			foreach($options as $key => $val)
+			foreach ($options as $key => $val)
 			{
-				switch($key)
+				switch ($key)
 				{
 					case 'Cookie':
 						break;
@@ -59,7 +59,7 @@ 
 		$method = php_xmlrpc_decode($m->getParam(1));
 		$pars = $m->getParam(2);
 		$m = new xmlrpcmsg($method);
-		for ($i = 0; $i < $pars->arraySize(); $i++)
+		for ($i = 0; $i<$pars->arraySize(); $i++)
 		{
 			$m->addParam($pars->arraymem($i));
 		}

demo/server/discuss.php

Indentation +108 added lines, -108 removed lines

@@ -1,124 +1,124 @@
 <?php
 
-	include("xmlrpc.inc");
-	include("xmlrpcs.inc");
+    include("xmlrpc.inc");
+    include("xmlrpcs.inc");
 
-	$addcomment_sig=array(array($xmlrpcInt, $xmlrpcString, $xmlrpcString, $xmlrpcString));
+    $addcomment_sig=array(array($xmlrpcInt, $xmlrpcString, $xmlrpcString, $xmlrpcString));
 
-	$addcomment_doc='Adds a comment to an item. The first parameter
+    $addcomment_doc='Adds a comment to an item. The first parameter
 is the item ID, the second the name of the commenter, and the third
 is the comment itself. Returns the number of comments against that
 ID.';
 
-	function addcomment($m)
-	{
-		global $xmlrpcerruser;
-		$err="";
-		// since validation has already been carried out for us,
-		// we know we got exactly 3 string values
-		$n = php_xmlrpc_decode($m);
-		$msgID = $n[0];
-		$name  = $n[1];
-		$comment = $n[2];
+    function addcomment($m)
+    {
+        global $xmlrpcerruser;
+        $err="";
+        // since validation has already been carried out for us,
+        // we know we got exactly 3 string values
+        $n = php_xmlrpc_decode($m);
+        $msgID = $n[0];
+        $name  = $n[1];
+        $comment = $n[2];
 
-		$dbh=dba_open("/tmp/comments.db", "c", "db2");
-		if($dbh)
-		{
-			$countID="${msgID}_count";
-			if(dba_exists($countID, $dbh))
-			{
-				$count=dba_fetch($countID, $dbh);
-			}
-			else
-			{
-				$count=0;
-			}
-			// add the new comment in
-			dba_insert($msgID . "_comment_${count}", $comment, $dbh);
-			dba_insert($msgID . "_name_${count}", $name, $dbh);
-			$count++;
-			dba_replace($countID, $count, $dbh);
-			dba_close($dbh);
-		}
-		else
-		{
-			$err="Unable to open comments database.";
-		}
-		// if we generated an error, create an error return response
-		if($err)
-		{
-			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
-		{
-			// otherwise, we create the right response
-			// with the state name
-			return new xmlrpcresp(new xmlrpcval($count, "int"));
-		}
-	}
+        $dbh=dba_open("/tmp/comments.db", "c", "db2");
+        if($dbh)
+        {
+            $countID="${msgID}_count";
+            if(dba_exists($countID, $dbh))
+            {
+                $count=dba_fetch($countID, $dbh);
+            }
+            else
+            {
+                $count=0;
+            }
+            // add the new comment in
+            dba_insert($msgID . "_comment_${count}", $comment, $dbh);
+            dba_insert($msgID . "_name_${count}", $name, $dbh);
+            $count++;
+            dba_replace($countID, $count, $dbh);
+            dba_close($dbh);
+        }
+        else
+        {
+            $err="Unable to open comments database.";
+        }
+        // if we generated an error, create an error return response
+        if($err)
+        {
+            return new xmlrpcresp(0, $xmlrpcerruser, $err);
+        }
+        else
+        {
+            // otherwise, we create the right response
+            // with the state name
+            return new xmlrpcresp(new xmlrpcval($count, "int"));
+        }
+    }
 
-	$getcomments_sig=array(array($xmlrpcArray, $xmlrpcString));
+    $getcomments_sig=array(array($xmlrpcArray, $xmlrpcString));
 
-	$getcomments_doc='Returns an array of comments for a given ID, which
+    $getcomments_doc='Returns an array of comments for a given ID, which
 is the sole argument. Each array item is a struct containing name
 and comment text.';
 
-	function getcomments($m)
-	{
-		global $xmlrpcerruser;
-		$err="";
-		$ra=array();
-		// get the first param
-		if(XMLRPC_EPI_ENABLED == '1')
-		{
-			$msgID=xmlrpc_decode($m->getParam(0));
-		}
-		else
-		{
-			$msgID=php_xmlrpc_decode($m->getParam(0));
-		}
-		$dbh=dba_open("/tmp/comments.db", "r", "db2");
-		if($dbh)
-		{
-			$countID="${msgID}_count";
-			if(dba_exists($countID, $dbh))
-			{
-				$count=dba_fetch($countID, $dbh);
-				for($i=0; $i<$count; $i++)
-				{
-					$name=dba_fetch("${msgID}_name_${i}", $dbh);
-					$comment=dba_fetch("${msgID}_comment_${i}", $dbh);
-					// push a new struct onto the return array
-					$ra[] = array(
-						"name" => $name,
-						"comment" => $comment
-						);
-				}
-			}
-		}
-		// if we generated an error, create an error return response
-		if($err)
-		{
-			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
-		{
-			// otherwise, we create the right response
-			// with the state name
-			return new xmlrpcresp(php_xmlrpc_encode($ra));
-		}
-	}
+    function getcomments($m)
+    {
+        global $xmlrpcerruser;
+        $err="";
+        $ra=array();
+        // get the first param
+        if(XMLRPC_EPI_ENABLED == '1')
+        {
+            $msgID=xmlrpc_decode($m->getParam(0));
+        }
+        else
+        {
+            $msgID=php_xmlrpc_decode($m->getParam(0));
+        }
+        $dbh=dba_open("/tmp/comments.db", "r", "db2");
+        if($dbh)
+        {
+            $countID="${msgID}_count";
+            if(dba_exists($countID, $dbh))
+            {
+                $count=dba_fetch($countID, $dbh);
+                for($i=0; $i<$count; $i++)
+                {
+                    $name=dba_fetch("${msgID}_name_${i}", $dbh);
+                    $comment=dba_fetch("${msgID}_comment_${i}", $dbh);
+                    // push a new struct onto the return array
+                    $ra[] = array(
+                        "name" => $name,
+                        "comment" => $comment
+                        );
+                }
+            }
+        }
+        // if we generated an error, create an error return response
+        if($err)
+        {
+            return new xmlrpcresp(0, $xmlrpcerruser, $err);
+        }
+        else
+        {
+            // otherwise, we create the right response
+            // with the state name
+            return new xmlrpcresp(php_xmlrpc_encode($ra));
+        }
+    }
 
-	$s = new xmlrpc_server(array(
-		"discuss.addComment" => array(
-			"function" => "addcomment",
-			"signature" => $addcomment_sig,
-			"docstring" => $addcomment_doc
-		),
-		"discuss.getComments" => array(
-			"function" => "getcomments",
-			"signature" => $getcomments_sig,
-			"docstring" => $getcomments_doc
-		)
-	));
+    $s = new xmlrpc_server(array(
+        "discuss.addComment" => array(
+            "function" => "addcomment",
+            "signature" => $addcomment_sig,
+            "docstring" => $addcomment_doc
+        ),
+        "discuss.getComments" => array(
+            "function" => "getcomments",
+            "signature" => $getcomments_sig,
+            "docstring" => $getcomments_doc
+        )
+    ));
 ?>

Spacing +29 added lines, -29 removed lines

@@ -3,9 +3,9 @@ 
 	include("xmlrpc.inc");
 	include("xmlrpcs.inc");
 
-	$addcomment_sig=array(array($xmlrpcInt, $xmlrpcString, $xmlrpcString, $xmlrpcString));
+	$addcomment_sig = array(array($xmlrpcInt, $xmlrpcString, $xmlrpcString, $xmlrpcString));
 
-	$addcomment_doc='Adds a comment to an item. The first parameter
+	$addcomment_doc = 'Adds a comment to an item. The first parameter
 is the item ID, the second the name of the commenter, and the third
 is the comment itself. Returns the number of comments against that
 ID.';
@@ -13,7 +13,7 @@ 
 	function addcomment($m)
 	{
 		global $xmlrpcerruser;
-		$err="";
+		$err = "";
 		// since validation has already been carried out for us,
 		// we know we got exactly 3 string values
 		$n = php_xmlrpc_decode($m);
@@ -21,31 +21,31 @@ 
 		$name  = $n[1];
 		$comment = $n[2];
 
-		$dbh=dba_open("/tmp/comments.db", "c", "db2");
-		if($dbh)
+		$dbh = dba_open("/tmp/comments.db", "c", "db2");
+		if ($dbh)
 		{
-			$countID="${msgID}_count";
-			if(dba_exists($countID, $dbh))
+			$countID = "${msgID}_count";
+			if (dba_exists($countID, $dbh))
 			{
-				$count=dba_fetch($countID, $dbh);
+				$count = dba_fetch($countID, $dbh);
 			}
 			else
 			{
-				$count=0;
+				$count = 0;
 			}
 			// add the new comment in
-			dba_insert($msgID . "_comment_${count}", $comment, $dbh);
-			dba_insert($msgID . "_name_${count}", $name, $dbh);
+			dba_insert($msgID."_comment_${count}", $comment, $dbh);
+			dba_insert($msgID."_name_${count}", $name, $dbh);
 			$count++;
 			dba_replace($countID, $count, $dbh);
 			dba_close($dbh);
 		}
 		else
 		{
-			$err="Unable to open comments database.";
+			$err = "Unable to open comments database.";
 		}
 		// if we generated an error, create an error return response
-		if($err)
+		if ($err)
 		{
 			return new xmlrpcresp(0, $xmlrpcerruser, $err);
 		}
@@ -57,37 +57,37 @@ 
 		}
 	}
 
-	$getcomments_sig=array(array($xmlrpcArray, $xmlrpcString));
+	$getcomments_sig = array(array($xmlrpcArray, $xmlrpcString));
 
-	$getcomments_doc='Returns an array of comments for a given ID, which
+	$getcomments_doc = 'Returns an array of comments for a given ID, which
 is the sole argument. Each array item is a struct containing name
 and comment text.';
 
 	function getcomments($m)
 	{
 		global $xmlrpcerruser;
-		$err="";
-		$ra=array();
+		$err = "";
+		$ra = array();
 		// get the first param
-		if(XMLRPC_EPI_ENABLED == '1')
+		if (XMLRPC_EPI_ENABLED == '1')
 		{
-			$msgID=xmlrpc_decode($m->getParam(0));
+			$msgID = xmlrpc_decode($m->getParam(0));
 		}
 		else
 		{
-			$msgID=php_xmlrpc_decode($m->getParam(0));
+			$msgID = php_xmlrpc_decode($m->getParam(0));
 		}
-		$dbh=dba_open("/tmp/comments.db", "r", "db2");
-		if($dbh)
+		$dbh = dba_open("/tmp/comments.db", "r", "db2");
+		if ($dbh)
 		{
-			$countID="${msgID}_count";
-			if(dba_exists($countID, $dbh))
+			$countID = "${msgID}_count";
+			if (dba_exists($countID, $dbh))
 			{
-				$count=dba_fetch($countID, $dbh);
-				for($i=0; $i<$count; $i++)
+				$count = dba_fetch($countID, $dbh);
+				for ($i = 0; $i<$count; $i++)
 				{
-					$name=dba_fetch("${msgID}_name_${i}", $dbh);
-					$comment=dba_fetch("${msgID}_comment_${i}", $dbh);
+					$name = dba_fetch("${msgID}_name_${i}", $dbh);
+					$comment = dba_fetch("${msgID}_comment_${i}", $dbh);
 					// push a new struct onto the return array
 					$ra[] = array(
 						"name" => $name,
@@ -97,7 +97,7 @@ 
 			}
 		}
 		// if we generated an error, create an error return response
-		if($err)
+		if ($err)
 		{
 			return new xmlrpcresp(0, $xmlrpcerruser, $err);
 		}

Braces +4 added lines, -8 removed lines

@@ -28,8 +28,7 @@ 
 			if(dba_exists($countID, $dbh))
 			{
 				$count=dba_fetch($countID, $dbh);
-			}
-			else
+			} else
 			{
 				$count=0;
 			}
@@ -48,8 +47,7 @@ 
 		if($err)
 		{
 			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
+		} else
 		{
 			// otherwise, we create the right response
 			// with the state name
@@ -72,8 +70,7 @@ 
 		if(XMLRPC_EPI_ENABLED == '1')
 		{
 			$msgID=xmlrpc_decode($m->getParam(0));
-		}
-		else
+		} else
 		{
 			$msgID=php_xmlrpc_decode($m->getParam(0));
 		}
@@ -100,8 +97,7 @@ 
 		if($err)
 		{
 			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
+		} else
 		{
 			// otherwise, we create the right response
 			// with the state name

demo/server/server.php

Indentation +811 added lines, -811 removed lines

@@ -13,240 +13,240 @@ 
 // give user a chance to see the source for this server instead of running the services
 if ($_SERVER['REQUEST_METHOD'] != 'POST' && isset($_GET['showSource']))
 {
-	highlight_file(__FILE__);
-	die();
+    highlight_file(__FILE__);
+    die();
 }
 
-	include("xmlrpc.inc");
-	include("xmlrpcs.inc");
-	include("xmlrpc_wrappers.inc");
-
-	/**
-	* Used to test usage of object methods in dispatch maps and in wrapper code
-	*/
-	class xmlrpc_server_methods_container
-	{
-		/**
-		* Method used to test logging of php warnings generated by user functions.
-		*/
-		function phpwarninggenerator($m)
-		{
-			$a = $b; // this triggers a warning in E_ALL mode, since $b is undefined
-			return new xmlrpcresp(new xmlrpcval(1, 'boolean'));
-		}
-
-	    /**
-	     * Method used to testcatching of exceptions in the server.
-	     */
-	    function exceptiongenerator($m)
-	    {
-	        throw new Exception("it's just a test", 1);
-	    }
-
-		/**
-		* a PHP version of the state-number server. Send me an integer and i'll sell you a state
-		* @param integer $s
-		* @return string
-		*/
-		static function findstate($s)
-		{
-			return inner_findstate($s);
-		}
-	}
-
-
-	// a PHP version
-	// of the state-number server
-	// send me an integer and i'll sell you a state
-
-	$stateNames = array(
-		"Alabama", "Alaska", "Arizona", "Arkansas", "California",
-		"Colorado", "Columbia", "Connecticut", "Delaware", "Florida",
-		"Georgia", "Hawaii", "Idaho", "Illinois", "Indiana", "Iowa", "Kansas",
-		"Kentucky", "Louisiana", "Maine", "Maryland", "Massachusetts", "Michigan",
-		"Minnesota", "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada",
-		"New Hampshire", "New Jersey", "New Mexico", "New York", "North Carolina",
-		"North Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania", "Rhode Island",
-		"South Carolina", "South Dakota", "Tennessee", "Texas", "Utah", "Vermont",
-		"Virginia", "Washington", "West Virginia", "Wisconsin", "Wyoming"
-	);
-
-	$findstate_sig=array(array($xmlrpcString, $xmlrpcInt));
-	$findstate_doc='When passed an integer between 1 and 51 returns the
+    include("xmlrpc.inc");
+    include("xmlrpcs.inc");
+    include("xmlrpc_wrappers.inc");
+
+    /**
+     * Used to test usage of object methods in dispatch maps and in wrapper code
+     */
+    class xmlrpc_server_methods_container
+    {
+        /**
+         * Method used to test logging of php warnings generated by user functions.
+         */
+        function phpwarninggenerator($m)
+        {
+            $a = $b; // this triggers a warning in E_ALL mode, since $b is undefined
+            return new xmlrpcresp(new xmlrpcval(1, 'boolean'));
+        }
+
+        /**
+         * Method used to testcatching of exceptions in the server.
+         */
+        function exceptiongenerator($m)
+        {
+            throw new Exception("it's just a test", 1);
+        }
+
+        /**
+         * a PHP version of the state-number server. Send me an integer and i'll sell you a state
+         * @param integer $s
+         * @return string
+         */
+        static function findstate($s)
+        {
+            return inner_findstate($s);
+        }
+    }
+
+
+    // a PHP version
+    // of the state-number server
+    // send me an integer and i'll sell you a state
+
+    $stateNames = array(
+        "Alabama", "Alaska", "Arizona", "Arkansas", "California",
+        "Colorado", "Columbia", "Connecticut", "Delaware", "Florida",
+        "Georgia", "Hawaii", "Idaho", "Illinois", "Indiana", "Iowa", "Kansas",
+        "Kentucky", "Louisiana", "Maine", "Maryland", "Massachusetts", "Michigan",
+        "Minnesota", "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada",
+        "New Hampshire", "New Jersey", "New Mexico", "New York", "North Carolina",
+        "North Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania", "Rhode Island",
+        "South Carolina", "South Dakota", "Tennessee", "Texas", "Utah", "Vermont",
+        "Virginia", "Washington", "West Virginia", "Wisconsin", "Wyoming"
+    );
+
+    $findstate_sig=array(array($xmlrpcString, $xmlrpcInt));
+    $findstate_doc='When passed an integer between 1 and 51 returns the
 name of a US state, where the integer is the index of that state name
 in an alphabetic order.';
 
 
-	function findstate($m)
-	{
-		global $xmlrpcerruser, $stateNames;
-		$err="";
-		// get the first param
-		$sno=$m->getParam(0);
-
-		// param must be there and of the correct type: server object does the
-		// validation for us
-
-		// extract the value of the state number
-		$snv=$sno->scalarval();
-		// look it up in our array (zero-based)
-		if (isset($stateNames[$snv-1]))
-		{
-			$sname=$stateNames[$snv-1];
-		}
-		else
-		{
-			// not, there so complain
-			$err="I don't have a state for the index '" . $snv . "'";
-		}
-
-		// if we generated an error, create an error return response
-		if ($err)
-		{
-			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
-		{
-			// otherwise, we create the right response
-			// with the state name
-			return new xmlrpcresp(new xmlrpcval($sname));
-		}
-	}
-
-	/**
-	* Inner code of the state-number server.
-	* Used to test auto-registration of PHP funcions as xmlrpc methods.
-	* @param integer $stateno the state number
-	* @return string the name of the state (or error descrption)
-	*/
-	function inner_findstate($stateno)
-	{
-		global $stateNames;
-		if (isset($stateNames[$stateno-1]))
-		{
-			return $stateNames[$stateno-1];
-		}
-		else
-		{
-			// not, there so complain
-			return "I don't have a state for the index '" . $stateno . "'";
-		}
-	}
-	$findstate2_sig = wrap_php_function('inner_findstate');
-
-	$findstate3_sig = wrap_php_function(array('xmlrpc_server_methods_container', 'findstate'));
-
-	$findstate5_sig = wrap_php_function('xmlrpc_server_methods_container::findstate');
-
-	$obj = new xmlrpc_server_methods_container();
-	$findstate4_sig = wrap_php_function(array($obj, 'findstate'));
-
-	$addtwo_sig=array(array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt));
-	$addtwo_doc='Add two integers together and return the result';
-	function addtwo($m)
-	{
-		$s=$m->getParam(0);
-		$t=$m->getParam(1);
-		return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(),"int"));
-	}
-
-	$addtwodouble_sig=array(array($xmlrpcDouble, $xmlrpcDouble, $xmlrpcDouble));
-	$addtwodouble_doc='Add two doubles together and return the result';
-	function addtwodouble($m)
-	{
-		$s=$m->getParam(0);
-		$t=$m->getParam(1);
-		return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(),"double"));
-	}
-
-	$stringecho_sig=array(array($xmlrpcString, $xmlrpcString));
-	$stringecho_doc='Accepts a string parameter, returns the string.';
-	function stringecho($m)
-	{
-		// just sends back a string
-		$s=$m->getParam(0);
-		$v = $s->scalarval();
-		return new xmlrpcresp(new xmlrpcval($s->scalarval()));
-	}
-
-	$echoback_sig=array(array($xmlrpcString, $xmlrpcString));
-	$echoback_doc='Accepts a string parameter, returns the entire incoming payload';
-	function echoback($m)
-	{
-		// just sends back a string with what i got
-		// sent to me, just escaped, that's all
-		//
-		// $m is an incoming message
-		$s="I got the following message:\n" . $m->serialize();
-		return new xmlrpcresp(new xmlrpcval($s));
-	}
-
-	$echosixtyfour_sig=array(array($xmlrpcString, $xmlrpcBase64));
-	$echosixtyfour_doc='Accepts a base64 parameter and returns it decoded as a string';
-	function echosixtyfour($m)
-	{
-		// accepts an encoded value, but sends it back
-		// as a normal string. this is to test base64 encoding
-		// is working as expected
-		$incoming=$m->getParam(0);
-		return new xmlrpcresp(new xmlrpcval($incoming->scalarval(), "string"));
-	}
-
-	$bitflipper_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$bitflipper_doc='Accepts an array of booleans, and returns them inverted';
-	function bitflipper($m)
-	{
-		global $xmlrpcArray;
-
-		$v=$m->getParam(0);
-		$sz=$v->arraysize();
-		$rv=new xmlrpcval(array(), $xmlrpcArray);
-
-		for($j=0; $j<$sz; $j++)
-		{
-			$b=$v->arraymem($j);
-			if ($b->scalarval())
-			{
-				$rv->addScalar(false, "boolean");
-			}
-			else
-			{
-				$rv->addScalar(true, "boolean");
-			}
-		}
-
-		return new xmlrpcresp($rv);
-	}
-
-	// Sorting demo
-	//
-	// send me an array of structs thus:
-	//
-	// Dave 35
-	// Edd  45
-	// Fred 23
-	// Barney 37
-	//
-	// and I'll return it to you in sorted order
-
-	function agesorter_compare($a, $b)
-	{
-		global $agesorter_arr;
-
-		// don't even ask me _why_ these come padded with
-		// hyphens, I couldn't tell you :p
-		$a=str_replace("-", "", $a);
-		$b=str_replace("-", "", $b);
-
-		if ($agesorter_arr[$a]==$agesorter[$b])
-		{
-			return 0;
-		}
-		return ($agesorter_arr[$a] > $agesorter_arr[$b]) ? -1 : 1;
-	}
-
-	$agesorter_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$agesorter_doc='Send this method an array of [string, int] structs, eg:
+    function findstate($m)
+    {
+        global $xmlrpcerruser, $stateNames;
+        $err="";
+        // get the first param
+        $sno=$m->getParam(0);
+
+        // param must be there and of the correct type: server object does the
+        // validation for us
+
+        // extract the value of the state number
+        $snv=$sno->scalarval();
+        // look it up in our array (zero-based)
+        if (isset($stateNames[$snv-1]))
+        {
+            $sname=$stateNames[$snv-1];
+        }
+        else
+        {
+            // not, there so complain
+            $err="I don't have a state for the index '" . $snv . "'";
+        }
+
+        // if we generated an error, create an error return response
+        if ($err)
+        {
+            return new xmlrpcresp(0, $xmlrpcerruser, $err);
+        }
+        else
+        {
+            // otherwise, we create the right response
+            // with the state name
+            return new xmlrpcresp(new xmlrpcval($sname));
+        }
+    }
+
+    /**
+     * Inner code of the state-number server.
+     * Used to test auto-registration of PHP funcions as xmlrpc methods.
+     * @param integer $stateno the state number
+     * @return string the name of the state (or error descrption)
+     */
+    function inner_findstate($stateno)
+    {
+        global $stateNames;
+        if (isset($stateNames[$stateno-1]))
+        {
+            return $stateNames[$stateno-1];
+        }
+        else
+        {
+            // not, there so complain
+            return "I don't have a state for the index '" . $stateno . "'";
+        }
+    }
+    $findstate2_sig = wrap_php_function('inner_findstate');
+
+    $findstate3_sig = wrap_php_function(array('xmlrpc_server_methods_container', 'findstate'));
+
+    $findstate5_sig = wrap_php_function('xmlrpc_server_methods_container::findstate');
+
+    $obj = new xmlrpc_server_methods_container();
+    $findstate4_sig = wrap_php_function(array($obj, 'findstate'));
+
+    $addtwo_sig=array(array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt));
+    $addtwo_doc='Add two integers together and return the result';
+    function addtwo($m)
+    {
+        $s=$m->getParam(0);
+        $t=$m->getParam(1);
+        return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(),"int"));
+    }
+
+    $addtwodouble_sig=array(array($xmlrpcDouble, $xmlrpcDouble, $xmlrpcDouble));
+    $addtwodouble_doc='Add two doubles together and return the result';
+    function addtwodouble($m)
+    {
+        $s=$m->getParam(0);
+        $t=$m->getParam(1);
+        return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(),"double"));
+    }
+
+    $stringecho_sig=array(array($xmlrpcString, $xmlrpcString));
+    $stringecho_doc='Accepts a string parameter, returns the string.';
+    function stringecho($m)
+    {
+        // just sends back a string
+        $s=$m->getParam(0);
+        $v = $s->scalarval();
+        return new xmlrpcresp(new xmlrpcval($s->scalarval()));
+    }
+
+    $echoback_sig=array(array($xmlrpcString, $xmlrpcString));
+    $echoback_doc='Accepts a string parameter, returns the entire incoming payload';
+    function echoback($m)
+    {
+        // just sends back a string with what i got
+        // sent to me, just escaped, that's all
+        //
+        // $m is an incoming message
+        $s="I got the following message:\n" . $m->serialize();
+        return new xmlrpcresp(new xmlrpcval($s));
+    }
+
+    $echosixtyfour_sig=array(array($xmlrpcString, $xmlrpcBase64));
+    $echosixtyfour_doc='Accepts a base64 parameter and returns it decoded as a string';
+    function echosixtyfour($m)
+    {
+        // accepts an encoded value, but sends it back
+        // as a normal string. this is to test base64 encoding
+        // is working as expected
+        $incoming=$m->getParam(0);
+        return new xmlrpcresp(new xmlrpcval($incoming->scalarval(), "string"));
+    }
+
+    $bitflipper_sig=array(array($xmlrpcArray, $xmlrpcArray));
+    $bitflipper_doc='Accepts an array of booleans, and returns them inverted';
+    function bitflipper($m)
+    {
+        global $xmlrpcArray;
+
+        $v=$m->getParam(0);
+        $sz=$v->arraysize();
+        $rv=new xmlrpcval(array(), $xmlrpcArray);
+
+        for($j=0; $j<$sz; $j++)
+        {
+            $b=$v->arraymem($j);
+            if ($b->scalarval())
+            {
+                $rv->addScalar(false, "boolean");
+            }
+            else
+            {
+                $rv->addScalar(true, "boolean");
+            }
+        }
+
+        return new xmlrpcresp($rv);
+    }
+
+    // Sorting demo
+    //
+    // send me an array of structs thus:
+    //
+    // Dave 35
+    // Edd  45
+    // Fred 23
+    // Barney 37
+    //
+    // and I'll return it to you in sorted order
+
+    function agesorter_compare($a, $b)
+    {
+        global $agesorter_arr;
+
+        // don't even ask me _why_ these come padded with
+        // hyphens, I couldn't tell you :p
+        $a=str_replace("-", "", $a);
+        $b=str_replace("-", "", $b);
+
+        if ($agesorter_arr[$a]==$agesorter[$b])
+        {
+            return 0;
+        }
+        return ($agesorter_arr[$a] > $agesorter_arr[$b]) ? -1 : 1;
+    }
+
+    $agesorter_sig=array(array($xmlrpcArray, $xmlrpcArray));
+    $agesorter_doc='Send this method an array of [string, int] structs, eg:
 <pre>
  Dave   35
  Edd	45
@@ -255,80 +255,80 @@ 
 </pre>
 And the array will be returned with the entries sorted by their numbers.
 ';
-	function agesorter($m)
-	{
-		global $agesorter_arr, $xmlrpcerruser, $s;
-
-		xmlrpc_debugmsg("Entering 'agesorter'");
-		// get the parameter
-		$sno=$m->getParam(0);
-		// error string for [if|when] things go wrong
-		$err="";
-		// create the output value
-		$v=new xmlrpcval();
-		$agar=array();
-
-		if (isset($sno) && $sno->kindOf()=="array")
-		{
-			$max=$sno->arraysize();
-			// TODO: create debug method to print can work once more
-			// print "<!-- found $max array elements -->\n";
-			for($i=0; $i<$max; $i++)
-			{
-				$rec=$sno->arraymem($i);
-				if ($rec->kindOf()!="struct")
-				{
-					$err="Found non-struct in array at element $i";
-					break;
-				}
-				// extract name and age from struct
-				$n=$rec->structmem("name");
-				$a=$rec->structmem("age");
-				// $n and $a are xmlrpcvals,
-				// so get the scalarval from them
-				$agar[$n->scalarval()]=$a->scalarval();
-			}
-
-			$agesorter_arr=$agar;
-			// hack, must make global as uksort() won't
-			// allow us to pass any other auxilliary information
-			uksort($agesorter_arr, agesorter_compare);
-			$outAr=array();
-			while (list( $key, $val ) = each( $agesorter_arr ) )
-			{
-				// recreate each struct element
-				$outAr[]=new xmlrpcval(array("name" =>
-				new xmlrpcval($key),
-				"age" =>
-				new xmlrpcval($val, "int")), "struct");
-			}
-			// add this array to the output value
-			$v->addArray($outAr);
-		}
-		else
-		{
-			$err="Must be one parameter, an array of structs";
-		}
-
-		if ($err)
-		{
-			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
-		{
-			return new xmlrpcresp($v);
-		}
-	}
-
-	// signature and instructions, place these in the dispatch
-	// map
-	$mail_send_sig=array(array(
-		$xmlrpcBoolean, $xmlrpcString, $xmlrpcString,
-		$xmlrpcString, $xmlrpcString, $xmlrpcString,
-		$xmlrpcString, $xmlrpcString
-	));
-
-	$mail_send_doc='mail.send(recipient, subject, text, sender, cc, bcc, mimetype)<br/>
+    function agesorter($m)
+    {
+        global $agesorter_arr, $xmlrpcerruser, $s;
+
+        xmlrpc_debugmsg("Entering 'agesorter'");
+        // get the parameter
+        $sno=$m->getParam(0);
+        // error string for [if|when] things go wrong
+        $err="";
+        // create the output value
+        $v=new xmlrpcval();
+        $agar=array();
+
+        if (isset($sno) && $sno->kindOf()=="array")
+        {
+            $max=$sno->arraysize();
+            // TODO: create debug method to print can work once more
+            // print "<!-- found $max array elements -->\n";
+            for($i=0; $i<$max; $i++)
+            {
+                $rec=$sno->arraymem($i);
+                if ($rec->kindOf()!="struct")
+                {
+                    $err="Found non-struct in array at element $i";
+                    break;
+                }
+                // extract name and age from struct
+                $n=$rec->structmem("name");
+                $a=$rec->structmem("age");
+                // $n and $a are xmlrpcvals,
+                // so get the scalarval from them
+                $agar[$n->scalarval()]=$a->scalarval();
+            }
+
+            $agesorter_arr=$agar;
+            // hack, must make global as uksort() won't
+            // allow us to pass any other auxilliary information
+            uksort($agesorter_arr, agesorter_compare);
+            $outAr=array();
+            while (list( $key, $val ) = each( $agesorter_arr ) )
+            {
+                // recreate each struct element
+                $outAr[]=new xmlrpcval(array("name" =>
+                new xmlrpcval($key),
+                "age" =>
+                new xmlrpcval($val, "int")), "struct");
+            }
+            // add this array to the output value
+            $v->addArray($outAr);
+        }
+        else
+        {
+            $err="Must be one parameter, an array of structs";
+        }
+
+        if ($err)
+        {
+            return new xmlrpcresp(0, $xmlrpcerruser, $err);
+        }
+        else
+        {
+            return new xmlrpcresp($v);
+        }
+    }
+
+    // signature and instructions, place these in the dispatch
+    // map
+    $mail_send_sig=array(array(
+        $xmlrpcBoolean, $xmlrpcString, $xmlrpcString,
+        $xmlrpcString, $xmlrpcString, $xmlrpcString,
+        $xmlrpcString, $xmlrpcString
+    ));
+
+    $mail_send_doc='mail.send(recipient, subject, text, sender, cc, bcc, mimetype)<br/>
 recipient, cc, and bcc are strings, comma-separated lists of email addresses, as described above.<br/>
 subject is a string, the subject of the message.<br/>
 sender is a string, it\'s the email address of the person sending the message. This string can not be
@@ -336,517 +336,517 @@ 
 text is a string, it contains the body of the message.<br/>
 mimetype, a string, is a standard MIME type, for example, text/plain.
 ';
-	// WARNING; this functionality depends on the sendmail -t option
-	// it may not work with Windows machines properly; particularly
-	// the Bcc option. Sneak on your friends at your own risk!
-	function mail_send($m)
-	{
-		global $xmlrpcerruser, $xmlrpcBoolean;
-		$err="";
-
-		$mTo=$m->getParam(0);
-		$mSub=$m->getParam(1);
-		$mBody=$m->getParam(2);
-		$mFrom=$m->getParam(3);
-		$mCc=$m->getParam(4);
-		$mBcc=$m->getParam(5);
-		$mMime=$m->getParam(6);
-
-		if ($mTo->scalarval()=="")
-		{
-			$err="Error, no 'To' field specified";
-		}
-
-		if ($mFrom->scalarval()=="")
-		{
-			$err="Error, no 'From' field specified";
-		}
-
-		$msghdr="From: " . $mFrom->scalarval() . "\n";
-		$msghdr.="To: ". $mTo->scalarval() . "\n";
-
-		if ($mCc->scalarval()!="")
-		{
-			$msghdr.="Cc: " . $mCc->scalarval(). "\n";
-		}
-		if ($mBcc->scalarval()!="")
-		{
-			$msghdr.="Bcc: " . $mBcc->scalarval(). "\n";
-		}
-		if ($mMime->scalarval()!="")
-		{
-			$msghdr.="Content-type: " . $mMime->scalarval() . "\n";
-		}
-		$msghdr.="X-Mailer: XML-RPC for PHP mailer 1.0";
-
-		if ($err=="")
-		{
-			if (!mail("",
-				$mSub->scalarval(),
-				$mBody->scalarval(),
-				$msghdr))
-			{
-				$err="Error, could not send the mail.";
-			}
-		}
-
-		if ($err)
-		{
-			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
-		{
-			return new xmlrpcresp(new xmlrpcval("true", $xmlrpcBoolean));
-		}
-	}
-
-	$getallheaders_sig=array(array($xmlrpcStruct));
-	$getallheaders_doc='Returns a struct containing all the HTTP headers received with the request. Provides limited functionality with IIS';
-	function getallheaders_xmlrpc($m)
-	{
-		global $xmlrpcerruser;
-		if (function_exists('getallheaders'))
-		{
-			return new xmlrpcresp(php_xmlrpc_encode(getallheaders()));
-		}
-		else
-		{
-			$headers = array();
-			// IIS: poor man's version of getallheaders
-			foreach ($_SERVER as $key => $val)
-				if (strpos($key, 'HTTP_') === 0)
-				{
-					$key = ucfirst(str_replace('_', '-', strtolower(substr($key, 5))));
-					$headers[$key] = $val;
-				}
-			return new xmlrpcresp(php_xmlrpc_encode($headers));
-		}
-	}
-
-	$setcookies_sig=array(array($xmlrpcInt, $xmlrpcStruct));
-	$setcookies_doc='Sends to client a response containing a single \'1\' digit, and sets to it http cookies as received in the request (array of structs describing a cookie)';
-	function setcookies($m)
-	{
-		$m = $m->getParam(0);
-		while(list($name,$value) = $m->structeach())
-		{
-			$cookiedesc = php_xmlrpc_decode($value);
-			setcookie($name, @$cookiedesc['value'], @$cookiedesc['expires'], @$cookiedesc['path'], @$cookiedesc['domain'], @$cookiedesc['secure']);
-		}
-		return new xmlrpcresp(new xmlrpcval(1, 'int'));
-	}
-
-	$getcookies_sig=array(array($xmlrpcStruct));
-	$getcookies_doc='Sends to client a response containing all http cookies as received in the request (as struct)';
-	function getcookies($m)
-	{
-		return new xmlrpcresp(php_xmlrpc_encode($_COOKIE));
-	}
-
-	$v1_arrayOfStructs_sig=array(array($xmlrpcInt, $xmlrpcArray));
-	$v1_arrayOfStructs_doc='This handler takes a single parameter, an array of structs, each of which contains at least three elements named moe, larry and curly, all <i4>s. Your handler must add all the struct elements named curly and return the result.';
-	function v1_arrayOfStructs($m)
-	{
-		$sno=$m->getParam(0);
-		$numcurly=0;
-		for($i=0; $i<$sno->arraysize(); $i++)
-		{
-			$str=$sno->arraymem($i);
-			$str->structreset();
-			while(list($key,$val)=$str->structeach())
-			{
-				if ($key=="curly")
-				{
-					$numcurly+=$val->scalarval();
-				}
-			}
-		}
-		return new xmlrpcresp(new xmlrpcval($numcurly, "int"));
-	}
-
-	$v1_easyStruct_sig=array(array($xmlrpcInt, $xmlrpcStruct));
-	$v1_easyStruct_doc='This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.';
-	function v1_easyStruct($m)
-	{
-		$sno=$m->getParam(0);
-		$moe=$sno->structmem("moe");
-		$larry=$sno->structmem("larry");
-		$curly=$sno->structmem("curly");
-		$num=$moe->scalarval() + $larry->scalarval() + $curly->scalarval();
-		return new xmlrpcresp(new xmlrpcval($num, "int"));
-	}
-
-	$v1_echoStruct_sig=array(array($xmlrpcStruct, $xmlrpcStruct));
-	$v1_echoStruct_doc='This handler takes a single parameter, a struct. Your handler must return the struct.';
-	function v1_echoStruct($m)
-	{
-		$sno=$m->getParam(0);
-		return new xmlrpcresp($sno);
-	}
-
-	$v1_manyTypes_sig=array(array(
-		$xmlrpcArray, $xmlrpcInt, $xmlrpcBoolean,
-		$xmlrpcString, $xmlrpcDouble, $xmlrpcDateTime,
-		$xmlrpcBase64
-	));
-	$v1_manyTypes_doc='This handler takes six parameters, and returns an array containing all the parameters.';
-	function v1_manyTypes($m)
-	{
-		return new xmlrpcresp(new xmlrpcval(array(
-			$m->getParam(0),
-			$m->getParam(1),
-			$m->getParam(2),
-			$m->getParam(3),
-			$m->getParam(4),
-			$m->getParam(5)),
-			"array"
-		));
-	}
-
-	$v1_moderateSizeArrayCheck_sig=array(array($xmlrpcString, $xmlrpcArray));
-	$v1_moderateSizeArrayCheck_doc='This handler takes a single parameter, which is an array containing between 100 and 200 elements. Each of the items is a string, your handler must return a string containing the concatenated text of the first and last elements.';
-	function v1_moderateSizeArrayCheck($m)
-	{
-		$ar=$m->getParam(0);
-		$sz=$ar->arraysize();
-		$first=$ar->arraymem(0);
-		$last=$ar->arraymem($sz-1);
-		return new xmlrpcresp(new xmlrpcval($first->scalarval() .
-		$last->scalarval(), "string"));
-	}
-
-	$v1_simpleStructReturn_sig=array(array($xmlrpcStruct, $xmlrpcInt));
-	$v1_simpleStructReturn_doc='This handler takes one parameter, and returns a struct containing three elements, times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.';
-	function v1_simpleStructReturn($m)
-	{
-		$sno=$m->getParam(0);
-		$v=$sno->scalarval();
-		return new xmlrpcresp(new xmlrpcval(array(
-			"times10"   => new xmlrpcval($v*10, "int"),
-			"times100"  => new xmlrpcval($v*100, "int"),
-			"times1000" => new xmlrpcval($v*1000, "int")),
-			"struct"
-		));
-	}
-
-	$v1_nestedStruct_sig=array(array($xmlrpcInt, $xmlrpcStruct));
-	$v1_nestedStruct_doc='This handler takes a single parameter, a struct, that models a daily calendar. At the top level, there is one struct for each year. Each year is broken down into months, and months into days. Most of the days are empty in the struct you receive, but the entry for April 1, 2000 contains a least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.';
-	function v1_nestedStruct($m)
-	{
-		$sno=$m->getParam(0);
-
-		$twoK=$sno->structmem("2000");
-		$april=$twoK->structmem("04");
-		$fools=$april->structmem("01");
-		$curly=$fools->structmem("curly");
-		$larry=$fools->structmem("larry");
-		$moe=$fools->structmem("moe");
-		return new xmlrpcresp(new xmlrpcval($curly->scalarval() + $larry->scalarval() + $moe->scalarval(), "int"));
-	}
-
-	$v1_countTheEntities_sig=array(array($xmlrpcStruct, $xmlrpcString));
-	$v1_countTheEntities_doc='This handler takes a single parameter, a string, that contains any number of predefined entities, namely &lt;, &gt;, &amp; \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.';
-	function v1_countTheEntities($m)
-	{
-		$sno=$m->getParam(0);
-		$str=$sno->scalarval();
-		$gt=0; $lt=0; $ap=0; $qu=0; $amp=0;
-		for($i=0; $i<strlen($str); $i++)
-		{
-			$c=substr($str, $i, 1);
-			switch($c)
-			{
-				case ">":
-					$gt++;
-					break;
-				case "<":
-					$lt++;
-					break;
-				case "\"":
-					$qu++;
-					break;
-				case "'":
-					$ap++;
-					break;
-				case "&":
-					$amp++;
-					break;
-				default:
-					break;
-			}
-		}
-		return new xmlrpcresp(new xmlrpcval(array(
-			"ctLeftAngleBrackets"  => new xmlrpcval($lt, "int"),
-			"ctRightAngleBrackets" => new xmlrpcval($gt, "int"),
-			"ctAmpersands"		 => new xmlrpcval($amp, "int"),
-			"ctApostrophes"		=> new xmlrpcval($ap, "int"),
-			"ctQuotes"			 => new xmlrpcval($qu, "int")),
-			"struct"
-		));
-	}
-
-	// trivial interop tests
-	// http://www.xmlrpc.com/stories/storyReader$1636
-
-	$i_echoString_sig=array(array($xmlrpcString, $xmlrpcString));
-	$i_echoString_doc="Echoes string.";
-
-	$i_echoStringArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoStringArray_doc="Echoes string array.";
-
-	$i_echoInteger_sig=array(array($xmlrpcInt, $xmlrpcInt));
-	$i_echoInteger_doc="Echoes integer.";
-
-	$i_echoIntegerArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoIntegerArray_doc="Echoes integer array.";
-
-	$i_echoFloat_sig=array(array($xmlrpcDouble, $xmlrpcDouble));
-	$i_echoFloat_doc="Echoes float.";
-
-	$i_echoFloatArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoFloatArray_doc="Echoes float array.";
-
-	$i_echoStruct_sig=array(array($xmlrpcStruct, $xmlrpcStruct));
-	$i_echoStruct_doc="Echoes struct.";
-
-	$i_echoStructArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoStructArray_doc="Echoes struct array.";
-
-	$i_echoValue_doc="Echoes any value back.";
-	$i_echoValue_sig=array(array($xmlrpcValue, $xmlrpcValue));
-
-	$i_echoBase64_sig=array(array($xmlrpcBase64, $xmlrpcBase64));
-	$i_echoBase64_doc="Echoes base64.";
-
-	$i_echoDate_sig=array(array($xmlrpcDateTime, $xmlrpcDateTime));
-	$i_echoDate_doc="Echoes dateTime.";
-
-	function i_echoParam($m)
-	{
-		$s=$m->getParam(0);
-		return new xmlrpcresp($s);
-	}
-
-	function i_echoString($m) { return i_echoParam($m); }
-	function i_echoInteger($m) { return i_echoParam($m); }
-	function i_echoFloat($m) { return i_echoParam($m); }
-	function i_echoStruct($m) { return i_echoParam($m); }
-	function i_echoStringArray($m) { return i_echoParam($m); }
-	function i_echoIntegerArray($m) { return i_echoParam($m); }
-	function i_echoFloatArray($m) { return i_echoParam($m); }
-	function i_echoStructArray($m) { return i_echoParam($m); }
-	function i_echoValue($m) { return i_echoParam($m); }
-	function i_echoBase64($m) { return i_echoParam($m); }
-	function i_echoDate($m) { return i_echoParam($m); }
-
-	$i_whichToolkit_sig=array(array($xmlrpcStruct));
-	$i_whichToolkit_doc="Returns a struct containing the following strings: toolkitDocsUrl, toolkitName, toolkitVersion, toolkitOperatingSystem.";
-
-	function i_whichToolkit($m)
-	{
-		global $xmlrpcName, $xmlrpcVersion,$SERVER_SOFTWARE;
-		$ret=array(
-			"toolkitDocsUrl" => "http://phpxmlrpc.sourceforge.net/",
-			"toolkitName" => $xmlrpcName,
-			"toolkitVersion" => $xmlrpcVersion,
-			"toolkitOperatingSystem" => isset ($SERVER_SOFTWARE) ? $SERVER_SOFTWARE : $_SERVER['SERVER_SOFTWARE']
-		);
-		return new xmlrpcresp ( php_xmlrpc_encode($ret));
-	}
-
-	$o=new xmlrpc_server_methods_container;
-	$a=array(
-		"examples.getStateName" => array(
-			"function" => "findstate",
-			"signature" => $findstate_sig,
-			"docstring" => $findstate_doc
-		),
-		"examples.sortByAge" => array(
-			"function" => "agesorter",
-			"signature" => $agesorter_sig,
-			"docstring" => $agesorter_doc
-		),
-		"examples.addtwo" => array(
-			"function" => "addtwo",
-			"signature" => $addtwo_sig,
-			"docstring" => $addtwo_doc
-		),
-		"examples.addtwodouble" => array(
-			"function" => "addtwodouble",
-			"signature" => $addtwodouble_sig,
-			"docstring" => $addtwodouble_doc
-		),
-		"examples.stringecho" => array(
-			"function" => "stringecho",
-			"signature" => $stringecho_sig,
-			"docstring" => $stringecho_doc
-		),
-		"examples.echo" => array(
-			"function" => "echoback",
-			"signature" => $echoback_sig,
-			"docstring" => $echoback_doc
-		),
-		"examples.decode64" => array(
-			"function" => "echosixtyfour",
-			"signature" => $echosixtyfour_sig,
-			"docstring" => $echosixtyfour_doc
-		),
-		"examples.invertBooleans" => array(
-			"function" => "bitflipper",
-			"signature" => $bitflipper_sig,
-			"docstring" => $bitflipper_doc
-		),
-		"examples.generatePHPWarning" => array(
-			"function" => array($o, "phpwarninggenerator")
-			//'function' => 'xmlrpc_server_methods_container::phpwarninggenerator'
-		),
-		"examples.raiseException" => array(
-			"function" => array($o, "exceptiongenerator")
-		),
-		"examples.getallheaders" => array(
-			"function" => 'getallheaders_xmlrpc',
-			"signature" => $getallheaders_sig,
-			"docstring" => $getallheaders_doc
-		),
-		"examples.setcookies" => array(
-			"function" => 'setcookies',
-			"signature" => $setcookies_sig,
-			"docstring" => $setcookies_doc
-		),
-		"examples.getcookies" => array(
-			"function" => 'getcookies',
-			"signature" => $getcookies_sig,
-			"docstring" => $getcookies_doc
-		),
-		"mail.send" => array(
-			"function" => "mail_send",
-			"signature" => $mail_send_sig,
-			"docstring" => $mail_send_doc
-		),
-		"validator1.arrayOfStructsTest" => array(
-			"function" => "v1_arrayOfStructs",
-			"signature" => $v1_arrayOfStructs_sig,
-			"docstring" => $v1_arrayOfStructs_doc
-		),
-		"validator1.easyStructTest" => array(
-			"function" => "v1_easyStruct",
-			"signature" => $v1_easyStruct_sig,
-			"docstring" => $v1_easyStruct_doc
-		),
-		"validator1.echoStructTest" => array(
-			"function" => "v1_echoStruct",
-			"signature" => $v1_echoStruct_sig,
-			"docstring" => $v1_echoStruct_doc
-		),
-		"validator1.manyTypesTest" => array(
-			"function" => "v1_manyTypes",
-			"signature" => $v1_manyTypes_sig,
-			"docstring" => $v1_manyTypes_doc
-		),
-		"validator1.moderateSizeArrayCheck" => array(
-			"function" => "v1_moderateSizeArrayCheck",
-			"signature" => $v1_moderateSizeArrayCheck_sig,
-			"docstring" => $v1_moderateSizeArrayCheck_doc
-		),
-		"validator1.simpleStructReturnTest" => array(
-			"function" => "v1_simpleStructReturn",
-			"signature" => $v1_simpleStructReturn_sig,
-			"docstring" => $v1_simpleStructReturn_doc
-		),
-		"validator1.nestedStructTest" => array(
-			"function" => "v1_nestedStruct",
-			"signature" => $v1_nestedStruct_sig,
-			"docstring" => $v1_nestedStruct_doc
-		),
-		"validator1.countTheEntities" => array(
-			"function" => "v1_countTheEntities",
-			"signature" => $v1_countTheEntities_sig,
-			"docstring" => $v1_countTheEntities_doc
-		),
-		"interopEchoTests.echoString" => array(
-			"function" => "i_echoString",
-			"signature" => $i_echoString_sig,
-			"docstring" => $i_echoString_doc
-		),
-		"interopEchoTests.echoStringArray" => array(
-			"function" => "i_echoStringArray",
-			"signature" => $i_echoStringArray_sig,
-			"docstring" => $i_echoStringArray_doc
-		),
-		"interopEchoTests.echoInteger" => array(
-			"function" => "i_echoInteger",
-			"signature" => $i_echoInteger_sig,
-			"docstring" => $i_echoInteger_doc
-		),
-		"interopEchoTests.echoIntegerArray" => array(
-			"function" => "i_echoIntegerArray",
-			"signature" => $i_echoIntegerArray_sig,
-			"docstring" => $i_echoIntegerArray_doc
-		),
-		"interopEchoTests.echoFloat" => array(
-			"function" => "i_echoFloat",
-			"signature" => $i_echoFloat_sig,
-			"docstring" => $i_echoFloat_doc
-		),
-		"interopEchoTests.echoFloatArray" => array(
-			"function" => "i_echoFloatArray",
-			"signature" => $i_echoFloatArray_sig,
-			"docstring" => $i_echoFloatArray_doc
-		),
-		"interopEchoTests.echoStruct" => array(
-			"function" => "i_echoStruct",
-			"signature" => $i_echoStruct_sig,
-			"docstring" => $i_echoStruct_doc
-		),
-		"interopEchoTests.echoStructArray" => array(
-			"function" => "i_echoStructArray",
-			"signature" => $i_echoStructArray_sig,
-			"docstring" => $i_echoStructArray_doc
-		),
-		"interopEchoTests.echoValue" => array(
-			"function" => "i_echoValue",
-			"signature" => $i_echoValue_sig,
-			"docstring" => $i_echoValue_doc
-		),
-		"interopEchoTests.echoBase64" => array(
-			"function" => "i_echoBase64",
-			"signature" => $i_echoBase64_sig,
-			"docstring" => $i_echoBase64_doc
-		),
-		"interopEchoTests.echoDate" => array(
-			"function" => "i_echoDate",
-			"signature" => $i_echoDate_sig,
-			"docstring" => $i_echoDate_doc
-		),
-		"interopEchoTests.whichToolkit" => array(
-			"function" => "i_whichToolkit",
-			"signature" => $i_whichToolkit_sig,
-			"docstring" => $i_whichToolkit_doc
-		)
-	);
-
-	if ($findstate2_sig)
-		$a['examples.php.getStateName'] = $findstate2_sig;
-
-	if ($findstate3_sig)
-		$a['examples.php2.getStateName'] = $findstate3_sig;
-
-	if ($findstate4_sig)
-		$a['examples.php3.getStateName'] = $findstate4_sig;
+    // WARNING; this functionality depends on the sendmail -t option
+    // it may not work with Windows machines properly; particularly
+    // the Bcc option. Sneak on your friends at your own risk!
+    function mail_send($m)
+    {
+        global $xmlrpcerruser, $xmlrpcBoolean;
+        $err="";
+
+        $mTo=$m->getParam(0);
+        $mSub=$m->getParam(1);
+        $mBody=$m->getParam(2);
+        $mFrom=$m->getParam(3);
+        $mCc=$m->getParam(4);
+        $mBcc=$m->getParam(5);
+        $mMime=$m->getParam(6);
+
+        if ($mTo->scalarval()=="")
+        {
+            $err="Error, no 'To' field specified";
+        }
+
+        if ($mFrom->scalarval()=="")
+        {
+            $err="Error, no 'From' field specified";
+        }
+
+        $msghdr="From: " . $mFrom->scalarval() . "\n";
+        $msghdr.="To: ". $mTo->scalarval() . "\n";
+
+        if ($mCc->scalarval()!="")
+        {
+            $msghdr.="Cc: " . $mCc->scalarval(). "\n";
+        }
+        if ($mBcc->scalarval()!="")
+        {
+            $msghdr.="Bcc: " . $mBcc->scalarval(). "\n";
+        }
+        if ($mMime->scalarval()!="")
+        {
+            $msghdr.="Content-type: " . $mMime->scalarval() . "\n";
+        }
+        $msghdr.="X-Mailer: XML-RPC for PHP mailer 1.0";
+
+        if ($err=="")
+        {
+            if (!mail("",
+                $mSub->scalarval(),
+                $mBody->scalarval(),
+                $msghdr))
+            {
+                $err="Error, could not send the mail.";
+            }
+        }
+
+        if ($err)
+        {
+            return new xmlrpcresp(0, $xmlrpcerruser, $err);
+        }
+        else
+        {
+            return new xmlrpcresp(new xmlrpcval("true", $xmlrpcBoolean));
+        }
+    }
+
+    $getallheaders_sig=array(array($xmlrpcStruct));
+    $getallheaders_doc='Returns a struct containing all the HTTP headers received with the request. Provides limited functionality with IIS';
+    function getallheaders_xmlrpc($m)
+    {
+        global $xmlrpcerruser;
+        if (function_exists('getallheaders'))
+        {
+            return new xmlrpcresp(php_xmlrpc_encode(getallheaders()));
+        }
+        else
+        {
+            $headers = array();
+            // IIS: poor man's version of getallheaders
+            foreach ($_SERVER as $key => $val)
+                if (strpos($key, 'HTTP_') === 0)
+                {
+                    $key = ucfirst(str_replace('_', '-', strtolower(substr($key, 5))));
+                    $headers[$key] = $val;
+                }
+            return new xmlrpcresp(php_xmlrpc_encode($headers));
+        }
+    }
+
+    $setcookies_sig=array(array($xmlrpcInt, $xmlrpcStruct));
+    $setcookies_doc='Sends to client a response containing a single \'1\' digit, and sets to it http cookies as received in the request (array of structs describing a cookie)';
+    function setcookies($m)
+    {
+        $m = $m->getParam(0);
+        while(list($name,$value) = $m->structeach())
+        {
+            $cookiedesc = php_xmlrpc_decode($value);
+            setcookie($name, @$cookiedesc['value'], @$cookiedesc['expires'], @$cookiedesc['path'], @$cookiedesc['domain'], @$cookiedesc['secure']);
+        }
+        return new xmlrpcresp(new xmlrpcval(1, 'int'));
+    }
+
+    $getcookies_sig=array(array($xmlrpcStruct));
+    $getcookies_doc='Sends to client a response containing all http cookies as received in the request (as struct)';
+    function getcookies($m)
+    {
+        return new xmlrpcresp(php_xmlrpc_encode($_COOKIE));
+    }
+
+    $v1_arrayOfStructs_sig=array(array($xmlrpcInt, $xmlrpcArray));
+    $v1_arrayOfStructs_doc='This handler takes a single parameter, an array of structs, each of which contains at least three elements named moe, larry and curly, all <i4>s. Your handler must add all the struct elements named curly and return the result.';
+    function v1_arrayOfStructs($m)
+    {
+        $sno=$m->getParam(0);
+        $numcurly=0;
+        for($i=0; $i<$sno->arraysize(); $i++)
+        {
+            $str=$sno->arraymem($i);
+            $str->structreset();
+            while(list($key,$val)=$str->structeach())
+            {
+                if ($key=="curly")
+                {
+                    $numcurly+=$val->scalarval();
+                }
+            }
+        }
+        return new xmlrpcresp(new xmlrpcval($numcurly, "int"));
+    }
+
+    $v1_easyStruct_sig=array(array($xmlrpcInt, $xmlrpcStruct));
+    $v1_easyStruct_doc='This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.';
+    function v1_easyStruct($m)
+    {
+        $sno=$m->getParam(0);
+        $moe=$sno->structmem("moe");
+        $larry=$sno->structmem("larry");
+        $curly=$sno->structmem("curly");
+        $num=$moe->scalarval() + $larry->scalarval() + $curly->scalarval();
+        return new xmlrpcresp(new xmlrpcval($num, "int"));
+    }
+
+    $v1_echoStruct_sig=array(array($xmlrpcStruct, $xmlrpcStruct));
+    $v1_echoStruct_doc='This handler takes a single parameter, a struct. Your handler must return the struct.';
+    function v1_echoStruct($m)
+    {
+        $sno=$m->getParam(0);
+        return new xmlrpcresp($sno);
+    }
+
+    $v1_manyTypes_sig=array(array(
+        $xmlrpcArray, $xmlrpcInt, $xmlrpcBoolean,
+        $xmlrpcString, $xmlrpcDouble, $xmlrpcDateTime,
+        $xmlrpcBase64
+    ));
+    $v1_manyTypes_doc='This handler takes six parameters, and returns an array containing all the parameters.';
+    function v1_manyTypes($m)
+    {
+        return new xmlrpcresp(new xmlrpcval(array(
+            $m->getParam(0),
+            $m->getParam(1),
+            $m->getParam(2),
+            $m->getParam(3),
+            $m->getParam(4),
+            $m->getParam(5)),
+            "array"
+        ));
+    }
+
+    $v1_moderateSizeArrayCheck_sig=array(array($xmlrpcString, $xmlrpcArray));
+    $v1_moderateSizeArrayCheck_doc='This handler takes a single parameter, which is an array containing between 100 and 200 elements. Each of the items is a string, your handler must return a string containing the concatenated text of the first and last elements.';
+    function v1_moderateSizeArrayCheck($m)
+    {
+        $ar=$m->getParam(0);
+        $sz=$ar->arraysize();
+        $first=$ar->arraymem(0);
+        $last=$ar->arraymem($sz-1);
+        return new xmlrpcresp(new xmlrpcval($first->scalarval() .
+        $last->scalarval(), "string"));
+    }
+
+    $v1_simpleStructReturn_sig=array(array($xmlrpcStruct, $xmlrpcInt));
+    $v1_simpleStructReturn_doc='This handler takes one parameter, and returns a struct containing three elements, times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.';
+    function v1_simpleStructReturn($m)
+    {
+        $sno=$m->getParam(0);
+        $v=$sno->scalarval();
+        return new xmlrpcresp(new xmlrpcval(array(
+            "times10"   => new xmlrpcval($v*10, "int"),
+            "times100"  => new xmlrpcval($v*100, "int"),
+            "times1000" => new xmlrpcval($v*1000, "int")),
+            "struct"
+        ));
+    }
+
+    $v1_nestedStruct_sig=array(array($xmlrpcInt, $xmlrpcStruct));
+    $v1_nestedStruct_doc='This handler takes a single parameter, a struct, that models a daily calendar. At the top level, there is one struct for each year. Each year is broken down into months, and months into days. Most of the days are empty in the struct you receive, but the entry for April 1, 2000 contains a least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.';
+    function v1_nestedStruct($m)
+    {
+        $sno=$m->getParam(0);
+
+        $twoK=$sno->structmem("2000");
+        $april=$twoK->structmem("04");
+        $fools=$april->structmem("01");
+        $curly=$fools->structmem("curly");
+        $larry=$fools->structmem("larry");
+        $moe=$fools->structmem("moe");
+        return new xmlrpcresp(new xmlrpcval($curly->scalarval() + $larry->scalarval() + $moe->scalarval(), "int"));
+    }
+
+    $v1_countTheEntities_sig=array(array($xmlrpcStruct, $xmlrpcString));
+    $v1_countTheEntities_doc='This handler takes a single parameter, a string, that contains any number of predefined entities, namely &lt;, &gt;, &amp; \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.';
+    function v1_countTheEntities($m)
+    {
+        $sno=$m->getParam(0);
+        $str=$sno->scalarval();
+        $gt=0; $lt=0; $ap=0; $qu=0; $amp=0;
+        for($i=0; $i<strlen($str); $i++)
+        {
+            $c=substr($str, $i, 1);
+            switch($c)
+            {
+                case ">":
+                    $gt++;
+                    break;
+                case "<":
+                    $lt++;
+                    break;
+                case "\"":
+                    $qu++;
+                    break;
+                case "'":
+                    $ap++;
+                    break;
+                case "&":
+                    $amp++;
+                    break;
+                default:
+                    break;
+            }
+        }
+        return new xmlrpcresp(new xmlrpcval(array(
+            "ctLeftAngleBrackets"  => new xmlrpcval($lt, "int"),
+            "ctRightAngleBrackets" => new xmlrpcval($gt, "int"),
+            "ctAmpersands"		 => new xmlrpcval($amp, "int"),
+            "ctApostrophes"		=> new xmlrpcval($ap, "int"),
+            "ctQuotes"			 => new xmlrpcval($qu, "int")),
+            "struct"
+        ));
+    }
+
+    // trivial interop tests
+    // http://www.xmlrpc.com/stories/storyReader$1636
+
+    $i_echoString_sig=array(array($xmlrpcString, $xmlrpcString));
+    $i_echoString_doc="Echoes string.";
+
+    $i_echoStringArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
+    $i_echoStringArray_doc="Echoes string array.";
+
+    $i_echoInteger_sig=array(array($xmlrpcInt, $xmlrpcInt));
+    $i_echoInteger_doc="Echoes integer.";
+
+    $i_echoIntegerArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
+    $i_echoIntegerArray_doc="Echoes integer array.";
+
+    $i_echoFloat_sig=array(array($xmlrpcDouble, $xmlrpcDouble));
+    $i_echoFloat_doc="Echoes float.";
+
+    $i_echoFloatArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
+    $i_echoFloatArray_doc="Echoes float array.";
+
+    $i_echoStruct_sig=array(array($xmlrpcStruct, $xmlrpcStruct));
+    $i_echoStruct_doc="Echoes struct.";
+
+    $i_echoStructArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
+    $i_echoStructArray_doc="Echoes struct array.";
+
+    $i_echoValue_doc="Echoes any value back.";
+    $i_echoValue_sig=array(array($xmlrpcValue, $xmlrpcValue));
+
+    $i_echoBase64_sig=array(array($xmlrpcBase64, $xmlrpcBase64));
+    $i_echoBase64_doc="Echoes base64.";
+
+    $i_echoDate_sig=array(array($xmlrpcDateTime, $xmlrpcDateTime));
+    $i_echoDate_doc="Echoes dateTime.";
+
+    function i_echoParam($m)
+    {
+        $s=$m->getParam(0);
+        return new xmlrpcresp($s);
+    }
+
+    function i_echoString($m) { return i_echoParam($m); }
+    function i_echoInteger($m) { return i_echoParam($m); }
+    function i_echoFloat($m) { return i_echoParam($m); }
+    function i_echoStruct($m) { return i_echoParam($m); }
+    function i_echoStringArray($m) { return i_echoParam($m); }
+    function i_echoIntegerArray($m) { return i_echoParam($m); }
+    function i_echoFloatArray($m) { return i_echoParam($m); }
+    function i_echoStructArray($m) { return i_echoParam($m); }
+    function i_echoValue($m) { return i_echoParam($m); }
+    function i_echoBase64($m) { return i_echoParam($m); }
+    function i_echoDate($m) { return i_echoParam($m); }
+
+    $i_whichToolkit_sig=array(array($xmlrpcStruct));
+    $i_whichToolkit_doc="Returns a struct containing the following strings: toolkitDocsUrl, toolkitName, toolkitVersion, toolkitOperatingSystem.";
+
+    function i_whichToolkit($m)
+    {
+        global $xmlrpcName, $xmlrpcVersion,$SERVER_SOFTWARE;
+        $ret=array(
+            "toolkitDocsUrl" => "http://phpxmlrpc.sourceforge.net/",
+            "toolkitName" => $xmlrpcName,
+            "toolkitVersion" => $xmlrpcVersion,
+            "toolkitOperatingSystem" => isset ($SERVER_SOFTWARE) ? $SERVER_SOFTWARE : $_SERVER['SERVER_SOFTWARE']
+        );
+        return new xmlrpcresp ( php_xmlrpc_encode($ret));
+    }
+
+    $o=new xmlrpc_server_methods_container;
+    $a=array(
+        "examples.getStateName" => array(
+            "function" => "findstate",
+            "signature" => $findstate_sig,
+            "docstring" => $findstate_doc
+        ),
+        "examples.sortByAge" => array(
+            "function" => "agesorter",
+            "signature" => $agesorter_sig,
+            "docstring" => $agesorter_doc
+        ),
+        "examples.addtwo" => array(
+            "function" => "addtwo",
+            "signature" => $addtwo_sig,
+            "docstring" => $addtwo_doc
+        ),
+        "examples.addtwodouble" => array(
+            "function" => "addtwodouble",
+            "signature" => $addtwodouble_sig,
+            "docstring" => $addtwodouble_doc
+        ),
+        "examples.stringecho" => array(
+            "function" => "stringecho",
+            "signature" => $stringecho_sig,
+            "docstring" => $stringecho_doc
+        ),
+        "examples.echo" => array(
+            "function" => "echoback",
+            "signature" => $echoback_sig,
+            "docstring" => $echoback_doc
+        ),
+        "examples.decode64" => array(
+            "function" => "echosixtyfour",
+            "signature" => $echosixtyfour_sig,
+            "docstring" => $echosixtyfour_doc
+        ),
+        "examples.invertBooleans" => array(
+            "function" => "bitflipper",
+            "signature" => $bitflipper_sig,
+            "docstring" => $bitflipper_doc
+        ),
+        "examples.generatePHPWarning" => array(
+            "function" => array($o, "phpwarninggenerator")
+            //'function' => 'xmlrpc_server_methods_container::phpwarninggenerator'
+        ),
+        "examples.raiseException" => array(
+            "function" => array($o, "exceptiongenerator")
+        ),
+        "examples.getallheaders" => array(
+            "function" => 'getallheaders_xmlrpc',
+            "signature" => $getallheaders_sig,
+            "docstring" => $getallheaders_doc
+        ),
+        "examples.setcookies" => array(
+            "function" => 'setcookies',
+            "signature" => $setcookies_sig,
+            "docstring" => $setcookies_doc
+        ),
+        "examples.getcookies" => array(
+            "function" => 'getcookies',
+            "signature" => $getcookies_sig,
+            "docstring" => $getcookies_doc
+        ),
+        "mail.send" => array(
+            "function" => "mail_send",
+            "signature" => $mail_send_sig,
+            "docstring" => $mail_send_doc
+        ),
+        "validator1.arrayOfStructsTest" => array(
+            "function" => "v1_arrayOfStructs",
+            "signature" => $v1_arrayOfStructs_sig,
+            "docstring" => $v1_arrayOfStructs_doc
+        ),
+        "validator1.easyStructTest" => array(
+            "function" => "v1_easyStruct",
+            "signature" => $v1_easyStruct_sig,
+            "docstring" => $v1_easyStruct_doc
+        ),
+        "validator1.echoStructTest" => array(
+            "function" => "v1_echoStruct",
+            "signature" => $v1_echoStruct_sig,
+            "docstring" => $v1_echoStruct_doc
+        ),
+        "validator1.manyTypesTest" => array(
+            "function" => "v1_manyTypes",
+            "signature" => $v1_manyTypes_sig,
+            "docstring" => $v1_manyTypes_doc
+        ),
+        "validator1.moderateSizeArrayCheck" => array(
+            "function" => "v1_moderateSizeArrayCheck",
+            "signature" => $v1_moderateSizeArrayCheck_sig,
+            "docstring" => $v1_moderateSizeArrayCheck_doc
+        ),
+        "validator1.simpleStructReturnTest" => array(
+            "function" => "v1_simpleStructReturn",
+            "signature" => $v1_simpleStructReturn_sig,
+            "docstring" => $v1_simpleStructReturn_doc
+        ),
+        "validator1.nestedStructTest" => array(
+            "function" => "v1_nestedStruct",
+            "signature" => $v1_nestedStruct_sig,
+            "docstring" => $v1_nestedStruct_doc
+        ),
+        "validator1.countTheEntities" => array(
+            "function" => "v1_countTheEntities",
+            "signature" => $v1_countTheEntities_sig,
+            "docstring" => $v1_countTheEntities_doc
+        ),
+        "interopEchoTests.echoString" => array(
+            "function" => "i_echoString",
+            "signature" => $i_echoString_sig,
+            "docstring" => $i_echoString_doc
+        ),
+        "interopEchoTests.echoStringArray" => array(
+            "function" => "i_echoStringArray",
+            "signature" => $i_echoStringArray_sig,
+            "docstring" => $i_echoStringArray_doc
+        ),
+        "interopEchoTests.echoInteger" => array(
+            "function" => "i_echoInteger",
+            "signature" => $i_echoInteger_sig,
+            "docstring" => $i_echoInteger_doc
+        ),
+        "interopEchoTests.echoIntegerArray" => array(
+            "function" => "i_echoIntegerArray",
+            "signature" => $i_echoIntegerArray_sig,
+            "docstring" => $i_echoIntegerArray_doc
+        ),
+        "interopEchoTests.echoFloat" => array(
+            "function" => "i_echoFloat",
+            "signature" => $i_echoFloat_sig,
+            "docstring" => $i_echoFloat_doc
+        ),
+        "interopEchoTests.echoFloatArray" => array(
+            "function" => "i_echoFloatArray",
+            "signature" => $i_echoFloatArray_sig,
+            "docstring" => $i_echoFloatArray_doc
+        ),
+        "interopEchoTests.echoStruct" => array(
+            "function" => "i_echoStruct",
+            "signature" => $i_echoStruct_sig,
+            "docstring" => $i_echoStruct_doc
+        ),
+        "interopEchoTests.echoStructArray" => array(
+            "function" => "i_echoStructArray",
+            "signature" => $i_echoStructArray_sig,
+            "docstring" => $i_echoStructArray_doc
+        ),
+        "interopEchoTests.echoValue" => array(
+            "function" => "i_echoValue",
+            "signature" => $i_echoValue_sig,
+            "docstring" => $i_echoValue_doc
+        ),
+        "interopEchoTests.echoBase64" => array(
+            "function" => "i_echoBase64",
+            "signature" => $i_echoBase64_sig,
+            "docstring" => $i_echoBase64_doc
+        ),
+        "interopEchoTests.echoDate" => array(
+            "function" => "i_echoDate",
+            "signature" => $i_echoDate_sig,
+            "docstring" => $i_echoDate_doc
+        ),
+        "interopEchoTests.whichToolkit" => array(
+            "function" => "i_whichToolkit",
+            "signature" => $i_whichToolkit_sig,
+            "docstring" => $i_whichToolkit_doc
+        )
+    );
+
+    if ($findstate2_sig)
+        $a['examples.php.getStateName'] = $findstate2_sig;
+
+    if ($findstate3_sig)
+        $a['examples.php2.getStateName'] = $findstate3_sig;
+
+    if ($findstate4_sig)
+        $a['examples.php3.getStateName'] = $findstate4_sig;
 
     if ($findstate5_sig)
         $a['examples.php4.getStateName'] = $findstate5_sig;
 
-	$s=new xmlrpc_server($a, false);
-	$s->setdebug(3);
-	$s->compress_response = true;
-
-	// out-of-band information: let the client manipulate the server operations.
-	// we do this to help the testsuite script: do not reproduce in production!
-	if (isset($_GET['RESPONSE_ENCODING']))
-		$s->response_charset_encoding = $_GET['RESPONSE_ENCODING'];
-	if (isset($_GET['EXCEPTION_HANDLING']))
-		$s->exception_handling = $_GET['EXCEPTION_HANDLING'];
-	$s->service();
-	// that should do all we need!
+    $s=new xmlrpc_server($a, false);
+    $s->setdebug(3);
+    $s->compress_response = true;
+
+    // out-of-band information: let the client manipulate the server operations.
+    // we do this to help the testsuite script: do not reproduce in production!
+    if (isset($_GET['RESPONSE_ENCODING']))
+        $s->response_charset_encoding = $_GET['RESPONSE_ENCODING'];
+    if (isset($_GET['EXCEPTION_HANDLING']))
+        $s->exception_handling = $_GET['EXCEPTION_HANDLING'];
+    $s->service();
+    // that should do all we need!
 ?>
\ No newline at end of file

Spacing +175 added lines, -175 removed lines

@@ -71,8 +71,8 @@ 
 		"Virginia", "Washington", "West Virginia", "Wisconsin", "Wyoming"
 	);
 
-	$findstate_sig=array(array($xmlrpcString, $xmlrpcInt));
-	$findstate_doc='When passed an integer between 1 and 51 returns the
+	$findstate_sig = array(array($xmlrpcString, $xmlrpcInt));
+	$findstate_doc = 'When passed an integer between 1 and 51 returns the
 name of a US state, where the integer is the index of that state name
 in an alphabetic order.';
 
@@ -80,24 +80,24 @@ 
 	function findstate($m)
 	{
 		global $xmlrpcerruser, $stateNames;
-		$err="";
+		$err = "";
 		// get the first param
-		$sno=$m->getParam(0);
+		$sno = $m->getParam(0);
 
 		// param must be there and of the correct type: server object does the
 		// validation for us
 
 		// extract the value of the state number
-		$snv=$sno->scalarval();
+		$snv = $sno->scalarval();
 		// look it up in our array (zero-based)
 		if (isset($stateNames[$snv-1]))
 		{
-			$sname=$stateNames[$snv-1];
+			$sname = $stateNames[$snv-1];
 		}
 		else
 		{
 			// not, there so complain
-			$err="I don't have a state for the index '" . $snv . "'";
+			$err = "I don't have a state for the index '".$snv."'";
 		}
 
 		// if we generated an error, create an error return response
@@ -129,7 +129,7 @@ 
 		else
 		{
 			// not, there so complain
-			return "I don't have a state for the index '" . $stateno . "'";
+			return "I don't have a state for the index '".$stateno."'";
 		}
 	}
 	$findstate2_sig = wrap_php_function('inner_findstate');
@@ -141,70 +141,70 @@ 
 	$obj = new xmlrpc_server_methods_container();
 	$findstate4_sig = wrap_php_function(array($obj, 'findstate'));
 
-	$addtwo_sig=array(array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt));
-	$addtwo_doc='Add two integers together and return the result';
+	$addtwo_sig = array(array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt));
+	$addtwo_doc = 'Add two integers together and return the result';
 	function addtwo($m)
 	{
-		$s=$m->getParam(0);
-		$t=$m->getParam(1);
-		return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(),"int"));
+		$s = $m->getParam(0);
+		$t = $m->getParam(1);
+		return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(), "int"));
 	}
 
-	$addtwodouble_sig=array(array($xmlrpcDouble, $xmlrpcDouble, $xmlrpcDouble));
-	$addtwodouble_doc='Add two doubles together and return the result';
+	$addtwodouble_sig = array(array($xmlrpcDouble, $xmlrpcDouble, $xmlrpcDouble));
+	$addtwodouble_doc = 'Add two doubles together and return the result';
 	function addtwodouble($m)
 	{
-		$s=$m->getParam(0);
-		$t=$m->getParam(1);
-		return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(),"double"));
+		$s = $m->getParam(0);
+		$t = $m->getParam(1);
+		return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(), "double"));
 	}
 
-	$stringecho_sig=array(array($xmlrpcString, $xmlrpcString));
-	$stringecho_doc='Accepts a string parameter, returns the string.';
+	$stringecho_sig = array(array($xmlrpcString, $xmlrpcString));
+	$stringecho_doc = 'Accepts a string parameter, returns the string.';
 	function stringecho($m)
 	{
 		// just sends back a string
-		$s=$m->getParam(0);
+		$s = $m->getParam(0);
 		$v = $s->scalarval();
 		return new xmlrpcresp(new xmlrpcval($s->scalarval()));
 	}
 
-	$echoback_sig=array(array($xmlrpcString, $xmlrpcString));
-	$echoback_doc='Accepts a string parameter, returns the entire incoming payload';
+	$echoback_sig = array(array($xmlrpcString, $xmlrpcString));
+	$echoback_doc = 'Accepts a string parameter, returns the entire incoming payload';
 	function echoback($m)
 	{
 		// just sends back a string with what i got
 		// sent to me, just escaped, that's all
 		//
 		// $m is an incoming message
-		$s="I got the following message:\n" . $m->serialize();
+		$s = "I got the following message:\n".$m->serialize();
 		return new xmlrpcresp(new xmlrpcval($s));
 	}
 
-	$echosixtyfour_sig=array(array($xmlrpcString, $xmlrpcBase64));
-	$echosixtyfour_doc='Accepts a base64 parameter and returns it decoded as a string';
+	$echosixtyfour_sig = array(array($xmlrpcString, $xmlrpcBase64));
+	$echosixtyfour_doc = 'Accepts a base64 parameter and returns it decoded as a string';
 	function echosixtyfour($m)
 	{
 		// accepts an encoded value, but sends it back
 		// as a normal string. this is to test base64 encoding
 		// is working as expected
-		$incoming=$m->getParam(0);
+		$incoming = $m->getParam(0);
 		return new xmlrpcresp(new xmlrpcval($incoming->scalarval(), "string"));
 	}
 
-	$bitflipper_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$bitflipper_doc='Accepts an array of booleans, and returns them inverted';
+	$bitflipper_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$bitflipper_doc = 'Accepts an array of booleans, and returns them inverted';
 	function bitflipper($m)
 	{
 		global $xmlrpcArray;
 
-		$v=$m->getParam(0);
-		$sz=$v->arraysize();
-		$rv=new xmlrpcval(array(), $xmlrpcArray);
+		$v = $m->getParam(0);
+		$sz = $v->arraysize();
+		$rv = new xmlrpcval(array(), $xmlrpcArray);
 
-		for($j=0; $j<$sz; $j++)
+		for ($j = 0; $j<$sz; $j++)
 		{
-			$b=$v->arraymem($j);
+			$b = $v->arraymem($j);
 			if ($b->scalarval())
 			{
 				$rv->addScalar(false, "boolean");
@@ -235,18 +235,18 @@ 
 
 		// don't even ask me _why_ these come padded with
 		// hyphens, I couldn't tell you :p
-		$a=str_replace("-", "", $a);
-		$b=str_replace("-", "", $b);
+		$a = str_replace("-", "", $a);
+		$b = str_replace("-", "", $b);
 
-		if ($agesorter_arr[$a]==$agesorter[$b])
+		if ($agesorter_arr[$a] == $agesorter[$b])
 		{
 			return 0;
 		}
-		return ($agesorter_arr[$a] > $agesorter_arr[$b]) ? -1 : 1;
+		return ($agesorter_arr[$a]>$agesorter_arr[$b]) ? -1 : 1;
 	}
 
-	$agesorter_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$agesorter_doc='Send this method an array of [string, int] structs, eg:
+	$agesorter_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$agesorter_doc = 'Send this method an array of [string, int] structs, eg:
 <pre>
  Dave   35
  Edd	45
@@ -261,43 +261,43 @@ 
 
 		xmlrpc_debugmsg("Entering 'agesorter'");
 		// get the parameter
-		$sno=$m->getParam(0);
+		$sno = $m->getParam(0);
 		// error string for [if|when] things go wrong
-		$err="";
+		$err = "";
 		// create the output value
-		$v=new xmlrpcval();
-		$agar=array();
+		$v = new xmlrpcval();
+		$agar = array();
 
-		if (isset($sno) && $sno->kindOf()=="array")
+		if (isset($sno) && $sno->kindOf() == "array")
 		{
-			$max=$sno->arraysize();
+			$max = $sno->arraysize();
 			// TODO: create debug method to print can work once more
 			// print "<!-- found $max array elements -->\n";
-			for($i=0; $i<$max; $i++)
+			for ($i = 0; $i<$max; $i++)
 			{
-				$rec=$sno->arraymem($i);
-				if ($rec->kindOf()!="struct")
+				$rec = $sno->arraymem($i);
+				if ($rec->kindOf() != "struct")
 				{
-					$err="Found non-struct in array at element $i";
+					$err = "Found non-struct in array at element $i";
 					break;
 				}
 				// extract name and age from struct
-				$n=$rec->structmem("name");
-				$a=$rec->structmem("age");
+				$n = $rec->structmem("name");
+				$a = $rec->structmem("age");
 				// $n and $a are xmlrpcvals,
 				// so get the scalarval from them
-				$agar[$n->scalarval()]=$a->scalarval();
+				$agar[$n->scalarval()] = $a->scalarval();
 			}
 
-			$agesorter_arr=$agar;
+			$agesorter_arr = $agar;
 			// hack, must make global as uksort() won't
 			// allow us to pass any other auxilliary information
 			uksort($agesorter_arr, agesorter_compare);
-			$outAr=array();
-			while (list( $key, $val ) = each( $agesorter_arr ) )
+			$outAr = array();
+			while (list($key, $val) = each($agesorter_arr))
 			{
 				// recreate each struct element
-				$outAr[]=new xmlrpcval(array("name" =>
+				$outAr[] = new xmlrpcval(array("name" =>
 				new xmlrpcval($key),
 				"age" =>
 				new xmlrpcval($val, "int")), "struct");
@@ -307,7 +307,7 @@ 
 		}
 		else
 		{
-			$err="Must be one parameter, an array of structs";
+			$err = "Must be one parameter, an array of structs";
 		}
 
 		if ($err)
@@ -322,13 +322,13 @@ 
 
 	// signature and instructions, place these in the dispatch
 	// map
-	$mail_send_sig=array(array(
+	$mail_send_sig = array(array(
 		$xmlrpcBoolean, $xmlrpcString, $xmlrpcString,
 		$xmlrpcString, $xmlrpcString, $xmlrpcString,
 		$xmlrpcString, $xmlrpcString
 	));
 
-	$mail_send_doc='mail.send(recipient, subject, text, sender, cc, bcc, mimetype)<br/>
+	$mail_send_doc = 'mail.send(recipient, subject, text, sender, cc, bcc, mimetype)<br/>
 recipient, cc, and bcc are strings, comma-separated lists of email addresses, as described above.<br/>
 subject is a string, the subject of the message.<br/>
 sender is a string, it\'s the email address of the person sending the message. This string can not be
@@ -342,51 +342,51 @@ 
 	function mail_send($m)
 	{
 		global $xmlrpcerruser, $xmlrpcBoolean;
-		$err="";
+		$err = "";
 
-		$mTo=$m->getParam(0);
-		$mSub=$m->getParam(1);
-		$mBody=$m->getParam(2);
-		$mFrom=$m->getParam(3);
-		$mCc=$m->getParam(4);
-		$mBcc=$m->getParam(5);
-		$mMime=$m->getParam(6);
+		$mTo = $m->getParam(0);
+		$mSub = $m->getParam(1);
+		$mBody = $m->getParam(2);
+		$mFrom = $m->getParam(3);
+		$mCc = $m->getParam(4);
+		$mBcc = $m->getParam(5);
+		$mMime = $m->getParam(6);
 
-		if ($mTo->scalarval()=="")
+		if ($mTo->scalarval() == "")
 		{
-			$err="Error, no 'To' field specified";
+			$err = "Error, no 'To' field specified";
 		}
 
-		if ($mFrom->scalarval()=="")
+		if ($mFrom->scalarval() == "")
 		{
-			$err="Error, no 'From' field specified";
+			$err = "Error, no 'From' field specified";
 		}
 
-		$msghdr="From: " . $mFrom->scalarval() . "\n";
-		$msghdr.="To: ". $mTo->scalarval() . "\n";
+		$msghdr = "From: ".$mFrom->scalarval()."\n";
+		$msghdr .= "To: ".$mTo->scalarval()."\n";
 
-		if ($mCc->scalarval()!="")
+		if ($mCc->scalarval() != "")
 		{
-			$msghdr.="Cc: " . $mCc->scalarval(). "\n";
+			$msghdr .= "Cc: ".$mCc->scalarval()."\n";
 		}
-		if ($mBcc->scalarval()!="")
+		if ($mBcc->scalarval() != "")
 		{
-			$msghdr.="Bcc: " . $mBcc->scalarval(). "\n";
+			$msghdr .= "Bcc: ".$mBcc->scalarval()."\n";
 		}
-		if ($mMime->scalarval()!="")
+		if ($mMime->scalarval() != "")
 		{
-			$msghdr.="Content-type: " . $mMime->scalarval() . "\n";
+			$msghdr .= "Content-type: ".$mMime->scalarval()."\n";
 		}
-		$msghdr.="X-Mailer: XML-RPC for PHP mailer 1.0";
+		$msghdr .= "X-Mailer: XML-RPC for PHP mailer 1.0";
 
-		if ($err=="")
+		if ($err == "")
 		{
 			if (!mail("",
 				$mSub->scalarval(),
 				$mBody->scalarval(),
 				$msghdr))
 			{
-				$err="Error, could not send the mail.";
+				$err = "Error, could not send the mail.";
 			}
 		}
 
@@ -400,8 +400,8 @@ 
 		}
 	}
 
-	$getallheaders_sig=array(array($xmlrpcStruct));
-	$getallheaders_doc='Returns a struct containing all the HTTP headers received with the request. Provides limited functionality with IIS';
+	$getallheaders_sig = array(array($xmlrpcStruct));
+	$getallheaders_doc = 'Returns a struct containing all the HTTP headers received with the request. Provides limited functionality with IIS';
 	function getallheaders_xmlrpc($m)
 	{
 		global $xmlrpcerruser;
@@ -423,12 +423,12 @@ 
 		}
 	}
 
-	$setcookies_sig=array(array($xmlrpcInt, $xmlrpcStruct));
-	$setcookies_doc='Sends to client a response containing a single \'1\' digit, and sets to it http cookies as received in the request (array of structs describing a cookie)';
+	$setcookies_sig = array(array($xmlrpcInt, $xmlrpcStruct));
+	$setcookies_doc = 'Sends to client a response containing a single \'1\' digit, and sets to it http cookies as received in the request (array of structs describing a cookie)';
 	function setcookies($m)
 	{
 		$m = $m->getParam(0);
-		while(list($name,$value) = $m->structeach())
+		while (list($name, $value) = $m->structeach())
 		{
 			$cookiedesc = php_xmlrpc_decode($value);
 			setcookie($name, @$cookiedesc['value'], @$cookiedesc['expires'], @$cookiedesc['path'], @$cookiedesc['domain'], @$cookiedesc['secure']);
@@ -436,60 +436,60 @@ 
 		return new xmlrpcresp(new xmlrpcval(1, 'int'));
 	}
 
-	$getcookies_sig=array(array($xmlrpcStruct));
-	$getcookies_doc='Sends to client a response containing all http cookies as received in the request (as struct)';
+	$getcookies_sig = array(array($xmlrpcStruct));
+	$getcookies_doc = 'Sends to client a response containing all http cookies as received in the request (as struct)';
 	function getcookies($m)
 	{
 		return new xmlrpcresp(php_xmlrpc_encode($_COOKIE));
 	}
 
-	$v1_arrayOfStructs_sig=array(array($xmlrpcInt, $xmlrpcArray));
-	$v1_arrayOfStructs_doc='This handler takes a single parameter, an array of structs, each of which contains at least three elements named moe, larry and curly, all <i4>s. Your handler must add all the struct elements named curly and return the result.';
+	$v1_arrayOfStructs_sig = array(array($xmlrpcInt, $xmlrpcArray));
+	$v1_arrayOfStructs_doc = 'This handler takes a single parameter, an array of structs, each of which contains at least three elements named moe, larry and curly, all <i4>s. Your handler must add all the struct elements named curly and return the result.';
 	function v1_arrayOfStructs($m)
 	{
-		$sno=$m->getParam(0);
-		$numcurly=0;
-		for($i=0; $i<$sno->arraysize(); $i++)
+		$sno = $m->getParam(0);
+		$numcurly = 0;
+		for ($i = 0; $i<$sno->arraysize(); $i++)
 		{
-			$str=$sno->arraymem($i);
+			$str = $sno->arraymem($i);
 			$str->structreset();
-			while(list($key,$val)=$str->structeach())
+			while (list($key, $val) = $str->structeach())
 			{
-				if ($key=="curly")
+				if ($key == "curly")
 				{
-					$numcurly+=$val->scalarval();
+					$numcurly += $val->scalarval();
 				}
 			}
 		}
 		return new xmlrpcresp(new xmlrpcval($numcurly, "int"));
 	}
 
-	$v1_easyStruct_sig=array(array($xmlrpcInt, $xmlrpcStruct));
-	$v1_easyStruct_doc='This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.';
+	$v1_easyStruct_sig = array(array($xmlrpcInt, $xmlrpcStruct));
+	$v1_easyStruct_doc = 'This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.';
 	function v1_easyStruct($m)
 	{
-		$sno=$m->getParam(0);
-		$moe=$sno->structmem("moe");
-		$larry=$sno->structmem("larry");
-		$curly=$sno->structmem("curly");
-		$num=$moe->scalarval() + $larry->scalarval() + $curly->scalarval();
+		$sno = $m->getParam(0);
+		$moe = $sno->structmem("moe");
+		$larry = $sno->structmem("larry");
+		$curly = $sno->structmem("curly");
+		$num = $moe->scalarval()+$larry->scalarval()+$curly->scalarval();
 		return new xmlrpcresp(new xmlrpcval($num, "int"));
 	}
 
-	$v1_echoStruct_sig=array(array($xmlrpcStruct, $xmlrpcStruct));
-	$v1_echoStruct_doc='This handler takes a single parameter, a struct. Your handler must return the struct.';
+	$v1_echoStruct_sig = array(array($xmlrpcStruct, $xmlrpcStruct));
+	$v1_echoStruct_doc = 'This handler takes a single parameter, a struct. Your handler must return the struct.';
 	function v1_echoStruct($m)
 	{
-		$sno=$m->getParam(0);
+		$sno = $m->getParam(0);
 		return new xmlrpcresp($sno);
 	}
 
-	$v1_manyTypes_sig=array(array(
+	$v1_manyTypes_sig = array(array(
 		$xmlrpcArray, $xmlrpcInt, $xmlrpcBoolean,
 		$xmlrpcString, $xmlrpcDouble, $xmlrpcDateTime,
 		$xmlrpcBase64
 	));
-	$v1_manyTypes_doc='This handler takes six parameters, and returns an array containing all the parameters.';
+	$v1_manyTypes_doc = 'This handler takes six parameters, and returns an array containing all the parameters.';
 	function v1_manyTypes($m)
 	{
 		return new xmlrpcresp(new xmlrpcval(array(
@@ -503,58 +503,58 @@ 
 		));
 	}
 
-	$v1_moderateSizeArrayCheck_sig=array(array($xmlrpcString, $xmlrpcArray));
-	$v1_moderateSizeArrayCheck_doc='This handler takes a single parameter, which is an array containing between 100 and 200 elements. Each of the items is a string, your handler must return a string containing the concatenated text of the first and last elements.';
+	$v1_moderateSizeArrayCheck_sig = array(array($xmlrpcString, $xmlrpcArray));
+	$v1_moderateSizeArrayCheck_doc = 'This handler takes a single parameter, which is an array containing between 100 and 200 elements. Each of the items is a string, your handler must return a string containing the concatenated text of the first and last elements.';
 	function v1_moderateSizeArrayCheck($m)
 	{
-		$ar=$m->getParam(0);
-		$sz=$ar->arraysize();
-		$first=$ar->arraymem(0);
-		$last=$ar->arraymem($sz-1);
-		return new xmlrpcresp(new xmlrpcval($first->scalarval() .
+		$ar = $m->getParam(0);
+		$sz = $ar->arraysize();
+		$first = $ar->arraymem(0);
+		$last = $ar->arraymem($sz-1);
+		return new xmlrpcresp(new xmlrpcval($first->scalarval().
 		$last->scalarval(), "string"));
 	}
 
-	$v1_simpleStructReturn_sig=array(array($xmlrpcStruct, $xmlrpcInt));
-	$v1_simpleStructReturn_doc='This handler takes one parameter, and returns a struct containing three elements, times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.';
+	$v1_simpleStructReturn_sig = array(array($xmlrpcStruct, $xmlrpcInt));
+	$v1_simpleStructReturn_doc = 'This handler takes one parameter, and returns a struct containing three elements, times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.';
 	function v1_simpleStructReturn($m)
 	{
-		$sno=$m->getParam(0);
-		$v=$sno->scalarval();
+		$sno = $m->getParam(0);
+		$v = $sno->scalarval();
 		return new xmlrpcresp(new xmlrpcval(array(
-			"times10"   => new xmlrpcval($v*10, "int"),
-			"times100"  => new xmlrpcval($v*100, "int"),
-			"times1000" => new xmlrpcval($v*1000, "int")),
+			"times10"   => new xmlrpcval($v * 10, "int"),
+			"times100"  => new xmlrpcval($v * 100, "int"),
+			"times1000" => new xmlrpcval($v * 1000, "int")),
 			"struct"
 		));
 	}
 
-	$v1_nestedStruct_sig=array(array($xmlrpcInt, $xmlrpcStruct));
-	$v1_nestedStruct_doc='This handler takes a single parameter, a struct, that models a daily calendar. At the top level, there is one struct for each year. Each year is broken down into months, and months into days. Most of the days are empty in the struct you receive, but the entry for April 1, 2000 contains a least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.';
+	$v1_nestedStruct_sig = array(array($xmlrpcInt, $xmlrpcStruct));
+	$v1_nestedStruct_doc = 'This handler takes a single parameter, a struct, that models a daily calendar. At the top level, there is one struct for each year. Each year is broken down into months, and months into days. Most of the days are empty in the struct you receive, but the entry for April 1, 2000 contains a least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.';
 	function v1_nestedStruct($m)
 	{
-		$sno=$m->getParam(0);
-
-		$twoK=$sno->structmem("2000");
-		$april=$twoK->structmem("04");
-		$fools=$april->structmem("01");
-		$curly=$fools->structmem("curly");
-		$larry=$fools->structmem("larry");
-		$moe=$fools->structmem("moe");
-		return new xmlrpcresp(new xmlrpcval($curly->scalarval() + $larry->scalarval() + $moe->scalarval(), "int"));
+		$sno = $m->getParam(0);
+
+		$twoK = $sno->structmem("2000");
+		$april = $twoK->structmem("04");
+		$fools = $april->structmem("01");
+		$curly = $fools->structmem("curly");
+		$larry = $fools->structmem("larry");
+		$moe = $fools->structmem("moe");
+		return new xmlrpcresp(new xmlrpcval($curly->scalarval()+$larry->scalarval()+$moe->scalarval(), "int"));
 	}
 
-	$v1_countTheEntities_sig=array(array($xmlrpcStruct, $xmlrpcString));
-	$v1_countTheEntities_doc='This handler takes a single parameter, a string, that contains any number of predefined entities, namely &lt;, &gt;, &amp; \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.';
+	$v1_countTheEntities_sig = array(array($xmlrpcStruct, $xmlrpcString));
+	$v1_countTheEntities_doc = 'This handler takes a single parameter, a string, that contains any number of predefined entities, namely &lt;, &gt;, &amp; \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.';
 	function v1_countTheEntities($m)
 	{
-		$sno=$m->getParam(0);
-		$str=$sno->scalarval();
-		$gt=0; $lt=0; $ap=0; $qu=0; $amp=0;
-		for($i=0; $i<strlen($str); $i++)
+		$sno = $m->getParam(0);
+		$str = $sno->scalarval();
+		$gt = 0; $lt = 0; $ap = 0; $qu = 0; $amp = 0;
+		for ($i = 0; $i<strlen($str); $i++)
 		{
-			$c=substr($str, $i, 1);
-			switch($c)
+			$c = substr($str, $i, 1);
+			switch ($c)
 			{
 				case ">":
 					$gt++;
@@ -588,42 +588,42 @@ 
 	// trivial interop tests
 	// http://www.xmlrpc.com/stories/storyReader$1636
 
-	$i_echoString_sig=array(array($xmlrpcString, $xmlrpcString));
-	$i_echoString_doc="Echoes string.";
+	$i_echoString_sig = array(array($xmlrpcString, $xmlrpcString));
+	$i_echoString_doc = "Echoes string.";
 
-	$i_echoStringArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoStringArray_doc="Echoes string array.";
+	$i_echoStringArray_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$i_echoStringArray_doc = "Echoes string array.";
 
-	$i_echoInteger_sig=array(array($xmlrpcInt, $xmlrpcInt));
-	$i_echoInteger_doc="Echoes integer.";
+	$i_echoInteger_sig = array(array($xmlrpcInt, $xmlrpcInt));
+	$i_echoInteger_doc = "Echoes integer.";
 
-	$i_echoIntegerArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoIntegerArray_doc="Echoes integer array.";
+	$i_echoIntegerArray_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$i_echoIntegerArray_doc = "Echoes integer array.";
 
-	$i_echoFloat_sig=array(array($xmlrpcDouble, $xmlrpcDouble));
-	$i_echoFloat_doc="Echoes float.";
+	$i_echoFloat_sig = array(array($xmlrpcDouble, $xmlrpcDouble));
+	$i_echoFloat_doc = "Echoes float.";
 
-	$i_echoFloatArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoFloatArray_doc="Echoes float array.";
+	$i_echoFloatArray_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$i_echoFloatArray_doc = "Echoes float array.";
 
-	$i_echoStruct_sig=array(array($xmlrpcStruct, $xmlrpcStruct));
-	$i_echoStruct_doc="Echoes struct.";
+	$i_echoStruct_sig = array(array($xmlrpcStruct, $xmlrpcStruct));
+	$i_echoStruct_doc = "Echoes struct.";
 
-	$i_echoStructArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoStructArray_doc="Echoes struct array.";
+	$i_echoStructArray_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$i_echoStructArray_doc = "Echoes struct array.";
 
-	$i_echoValue_doc="Echoes any value back.";
-	$i_echoValue_sig=array(array($xmlrpcValue, $xmlrpcValue));
+	$i_echoValue_doc = "Echoes any value back.";
+	$i_echoValue_sig = array(array($xmlrpcValue, $xmlrpcValue));
 
-	$i_echoBase64_sig=array(array($xmlrpcBase64, $xmlrpcBase64));
-	$i_echoBase64_doc="Echoes base64.";
+	$i_echoBase64_sig = array(array($xmlrpcBase64, $xmlrpcBase64));
+	$i_echoBase64_doc = "Echoes base64.";
 
-	$i_echoDate_sig=array(array($xmlrpcDateTime, $xmlrpcDateTime));
-	$i_echoDate_doc="Echoes dateTime.";
+	$i_echoDate_sig = array(array($xmlrpcDateTime, $xmlrpcDateTime));
+	$i_echoDate_doc = "Echoes dateTime.";
 
 	function i_echoParam($m)
 	{
-		$s=$m->getParam(0);
+		$s = $m->getParam(0);
 		return new xmlrpcresp($s);
 	}
 
@@ -639,23 +639,23 @@ 
 	function i_echoBase64($m) { return i_echoParam($m); }
 	function i_echoDate($m) { return i_echoParam($m); }
 
-	$i_whichToolkit_sig=array(array($xmlrpcStruct));
-	$i_whichToolkit_doc="Returns a struct containing the following strings: toolkitDocsUrl, toolkitName, toolkitVersion, toolkitOperatingSystem.";
+	$i_whichToolkit_sig = array(array($xmlrpcStruct));
+	$i_whichToolkit_doc = "Returns a struct containing the following strings: toolkitDocsUrl, toolkitName, toolkitVersion, toolkitOperatingSystem.";
 
 	function i_whichToolkit($m)
 	{
-		global $xmlrpcName, $xmlrpcVersion,$SERVER_SOFTWARE;
-		$ret=array(
+		global $xmlrpcName, $xmlrpcVersion, $SERVER_SOFTWARE;
+		$ret = array(
 			"toolkitDocsUrl" => "http://phpxmlrpc.sourceforge.net/",
 			"toolkitName" => $xmlrpcName,
 			"toolkitVersion" => $xmlrpcVersion,
 			"toolkitOperatingSystem" => isset ($SERVER_SOFTWARE) ? $SERVER_SOFTWARE : $_SERVER['SERVER_SOFTWARE']
 		);
-		return new xmlrpcresp ( php_xmlrpc_encode($ret));
+		return new xmlrpcresp(php_xmlrpc_encode($ret));
 	}
 
-	$o=new xmlrpc_server_methods_container;
-	$a=array(
+	$o = new xmlrpc_server_methods_container;
+	$a = array(
 		"examples.getStateName" => array(
 			"function" => "findstate",
 			"signature" => $findstate_sig,
@@ -837,7 +837,7 @@ 
     if ($findstate5_sig)
         $a['examples.php4.getStateName'] = $findstate5_sig;
 
-	$s=new xmlrpc_server($a, false);
+	$s = new xmlrpc_server($a, false);
 	$s->setdebug(3);
 	$s->compress_response = true;
 

Braces +29 added lines, -30 removed lines

@@ -93,8 +93,7 @@ 
 		if (isset($stateNames[$snv-1]))
 		{
 			$sname=$stateNames[$snv-1];
-		}
-		else
+		} else
 		{
 			// not, there so complain
 			$err="I don't have a state for the index '" . $snv . "'";
@@ -104,8 +103,7 @@ 
 		if ($err)
 		{
 			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
+		} else
 		{
 			// otherwise, we create the right response
 			// with the state name
@@ -125,8 +123,7 @@ 
 		if (isset($stateNames[$stateno-1]))
 		{
 			return $stateNames[$stateno-1];
-		}
-		else
+		} else
 		{
 			// not, there so complain
 			return "I don't have a state for the index '" . $stateno . "'";
@@ -208,8 +205,7 @@ 
 			if ($b->scalarval())
 			{
 				$rv->addScalar(false, "boolean");
-			}
-			else
+			} else
 			{
 				$rv->addScalar(true, "boolean");
 			}
@@ -304,8 +300,7 @@ 
 			}
 			// add this array to the output value
 			$v->addArray($outAr);
-		}
-		else
+		} else
 		{
 			$err="Must be one parameter, an array of structs";
 		}
@@ -313,8 +308,7 @@ 
 		if ($err)
 		{
 			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
+		} else
 		{
 			return new xmlrpcresp($v);
 		}
@@ -393,8 +387,7 @@ 
 		if ($err)
 		{
 			return new xmlrpcresp(0, $xmlrpcerruser, $err);
-		}
-		else
+		} else
 		{
 			return new xmlrpcresp(new xmlrpcval("true", $xmlrpcBoolean));
 		}
@@ -408,15 +401,15 @@ 
 		if (function_exists('getallheaders'))
 		{
 			return new xmlrpcresp(php_xmlrpc_encode(getallheaders()));
-		}
-		else
+		} else
 		{
 			$headers = array();
 			// IIS: poor man's version of getallheaders
-			foreach ($_SERVER as $key => $val)
-				if (strpos($key, 'HTTP_') === 0)
+			foreach ($_SERVER as $key => $val) {
+							if (strpos($key, 'HTTP_') === 0)
 				{
 					$key = ucfirst(str_replace('_', '-', strtolower(substr($key, 5))));
+			}
 					$headers[$key] = $val;
 				}
 			return new xmlrpcresp(php_xmlrpc_encode($headers));
@@ -825,17 +818,21 @@ 
 		)
 	);
 
-	if ($findstate2_sig)
-		$a['examples.php.getStateName'] = $findstate2_sig;
+	if ($findstate2_sig) {
+			$a['examples.php.getStateName'] = $findstate2_sig;
+	}
 
-	if ($findstate3_sig)
-		$a['examples.php2.getStateName'] = $findstate3_sig;
+	if ($findstate3_sig) {
+			$a['examples.php2.getStateName'] = $findstate3_sig;
+	}
 
-	if ($findstate4_sig)
-		$a['examples.php3.getStateName'] = $findstate4_sig;
+	if ($findstate4_sig) {
+			$a['examples.php3.getStateName'] = $findstate4_sig;
+	}
 
-    if ($findstate5_sig)
-        $a['examples.php4.getStateName'] = $findstate5_sig;
+    if ($findstate5_sig) {
+            $a['examples.php4.getStateName'] = $findstate5_sig;
+    }
 
 	$s=new xmlrpc_server($a, false);
 	$s->setdebug(3);
@@ -843,10 +840,12 @@ 
 
 	// out-of-band information: let the client manipulate the server operations.
 	// we do this to help the testsuite script: do not reproduce in production!
-	if (isset($_GET['RESPONSE_ENCODING']))
-		$s->response_charset_encoding = $_GET['RESPONSE_ENCODING'];
-	if (isset($_GET['EXCEPTION_HANDLING']))
-		$s->exception_handling = $_GET['EXCEPTION_HANDLING'];
+	if (isset($_GET['RESPONSE_ENCODING'])) {
+			$s->response_charset_encoding = $_GET['RESPONSE_ENCODING'];
+	}
+	if (isset($_GET['EXCEPTION_HANDLING'])) {
+			$s->exception_handling = $_GET['EXCEPTION_HANDLING'];
+	}
 	$s->service();
 	// that should do all we need!
 ?>
\ No newline at end of file

demo/vardemo.php

Indentation +71 added lines, -71 removed lines

@@ -2,59 +2,59 @@ 
 <head><title>xmlrpc</title></head>
 <body>
 <?php
-	include("xmlrpc.inc");
-
-	$f = new xmlrpcmsg('examples.getStateName');
-
-	print "<h3>Testing value serialization</h3>\n";
-
-	$v = new xmlrpcval(23, "int");
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
-	$v = new xmlrpcval("What are you saying? >> << &&");
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
-
-	$v = new xmlrpcval(array(
-		new xmlrpcval("ABCDEFHIJ"),
-		new xmlrpcval(1234, 'int'),
-		new xmlrpcval(1, 'boolean')),
-		"array"
-	);
-
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
-
-	$v = new xmlrpcval(
-		array(
-			"thearray" => new xmlrpcval(
-				array(
-					new xmlrpcval("ABCDEFHIJ"),
-					new xmlrpcval(1234, 'int'),
-					new xmlrpcval(1, 'boolean'),
-					new xmlrpcval(0, 'boolean'),
-					new xmlrpcval(true, 'boolean'),
-					new xmlrpcval(false, 'boolean')
-				),
-				"array"
-			),
-			"theint" => new xmlrpcval(23, 'int'),
-			"thestring" => new xmlrpcval("foobarwhizz"),
-			"thestruct" => new xmlrpcval(
-				array(
-					"one" => new xmlrpcval(1, 'int'),
-					"two" => new xmlrpcval(2, 'int')
-				),
-				"struct"
-			)
-		),
-		"struct"
-	);
-
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
-
-	$w = new xmlrpcval(array($v, new xmlrpcval("That was the struct!")), "array");
-
-	print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
-
-	$w = new xmlrpcval("Mary had a little lamb,
+    include("xmlrpc.inc");
+
+    $f = new xmlrpcmsg('examples.getStateName');
+
+    print "<h3>Testing value serialization</h3>\n";
+
+    $v = new xmlrpcval(23, "int");
+    print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+    $v = new xmlrpcval("What are you saying? >> << &&");
+    print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+
+    $v = new xmlrpcval(array(
+        new xmlrpcval("ABCDEFHIJ"),
+        new xmlrpcval(1234, 'int'),
+        new xmlrpcval(1, 'boolean')),
+        "array"
+    );
+
+    print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+
+    $v = new xmlrpcval(
+        array(
+            "thearray" => new xmlrpcval(
+                array(
+                    new xmlrpcval("ABCDEFHIJ"),
+                    new xmlrpcval(1234, 'int'),
+                    new xmlrpcval(1, 'boolean'),
+                    new xmlrpcval(0, 'boolean'),
+                    new xmlrpcval(true, 'boolean'),
+                    new xmlrpcval(false, 'boolean')
+                ),
+                "array"
+            ),
+            "theint" => new xmlrpcval(23, 'int'),
+            "thestring" => new xmlrpcval("foobarwhizz"),
+            "thestruct" => new xmlrpcval(
+                array(
+                    "one" => new xmlrpcval(1, 'int'),
+                    "two" => new xmlrpcval(2, 'int')
+                ),
+                "struct"
+            )
+        ),
+        "struct"
+    );
+
+    print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+
+    $w = new xmlrpcval(array($v, new xmlrpcval("That was the struct!")), "array");
+
+    print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
+
+    $w = new xmlrpcval("Mary had a little lamb,
 Whose fleece was white as snow,
 And everywhere that Mary went
 the lamb was sure to go.
@@ -63,29 +63,29 @@ 
 She tied it to a pylon
 Ten thousand volts went down its back
 And turned it into nylon", "base64"
-	);
-	print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
-	print "<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>";
+    );
+    print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
+    print "<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>";
 
-	$f->method('');
-	$f->addParam(new xmlrpcval("41", "int"));
+    $f->method('');
+    $f->addParam(new xmlrpcval("41", "int"));
 
-	print "<h3>Testing request serialization</h3>\n";
-	$op = $f->serialize();
-	print "<PRE>" . htmlentities($op) . "</PRE>";
+    print "<h3>Testing request serialization</h3>\n";
+    $op = $f->serialize();
+    print "<PRE>" . htmlentities($op) . "</PRE>";
 
-	print "<h3>Testing ISO date format</h3><pre>\n";
+    print "<h3>Testing ISO date format</h3><pre>\n";
 
-	$t = time();
-	$date = iso8601_encode($t);
-	print "Now is $t --> $date\n";
-	print "Or in UTC, that is " . iso8601_encode($t, 1) . "\n";
-	$tb = iso8601_decode($date);
-	print "That is to say $date --> $tb\n";
-	print "Which comes out at " . iso8601_encode($tb) . "\n";
-	print "Which was the time in UTC at " . iso8601_decode($date, 1) . "\n";
+    $t = time();
+    $date = iso8601_encode($t);
+    print "Now is $t --> $date\n";
+    print "Or in UTC, that is " . iso8601_encode($t, 1) . "\n";
+    $tb = iso8601_decode($date);
+    print "That is to say $date --> $tb\n";
+    print "Which comes out at " . iso8601_encode($tb) . "\n";
+    print "Which was the time in UTC at " . iso8601_decode($date, 1) . "\n";
 
-	print "</pre>\n";
+    print "</pre>\n";
 ?>
 </body>
 </html>

Spacing +11 added lines, -11 removed lines

@@ -9,9 +9,9 @@ 
 	print "<h3>Testing value serialization</h3>\n";
 
 	$v = new xmlrpcval(23, "int");
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+	print "<PRE>".htmlentities($v->serialize())."</PRE>";
 	$v = new xmlrpcval("What are you saying? >> << &&");
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+	print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 	$v = new xmlrpcval(array(
 		new xmlrpcval("ABCDEFHIJ"),
@@ -20,7 +20,7 @@ 
 		"array"
 	);
 
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+	print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 	$v = new xmlrpcval(
 		array(
@@ -48,11 +48,11 @@ 
 		"struct"
 	);
 
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+	print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 	$w = new xmlrpcval(array($v, new xmlrpcval("That was the struct!")), "array");
 
-	print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
+	print "<PRE>".htmlentities($w->serialize())."</PRE>";
 
 	$w = new xmlrpcval("Mary had a little lamb,
 Whose fleece was white as snow,
@@ -64,26 +64,26 @@ 
 Ten thousand volts went down its back
 And turned it into nylon", "base64"
 	);
-	print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
-	print "<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>";
+	print "<PRE>".htmlentities($w->serialize())."</PRE>";
+	print "<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>";
 
 	$f->method('');
 	$f->addParam(new xmlrpcval("41", "int"));
 
 	print "<h3>Testing request serialization</h3>\n";
 	$op = $f->serialize();
-	print "<PRE>" . htmlentities($op) . "</PRE>";
+	print "<PRE>".htmlentities($op)."</PRE>";
 
 	print "<h3>Testing ISO date format</h3><pre>\n";
 
 	$t = time();
 	$date = iso8601_encode($t);
 	print "Now is $t --> $date\n";
-	print "Or in UTC, that is " . iso8601_encode($t, 1) . "\n";
+	print "Or in UTC, that is ".iso8601_encode($t, 1)."\n";
 	$tb = iso8601_decode($date);
 	print "That is to say $date --> $tb\n";
-	print "Which comes out at " . iso8601_encode($tb) . "\n";
-	print "Which was the time in UTC at " . iso8601_decode($date, 1) . "\n";
+	print "Which comes out at ".iso8601_encode($tb)."\n";
+	print "Which was the time in UTC at ".iso8601_decode($date, 1)."\n";
 
 	print "</pre>\n";
 ?>

demo/client/comment.php

Indentation +88 added lines, -88 removed lines

@@ -6,41 +6,41 @@ 
 // define some utility functions
 function bomb() { print "</body></html>"; exit(); }
 function dispatch($client, $method, $args) {
-	$msg=new xmlrpcmsg($method, $args);
-	$resp=$client->send($msg);
-	if (!$resp) { print "<p>IO error: ".$client->errstr."</p>"; bomb(); }
-	if ($resp->faultCode()) {
-		print "<p>There was an error: " . $resp->faultCode() . " " .
-			$resp->faultString() . "</p>";
-		bomb();
-	}
-	return php_xmlrpc_decode($resp->value());
+    $msg=new xmlrpcmsg($method, $args);
+    $resp=$client->send($msg);
+    if (!$resp) { print "<p>IO error: ".$client->errstr."</p>"; bomb(); }
+    if ($resp->faultCode()) {
+        print "<p>There was an error: " . $resp->faultCode() . " " .
+            $resp->faultString() . "</p>";
+        bomb();
+    }
+    return php_xmlrpc_decode($resp->value());
 }
 
 // create client for discussion server
 $dclient=new xmlrpc_client("${mydir}/discuss.php",
-													 "xmlrpc.usefulinc.com", 80);
+                                                        "xmlrpc.usefulinc.com", 80);
 
 // check if we're posting a comment, and send it if so
 @$storyid=$_POST["storyid"];
 if ($storyid) {
 
 
-	//	print "Returning to " . $HTTP_POST_VARS["returnto"];
+    //	print "Returning to " . $HTTP_POST_VARS["returnto"];
 
-	$res=dispatch($dclient, "discuss.addComment",
-								array(new xmlrpcval($storyid),
-											new xmlrpcval(stripslashes
-																		(@$_POST["name"])),
-											new xmlrpcval(stripslashes
-																		(@$_POST["commenttext"]))));
+    $res=dispatch($dclient, "discuss.addComment",
+                                array(new xmlrpcval($storyid),
+                                            new xmlrpcval(stripslashes
+                                                                        (@$_POST["name"])),
+                                            new xmlrpcval(stripslashes
+                                                                        (@$_POST["commenttext"]))));
 
-	// send the browser back to the originating page
-	Header("Location: ${mydir}/comment.php?catid=" .
-				 $_POST["catid"] . "&chanid=" .
-				 $_POST["chanid"] . "&oc=" .
-				 $_POST["catid"]);
-	exit(0);
+    // send the browser back to the originating page
+    Header("Location: ${mydir}/comment.php?catid=" .
+                    $_POST["catid"] . "&chanid=" .
+                    $_POST["chanid"] . "&oc=" .
+                    $_POST["catid"]);
+    exit(0);
 }
 
 // now we've got here, we're exploring the story store
@@ -52,17 +52,17 @@ 
 <?php
 @$catid=$_GET["catid"];
 if (@$_GET["oc"]==$catid)
-	@$chanid=$_GET["chanid"];
+    @$chanid=$_GET["chanid"];
 else
-	$chanid=0;
+    $chanid=0;
 
 $client=new xmlrpc_client("/meerkat/xml-rpc/server.php",
-													"www.oreillynet.com", 80);
+                                                    "www.oreillynet.com", 80);
 
 if (@$_GET["comment"] &&
-		(!@$_GET["cdone"])) {
-	// we're making a comment on a story,
-	// so display a comment form
+        (!@$_GET["cdone"])) {
+    // we're making a comment on a story,
+    // so display a comment form
 ?>
 <h3>Make a comment on the story</h3>
 <form method="post">
@@ -80,54 +80,54 @@ 
 </form>
 <?php
 } else {
-	$categories=dispatch($client, "meerkat.getCategories", array());
-	if ($catid)
-		$sources = dispatch($client, "meerkat.getChannelsByCategory",
-												array(new xmlrpcval($catid, "int")));
-	if ($chanid) {
-		$stories = dispatch($client, "meerkat.getItems",
-					array(new xmlrpcval(
-						array(
-							"channel" => new xmlrpcval($chanid, "int"),
-							"ids" => new xmlrpcval(1, "int"),
-							"descriptions" => new xmlrpcval(200, "int"),
-							"num_items" => new xmlrpcval(5, "int"),
-							"dates" => new xmlrpcval(0, "int")
-						), "struct")));
-	}
+    $categories=dispatch($client, "meerkat.getCategories", array());
+    if ($catid)
+        $sources = dispatch($client, "meerkat.getChannelsByCategory",
+                                                array(new xmlrpcval($catid, "int")));
+    if ($chanid) {
+        $stories = dispatch($client, "meerkat.getItems",
+                    array(new xmlrpcval(
+                        array(
+                            "channel" => new xmlrpcval($chanid, "int"),
+                            "ids" => new xmlrpcval(1, "int"),
+                            "descriptions" => new xmlrpcval(200, "int"),
+                            "num_items" => new xmlrpcval(5, "int"),
+                            "dates" => new xmlrpcval(0, "int")
+                        ), "struct")));
+    }
 ?>
 <form>
 <p>Subject area:<br />
 <select name="catid">
 <?php
-	if (!$catid)
-		print "<option value=\"0\">Choose a category</option>\n";
-	while(list($k,$v) = each($categories)) {
-		print "<option value=\"" . $v['id'] ."\"";
-		if ($v['id']==$catid) print " selected=\"selected\"";
-			print ">". $v['title'] . "</option>\n";
-	}
+    if (!$catid)
+        print "<option value=\"0\">Choose a category</option>\n";
+    while(list($k,$v) = each($categories)) {
+        print "<option value=\"" . $v['id'] ."\"";
+        if ($v['id']==$catid) print " selected=\"selected\"";
+            print ">". $v['title'] . "</option>\n";
+    }
 ?>
 </select></p>
 <?php
-	if ($catid) {
+    if ($catid) {
 ?>
 <p>News source:<br />
 <select name="chanid">
 <?php
-		if (!$chanid)
-			print "<option value=\"0\">Choose a source</option>\n";
-		while(list($k,$v) = each($sources)) {
-			print "<option value=\"" . $v['id'] ."\"";
-			if ($v['id']==$chanid) print "\" selected=\"selected\"";
-			print ">". $v['title'] . "</option>\n";
-		}
+        if (!$chanid)
+            print "<option value=\"0\">Choose a source</option>\n";
+        while(list($k,$v) = each($sources)) {
+            print "<option value=\"" . $v['id'] ."\"";
+            if ($v['id']==$chanid) print "\" selected=\"selected\"";
+            print ">". $v['title'] . "</option>\n";
+        }
 ?>
 </select>
 </p>
 
 <?php
-		} // end if ($catid)
+        } // end if ($catid)
 ?>
 
 <p><input type="submit" value="Update" /></p>
@@ -135,43 +135,43 @@ 
 </form>
 
 <?php
-	 if ($chanid) {
+        if ($chanid) {
 ?>
 
 <h2>Stories available</h2>
 <table>
 <?php
-	 while(list($k,$v) = each($stories)) {
-		 print "<tr>";
-		 print "<td><b>" . $v['title'] . "</b><br />";
-		 print $v['description'] . "<br />";
-		 print "<em><a target=\"_blank\" href=\"" .
-			 $v['link'] . "\">Read full story</a> ";
-		 print "<a href=\"comment.php?catid=${catid}&chanid=${chanid}&" .
-			 "oc=${oc}&comment=" . $v['id'] . "\">Comment on this story</a>";
-		 print "</em>";
-		 print "</td>";
-		 print "</tr>\n";
-		 // now look for existing comments
-		 $res=dispatch($dclient, "discuss.getComments",
-							array(new xmlrpcval($v['id'])));
-		 if (sizeof($res)>0) {
-			 print "<tr><td bgcolor=\"#dddddd\"><p><b><i>" .
-				 "Comments on this story:</i></b></p>";
-			 for($i=0; $i<sizeof($res); $i++) {
-				 $s=$res[$i];
-				 print "<p><b>From:</b> " . htmlentities($s['name']) . "<br />";
-				 print "<b>Comment:</b> " . htmlentities($s['comment']) . "</p>";
-			 }
-			 print "</td></tr>\n";
-		 }
-		 print "<tr><td><hr /></td></tr>\n";
-	 }
+        while(list($k,$v) = each($stories)) {
+            print "<tr>";
+            print "<td><b>" . $v['title'] . "</b><br />";
+            print $v['description'] . "<br />";
+            print "<em><a target=\"_blank\" href=\"" .
+                $v['link'] . "\">Read full story</a> ";
+            print "<a href=\"comment.php?catid=${catid}&chanid=${chanid}&" .
+                "oc=${oc}&comment=" . $v['id'] . "\">Comment on this story</a>";
+            print "</em>";
+            print "</td>";
+            print "</tr>\n";
+            // now look for existing comments
+            $res=dispatch($dclient, "discuss.getComments",
+                            array(new xmlrpcval($v['id'])));
+            if (sizeof($res)>0) {
+                print "<tr><td bgcolor=\"#dddddd\"><p><b><i>" .
+                    "Comments on this story:</i></b></p>";
+                for($i=0; $i<sizeof($res); $i++) {
+                    $s=$res[$i];
+                    print "<p><b>From:</b> " . htmlentities($s['name']) . "<br />";
+                    print "<b>Comment:</b> " . htmlentities($s['comment']) . "</p>";
+                }
+                print "</td></tr>\n";
+            }
+            print "<tr><td><hr /></td></tr>\n";
+        }
 ?>
 </table>
 
 <?php
-		} // end if ($chanid)
+        } // end if ($chanid)
 } // end if comment
 ?>
 <hr />

Spacing +41 added lines, -43 removed lines

@@ -1,44 +1,42 @@ 
 <?php
 include("xmlrpc.inc");
 
-$mydir="/demo";
+$mydir = "/demo";
 
 // define some utility functions
 function bomb() { print "</body></html>"; exit(); }
 function dispatch($client, $method, $args) {
-	$msg=new xmlrpcmsg($method, $args);
-	$resp=$client->send($msg);
+	$msg = new xmlrpcmsg($method, $args);
+	$resp = $client->send($msg);
 	if (!$resp) { print "<p>IO error: ".$client->errstr."</p>"; bomb(); }
 	if ($resp->faultCode()) {
-		print "<p>There was an error: " . $resp->faultCode() . " " .
-			$resp->faultString() . "</p>";
+		print "<p>There was an error: ".$resp->faultCode()." ".
+			$resp->faultString()."</p>";
 		bomb();
 	}
 	return php_xmlrpc_decode($resp->value());
 }
 
 // create client for discussion server
-$dclient=new xmlrpc_client("${mydir}/discuss.php",
+$dclient = new xmlrpc_client("${mydir}/discuss.php",
 													 "xmlrpc.usefulinc.com", 80);
 
 // check if we're posting a comment, and send it if so
-@$storyid=$_POST["storyid"];
+@$storyid = $_POST["storyid"];
 if ($storyid) {
 
 
 	//	print "Returning to " . $HTTP_POST_VARS["returnto"];
 
-	$res=dispatch($dclient, "discuss.addComment",
+	$res = dispatch($dclient, "discuss.addComment",
 								array(new xmlrpcval($storyid),
-											new xmlrpcval(stripslashes
-																		(@$_POST["name"])),
-											new xmlrpcval(stripslashes
-																		(@$_POST["commenttext"]))));
+											new xmlrpcval(stripslashes(@$_POST["name"])),
+											new xmlrpcval(stripslashes(@$_POST["commenttext"]))));
 
 	// send the browser back to the originating page
-	Header("Location: ${mydir}/comment.php?catid=" .
-				 $_POST["catid"] . "&chanid=" .
-				 $_POST["chanid"] . "&oc=" .
+	Header("Location: ${mydir}/comment.php?catid=".
+				 $_POST["catid"]."&chanid=".
+				 $_POST["chanid"]."&oc=".
 				 $_POST["catid"]);
 	exit(0);
 }
@@ -50,13 +48,13 @@ 
 <body bgcolor="#ffffff">
 <h2>Meerkat integration</h2>
 <?php
-@$catid=$_GET["catid"];
-if (@$_GET["oc"]==$catid)
-	@$chanid=$_GET["chanid"];
+@$catid = $_GET["catid"];
+if (@$_GET["oc"] == $catid)
+	@$chanid = $_GET["chanid"];
 else
-	$chanid=0;
+	$chanid = 0;
 
-$client=new xmlrpc_client("/meerkat/xml-rpc/server.php",
+$client = new xmlrpc_client("/meerkat/xml-rpc/server.php",
 													"www.oreillynet.com", 80);
 
 if (@$_GET["comment"] &&
@@ -71,7 +69,7 @@ 
    name="commenttext"></textarea></p>
 <input type="submit" value="Send comment" />
 <input type="hidden" name="storyid"
-   value="<?php echo @$_GET["comment"];?>" />
+   value="<?php echo @$_GET["comment"]; ?>" />
 <input type="hidden" name="chanid"
    value="<?php echo $chanid; ?>" />
 <input type="hidden" name="catid"
@@ -80,7 +78,7 @@ 
 </form>
 <?php
 } else {
-	$categories=dispatch($client, "meerkat.getCategories", array());
+	$categories = dispatch($client, "meerkat.getCategories", array());
 	if ($catid)
 		$sources = dispatch($client, "meerkat.getChannelsByCategory",
 												array(new xmlrpcval($catid, "int")));
@@ -102,10 +100,10 @@ 
 <?php
 	if (!$catid)
 		print "<option value=\"0\">Choose a category</option>\n";
-	while(list($k,$v) = each($categories)) {
-		print "<option value=\"" . $v['id'] ."\"";
-		if ($v['id']==$catid) print " selected=\"selected\"";
-			print ">". $v['title'] . "</option>\n";
+	while (list($k, $v) = each($categories)) {
+		print "<option value=\"".$v['id']."\"";
+		if ($v['id'] == $catid) print " selected=\"selected\"";
+			print ">".$v['title']."</option>\n";
 	}
 ?>
 </select></p>
@@ -117,10 +115,10 @@ 
 <?php
 		if (!$chanid)
 			print "<option value=\"0\">Choose a source</option>\n";
-		while(list($k,$v) = each($sources)) {
-			print "<option value=\"" . $v['id'] ."\"";
-			if ($v['id']==$chanid) print "\" selected=\"selected\"";
-			print ">". $v['title'] . "</option>\n";
+		while (list($k, $v) = each($sources)) {
+			print "<option value=\"".$v['id']."\"";
+			if ($v['id'] == $chanid) print "\" selected=\"selected\"";
+			print ">".$v['title']."</option>\n";
 		}
 ?>
 </select>
@@ -141,27 +139,27 @@ 
 <h2>Stories available</h2>
 <table>
 <?php
-	 while(list($k,$v) = each($stories)) {
+	 while (list($k, $v) = each($stories)) {
 		 print "<tr>";
-		 print "<td><b>" . $v['title'] . "</b><br />";
-		 print $v['description'] . "<br />";
-		 print "<em><a target=\"_blank\" href=\"" .
-			 $v['link'] . "\">Read full story</a> ";
-		 print "<a href=\"comment.php?catid=${catid}&chanid=${chanid}&" .
-			 "oc=${oc}&comment=" . $v['id'] . "\">Comment on this story</a>";
+		 print "<td><b>".$v['title']."</b><br />";
+		 print $v['description']."<br />";
+		 print "<em><a target=\"_blank\" href=\"".
+			 $v['link']."\">Read full story</a> ";
+		 print "<a href=\"comment.php?catid=${catid}&chanid=${chanid}&".
+			 "oc=${oc}&comment=".$v['id']."\">Comment on this story</a>";
 		 print "</em>";
 		 print "</td>";
 		 print "</tr>\n";
 		 // now look for existing comments
-		 $res=dispatch($dclient, "discuss.getComments",
+		 $res = dispatch($dclient, "discuss.getComments",
 							array(new xmlrpcval($v['id'])));
 		 if (sizeof($res)>0) {
-			 print "<tr><td bgcolor=\"#dddddd\"><p><b><i>" .
+			 print "<tr><td bgcolor=\"#dddddd\"><p><b><i>".
 				 "Comments on this story:</i></b></p>";
-			 for($i=0; $i<sizeof($res); $i++) {
-				 $s=$res[$i];
-				 print "<p><b>From:</b> " . htmlentities($s['name']) . "<br />";
-				 print "<b>Comment:</b> " . htmlentities($s['comment']) . "</p>";
+			 for ($i = 0; $i<sizeof($res); $i++) {
+				 $s = $res[$i];
+				 print "<p><b>From:</b> ".htmlentities($s['name'])."<br />";
+				 print "<b>Comment:</b> ".htmlentities($s['comment'])."</p>";
 			 }
 			 print "</td></tr>\n";
 		 }

Braces +18 added lines, -10 removed lines

@@ -51,10 +51,11 @@ 
 <h2>Meerkat integration</h2>
 <?php
 @$catid=$_GET["catid"];
-if (@$_GET["oc"]==$catid)
+if (@$_GET["oc"]==$catid) {
 	@$chanid=$_GET["chanid"];
-else
+} else {
 	$chanid=0;
+}
 
 $client=new xmlrpc_client("/meerkat/xml-rpc/server.php",
 													"www.oreillynet.com", 80);
@@ -81,9 +82,10 @@ 
 <?php
 } else {
 	$categories=dispatch($client, "meerkat.getCategories", array());
-	if ($catid)
-		$sources = dispatch($client, "meerkat.getChannelsByCategory",
+	if ($catid) {
+			$sources = dispatch($client, "meerkat.getChannelsByCategory",
 												array(new xmlrpcval($catid, "int")));
+	}
 	if ($chanid) {
 		$stories = dispatch($client, "meerkat.getItems",
 					array(new xmlrpcval(
@@ -100,11 +102,14 @@ 
 <p>Subject area:<br />
 <select name="catid">
 <?php
-	if (!$catid)
-		print "<option value=\"0\">Choose a category</option>\n";
+	if (!$catid) {
+			print "<option value=\"0\">Choose a category</option>\n";
+	}
 	while(list($k,$v) = each($categories)) {
 		print "<option value=\"" . $v['id'] ."\"";
-		if ($v['id']==$catid) print " selected=\"selected\"";
+		if ($v['id']==$catid) {
+		    print " selected=\"selected\"";
+		}
 			print ">". $v['title'] . "</option>\n";
 	}
 ?>
@@ -115,11 +120,14 @@ 
 <p>News source:<br />
 <select name="chanid">
 <?php
-		if (!$chanid)
-			print "<option value=\"0\">Choose a source</option>\n";
+		if (!$chanid) {
+					print "<option value=\"0\">Choose a source</option>\n";
+		}
 		while(list($k,$v) = each($sources)) {
 			print "<option value=\"" . $v['id'] ."\"";
-			if ($v['id']==$chanid) print "\" selected=\"selected\"";
+			if ($v['id']==$chanid) {
+			    print "\" selected=\"selected\"";
+			}
 			print ">". $v['title'] . "</option>\n";
 		}
 ?>