gggeek / phpxmlrpc

debugger/common.php

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

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

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

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/discuss.php

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

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/client/comment.php

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";
 		}
 ?>

demo/client/wrap.php

Braces +5 added lines, -5 removed lines

@@ -17,22 +17,22 @@
 	if($r->faultCode())
 	{
 		echo "<p>Server methods list could not be retrieved: error '".htmlspecialchars($r->faultString())."'</p>\n";
-	}
-	else
+	} else
 	{
 		$testcase = '';
 		echo "<p>Server methods list retrieved, now wrapping it up...</p>\n<ul>\n";
-		foreach($r->value() as $methodname) // $r->value is an array of strings
+		foreach($r->value() as $methodname) {
+		    // $r->value is an array of strings
 		{
 			// do not wrap remote server system methods
 			if (strpos($methodname, 'system.') !== 0)
 			{
 				$funcname = wrap_xmlrpc_method($c, $methodname);
+		}
 				if($funcname)
 				{
 					echo "<li>Remote server method ".htmlspecialchars($methodname)." wrapped into php function ".$funcname."</li>\n";
-				}
-				else
+				} else
 				{
 					echo "<li>Remote server method ".htmlspecialchars($methodname)." could not be wrapped!</li>\n";
 				}

demo/client/client.php

Braces +2 added lines, -4 removed lines

@@ -30,15 +30,13 @@
 				. htmlspecialchars($v->scalarval()) . "<br/>";
 			// print "<HR>I got this value back<BR><PRE>" .
 			//  htmlentities($r->serialize()). "</PRE><HR>\n";
-		}
-		else
+		} else
 		{
 			print "An error occurred: ";
 			print "Code: " . htmlspecialchars($r->faultCode())
 				. " Reason: '" . htmlspecialchars($r->faultString()) . "'</pre><br/>";
 		}
-	}
-	else
+	} else
 	{
 		$stateno = "";
 	}