gggeek / phpxmlrpc

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

demo/client/wrap.php

Indentation +42 added lines, -42 removed lines

@@ -8,49 +8,49 @@
 2) wrapping of remote methods into php functions
 </h3>
 <?php
-	include("xmlrpc.inc");
-	include("xmlrpc_wrappers.inc");
+    include("xmlrpc.inc");
+    include("xmlrpc_wrappers.inc");
 
-	$c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);
-	$c->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals
-	$r =& $c->send(new xmlrpcmsg('system.listMethods'));
-	if($r->faultCode())
-	{
-		echo "<p>Server methods list could not be retrieved: error '".htmlspecialchars($r->faultString())."'</p>\n";
-	}
-	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
-		{
-			// 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
-				{
-					echo "<li>Remote server method ".htmlspecialchars($methodname)." could not be wrapped!</li>\n";
-				}
-				if($methodname == 'examples.getStateName')
-				{
-					$testcase = $funcname;
-				}
-			}
-		}
-		echo "</ul>\n";
-		if($testcase)
-		{
-			echo "Now testing function $testcase: remote method to convert U.S. state number into state name";
-			$statenum = 25;
-			$statename = $testcase($statenum, 2);
-			echo "State number $statenum is ".htmlspecialchars($statename);
-		}
-	}
+    $c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);
+    $c->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals
+    $r =& $c->send(new xmlrpcmsg('system.listMethods'));
+    if($r->faultCode())
+    {
+        echo "<p>Server methods list could not be retrieved: error '".htmlspecialchars($r->faultString())."'</p>\n";
+    }
+    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
+        {
+            // 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
+                {
+                    echo "<li>Remote server method ".htmlspecialchars($methodname)." could not be wrapped!</li>\n";
+                }
+                if($methodname == 'examples.getStateName')
+                {
+                    $testcase = $funcname;
+                }
+            }
+        }
+        echo "</ul>\n";
+        if($testcase)
+        {
+            echo "Now testing function $testcase: remote method to convert U.S. state number into state name";
+            $statenum = 25;
+            $statename = $testcase($statenum, 2);
+            echo "State number $statenum is ".htmlspecialchars($statename);
+        }
+    }
 ?>
 </body>
 </html>

Spacing +6 added lines, -6 removed lines

@@ -13,8 +13,8 @@ 
 
 	$c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);
 	$c->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals
-	$r =& $c->send(new xmlrpcmsg('system.listMethods'));
-	if($r->faultCode())
+	$r = & $c->send(new xmlrpcmsg('system.listMethods'));
+	if ($r->faultCode())
 	{
 		echo "<p>Server methods list could not be retrieved: error '".htmlspecialchars($r->faultString())."'</p>\n";
 	}
@@ -22,13 +22,13 @@ 
 	{
 		$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)
+				if ($funcname)
 				{
 					echo "<li>Remote server method ".htmlspecialchars($methodname)." wrapped into php function ".$funcname."</li>\n";
 				}
@@ -36,14 +36,14 @@ 
 				{
 					echo "<li>Remote server method ".htmlspecialchars($methodname)." could not be wrapped!</li>\n";
 				}
-				if($methodname == 'examples.getStateName')
+				if ($methodname == 'examples.getStateName')
 				{
 					$testcase = $funcname;
 				}
 			}
 		}
 		echo "</ul>\n";
-		if($testcase)
+		if ($testcase)
 		{
 			echo "Now testing function $testcase: remote method to convert U.S. state number into state name";
 			$statenum = 25;

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

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<html>
<head><title>xmlrpc</title></head>
<body>
<h1>Agesort demo</h1>
<h2>Send an array of 'name' => 'age' pairs to the server that will send it back sorted.</h2>
<h3>The source code demonstrates basic lib usage, including handling of xmlrpc arrays and structs</h3>
<p></p>
<?php
include("xmlrpc.inc");

$inAr=array("Dave" => 24, "Edd" => 45, "Joe" => 37, "Fred" => 27);
reset($inAr);
print "This is the input data:<br/><pre>";
while (list($key, $val)=each($inAr)) {
  print $key . ", " . $val . "\n";
}
print "</pre>";

// create parameters from the input array: an xmlrpc array of xmlrpc structs
$p=array();
foreach($inAr as $key => $val) {
  $p[]=new xmlrpcval(array("name" => new xmlrpcval($key),
                           "age" => new xmlrpcval($val, "int")), "struct");
}
$v=new xmlrpcval($p, "array");
print "Encoded into xmlrpc format it looks like this: <pre>\n" .  htmlentities($v->serialize()). "</pre>\n";

// create client and message objects
$f=new xmlrpcmsg('examples.sortByAge',  array($v));
$c=new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);

// set maximum debug level, to have the complete communication printed to screen
$c->setDebug(2);

// send request
print "Now sending request (detailed debug info follows)";
$r=&$c->send($f);

