gggeek /
phpxmlrpc
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>phpxmlrpc - Agesort demo</title></head> |
@@ -17,21 +17,21 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | $inAr = array( |
| 19 | 19 | array('name' => 'Dave', 'age' => 24), |
| 20 | - array('name' => 'Edd', 'age' => 45), |
|
| 21 | - array('name' => 'Joe', 'age' => 37), |
|
| 20 | + array('name' => 'Edd', 'age' => 45), |
|
| 21 | + array('name' => 'Joe', 'age' => 37), |
|
| 22 | 22 | array('name' => 'Fred', 'age' => 27), |
| 23 | 23 | ); |
| 24 | 24 | |
| 25 | 25 | output('This is the input data:<br/><pre>'); |
| 26 | 26 | foreach ($inAr as $val) { |
| 27 | - output($val['name'] . ", " . $val['age'] . "\n"); |
|
| 27 | + output($val['name'].", ".$val['age']."\n"); |
|
| 28 | 28 | } |
| 29 | 29 | output('</pre>'); |
| 30 | 30 | |
| 31 | 31 | // Create xml-rpc parameters from the input array: an array of structs |
| 32 | 32 | $encoder = new Encoder(); |
| 33 | 33 | $v = $encoder->encode($inAr); |
| 34 | -output("Encoded into xml-rpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n"); |
|
| 34 | +output("Encoded into xml-rpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n"); |
|
| 35 | 35 | |
| 36 | 36 | // create client and request objects |
| 37 | 37 | $req = new Request('examples.sortByAge', array($v)); |
@@ -51,15 +51,15 @@ discard block |
||
| 51 | 51 | $value = $resp->value(); |
| 52 | 52 | foreach ($encoder->decode($value) as $struct) { |
| 53 | 53 | // note: here we are trusting the server's response to have the expected format |
| 54 | - output(htmlspecialchars($struct['name']) . ", " . htmlspecialchars($struct['age']) . "\n"); |
|
| 54 | + output(htmlspecialchars($struct['name']).", ".htmlspecialchars($struct['age'])."\n"); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - output('</pre><hr/>For nerds: I got this value back<br/><pre>' . |
|
| 58 | - htmlentities($resp->serialize()) . "</pre><hr/>\n"); |
|
| 57 | + output('</pre><hr/>For nerds: I got this value back<br/><pre>'. |
|
| 58 | + htmlentities($resp->serialize())."</pre><hr/>\n"); |
|
| 59 | 59 | } else { |
| 60 | 60 | output('An error occurred:<pre>'); |
| 61 | - output('Code: ' . htmlspecialchars($resp->faultCode()) . |
|
| 62 | - "\nReason: '" . htmlspecialchars($resp->faultString()) . "'</pre><hr/>"); |
|
| 61 | + output('Code: '.htmlspecialchars($resp->faultCode()). |
|
| 62 | + "\nReason: '".htmlspecialchars($resp->faultString())."'</pre><hr/>"); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | output("</body></html>\n"); |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>phpxmlrpc - Introspect demo</title></head> |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | function display_error($r) |
| 18 | 18 | { |
| 19 | 19 | output("An error occurred: "); |
| 20 | - output("Code: " . $r->faultCode() . " Reason: '" . $r->faultString() . "'<br/>"); |
|
| 20 | + output("Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>"); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | $client = new Client(XMLRPCSERVER); |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $client->return_type = XMLRPCParser::RETURN_PHP; |
| 26 | 26 | |
| 27 | 27 | // First off, let's retrieve the list of methods available on the remote server |
| 28 | -output("<h3>methods available at http://" . $client->server . $client->path . "</h3>\n"); |
|
| 28 | +output("<h3>methods available at http://".$client->server.$client->path."</h3>\n"); |
|
| 29 | 29 | $req = new Request('system.listMethods'); |
| 30 | 30 | $resp = $client->send($req); |
| 31 | 31 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | // Then, retrieve the signature and help text of each available method |
| 49 | 49 | foreach ($v as $methodName) { |
| 50 | - output("<h4>" . htmlspecialchars($methodName) . "</h4>\n"); |
|
| 50 | + output("<h4>".htmlspecialchars($methodName)."</h4>\n"); |
|
| 51 | 51 | // build requests first, add params later |
| 52 | 52 | $r1 = new PhpXmlRpc\Request('system.methodHelp'); |
| 53 | 53 | $r2 = new PhpXmlRpc\Request('system.methodSignature'); |
@@ -83,12 +83,12 @@ discard block |
||
| 83 | 83 | continue; |
| 84 | 84 | } |
| 85 | 85 | $ret = $sig[0]; |
| 86 | - output("<code>" . htmlspecialchars($ret) . " " |
|
| 87 | - . htmlspecialchars($methodName) . "("); |
|
| 88 | - if (count($sig) > 1) { |
|
| 89 | - for ($k = 1; $k < count($sig); $k++) { |
|
| 86 | + output("<code>".htmlspecialchars($ret)." " |
|
| 87 | + . htmlspecialchars($methodName)."("); |
|
| 88 | + if (count($sig)>1) { |
|
| 89 | + for ($k = 1; $k<count($sig); $k++) { |
|
| 90 | 90 | output(htmlspecialchars($sig[$k])); |
| 91 | - if ($k < count($sig) - 1) { |
|
| 91 | + if ($k<count($sig)-1) { |
|
| 92 | 92 | output(", "); |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | */ |
| 27 | 27 | function plain_findstate($stateNo) |
| 28 | 28 | { |
| 29 | - if (isset(exampleMethods::$stateNames[$stateNo - 1])) { |
|
| 29 | + if (isset(exampleMethods::$stateNames[$stateNo - 1])) { |
|
| 30 | 30 | return exampleMethods::$stateNames[$stateNo - 1]; |
| 31 | 31 | } else { |
| 32 | 32 | // not, there so complain |
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | function plain_findstate($stateNo) |
| 28 | 28 | { |
| 29 | - if (isset(exampleMethods::$stateNames[$stateNo - 1])) { |
|
| 30 | - return exampleMethods::$stateNames[$stateNo - 1]; |
|
| 29 | + if (isset(exampleMethods::$stateNames[$stateNo-1])) { |
|
| 30 | + return exampleMethods::$stateNames[$stateNo-1]; |
|
| 31 | 31 | } else { |
| 32 | 32 | // not, there so complain |
| 33 | - throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 33 | + throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($req->getNumParams()) { |
| 70 | 70 | $p1 = $req->getParam(0); |
| 71 | 71 | if ($p1->kindOf() === 'scalar') { |
| 72 | - $errNum = (int)$p1->scalarval(); |
|
| 72 | + $errNum = (int) $p1->scalarval(); |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | throw new Exception("it's just a test", $errNum); |
@@ -141,13 +141,13 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | $findstate10_sig = array( |
| 143 | 143 | /// @todo add a demo and test with closure usage |
| 144 | - "function" => function ($req) { return exampleMethods::findState($req); }, |
|
| 144 | + "function" => function($req) { return exampleMethods::findState($req); }, |
|
| 145 | 145 | "signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)), |
| 146 | - "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' . |
|
| 146 | + "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '. |
|
| 147 | 147 | 'index of that state name in an alphabetic order.', |
| 148 | 148 | ); |
| 149 | 149 | |
| 150 | -$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); }); |
|
| 150 | +$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); }); |
|
| 151 | 151 | |
| 152 | 152 | /// @todo do we really need a new instance ? |
| 153 | 153 | $c = new handlersContainer(); |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | $namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static')); |
| 158 | 158 | |
| 159 | -$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 159 | +$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 160 | 160 | |
| 161 | 161 | return array_merge( |
| 162 | 162 | array( |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Demoing the code-generation capabilities of the library: create a client class which exposes a bunch of methods |
@@ -21,12 +21,12 @@ discard block |
||
| 21 | 21 | ); |
| 22 | 22 | |
| 23 | 23 | // the generated code does not have an autoloader included - we need to add in one |
| 24 | -$autoloader = __DIR__ . "/_prepend.php"; |
|
| 24 | +$autoloader = __DIR__."/_prepend.php"; |
|
| 25 | 25 | |
| 26 | 26 | $targetFile = '/tmp/MyClient.php'; |
| 27 | 27 | $generated = file_put_contents($targetFile, |
| 28 | - "<?php\n\n" . |
|
| 29 | - "require_once '$autoloader';\n\n" . |
|
| 28 | + "<?php\n\n". |
|
| 29 | + "require_once '$autoloader';\n\n". |
|
| 30 | 30 | $code['code'] |
| 31 | 31 | ); |
| 32 | 32 | |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | $client = new MyClient(); |
| 47 | 47 | $sorted = $client->examples_sortByAge(array( |
| 48 | 48 | array('name' => 'Dave', 'age' => 24), |
| 49 | - array('name' => 'Edd', 'age' => 45), |
|
| 50 | - array('name' => 'Joe', 'age' => 37), |
|
| 49 | + array('name' => 'Edd', 'age' => 45), |
|
| 50 | + array('name' => 'Joe', 'age' => 37), |
|
| 51 | 51 | array('name' => 'Fred', 'age' => 27), |
| 52 | 52 | )); |
| 53 | 53 | |
@@ -8,5 +8,5 @@ |
||
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer |
| 11 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
| 11 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
| 12 | 12 | PhpXmlRpc\Autoloader::register(); |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer |
| 11 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
| 11 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
| 12 | 12 | PhpXmlRpc\Autoloader::register(); |
| 13 | 13 | |
| 14 | 14 | // Let unit tests run against localhost, 'plain' demos against a known public server |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | array(Value::$xmlrpcInt, Value::$xmlrpcArray) |
| 18 | 18 | ), |
| 19 | 19 | "docstring" => '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.', |
| 20 | - "function" => function ($req) |
|
| 20 | + "function" => function($req) |
|
| 21 | 21 | { |
| 22 | 22 | $sno = $req->getParam(0); |
| 23 | 23 | $numCurly = 0; |
@@ -38,13 +38,13 @@ discard block |
||
| 38 | 38 | array(Value::$xmlrpcInt, Value::$xmlrpcStruct) |
| 39 | 39 | ), |
| 40 | 40 | "docstring" => 'This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all <i4>s. Your handler must add the three numbers and return the result.', |
| 41 | - "function" => function ($req) |
|
| 41 | + "function" => function($req) |
|
| 42 | 42 | { |
| 43 | 43 | $sno = $req->getParam(0); |
| 44 | 44 | $moe = $sno["moe"]; |
| 45 | 45 | $larry = $sno["larry"]; |
| 46 | 46 | $curly = $sno["curly"]; |
| 47 | - $num = $moe->scalarval() + $larry->scalarval() + $curly->scalarval(); |
|
| 47 | + $num = $moe->scalarval()+$larry->scalarval()+$curly->scalarval(); |
|
| 48 | 48 | |
| 49 | 49 | return new Response(new Value($num, Value::$xmlrpcInt)); |
| 50 | 50 | } |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | array(Value::$xmlrpcStruct, Value::$xmlrpcStruct) |
| 56 | 56 | ), |
| 57 | 57 | "docstring" => 'This handler takes a single parameter, a struct. Your handler must return the struct.', |
| 58 | - "function" => function ($req) |
|
| 58 | + "function" => function($req) |
|
| 59 | 59 | { |
| 60 | 60 | $sno = $req->getParam(0); |
| 61 | 61 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | ) |
| 72 | 72 | ), |
| 73 | 73 | "docstring" => 'This handler takes six parameters, and returns an array containing all the parameters.', |
| 74 | - "function" => function ($req) |
|
| 74 | + "function" => function($req) |
|
| 75 | 75 | { |
| 76 | 76 | return new Response(new Value( |
| 77 | 77 | array( |
@@ -92,14 +92,14 @@ discard block |
||
| 92 | 92 | array(Value::$xmlrpcString, Value::$xmlrpcArray) |
| 93 | 93 | ), |
| 94 | 94 | "docstring" => '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.', |
| 95 | - "function" => function ($req) |
|
| 95 | + "function" => function($req) |
|
| 96 | 96 | { |
| 97 | 97 | $ar = $req->getParam(0); |
| 98 | 98 | $sz = $ar->count(); |
| 99 | 99 | $first = $ar[0]; |
| 100 | - $last = $ar[$sz - 1]; |
|
| 100 | + $last = $ar[$sz-1]; |
|
| 101 | 101 | |
| 102 | - return new Response(new Value($first->scalarval() . $last->scalarval(), Value::$xmlrpcString)); |
|
| 102 | + return new Response(new Value($first->scalarval().$last->scalarval(), Value::$xmlrpcString)); |
|
| 103 | 103 | } |
| 104 | 104 | ), |
| 105 | 105 | |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | array(Value::$xmlrpcStruct, Value::$xmlrpcInt) |
| 109 | 109 | ), |
| 110 | 110 | "docstring" => '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.', |
| 111 | - "function" => function ($req) |
|
| 111 | + "function" => function($req) |
|
| 112 | 112 | { |
| 113 | 113 | $sno = $req->getParam(0); |
| 114 | 114 | $v = $sno->scalarval(); |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | array(Value::$xmlrpcInt, Value::$xmlrpcStruct) |
| 130 | 130 | ), |
| 131 | 131 | "docstring" => '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 <i4>s. Your handler must add the three numbers and return the result.', |
| 132 | - "function" => function ($req) |
|
| 132 | + "function" => function($req) |
|
| 133 | 133 | { |
| 134 | 134 | $sno = $req->getParam(0); |
| 135 | 135 | |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | $larry = $fools["larry"]; |
| 141 | 141 | $moe = $fools["moe"]; |
| 142 | 142 | |
| 143 | - return new Response(new Value($curly->scalarval() + $larry->scalarval() + $moe->scalarval(), Value::$xmlrpcInt)); |
|
| 143 | + return new Response(new Value($curly->scalarval()+$larry->scalarval()+$moe->scalarval(), Value::$xmlrpcInt)); |
|
| 144 | 144 | } |
| 145 | 145 | ), |
| 146 | 146 | |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | array(Value::$xmlrpcStruct, Value::$xmlrpcString) |
| 150 | 150 | ), |
| 151 | 151 | "docstring" => 'This handler takes a single parameter, a string, that contains any number of predefined entities, namely <, >, & \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.', |
| 152 | - "function" => function ($req) |
|
| 152 | + "function" => function($req) |
|
| 153 | 153 | { |
| 154 | 154 | $sno = $req->getParam(0); |
| 155 | 155 | $str = $sno->scalarval(); |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | $ap = 0; |
| 159 | 159 | $qu = 0; |
| 160 | 160 | $amp = 0; |
| 161 | - for ($i = 0; $i < strlen($str); $i++) { |
|
| 161 | + for ($i = 0; $i<strlen($str); $i++) { |
|
| 162 | 162 | $c = substr($str, $i, 1); |
| 163 | 163 | switch ($c) { |
| 164 | 164 | case ">": |
@@ -107,9 +107,9 @@ discard block |
||
| 107 | 107 | public function xml_header($charsetEncoding = '') |
| 108 | 108 | { |
| 109 | 109 | if ($charsetEncoding != '') { |
| 110 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n"; |
|
| 110 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n"; |
|
| 111 | 111 | } else { |
| 112 | - return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n"; |
|
| 112 | + return "<?xml version=\"1.0\"?".">\n<methodCall>\n"; |
|
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | |
@@ -132,16 +132,16 @@ discard block |
||
| 132 | 132 | public function createPayload($charsetEncoding = '') |
| 133 | 133 | { |
| 134 | 134 | if ($charsetEncoding != '') { |
| 135 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 135 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 136 | 136 | } else { |
| 137 | 137 | $this->content_type = 'text/xml'; |
| 138 | 138 | } |
| 139 | 139 | $this->payload = $this->xml_header($charsetEncoding); |
| 140 | - $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities( |
|
| 141 | - $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n"; |
|
| 140 | + $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities( |
|
| 141 | + $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n"; |
|
| 142 | 142 | $this->payload .= "<params>\n"; |
| 143 | 143 | foreach ($this->params as $p) { |
| 144 | - $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) . |
|
| 144 | + $this->payload .= "<param>\n".$p->serialize($charsetEncoding). |
|
| 145 | 145 | "</param>\n"; |
| 146 | 146 | } |
| 147 | 147 | $this->payload .= "</params>\n"; |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array()); |
| 264 | 264 | |
| 265 | 265 | if ($data == '') { |
| 266 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.'); |
|
| 266 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.'); |
|
| 267 | 267 | return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']); |
| 268 | 268 | } |
| 269 | 269 | |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | // failed processing of HTTP response headers |
| 277 | 277 | // save into response obj the full payload received, for debugging |
| 278 | 278 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode())); |
| 279 | - } catch(\Exception $e) { |
|
| 279 | + } catch (\Exception $e) { |
|
| 280 | 280 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data)); |
| 281 | 281 | } |
| 282 | 282 | } |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | // idea from Luca Mariano <[email protected]> originally in PEARified version of the lib |
| 291 | 291 | $pos = strrpos($data, '</methodResponse>'); |
| 292 | 292 | if ($pos !== false) { |
| 293 | - $data = substr($data, 0, $pos + 17); |
|
| 293 | + $data = substr($data, 0, $pos+17); |
|
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | // try to 'guestimate' the character encoding of the received response |
@@ -304,9 +304,9 @@ discard block |
||
| 304 | 304 | if ($start) { |
| 305 | 305 | $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
| 306 | 306 | $end = strpos($data, '-->', $start); |
| 307 | - $comments = substr($data, $start, $end - $start); |
|
| 308 | - $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" . |
|
| 309 | - str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding); |
|
| 307 | + $comments = substr($data, $start, $end-$start); |
|
| 308 | + $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t". |
|
| 309 | + str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding); |
|
| 310 | 310 | } |
| 311 | 311 | } |
| 312 | 312 | |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | if ($respEncoding == 'ISO-8859-1') { |
| 329 | 329 | $data = utf8_encode($data); |
| 330 | 330 | } else { |
| 331 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding); |
|
| 331 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding); |
|
| 332 | 332 | } |
| 333 | 333 | } |
| 334 | 334 | } |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | // there could be proxies meddling with the request, or network data corruption... |
| 355 | 355 | |
| 356 | 356 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'], |
| 357 | - PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', |
|
| 357 | + PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '', |
|
| 358 | 358 | $this->httpResponse |
| 359 | 359 | ); |
| 360 | 360 | |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | // second error check: xml well-formed but not xml-rpc compliant |
| 366 | 366 | elseif ($xmlRpcParser->_xh['isf'] == 2) { |
| 367 | 367 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'], |
| 368 | - PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', |
|
| 368 | + PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '', |
|
| 369 | 369 | $this->httpResponse |
| 370 | 370 | ); |
| 371 | 371 | |
@@ -375,13 +375,13 @@ discard block |
||
| 375 | 375 | } |
| 376 | 376 | // third error check: parsing of the response has somehow gone boink. |
| 377 | 377 | /// @todo shall we omit this check, since we trust the parsing code? |
| 378 | - elseif ($xmlRpcParser->_xh['isf'] > 3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($xmlRpcParser->_xh['value'])) { |
|
| 378 | + elseif ($xmlRpcParser->_xh['isf']>3 || $returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($xmlRpcParser->_xh['value'])) { |
|
| 379 | 379 | // something odd has happened and it's time to generate a client side error indicating something odd went on |
| 380 | 380 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'], |
| 381 | 381 | '', $this->httpResponse |
| 382 | 382 | ); |
| 383 | 383 | } else { |
| 384 | - if ($this->debug > 1) { |
|
| 384 | + if ($this->debug>1) { |
|
| 385 | 385 | $this->getLogger()->debugMessage( |
| 386 | 386 | "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---" |
| 387 | 387 | ); |
@@ -54,11 +54,11 @@ discard block |
||
| 54 | 54 | $snv = $sno->scalarval(); |
| 55 | 55 | |
| 56 | 56 | // look it up in our array (zero-based) |
| 57 | - if (isset(self::$stateNames[$snv - 1])) { |
|
| 58 | - $stateName = self::$stateNames[$snv - 1]; |
|
| 57 | + if (isset(self::$stateNames[$snv-1])) { |
|
| 58 | + $stateName = self::$stateNames[$snv-1]; |
|
| 59 | 59 | } else { |
| 60 | 60 | // not there, so complain |
| 61 | - $err = "I don't have a state for the index '" . $snv . "'"; |
|
| 61 | + $err = "I don't have a state for the index '".$snv."'"; |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | if ($err != '') { |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | $s = $req->getParam(0); |
| 133 | 133 | $t = $req->getParam(1); |
| 134 | 134 | |
| 135 | - return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcInt)); |
|
| 135 | + return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcInt)); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | public static $addtwodouble_sig = array(array('double', 'double', 'double')); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | $s = $req->getParam(0); |
| 143 | 143 | $t = $req->getParam(1); |
| 144 | 144 | |
| 145 | - return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcDouble)); |
|
| 145 | + return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcDouble)); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | public static $stringecho_sig = array(array('string', 'string')); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | /// In fact, we miss some API (or extra data) in the Request... |
| 166 | 166 | //$payload = file_get_contents('php://input'); |
| 167 | 167 | $payload = $req->serialize(PhpXmlRpc::$xmlrpc_internalencoding); |
| 168 | - $s = "I got the following message:\n" . $payload; |
|
| 168 | + $s = "I got the following message:\n".$payload; |
|
| 169 | 169 | |
| 170 | 170 | return new Response(new Value($s)); |
| 171 | 171 | } |
@@ -238,17 +238,17 @@ discard block |
||
| 238 | 238 | |
| 239 | 239 | /// @todo in real life, we should check for presence of return characters to avoid header injection! |
| 240 | 240 | |
| 241 | - $msgHdr = "From: " . $mFrom->scalarval() . "\n"; |
|
| 242 | - $msgHdr .= "To: " . $mTo->scalarval() . "\n"; |
|
| 241 | + $msgHdr = "From: ".$mFrom->scalarval()."\n"; |
|
| 242 | + $msgHdr .= "To: ".$mTo->scalarval()."\n"; |
|
| 243 | 243 | |
| 244 | 244 | if ($mCc->scalarval() != "") { |
| 245 | - $msgHdr .= "Cc: " . $mCc->scalarval() . "\n"; |
|
| 245 | + $msgHdr .= "Cc: ".$mCc->scalarval()."\n"; |
|
| 246 | 246 | } |
| 247 | 247 | if ($mBcc->scalarval() != "") { |
| 248 | - $msgHdr .= "Bcc: " . $mBcc->scalarval() . "\n"; |
|
| 248 | + $msgHdr .= "Bcc: ".$mBcc->scalarval()."\n"; |
|
| 249 | 249 | } |
| 250 | 250 | if ($mMime->scalarval() != "") { |
| 251 | - $msgHdr .= "Content-type: " . $mMime->scalarval() . "\n"; |
|
| 251 | + $msgHdr .= "Content-type: ".$mMime->scalarval()."\n"; |
|
| 252 | 252 | } |
| 253 | 253 | $msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0"; |
| 254 | 254 | |
