gggeek /
phpxmlrpc
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/client/_prepend.php"; |
|
| 2 | +require_once __DIR__."/client/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>phpxmlrpc</title></head> |
@@ -10,23 +10,23 @@ discard block |
||
| 10 | 10 | output("<p>Please note that in most cases you are better off using `new PhpXmlRpc\Encoder()->encode()` to create nested Value objects</p>\n"); |
| 11 | 11 | |
| 12 | 12 | $v = new PhpXmlRpc\Value(1234, 'int'); |
| 13 | -output("Int: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 13 | +output("Int: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 14 | 14 | |
| 15 | 15 | $v = new PhpXmlRpc\Value('Are the following characters escaped? < & >'); |
| 16 | -output("String <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 16 | +output("String <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 17 | 17 | |
| 18 | 18 | $v = new PhpXmlRpc\Value(true, 'boolean'); |
| 19 | -output("Boolean: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 19 | +output("Boolean: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 20 | 20 | |
| 21 | 21 | $v = new PhpXmlRpc\Value(1234.5678, 'double'); |
| 22 | -output("Double: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 22 | +output("Double: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 23 | 23 | |
| 24 | 24 | $v = new PhpXmlRpc\Value(time(), 'dateTime.iso8601'); |
| 25 | -output("Datetime: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 25 | +output("Datetime: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 26 | 26 | |
| 27 | 27 | $v = new PhpXmlRpc\Value('hello world', 'base64'); |
| 28 | -output("Base64: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 29 | -output("(value of base64 string is: '" . $v->scalarval() . "')<BR><BR>"); |
|
| 28 | +output("Base64: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 29 | +output("(value of base64 string is: '".$v->scalarval()."')<BR><BR>"); |
|
| 30 | 30 | |
| 31 | 31 | $v = new PhpXmlRpc\Value( |
| 32 | 32 | array( |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | ), |
| 40 | 40 | "array" |
| 41 | 41 | ); |
| 42 | -output("Array: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 42 | +output("Array: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 43 | 43 | |
| 44 | 44 | $v = new PhpXmlRpc\Value( |
| 45 | 45 | array( |
@@ -59,10 +59,10 @@ discard block |
||
| 59 | 59 | ), |
| 60 | 60 | "struct" |
| 61 | 61 | ); |
| 62 | -output("Struct: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 62 | +output("Struct: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 63 | 63 | |
| 64 | 64 | $w = new PhpXmlRpc\Value(array($v), 'array'); |
| 65 | -output("Array containing a struct: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
| 65 | +output("Array containing a struct: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
| 66 | 66 | |
| 67 | 67 | class MyClass |
| 68 | 68 | { |
@@ -74,49 +74,49 @@ discard block |
||
| 74 | 74 | // the public property is the only one which will be serialized. As such, it has to be of type Value |
| 75 | 75 | $myObject->public = new \PhpXmlRpc\Value('a public property, wrapped'); |
| 76 | 76 | $w = new PhpXmlRpc\Value($myObject, 'struct'); |
| 77 | -output("Struct encoding a php object: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
| 77 | +output("Struct encoding a php object: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
| 78 | 78 | |
| 79 | 79 | output("<h3>Testing value serialization - xml-rpc extensions</h3>\n"); |
| 80 | 80 | $v = new PhpXmlRpc\Value(1234, 'i8'); |
| 81 | -output("I8: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 81 | +output("I8: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 82 | 82 | $v = new PhpXmlRpc\Value(null, 'null'); |
| 83 | -output("Null: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 83 | +output("Null: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 84 | 84 | \PhpXmlRpc\PhpXmlRpc::$xmlrpc_null_apache_encoding = true; |
| 85 | -output("Null, alternative: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 85 | +output("Null, alternative: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 86 | 86 | |
| 87 | 87 | output("<h3>Testing value serialization - character encoding</h3>\n"); |
| 88 | 88 | // The greek word 'kosme' |
| 89 | 89 | $v = new PhpXmlRpc\Value('κόσμε'); |
| 90 | -output("Greek (default encoding): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 91 | -output("Greek (utf8 encoding): <PRE>" . htmlentities($v->serialize('UTF-8')) . "</PRE>"); |
|
| 90 | +output("Greek (default encoding): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 91 | +output("Greek (utf8 encoding): <PRE>".htmlentities($v->serialize('UTF-8'))."</PRE>"); |
|
| 92 | 92 | if (function_exists('mb_convert_encoding')) { |
| 93 | - output("Greek (ISO-8859-7 encoding): <PRE>" . htmlentities($v->serialize('ISO-8859-7')) . "</PRE>"); |
|
| 93 | + output("Greek (ISO-8859-7 encoding): <PRE>".htmlentities($v->serialize('ISO-8859-7'))."</PRE>"); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | output("<h3>Testing request serialization</h3>\n"); |
| 97 | 97 | $req = new PhpXmlRpc\Request('examples.getStateName'); |
| 98 | 98 | $req->method('examples.getStateName'); |
| 99 | 99 | $req->addParam(new PhpXmlRpc\Value(42, 'int')); |
| 100 | -output("<PRE>" . htmlentities($req->serialize()) . "</PRE>"); |
|
| 100 | +output("<PRE>".htmlentities($req->serialize())."</PRE>"); |
|
| 101 | 101 | |
| 102 | 102 | output("<h3>Testing response serialization</h3>\n"); |
| 103 | 103 | $resp = new PhpXmlRpc\Response(new PhpXmlRpc\Value('The meaning of life')); |
| 104 | -output("<PRE>" . htmlentities($resp->serialize()) . "</PRE>"); |
|
| 104 | +output("<PRE>".htmlentities($resp->serialize())."</PRE>"); |
|
| 105 | 105 | |
| 106 | 106 | output("<h3>Testing ISO date formatting</h3><pre>\n"); |
| 107 | 107 | $t = time(); |
| 108 | 108 | $date = PhpXmlRpc\Helper\Date::iso8601Encode($t); |
| 109 | 109 | output("Now is $t --> $date\n"); |
| 110 | -output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n"); |
|
| 110 | +output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n"); |
|
| 111 | 111 | $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date); |
| 112 | 112 | output("That is to say $date --> $tb\n"); |
| 113 | -output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n"); |
|
| 114 | -output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n"); |
|
| 113 | +output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n"); |
|
| 114 | +output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n"); |
|
| 115 | 115 | output("</pre>\n"); |
| 116 | 116 | |
| 117 | 117 | output("<h3>Testing reduced-precision formatting for doubles</h3><pre>\n"); |
| 118 | 118 | $v = new PhpXmlRpc\Value(1234.56789, 'double'); |
| 119 | 119 | \PhpXmlRpc\PhpXmlRpc::$xmlpc_double_precision = 2; |
| 120 | -output("Double, limited precision: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 120 | +output("Double, limited precision: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 121 | 121 | |
| 122 | 122 | output('</body></html>'); |
@@ -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 | |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | * @license code licensed under the BSD License: see file license.txt |
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | -require_once __DIR__ . "/_prepend.php"; |
|
| 18 | +require_once __DIR__."/_prepend.php"; |
|
| 19 | 19 | |
| 20 | 20 | // *** NB: WE BLOCK THIS FROM RUNNING BY DEFAULT IN CASE ACCESS IS GRANTED TO IT IN PRODUCTION BY MISTAKE *** |
| 21 | 21 | // Comment out the following safeguard if you want to use it as is, but remember: this is an open relay !!! |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | // fe. any url using the 'file://' protocol might be considered a hacking attempt |
| 47 | 47 | $client = new Client($url); |
| 48 | 48 | |
| 49 | - if ($req->getNumParams() > 3) { |
|
| 49 | + if ($req->getNumParams()>3) { |
|
| 50 | 50 | // We have to set some options onto the client. |
| 51 | 51 | // Note that if we do not untaint the received values, warnings might be generated... |
| 52 | 52 | $options = $encoder->decode($req->getParam(3)); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $client->setSSLVerifyPeer($val); |
| 87 | 87 | break; |
| 88 | 88 | case 'Timeout': |
| 89 | - $timeout = (integer)$val; |
|
| 89 | + $timeout = (integer) $val; |
|
| 90 | 90 | break; |
| 91 | 91 | } // switch |
| 92 | 92 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | /// X-forwarded-for anyway, unless they consider this server as trusted...) |
| 100 | 100 | $reqMethod = $req->getParam(1)->scalarval(); |
| 101 | 101 | $req = new Request($reqMethod); |
| 102 | - if ($req->getNumParams() > 1) { |
|
| 102 | + if ($req->getNumParams()>1) { |
|
| 103 | 103 | $pars = $req->getParam(2); |
| 104 | 104 | foreach ($pars as $par) { |
| 105 | 105 | $req->addParam($par); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | // add debug info into response we give back to caller |
| 110 | - Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize()); |
|
| 110 | + Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize()); |
|
| 111 | 111 | |
| 112 | 112 | return $client->send($req, $timeout); |
| 113 | 113 | } |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | * `$functions_parameters_type` and `$exception_handling` |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | -require_once __DIR__ . "/_prepend.php"; |
|
| 11 | +require_once __DIR__."/_prepend.php"; |
|
| 12 | 12 | |
| 13 | 13 | require_once __DIR__.'/methodProviders/CommentManager.php'; |
| 14 | 14 | |
@@ -19,12 +19,12 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | $addComment_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcString, Value::$xmlrpcString, Value::$xmlrpcString)); |
| 21 | 21 | |
| 22 | -$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, ' . |
|
| 22 | +$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, '. |
|
| 23 | 23 | 'and the third is the comment itself. Returns the number of comments against that ID.'; |
| 24 | 24 | |
| 25 | 25 | $getComments_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcString)); |
| 26 | 26 | |
| 27 | -$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct ' . |
|
| 27 | +$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct '. |
|
| 28 | 28 | 'containing name and comment text.'; |
| 29 | 29 | |
| 30 | 30 | $srv = new Server(); |
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Demoing the charset conversion of the library: create a client class which uses data in the CP-1252 character set, |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | $this->me['struct'] = $val; |
| 130 | 130 | break; |
| 131 | 131 | default: |
| 132 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
| 132 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | } |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | if ($typeOf !== 1) { |
| 156 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
| 156 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
| 157 | 157 | return 0; |
| 158 | 158 | } |
| 159 | 159 | |
@@ -170,10 +170,10 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | switch ($this->mytype) { |
| 172 | 172 | case 1: |
| 173 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
| 173 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
| 174 | 174 | return 0; |
| 175 | 175 | case 3: |
| 176 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 176 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 177 | 177 | return 0; |
| 178 | 178 | case 2: |
| 179 | 179 | // we're adding a scalar value to an array here |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | |
| 215 | 215 | return 1; |
| 216 | 216 | } else { |
| 217 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 217 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 218 | 218 | return 0; |
| 219 | 219 | } |
| 220 | 220 | } |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | |
| 245 | 245 | return 1; |
| 246 | 246 | } else { |
| 247 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 247 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 248 | 248 | return 0; |
| 249 | 249 | } |
| 250 | 250 | } |
@@ -286,19 +286,19 @@ discard block |
||
| 286 | 286 | case 1: |
| 287 | 287 | switch ($typ) { |
| 288 | 288 | case static::$xmlrpcBase64: |
| 289 | - $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>"; |
|
| 289 | + $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>"; |
|
| 290 | 290 | break; |
| 291 | 291 | case static::$xmlrpcBoolean: |
| 292 | - $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>"; |
|
| 292 | + $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>"; |
|
| 293 | 293 | break; |
| 294 | 294 | case static::$xmlrpcString: |
| 295 | 295 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
| 296 | - $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>"; |
|
| 296 | + $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>"; |
|
| 297 | 297 | break; |
| 298 | 298 | case static::$xmlrpcInt: |
| 299 | 299 | case static::$xmlrpcI4: |
| 300 | 300 | case static::$xmlrpcI8: |
| 301 | - $rs .= "<{$typ}>" . (int)$val . "</{$typ}>"; |
|
| 301 | + $rs .= "<{$typ}>".(int) $val."</{$typ}>"; |
|
| 302 | 302 | break; |
| 303 | 303 | case static::$xmlrpcDouble: |
| 304 | 304 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -306,16 +306,16 @@ discard block |
||
| 306 | 306 | // sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14. |
| 307 | 307 | // The code below tries its best at keeping max precision while avoiding exp notation, |
| 308 | 308 | // but there is of course no limit in the number of decimal places to be used... |
| 309 | - $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>"; |
|
| 309 | + $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>"; |
|
| 310 | 310 | break; |
| 311 | 311 | case static::$xmlrpcDateTime: |
| 312 | 312 | if (is_string($val)) { |
| 313 | 313 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
| 314 | 314 | // DateTimeInterface is not present in php 5.4... |
| 315 | 315 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
| 316 | - $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>"; |
|
| 316 | + $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>"; |
|
| 317 | 317 | } elseif (is_int($val)) { |
| 318 | - $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>"; |
|
| 318 | + $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>"; |
|
| 319 | 319 | } else { |
| 320 | 320 | // not really a good idea here: but what should we output anyway? left for backward compat... |
| 321 | 321 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
@@ -337,14 +337,14 @@ discard block |
||
| 337 | 337 | case 3: |
| 338 | 338 | // struct |
| 339 | 339 | if ($this->_php_class) { |
| 340 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
| 340 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
| 341 | 341 | } else { |
| 342 | 342 | $rs .= "<struct>\n"; |
| 343 | 343 | } |
| 344 | 344 | $charsetEncoder = $this->getCharsetEncoder(); |
| 345 | 345 | /** @var Value $val2 */ |
| 346 | 346 | foreach ($val as $key2 => $val2) { |
| 347 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
| 347 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
| 348 | 348 | //$rs.=$this->serializeval($val2); |
| 349 | 349 | $rs .= $val2->serialize($charsetEncoding); |
| 350 | 350 | $rs .= "</member>\n"; |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | $val = reset($this->me); |
| 380 | 380 | $typ = key($this->me); |
| 381 | 381 | |
| 382 | - return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n"; |
|
| 382 | + return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n"; |
|
| 383 | 383 | } |
| 384 | 384 | |
| 385 | 385 | /** |
@@ -90,13 +90,13 @@ discard block |
||
| 90 | 90 | 'scalar' => $val, |
| 91 | 91 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val) |
| 92 | 92 | ); |
| 93 | - return (object)$xmlrpcVal; |
|
| 93 | + return (object) $xmlrpcVal; |
|
| 94 | 94 | case 'base64': |
| 95 | 95 | $xmlrpcVal = array( |
| 96 | 96 | 'xmlrpc_type' => 'base64', |
| 97 | 97 | 'scalar' => $val |
| 98 | 98 | ); |
| 99 | - return (object)$xmlrpcVal; |
|
| 99 | + return (object) $xmlrpcVal; |
|
| 100 | 100 | case 'string': |
| 101 | 101 | if (isset($options['extension_api_encoding'])) { |
| 102 | 102 | // if iconv is not available, we use mb_convert_encoding |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | case 'msg': |
| 166 | 166 | $paramCount = $xmlrpcVal->getNumParams(); |
| 167 | 167 | $arr = array(); |
| 168 | - for ($i = 0; $i < $paramCount; $i++) { |
|
| 168 | + for ($i = 0; $i<$paramCount; $i++) { |
|
| 169 | 169 | $arr[] = $this->decode($xmlrpcVal->getParam($i), $options); |
| 170 | 170 | } |
| 171 | 171 | return $arr; |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | break; |
| 292 | 292 | case 'resource': |
| 293 | 293 | if (in_array('extension_api', $options)) { |
| 294 | - $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt); |
|
| 294 | + $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt); |
|
| 295 | 295 | } else { |
| 296 | 296 | $xmlrpcVal = new Value(); |
| 297 | 297 | } |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | if ($valEncoding == 'ISO-8859-1') { |
| 341 | 341 | $xmlVal = utf8_encode($xmlVal); |
| 342 | 342 | } else { |
| 343 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding); |
|
| 343 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding); |
|
| 344 | 344 | } |
| 345 | 345 | } |
| 346 | 346 | } |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | $parserOptions |
| 363 | 363 | ); |
| 364 | 364 | |
| 365 | - if ($xmlRpcParser->_xh['isf'] > 1) { |
|
| 365 | + if ($xmlRpcParser->_xh['isf']>1) { |
|
| 366 | 366 | // test that $xmlrpc->_xh['value'] is an obj, too??? |
| 367 | 367 | |
| 368 | 368 | $this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']); |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | |
| 387 | 387 | case 'methodcall': |
| 388 | 388 | $req = new Request($xmlRpcParser->_xh['method']); |
| 389 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
| 389 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
| 390 | 390 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
| 391 | 391 | } |
| 392 | 392 | return $req; |
@@ -45,12 +45,12 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | // read chunk-size, chunk-extension (if any) and crlf |
| 47 | 47 | // get the position of the linebreak |
| 48 | - $chunkEnd = strpos($buffer, "\r\n") + 2; |
|
| 48 | + $chunkEnd = strpos($buffer, "\r\n")+2; |
|
| 49 | 49 | $temp = substr($buffer, 0, $chunkEnd); |
| 50 | 50 | $chunkSize = hexdec(trim($temp)); |
| 51 | 51 | $chunkStart = $chunkEnd; |
| 52 | - while ($chunkSize > 0) { |
|
| 53 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize); |
|
| 52 | + while ($chunkSize>0) { |
|
| 53 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize); |
|
| 54 | 54 | |
| 55 | 55 | // just in case we got a broken connection |
| 56 | 56 | if ($chunkEnd == false) { |
@@ -62,19 +62,19 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | // read chunk-data and crlf |
| 65 | - $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 65 | + $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 66 | 66 | // append chunk-data to entity-body |
| 67 | 67 | $new .= $chunk; |
| 68 | 68 | // length := length + chunk-size |
| 69 | 69 | $length += strlen($chunk); |
| 70 | 70 | // read chunk-size and crlf |
| 71 | - $chunkStart = $chunkEnd + 2; |
|
| 71 | + $chunkStart = $chunkEnd+2; |
|
| 72 | 72 | |
| 73 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2; |
|
| 73 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2; |
|
| 74 | 74 | if ($chunkEnd == false) { |
| 75 | 75 | break; // just in case we got a broken connection |
| 76 | 76 | } |
| 77 | - $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 77 | + $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 78 | 78 | $chunkSize = hexdec(trim($temp)); |
| 79 | 79 | $chunkStart = $chunkEnd; |
| 80 | 80 | } |
@@ -103,11 +103,11 @@ discard block |
||
| 103 | 103 | // Look for CR/LF or simple LF as line separator (even though it is not valid http) |
| 104 | 104 | $pos = strpos($data, "\r\n\r\n"); |
| 105 | 105 | if ($pos || is_int($pos)) { |
| 106 | - $bd = $pos + 4; |
|
| 106 | + $bd = $pos+4; |
|
| 107 | 107 | } else { |
| 108 | 108 | $pos = strpos($data, "\n\n"); |
| 109 | 109 | if ($pos || is_int($pos)) { |
| 110 | - $bd = $pos + 2; |
|
| 110 | + $bd = $pos+2; |
|
| 111 | 111 | } else { |
| 112 | 112 | // No separation between response headers and body: fault? |
| 113 | 113 | $bd = 0; |
@@ -117,8 +117,8 @@ discard block |
||
| 117 | 117 | // this filters out all http headers from proxy. maybe we could take them into account, too? |
| 118 | 118 | $data = substr($data, $bd); |
| 119 | 119 | } else { |
| 120 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 121 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 120 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 121 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | |
@@ -151,19 +151,19 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | if ($httpResponse['status_code'] !== '200') { |
| 154 | - $errstr = substr($data, 0, strpos($data, "\n") - 1); |
|
| 155 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr); |
|
| 156 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 154 | + $errstr = substr($data, 0, strpos($data, "\n")-1); |
|
| 155 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr); |
|
| 156 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http) |
| 160 | 160 | $pos = strpos($data, "\r\n\r\n"); |
| 161 | 161 | if ($pos || is_int($pos)) { |
| 162 | - $bd = $pos + 4; |
|
| 162 | + $bd = $pos+4; |
|
| 163 | 163 | } else { |
| 164 | 164 | $pos = strpos($data, "\n\n"); |
| 165 | 165 | if ($pos || is_int($pos)) { |
| 166 | - $bd = $pos + 2; |
|
| 166 | + $bd = $pos+2; |
|
| 167 | 167 | } else { |
| 168 | 168 | // No separation between response headers and body: fault? |
| 169 | 169 | // we could take some action here instead of going on... |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | foreach ($ar as $line) { |
| 178 | 178 | // take care of multi-line headers and cookies |
| 179 | 179 | $arr = explode(':', $line, 2); |
| 180 | - if (count($arr) > 1) { |
|
| 180 | + if (count($arr)>1) { |
|
| 181 | 181 | $headerName = strtolower(trim($arr[0])); |
| 182 | 182 | /// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be |
| 183 | 183 | /// passed using multiple header lines. |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | foreach ($cookies as $cookie) { |
| 195 | 195 | // glue together all received cookies, using a comma to separate them (same as php does with getallheaders()) |
| 196 | 196 | if (isset($httpResponse['headers'][$headerName])) { |
| 197 | - $httpResponse['headers'][$headerName] .= ', ' . trim($cookie); |
|
| 197 | + $httpResponse['headers'][$headerName] .= ', '.trim($cookie); |
|
| 198 | 198 | } else { |
| 199 | 199 | $httpResponse['headers'][$headerName] = trim($cookie); |
| 200 | 200 | } |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | } |
| 224 | 224 | } elseif (isset($headerName)) { |
| 225 | 225 | /// @todo version1 cookies might span multiple lines, thus breaking the parsing above |
| 226 | - $httpResponse['headers'][$headerName] .= ' ' . trim($line); |
|
| 226 | + $httpResponse['headers'][$headerName] .= ' '.trim($line); |
|
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | // Decode chunked encoding sent by http 1.1 servers |
| 247 | 247 | if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') { |
| 248 | 248 | if (!$data = static::decodeChunked($data)) { |
| 249 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 249 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 250 | 250 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']); |
| 251 | 251 | } |
| 252 | 252 | } |
@@ -261,19 +261,19 @@ discard block |
||
| 261 | 261 | if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 262 | 262 | $data = $degzdata; |
| 263 | 263 | if ($debug) { |
| 264 | - $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 264 | + $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 265 | 265 | } |
| 266 | 266 | } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 267 | 267 | $data = $degzdata; |
| 268 | 268 | if ($debug) { |
| 269 | - $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 269 | + $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 270 | 270 | } |
| 271 | 271 | } else { |
| 272 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server'); |
|
| 272 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server'); |
|
| 273 | 273 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']); |
| 274 | 274 | } |
| 275 | 275 | } else { |
| 276 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 276 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 277 | 277 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']); |
| 278 | 278 | } |
| 279 | 279 | } |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | public function parseAcceptHeader($header) |
| 294 | 294 | { |
| 295 | 295 | $accepted = array(); |
| 296 | - foreach(explode(',', $header) as $c) { |
|
| 296 | + foreach (explode(',', $header) as $c) { |
|
| 297 | 297 | if (preg_match('/^([^;]+); *q=([0-9.]+)/', $c, $matches)) { |
| 298 | 298 | $c = $matches[1]; |
| 299 | 299 | $w = $matches[2]; |
@@ -155,35 +155,35 @@ discard block |
||
| 155 | 155 | public function serialize($charsetEncoding = '') |
| 156 | 156 | { |
| 157 | 157 | if ($charsetEncoding != '') { |
| 158 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 158 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 159 | 159 | } else { |
| 160 | 160 | $this->content_type = 'text/xml'; |
| 161 | 161 | } |
| 162 | 162 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 163 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 163 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 164 | 164 | } else { |
| 165 | 165 | $result = "<methodResponse>\n"; |
| 166 | 166 | } |
| 167 | 167 | if ($this->errno) { |
| 168 | 168 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 169 | - $result .= "<fault>\n" . |
|
| 170 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 171 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 172 | - $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" . |
|
| 169 | + $result .= "<fault>\n". |
|
| 170 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 171 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 172 | + $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n". |
|
| 173 | 173 | "</struct>\n</value>\n</fault>"; |
| 174 | 174 | } else { |
| 175 | 175 | if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) { |
| 176 | 176 | if (is_string($this->val) && $this->valtyp == 'xml') { |
| 177 | - $result .= "<params>\n<param>\n" . |
|
| 178 | - $this->val . |
|
| 177 | + $result .= "<params>\n<param>\n". |
|
| 178 | + $this->val. |
|
| 179 | 179 | "</param>\n</params>"; |
| 180 | 180 | } else { |
| 181 | 181 | /// @todo try to build something serializable using the Encoder... |
| 182 | 182 | throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values'); |
| 183 | 183 | } |
| 184 | 184 | } else { |
| 185 | - $result .= "<params>\n<param>\n" . |
|
| 186 | - $this->val->serialize($charsetEncoding) . |
|
| 185 | + $result .= "<params>\n<param>\n". |
|
| 186 | + $this->val->serialize($charsetEncoding). |
|
| 187 | 187 | "</param>\n</params>"; |
| 188 | 188 | } |
| 189 | 189 | } |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | return $this->httpResponse['raw_data']; |
| 209 | 209 | default: |
| 210 | 210 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 211 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 211 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 212 | 212 | return null; |
| 213 | 213 | } |
| 214 | 214 | } |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | break; |
| 230 | 230 | default: |
| 231 | 231 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 232 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 232 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 233 | 233 | } |
| 234 | 234 | } |
| 235 | 235 | |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | break; |
| 264 | 264 | default: |
| 265 | 265 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 266 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 266 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 267 | 267 | } |
| 268 | 268 | } |
| 269 | 269 | } |