// check response for errors, and take appropriate action
if (!$r->faultCode()) {
  print "The server gave me these results:<pre>";
  $v=$r->value();
  $max=$v->arraysize();
  for($i=0; $i<$max; $i++) {
    $rec=$v->arraymem($i);
    $n=$rec->structmem("name");
    $a=$rec->structmem("age");
    print htmlspecialchars($n->scalarval()) . ", " . htmlspecialchars($a->scalarval()) . "\n";
  }

  print "<hr/>For nerds: I got this value back<br/><pre>" .
    htmlentities($r->serialize()). "</pre><hr/>\n";
} else {
  print "An error occurred:<pre>";
  print "Code: " . htmlspecialchars($r->faultCode()) .
    "\nReason: '" . htmlspecialchars($r->faultString()).'\'</pre><hr/>';
}

?>
</body>
</html>

\ No newline at end of file
+<html>
<head><title>xmlrpc</title></head>
<body>
<h1>Agesort demo</h1>
<h2>Send an array of 'name' => 'age' pairs to the server that will send it back sorted.</h2>
<h3>The source code demonstrates basic lib usage, including handling of xmlrpc arrays and structs</h3>
<p></p>
<?php
include("xmlrpc.inc"); $inAr = array("Dave" => 24, "Edd" => 45, "Joe" => 37, "Fred" => 27); reset($inAr); print "This is the input data:<br/><pre>"; while (list($key, $val) = each($inAr)) {
  print $key.", ".$val."\n"; }
print "</pre>"; // create parameters from the input array: an xmlrpc array of xmlrpc structs
$p = array(); foreach ($inAr as $key => $val) {
  $p[] = new xmlrpcval(array("name" => new xmlrpcval($key), "age" => new xmlrpcval($val, "int")), "struct"); }
$v = new xmlrpcval($p, "array"); print "Encoded into xmlrpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n"; // create client and message objects
$f = new xmlrpcmsg('examples.sortByAge', array($v)); $c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80); // set maximum debug level, to have the complete communication printed to screen
$c->setDebug(2); // send request
print "Now sending request (detailed debug info follows)"; $r = &$c->send($f); // check response for errors, and take appropriate action
if (!$r->faultCode()) {
  print "The server gave me these results:<pre>"; $v = $r->value(); $max = $v->arraysize(); for ($i = 0; $i<$max; $i++) {
    $rec = $v->arraymem($i); $n = $rec->structmem("name"); $a = $rec->structmem("age"); print htmlspecialchars($n->scalarval()).", ".htmlspecialchars($a->scalarval())."\n"; }

  print "<hr/>For nerds: I got this value back<br/><pre>".htmlentities($r->serialize())."</pre><hr/>\n"; } else {
  print "An error occurred:<pre>"; print "Code: ".htmlspecialchars($r->faultCode())."\nReason: '".htmlspecialchars($r->faultString()).'\'</pre><hr/>'; }

?>
</body>
</html>

\ No newline at end of file

demo/client/client.php

Indentation +36 added lines, -36 removed lines

@@ -5,45 +5,45 @@
 <h2>Send a U.S. state number to the server and get back the state name</h2>
 <h3>The code demonstrates usage of the php_xmlrpc_encode function</h3>
 <?php
-	include("xmlrpc.inc");
+    include("xmlrpc.inc");
 
-	// Play nice to PHP 5 installations with REGISTER_LONG_ARRAYS off
-	if(!isset($HTTP_POST_VARS) && isset($_POST))
-	{
-		$HTTP_POST_VARS = $_POST;
-	}
+    // Play nice to PHP 5 installations with REGISTER_LONG_ARRAYS off
+    if(!isset($HTTP_POST_VARS) && isset($_POST))
+    {
+        $HTTP_POST_VARS = $_POST;
+    }
 
-	if(isset($HTTP_POST_VARS["stateno"]) && $HTTP_POST_VARS["stateno"]!="")
-	{
-		$stateno=(integer)$HTTP_POST_VARS["stateno"];
-		$f=new xmlrpcmsg('examples.getStateName',
-			array(php_xmlrpc_encode($stateno))
-		);
-		print "<pre>Sending the following request:\n\n" . htmlentities($f->serialize()) . "\n\nDebug info of server data follows...\n\n";
-		$c=new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);
-		$c->setDebug(1);
-		$r=&$c->send($f);
-		if(!$r->faultCode())
-		{
-			$v=$r->value();
-			print "</pre><br/>State number " . $stateno . " is "
-				. htmlspecialchars($v->scalarval()) . "<br/>";
-			// print "<HR>I got this value back<BR><PRE>" .
-			//  htmlentities($r->serialize()). "</PRE><HR>\n";
-		}
-		else
-		{
-			print "An error occurred: ";
-			print "Code: " . htmlspecialchars($r->faultCode())
-				. " Reason: '" . htmlspecialchars($r->faultString()) . "'</pre><br/>";
-		}
-	}
-	else
-	{
-		$stateno = "";
-	}
+    if(isset($HTTP_POST_VARS["stateno"]) && $HTTP_POST_VARS["stateno"]!="")
+    {
+        $stateno=(integer)$HTTP_POST_VARS["stateno"];
+        $f=new xmlrpcmsg('examples.getStateName',
+            array(php_xmlrpc_encode($stateno))
+        );
+        print "<pre>Sending the following request:\n\n" . htmlentities($f->serialize()) . "\n\nDebug info of server data follows...\n\n";
+        $c=new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);
+        $c->setDebug(1);
+        $r=&$c->send($f);
+        if(!$r->faultCode())
+        {
+            $v=$r->value();
+            print "</pre><br/>State number " . $stateno . " is "
+                . htmlspecialchars($v->scalarval()) . "<br/>";
+            // print "<HR>I got this value back<BR><PRE>" .
+            //  htmlentities($r->serialize()). "</PRE><HR>\n";
+        }
+        else
+        {
+            print "An error occurred: ";
+            print "Code: " . htmlspecialchars($r->faultCode())
+                . " Reason: '" . htmlspecialchars($r->faultString()) . "'</pre><br/>";
+        }
+    }
+    else
+    {
+        $stateno = "";
+    }
 
