gggeek / phpxmlrpc

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

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