-	print "<form action=\"client.php\" method=\"POST\">
+    print "<form action=\"client.php\" method=\"POST\">
 <input name=\"stateno\" value=\"" . $stateno . "\"><input type=\"submit\" value=\"go\" name=\"submit\"></form>
 <p>Enter a state number to query its name</p>";
 

Spacing +14 added lines, -14 removed lines

@@ -8,34 +8,34 @@ 
 	include("xmlrpc.inc");
 
 	// Play nice to PHP 5 installations with REGISTER_LONG_ARRAYS off
-	if(!isset($HTTP_POST_VARS) && isset($_POST))
+	if (!isset($HTTP_POST_VARS) && isset($_POST))
 	{
 		$HTTP_POST_VARS = $_POST;
 	}
 
-	if(isset($HTTP_POST_VARS["stateno"]) && $HTTP_POST_VARS["stateno"]!="")
+	if (isset($HTTP_POST_VARS["stateno"]) && $HTTP_POST_VARS["stateno"] != "")
 	{
-		$stateno=(integer)$HTTP_POST_VARS["stateno"];
-		$f=new xmlrpcmsg('examples.getStateName',
+		$stateno = (integer) $HTTP_POST_VARS["stateno"];
+		$f = new xmlrpcmsg('examples.getStateName',
 			array(php_xmlrpc_encode($stateno))
 		);
-		print "<pre>Sending the following request:\n\n" . htmlentities($f->serialize()) . "\n\nDebug info of server data follows...\n\n";
-		$c=new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);
+		print "<pre>Sending the following request:\n\n".htmlentities($f->serialize())."\n\nDebug info of server data follows...\n\n";
+		$c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);
 		$c->setDebug(1);
-		$r=&$c->send($f);
-		if(!$r->faultCode())
+		$r = &$c->send($f);
+		if (!$r->faultCode())
 		{
-			$v=$r->value();
-			print "</pre><br/>State number " . $stateno . " is "
-				. htmlspecialchars($v->scalarval()) . "<br/>";
+			$v = $r->value();
+			print "</pre><br/>State number ".$stateno." is "
+				. htmlspecialchars($v->scalarval())."<br/>";
 			// print "<HR>I got this value back<BR><PRE>" .
 			//  htmlentities($r->serialize()). "</PRE><HR>\n";
 		}
 		else
 		{
 			print "An error occurred: ";
-			print "Code: " . htmlspecialchars($r->faultCode())
-				. " Reason: '" . htmlspecialchars($r->faultString()) . "'</pre><br/>";
+			print "Code: ".htmlspecialchars($r->faultCode())
+				. " Reason: '".htmlspecialchars($r->faultString())."'</pre><br/>";
 		}
 	}
 	else
@@ -44,7 +44,7 @@ 
 	}
 
 	print "<form action=\"client.php\" method=\"POST\">
-<input name=\"stateno\" value=\"" . $stateno . "\"><input type=\"submit\" value=\"go\" name=\"submit\"></form>
+<input name=\"stateno\" value=\"" . $stateno."\"><input type=\"submit\" value=\"go\" name=\"submit\"></form>
 <p>Enter a state number to query its name</p>";
 
 ?>

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

demo/client/mail.php

Indentation +29 added lines, -29 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 // Allow users to see the source of this file even if PHP is not configured for it
 if ((isset($HTTP_GET_VARS['showSource']) && $HTTP_GET_VARS['showSource']) ||
-	(isset($_GET['showSource']) && $_GET['showSource']))
-	{ highlight_file(__FILE__); die(); }
+    (isset($_GET['showSource']) && $_GET['showSource']))
+    { highlight_file(__FILE__); die(); }
 ?>
 <html>
 <head><title>xmlrpc</title></head>
@@ -18,36 +18,36 @@ 
 
 // Play nice to PHP 5 installations with REGISTER_LONG_ARRAYS off
 if (!isset($HTTP_POST_VARS) && isset($_POST))
-	$HTTP_POST_VARS = $_POST;
+    $HTTP_POST_VARS = $_POST;
 
 if (isset($HTTP_POST_VARS["server"]) && $HTTP_POST_VARS["server"]) {
-	if ($HTTP_POST_VARS["server"]=="Userland") {
-		$XP="/RPC2"; $XS="206.204.24.2";
-	} else {
-		$XP="/xmlrpc/server.php"; $XS="pingu.heddley.com";
-	}
-	$f=new xmlrpcmsg('mail.send');
-	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailto"]));
-	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailsub"]));
-	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailmsg"]));
-	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailfrom"]));
-	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailcc"]));
-	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailbcc"]));
-	$f->addParam(new xmlrpcval("text/plain"));
+    if ($HTTP_POST_VARS["server"]=="Userland") {
+        $XP="/RPC2"; $XS="206.204.24.2";
+    } else {
+        $XP="/xmlrpc/server.php"; $XS="pingu.heddley.com";
+    }
+    $f=new xmlrpcmsg('mail.send');
+    $f->addParam(new xmlrpcval($HTTP_POST_VARS["mailto"]));
+    $f->addParam(new xmlrpcval($HTTP_POST_VARS["mailsub"]));
+    $f->addParam(new xmlrpcval($HTTP_POST_VARS["mailmsg"]));
+    $f->addParam(new xmlrpcval($HTTP_POST_VARS["mailfrom"]));
+    $f->addParam(new xmlrpcval($HTTP_POST_VARS["mailcc"]));
+    $f->addParam(new xmlrpcval($HTTP_POST_VARS["mailbcc"]));
+    $f->addParam(new xmlrpcval("text/plain"));
 
-	$c=new xmlrpc_client($XP, $XS, 80);
-	$c->setDebug(2);
-	$r=&$c->send($f);
-	if (!$r->faultCode()) {
-		print "Mail sent OK<br/>\n";
-	} else {
-		print "<fonr color=\"red\">";
-		print "Mail send failed<br/>\n";
-		print "Fault: ";
-		print "Code: " . htmlspecialchars($r->faultCode()) .
-	  " Reason: '" . htmlspecialchars($r->faultString()) . "'<br/>";
-		print "</font><br/>";
-	}
+    $c=new xmlrpc_client($XP, $XS, 80);
+    $c->setDebug(2);
+    $r=&$c->send($f);
+    if (!$r->faultCode()) {
+        print "Mail sent OK<br/>\n";
+    } else {
+        print "<fonr color=\"red\">";
+        print "Mail send failed<br/>\n";
+        print "Fault: ";
+        print "Code: " . htmlspecialchars($r->faultCode()) .
+        " Reason: '" . htmlspecialchars($r->faultString()) . "'<br/>";
+        print "</font><br/>";
+    }
 }
 ?>
 <form method="POST">

Spacing +8 added lines, -8 removed lines

@@ -21,12 +21,12 @@ 
 	$HTTP_POST_VARS = $_POST;
 
 if (isset($HTTP_POST_VARS["server"]) && $HTTP_POST_VARS["server"]) {
-	if ($HTTP_POST_VARS["server"]=="Userland") {
-		$XP="/RPC2"; $XS="206.204.24.2";
+	if ($HTTP_POST_VARS["server"] == "Userland") {
+		$XP = "/RPC2"; $XS = "206.204.24.2";
 	} else {
-		$XP="/xmlrpc/server.php"; $XS="pingu.heddley.com";
+		$XP = "/xmlrpc/server.php"; $XS = "pingu.heddley.com";
 	}
-	$f=new xmlrpcmsg('mail.send');
+	$f = new xmlrpcmsg('mail.send');
 	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailto"]));
 	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailsub"]));
 	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailmsg"]));
@@ -35,17 +35,17 @@ 
 	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailbcc"]));
 	$f->addParam(new xmlrpcval("text/plain"));
 
-	$c=new xmlrpc_client($XP, $XS, 80);
+	$c = new xmlrpc_client($XP, $XS, 80);
 	$c->setDebug(2);
-	$r=&$c->send($f);
+	$r = &$c->send($f);
 	if (!$r->faultCode()) {
 		print "Mail sent OK<br/>\n";
 	} else {
 		print "<fonr color=\"red\">";
 		print "Mail send failed<br/>\n";
 		print "Fault: ";
-		print "Code: " . htmlspecialchars($r->faultCode()) .
-	  " Reason: '" . htmlspecialchars($r->faultString()) . "'<br/>";
+		print "Code: ".htmlspecialchars($r->faultCode()).
+	  " Reason: '".htmlspecialchars($r->faultString())."'<br/>";
 		print "</font><br/>";
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -17,8 +17,9 @@
 include("xmlrpc.inc");
 
 // Play nice to PHP 5 installations with REGISTER_LONG_ARRAYS off
-if (!isset($HTTP_POST_VARS) && isset($_POST))
+if (!isset($HTTP_POST_VARS) && isset($_POST)) {
 	$HTTP_POST_VARS = $_POST;
+}
 
 if (isset($HTTP_POST_VARS["server"]) && $HTTP_POST_VARS["server"]) {
 	if ($HTTP_POST_VARS["server"]=="Userland") {

demo/client/zopetest.php

Indentation +19 added lines, -19 removed lines

@@ -4,26 +4,26 @@
 <h1>Zope test demo</h1>
 <h3>The code demonstrates usage of basic authentication to connect to the server</h3>
 <?php
-	include("xmlrpc.inc");
+    include("xmlrpc.inc");
 
-	$f = new xmlrpcmsg('document_src', array());
-	$c = new xmlrpc_client("/index_html", "pingu.heddley.com", 9080);
-	$c->setCredentials("username", "password");
-	$c->setDebug(2);
-	$r = $c->send($f);
-	if(!$r->faultCode())
-	{
-		$v = $r->value();
-		print "I received:" . htmlspecialchars($v->scalarval()) . "<br/>";
-		print "<hr/>I got this value back<br/>pre>" .
-		htmlentities($r->serialize()). "</pre>\n";
-	}
-	else
-	{
-		print "An error occurred: ";
-		print "Code: " . htmlspecialchars($r->faultCode())
-			. " Reason: '" . ($r->faultString()) . "'<br/>";
-	}
+    $f = new xmlrpcmsg('document_src', array());
+    $c = new xmlrpc_client("/index_html", "pingu.heddley.com", 9080);
+    $c->setCredentials("username", "password");
+    $c->setDebug(2);
+    $r = $c->send($f);
+    if(!$r->faultCode())
+    {
+        $v = $r->value();
+        print "I received:" . htmlspecialchars($v->scalarval()) . "<br/>";
+        print "<hr/>I got this value back<br/>pre>" .
+        htmlentities($r->serialize()). "</pre>\n";
+    }
+    else
+    {
+        print "An error occurred: ";
+        print "Code: " . htmlspecialchars($r->faultCode())
+            . " Reason: '" . ($r->faultString()) . "'<br/>";
+    }
 ?>
 </body>
 </html>

Spacing +6 added lines, -6 removed lines

@@ -11,18 +11,18 @@
 	$c->setCredentials("username", "password");
 	$c->setDebug(2);
 	$r = $c->send($f);
-	if(!$r->faultCode())
+	if (!$r->faultCode())
 	{
 		$v = $r->value();
-		print "I received:" . htmlspecialchars($v->scalarval()) . "<br/>";
-		print "<hr/>I got this value back<br/>pre>" .
-		htmlentities($r->serialize()). "</pre>\n";
+		print "I received:".htmlspecialchars($v->scalarval())."<br/>";
+		print "<hr/>I got this value back<br/>pre>".
+		htmlentities($r->serialize())."</pre>\n";
 	}
 	else
 	{
 		print "An error occurred: ";
-		print "Code: " . htmlspecialchars($r->faultCode())
-			. " Reason: '" . ($r->faultString()) . "'<br/>";
+		print "Code: ".htmlspecialchars($r->faultCode())
+			. " Reason: '".($r->faultString())."'<br/>";
 	}
 ?>
 </body>

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
 		print "I received:" . htmlspecialchars($v->scalarval()) . "<br/>";
 		print "<hr/>I got this value back<br/>pre>" .
 		htmlentities($r->serialize()). "</pre>\n";
-	}
-	else
+	} else
 	{
 		print "An error occurred: ";
 		print "Code: " . htmlspecialchars($r->faultCode())

demo/client/introspect.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Introspect demo</h1>

<h2>Query server for available methods and their description</h2>

<h3>The code demonstrates usage of multicall and introspection methods</h3>

<?php

	include("xmlrpc.inc");



	function display_error($r)

	{

		print "An error occurred: ";

		print "Code: " . $r->faultCode()

			. " Reason: '" .$r->faultString()."'<br/>";

	}



	// 'new style' client constuctor

	$c = new xmlrpc_client("http://phpxmlrpc.sourceforge.net/server.php");

	print "<h3>methods available at http://" . $c->server . $c->path .  "</h3>\n";



	$m = new xmlrpcmsg('system.listMethods');

	$r =& $c->send($m);

	if($r->faultCode())

	{

		display_error($r);

	}

	else

	{

		$v=$r->value();

		for($i=0; $i<$v->arraysize(); $i++)

		{

			$mname=$v->arraymem($i);

			print "<h4>" . $mname->scalarval() . "</h4>\n";



			// build messages first, add params later

			$m1  = new xmlrpcmsg('system.methodHelp');

			$m2  = new xmlrpcmsg('system.methodSignature');

			$val = new xmlrpcval($mname->scalarval(), "string");

			$m1->addParam($val);

			$m2->addParam($val);



			// send multiple messages in one pass.

			// If server does not support multicall, client will fall back to 2 separate calls

			$ms = array($m1, $m2);

			$rs =& $c->send($ms);



			if($rs[0]->faultCode())

			{

				display_error($rs[0]);

			}

			else

			{

				$val=$rs[0]->value();

				$txt=$val->scalarval();

				if($txt != "")

				{

					print "<h4>Documentation</h4><p>${txt}</p>\n";

				}

				else

				{

					print "<p>No documentation available.</p>\n";

				}

			}



			if($rs[1]->faultCode())

			{

				display_error($rs[1]);

			}

			else

			{

				print "<h4>Signature</h4><p>\n";

				$val = $rs[1]->value();

				if($val->kindOf()=="array")

				{

					for($j=0; $j<$val->arraysize(); $j++)

					{

						$x = $val->arraymem($j);

						$ret = $x->arraymem(0);

						print "<code>" . $ret->scalarval() . " "

							. $mname->scalarval() . "(";

						if($x->arraysize()>1)

						{

							for($k=1; $k<$x->arraysize(); $k++)

							{

								$y = $x->arraymem($k);

								print $y->scalarval();

								if($k < $x->arraysize()-1)

								{

									print ", ";

								}

							}

						}

						print ")</code><br/>\n";

					}

				}

				else

				{

					print "Signature unknown\n";

				}

				print "</p>\n";

			}

		}

	}

?>

</body>

</html>


\ No newline at end of file
+<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Introspect demo</h1>

<h2>Query server for available methods and their description</h2>

<h3>The code demonstrates usage of multicall and introspection methods</h3>

<?php

	include("xmlrpc.inc"); function display_error($r) {

		print "An error occurred: "; print "Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>"; }



	// 'new style' client constuctor

	$c = new xmlrpc_client("http://phpxmlrpc.sourceforge.net/server.php"); print "<h3>methods available at http://".$c->server.$c->path."</h3>\n"; $m = new xmlrpcmsg('system.listMethods'); $r = & $c->send($m); if ($r->faultCode()) {

		display_error($r); } else {

		$v = $r->value(); for ($i = 0; $i<$v->arraysize(); $i++) {

			$mname = $v->arraymem($i); print "<h4>".$mname->scalarval()."</h4>\n"; // build messages first, add params later

			$m1 = new xmlrpcmsg('system.methodHelp'); $m2 = new xmlrpcmsg('system.methodSignature'); $val = new xmlrpcval($mname->scalarval(), "string"); $m1->addParam($val); $m2->addParam($val); // send multiple messages in one pass.

			// If server does not support multicall, client will fall back to 2 separate calls

			$ms = array($m1, $m2); $rs = & $c->send($ms); if ($rs[0]->faultCode()) {

				display_error($rs[0]); } else {

				$val = $rs[0]->value(); $txt = $val->scalarval(); if ($txt != "") {

					print "<h4>Documentation</h4><p>${txt}</p>\n"; } else {

					print "<p>No documentation available.</p>\n"; }

			}



			if ($rs[1]->faultCode()) {

				display_error($rs[1]); } else {

				print "<h4>Signature</h4><p>\n"; $val = $rs[1]->value(); if ($val->kindOf() == "array") {

					for ($j = 0; $j<$val->arraysize(); $j++) {

						$x = $val->arraymem($j); $ret = $x->arraymem(0); print "<code>".$ret->scalarval()." ".$mname->scalarval()."("; if ($x->arraysize()>1) {

							for ($k = 1; $k<$x->arraysize(); $k++) {

								$y = $x->arraymem($k); print $y->scalarval(); if ($k<$x->arraysize()-1) {

									print ", "; }

							}

						}

						print ")</code><br/>\n"; }

				} else {

					print "Signature unknown\n"; }

				print "</p>\n"; }

		}

	}

?>

</body>

</html>


\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Introspect demo</h1>

<h2>Query server for available methods and their description</h2>

<h3>The code demonstrates usage of multicall and introspection methods</h3>

<?php

	include("xmlrpc.inc");



	function display_error($r)

	{

		print "An error occurred: ";

		print "Code: " . $r->faultCode()

			. " Reason: '" .$r->faultString()."'<br/>";

	}



	// 'new style' client constuctor

	$c = new xmlrpc_client("http://phpxmlrpc.sourceforge.net/server.php");

	print "<h3>methods available at http://" . $c->server . $c->path .  "</h3>\n";



	$m = new xmlrpcmsg('system.listMethods');

	$r =& $c->send($m);

	if($r->faultCode())

	{

		display_error($r);

	}

	else

	{

		$v=$r->value();

		for($i=0; $i<$v->arraysize(); $i++)

		{

			$mname=$v->arraymem($i);

			print "<h4>" . $mname->scalarval() . "</h4>\n";



			// build messages first, add params later

			$m1  = new xmlrpcmsg('system.methodHelp');

			$m2  = new xmlrpcmsg('system.methodSignature');

			$val = new xmlrpcval($mname->scalarval(), "string");

			$m1->addParam($val);

			$m2->addParam($val);



			// send multiple messages in one pass.

			// If server does not support multicall, client will fall back to 2 separate calls

			$ms = array($m1, $m2);

			$rs =& $c->send($ms);



			if($rs[0]->faultCode())

			{

				display_error($rs[0]);

			}

			else

			{

				$val=$rs[0]->value();

				$txt=$val->scalarval();

				if($txt != "")

				{

					print "<h4>Documentation</h4><p>${txt}</p>\n";

				}

				else

				{

					print "<p>No documentation available.</p>\n";

				}

			}



			if($rs[1]->faultCode())

			{

				display_error($rs[1]);

			}

			else

			{

				print "<h4>Signature</h4><p>\n";

				$val = $rs[1]->value();

				if($val->kindOf()=="array")

				{

					for($j=0; $j<$val->arraysize(); $j++)

					{

						$x = $val->arraymem($j);

						$ret = $x->arraymem(0);

						print "<code>" . $ret->scalarval() . " "

							. $mname->scalarval() . "(";

						if($x->arraysize()>1)

						{

							for($k=1; $k<$x->arraysize(); $k++)

							{

								$y = $x->arraymem($k);

								print $y->scalarval();

								if($k < $x->arraysize()-1)

								{

									print ", ";

								}

							}

						}

						print ")</code><br/>\n";

					}

				}

				else

				{

					print "Signature unknown\n";

				}

				print "</p>\n";

			}

		}

	}

?>

</body>

</html>


\ No newline at end of file
+<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Introspect demo</h1>

<h2>Query server for available methods and their description</h2>

<h3>The code demonstrates usage of multicall and introspection methods</h3>

<?php

	include("xmlrpc.inc");



	function display_error($r)

	{

		print "An error occurred: ";

		print "Code: " . $r->faultCode()

			. " Reason: '" .$r->faultString()."'<br/>";

	}



	// 'new style' client constuctor

	$c = new xmlrpc_client("http://phpxmlrpc.sourceforge.net/server.php");

	print "<h3>methods available at http://" . $c->server . $c->path .  "</h3>\n";



	$m = new xmlrpcmsg('system.listMethods');

	$r =& $c->send($m);

	if($r->faultCode())

	{

		display_error($r);

	} else

	{

		$v=$r->value();

		for($i=0; $i<$v->arraysize(); $i++)

		{

			$mname=$v->arraymem($i);

			print "<h4>" . $mname->scalarval() . "</h4>\n";



			// build messages first, add params later

			$m1  = new xmlrpcmsg('system.methodHelp');

			$m2  = new xmlrpcmsg('system.methodSignature');

			$val = new xmlrpcval($mname->scalarval(), "string");

			$m1->addParam($val);

			$m2->addParam($val);



			// send multiple messages in one pass.

			// If server does not support multicall, client will fall back to 2 separate calls

			$ms = array($m1, $m2);

			$rs =& $c->send($ms);



			if($rs[0]->faultCode())

			{

				display_error($rs[0]);

			} else

			{

				$val=$rs[0]->value();

				$txt=$val->scalarval();

				if($txt != "")

				{

					print "<h4>Documentation</h4><p>${txt}</p>\n";

				} else

				{

					print "<p>No documentation available.</p>\n";

				}

			}



			if($rs[1]->faultCode())

			{

				display_error($rs[1]);

			} else

			{

				print "<h4>Signature</h4><p>\n";

				$val = $rs[1]->value();

				if($val->kindOf()=="array")

				{

					for($j=0; $j<$val->arraysize(); $j++)

					{

						$x = $val->arraymem($j);

						$ret = $x->arraymem(0);

						print "<code>" . $ret->scalarval() . " "

							. $mname->scalarval() . "(";

						if($x->arraysize()>1)

						{

							for($k=1; $k<$x->arraysize(); $k++)

							{

								$y = $x->arraymem($k);

								print $y->scalarval();

								if($k < $x->arraysize()-1)

								{

									print ", ";

								}

							}

						}

						print ")</code><br/>\n";

					}

				} else

				{

					print "Signature unknown\n";

				}

				print "</p>\n";

			}

		}

	}

?>

</body>

</html>


\ No newline at end of file

demo/client/which.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Which toolkit demo</h1>

<h2>Query server for toolkit information</h2>

<h3>The code demonstrates usage of the php_xmlrpc_decode function</h3>

<?php

	include("xmlrpc.inc");



	$f = new xmlrpcmsg('interopEchoTests.whichToolkit', array());

	$c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);

	$r = $c->send($f);

	if(!$r->faultCode())

	{

		$v = php_xmlrpc_decode($r->value());

		print "<pre>";

		print "name: " . htmlspecialchars($v["toolkitName"]) . "\n";

		print "version: " . htmlspecialchars($v["toolkitVersion"]) . "\n";

		print "docs: " . htmlspecialchars($v["toolkitDocsUrl"]) . "\n";

		print "os: " . htmlspecialchars($v["toolkitOperatingSystem"]) . "\n";

		print "</pre>";

	}

	else

	{

		print "An error occurred: ";

		print "Code: " . htmlspecialchars($r->faultCode()) . " Reason: '" . htmlspecialchars($r->faultString()) . "'\n";

	}

?>

</body>

</html>


\ No newline at end of file
+<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Which toolkit demo</h1>

<h2>Query server for toolkit information</h2>

<h3>The code demonstrates usage of the php_xmlrpc_decode function</h3>

<?php

	include("xmlrpc.inc"); $f = new xmlrpcmsg('interopEchoTests.whichToolkit', array()); $c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80); $r = $c->send($f); if (!$r->faultCode()) {

		$v = php_xmlrpc_decode($r->value()); print "<pre>"; print "name: ".htmlspecialchars($v["toolkitName"])."\n"; print "version: ".htmlspecialchars($v["toolkitVersion"])."\n"; print "docs: ".htmlspecialchars($v["toolkitDocsUrl"])."\n"; print "os: ".htmlspecialchars($v["toolkitOperatingSystem"])."\n"; print "</pre>"; } else {

		print "An error occurred: "; print "Code: ".htmlspecialchars($r->faultCode())." Reason: '".htmlspecialchars($r->faultString())."'\n"; }

?>

</body>

</html>


\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Which toolkit demo</h1>

<h2>Query server for toolkit information</h2>

<h3>The code demonstrates usage of the php_xmlrpc_decode function</h3>

<?php

	include("xmlrpc.inc");



	$f = new xmlrpcmsg('interopEchoTests.whichToolkit', array());

	$c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);

	$r = $c->send($f);

	if(!$r->faultCode())

	{

		$v = php_xmlrpc_decode($r->value());

		print "<pre>";

		print "name: " . htmlspecialchars($v["toolkitName"]) . "\n";

		print "version: " . htmlspecialchars($v["toolkitVersion"]) . "\n";

		print "docs: " . htmlspecialchars($v["toolkitDocsUrl"]) . "\n";

		print "os: " . htmlspecialchars($v["toolkitOperatingSystem"]) . "\n";

		print "</pre>";

	}

	else

	{

		print "An error occurred: ";

		print "Code: " . htmlspecialchars($r->faultCode()) . " Reason: '" . htmlspecialchars($r->faultString()) . "'\n";

	}

?>

</body>

</html>


\ No newline at end of file
+<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Which toolkit demo</h1>

<h2>Query server for toolkit information</h2>

<h3>The code demonstrates usage of the php_xmlrpc_decode function</h3>

<?php

	include("xmlrpc.inc");



	$f = new xmlrpcmsg('interopEchoTests.whichToolkit', array());

	$c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);

	$r = $c->send($f);

	if(!$r->faultCode())

	{

		$v = php_xmlrpc_decode($r->value());

		print "<pre>";

		print "name: " . htmlspecialchars($v["toolkitName"]) . "\n";

		print "version: " . htmlspecialchars($v["toolkitVersion"]) . "\n";

		print "docs: " . htmlspecialchars($v["toolkitDocsUrl"]) . "\n";

		print "os: " . htmlspecialchars($v["toolkitOperatingSystem"]) . "\n";

		print "</pre>";

	} else

	{

		print "An error occurred: ";

		print "Code: " . htmlspecialchars($r->faultCode()) . " Reason: '" . htmlspecialchars($r->faultString()) . "'\n";

	}

?>

</body>

</html>


\ No newline at end of file

doc/highlight.php

Indentation +20 added lines, -20 removed lines

@@ -8,29 +8,29 @@ 
 
 function highlight($file)
 {
-  $starttag = '<pre class="programlisting">';
-  $endtag = '</pre>';
+    $starttag = '<pre class="programlisting">';
+    $endtag = '</pre>';
 
-  $content = file_get_contents($file);
-  $last = 0;
-  $out = '';
-  while(($start = strpos($content, $starttag, $last)) !== false)
-  {
+    $content = file_get_contents($file);
+    $last = 0;
+    $out = '';
+    while(($start = strpos($content, $starttag, $last)) !== false)
+    {
     $end = strpos($content, $endtag, $start);
-	$code = substr($content, $start+strlen($starttag), $end-$start-strlen($starttag));
-	if ($code[strlen($code)-1] == "\n") {
-		$code = substr($code, 0, -1);
-	}
+    $code = substr($content, $start+strlen($starttag), $end-$start-strlen($starttag));
+    if ($code[strlen($code)-1] == "\n") {
+        $code = substr($code, 0, -1);
+    }
 //var_dump($code);
-	$code = str_replace(array('&gt;', '&lt;'), array('>', '<'), $code);
+    $code = str_replace(array('&gt;', '&lt;'), array('>', '<'), $code);
     $code = highlight_string('<?php '.$code, true);
     $code = str_replace('<span style="color: #0000BB">&lt;?php&nbsp;<br />', '<span style="color: #0000BB">', $code);
 //echo($code);
     $out = $out . substr($content, $last, $start+strlen($starttag)-$last) . $code . $endtag;
     $last = $end+strlen($endtag);
-  }
-  $out .= substr($content, $last, strlen($content));
-  return $out;
+    }
+    $out .= substr($content, $last, strlen($content));
+    return $out;
 }
 
 $dir = $argv[1];
@@ -38,11 +38,11 @@ 
 $files = scandir($dir);
 foreach($files as $file)
 {
-	if (substr($file, -5, 5) == '.html')
-	{
-		$out = highlight($dir.'/'.$file);
-		file_put_contents($dir.'/'.$file, $out);
-	}
+    if (substr($file, -5, 5) == '.html')
+    {
+        $out = highlight($dir.'/'.$file);
+        file_put_contents($dir.'/'.$file, $out);
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
   $content = file_get_contents($file);
   $last = 0;
   $out = '';
-  while(($start = strpos($content, $starttag, $last)) !== false)
+  while (($start = strpos($content, $starttag, $last)) !== false)
   {
     $end = strpos($content, $endtag, $start);
 	$code = substr($content, $start+strlen($starttag), $end-$start-strlen($starttag));
@@ -26,7 +26,7 @@ 
     $code = highlight_string('<?php '.$code, true);
     $code = str_replace('<span style="color: #0000BB">&lt;?php&nbsp;<br />', '<span style="color: #0000BB">', $code);
 //echo($code);
-    $out = $out . substr($content, $last, $start+strlen($starttag)-$last) . $code . $endtag;
+    $out = $out.substr($content, $last, $start+strlen($starttag)-$last).$code.$endtag;
     $last = $end+strlen($endtag);
   }
   $out .= substr($content, $last, strlen($content));
@@ -36,7 +36,7 @@ 
 $dir = $argv[1];
 
 $files = scandir($dir);
-foreach($files as $file)
+foreach ($files as $file)
 {
 	if (substr($file, -5, 5) == '.html')
 	{