gggeek /
phpxmlrpc
@@ -91,13 +91,13 @@ discard block |
||
| 91 | 91 | <body> |
| 92 | 92 | <?php |
| 93 | 93 | |
| 94 | -include __DIR__ . '/common.php'; |
|
| 94 | +include __DIR__.'/common.php'; |
|
| 95 | 95 | |
| 96 | 96 | if ($action) { |
| 97 | 97 | |
| 98 | 98 | // make sure the script waits long enough for the call to complete... |
| 99 | 99 | if ($timeout) { |
| 100 | - set_time_limit($timeout + 10); |
|
| 100 | + set_time_limit($timeout+10); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | if ($wstype == 1) { |
@@ -122,13 +122,13 @@ discard block |
||
| 122 | 122 | $server = "$host$path"; |
| 123 | 123 | } |
| 124 | 124 | if ($protocol == 2) { |
| 125 | - $server = 'https://' . $server; |
|
| 125 | + $server = 'https://'.$server; |
|
| 126 | 126 | } else { |
| 127 | - $server = 'http://' . $server; |
|
| 127 | + $server = 'http://'.$server; |
|
| 128 | 128 | } |
| 129 | 129 | if ($proxy != '') { |
| 130 | 130 | $pproxy = explode(':', $proxy); |
| 131 | - if (count($pproxy) > 1) { |
|
| 131 | + if (count($pproxy)>1) { |
|
| 132 | 132 | $pport = $pproxy[1]; |
| 133 | 133 | } else { |
| 134 | 134 | $pport = 8080; |
@@ -197,9 +197,9 @@ discard block |
||
| 197 | 197 | case 'wrap': |
| 198 | 198 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 199 | 199 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 200 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 200 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 201 | 201 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 202 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 202 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 203 | 203 | break; |
| 204 | 204 | case 'list': |
| 205 | 205 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -212,9 +212,9 @@ discard block |
||
| 212 | 212 | $msg[0] = new $requestClass($method, array(), $id); |
| 213 | 213 | // hack! build xml payload by hand |
| 214 | 214 | if ($wstype == 1) { |
| 215 | - $msg[0]->payload = "{\n" . |
|
| 216 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 217 | - $payload . |
|
| 215 | + $msg[0]->payload = "{\n". |
|
| 216 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 217 | + $payload. |
|
| 218 | 218 | "\n],\n\"id\": "; |
| 219 | 219 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 220 | 220 | if ($id == "") { |
@@ -227,20 +227,20 @@ discard block |
||
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | } else { |
| 230 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . |
|
| 231 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 232 | - $payload . |
|
| 233 | - "</params>\n" . $msg[0]->xml_footer(); |
|
| 230 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). |
|
| 231 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 232 | + $payload. |
|
| 233 | + "</params>\n".$msg[0]->xml_footer(); |
|
| 234 | 234 | } |
| 235 | - $actionname = 'Execution of method ' . $method; |
|
| 235 | + $actionname = 'Execution of method '.$method; |
|
| 236 | 236 | break; |
| 237 | 237 | default: // give a warning |
| 238 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 238 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 242 | 242 | // this gives good user feedback for long-running methods... |
| 243 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 243 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 244 | 244 | flush(); |
| 245 | 245 | |
| 246 | 246 | $response = null; |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | break; |
| 259 | 259 | } |
| 260 | 260 | } |
| 261 | - $time = microtime(true) - $time; |
|
| 261 | + $time = microtime(true)-$time; |
|
| 262 | 262 | if ($debug) { |
| 263 | 263 | echo "</div>\n"; |
| 264 | 264 | } |
@@ -268,8 +268,8 @@ discard block |
||
| 268 | 268 | // call failed! echo out error msg! |
| 269 | 269 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 270 | 270 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 271 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 272 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 271 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 272 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 273 | 273 | echo(strftime("%d/%b/%Y:%H:%M:%S\n")); |
| 274 | 274 | } else { |
| 275 | 275 | // call succeeded: parse results |
@@ -285,36 +285,36 @@ discard block |
||
| 285 | 285 | $max = $v->count(); |
| 286 | 286 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 287 | 287 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 288 | - foreach($v as $i => $rec) { |
|
| 288 | + foreach ($v as $i => $rec) { |
|
| 289 | 289 | if ($i % 2) { |
| 290 | 290 | $class = ' class="oddrow"'; |
| 291 | 291 | } else { |
| 292 | 292 | $class = ' class="evenrow"'; |
| 293 | 293 | } |
| 294 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 295 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 296 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 297 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 298 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 299 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 300 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 301 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 302 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 294 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 295 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 296 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 297 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 298 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 299 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 300 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 301 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 302 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 318 | 318 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 319 | 319 | //echo("</tr>\n"); |
| 320 | 320 | |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | $r2 = $resp[1]->value(); |
| 342 | 342 | |
| 343 | 343 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 344 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 344 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 345 | 345 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 346 | 346 | if ($desc == "") { |
| 347 | 347 | $desc = "-"; |
@@ -351,41 +351,41 @@ discard block |
||
| 351 | 351 | if ($r2->kindOf() != "array") { |
| 352 | 352 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 353 | 353 | } else { |
| 354 | - foreach($r2 as $i => $x) { |
|
| 354 | + foreach ($r2 as $i => $x) { |
|
| 355 | 355 | $payload = ""; |
| 356 | 356 | $alt_payload = ""; |
| 357 | - if ($i + 1 % 2) { |
|
| 357 | + if ($i+1 % 2) { |
|
| 358 | 358 | $class = ' class="oddrow"'; |
| 359 | 359 | } else { |
| 360 | 360 | $class = ' class="evenrow"'; |
| 361 | 361 | } |
| 362 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 362 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 363 | 363 | if ($x->kindOf() == "array") { |
| 364 | 364 | $ret = $x[0]; |
| 365 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 366 | - if ($x->count() > 1) { |
|
| 367 | - foreach($x as $k => $y) { |
|
| 365 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 366 | + if ($x->count()>1) { |
|
| 367 | + foreach ($x as $k => $y) { |
|
| 368 | 368 | if ($k == 0) continue; |
| 369 | 369 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 370 | 370 | if ($wstype != 1) { |
| 371 | 371 | $type = $y->scalarval(); |
| 372 | 372 | $payload .= '<param><value>'; |
| 373 | - switch($type) { |
|
| 373 | + switch ($type) { |
|
| 374 | 374 | case 'undefined': |
| 375 | 375 | break; |
| 376 | 376 | case 'null'; |
| 377 | 377 | $type = 'nil'; |
| 378 | 378 | // fall thru intentionally |
| 379 | 379 | default: |
| 380 | - $payload .= '<' . |
|
| 381 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 382 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 380 | + $payload .= '<'. |
|
| 381 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 382 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 383 | 383 | '>'; |
| 384 | 384 | } |
| 385 | 385 | $payload .= "</value></param>\n"; |
| 386 | 386 | } |
| 387 | 387 | $alt_payload .= $y->scalarval(); |
| 388 | - if ($k < $x->count() - 1) { |
|
| 388 | + if ($k<$x->count()-1) { |
|
| 389 | 389 | $alt_payload .= ';'; |
| 390 | 390 | echo ", "; |
| 391 | 391 | } |
@@ -398,63 +398,63 @@ discard block |
||
| 398 | 398 | echo '</td>'; |
| 399 | 399 | // button to test this method |
| 400 | 400 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 401 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 402 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 403 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 404 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 405 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 406 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 407 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 408 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 409 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 410 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 411 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 412 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 413 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 414 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 415 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 416 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 417 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 418 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 419 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 420 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 421 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 422 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 423 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 424 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 401 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 402 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 403 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 404 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 405 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 406 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 407 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 408 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 409 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 410 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 411 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 412 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 413 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 414 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 415 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 416 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 417 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 418 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 419 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 420 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 421 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 422 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 423 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 424 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 425 | 425 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 426 | 426 | if ($wstype != 1) { |
| 427 | 427 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 428 | 428 | } |
| 429 | 429 | echo "</form></td>\n"; |
| 430 | 430 | |
| 431 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 432 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 433 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 434 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 435 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 436 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 437 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 438 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 439 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 440 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 441 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 431 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 432 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 433 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 434 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 435 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 436 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 437 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 438 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 439 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 440 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 441 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 458 | 458 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 459 | 459 | echo "</form></td></tr>\n"; |
| 460 | 460 | } |
@@ -466,14 +466,14 @@ discard block |
||
| 466 | 466 | case 'wrap': |
| 467 | 467 | $r1 = $resp[0]->value(); |
| 468 | 468 | $r2 = $resp[1]->value(); |
| 469 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 469 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 470 | 470 | echo "Error: signature unknown\n"; |
| 471 | 471 | } else { |
| 472 | 472 | $mdesc = $r1->scalarval(); |
| 473 | 473 | $encoder = new PhpXmlRpc\Encoder(); |
| 474 | 474 | $msig = $encoder->decode($r2); |
| 475 | 475 | $msig = $msig[$methodsig]; |
| 476 | - $proto = $protocol == 2 ? 'https' : ( $protocol == 1 ? 'http11' : '' ); |
|
| 476 | + $proto = $protocol == 2 ? 'https' : ($protocol == 1 ? 'http11' : ''); |
|
| 477 | 477 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 478 | 478 | $clientcookies == '' |
| 479 | 479 | ) { |
@@ -487,11 +487,11 @@ discard block |
||
| 487 | 487 | $prefix = 'xmlrpc'; |
| 488 | 488 | } |
| 489 | 489 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 490 | - $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc); |
|
| 490 | + $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc); |
|
| 491 | 491 | //if ($code) |
| 492 | 492 | //{ |
| 493 | 493 | echo "<div id=\"phpcode\">\n"; |
| 494 | - highlight_string("<?php\n" . $code['docstring'] . $code['source'] . '?>'); |
|
| 494 | + highlight_string("<?php\n".$code['docstring'].$code['source'].'?>'); |
|
| 495 | 495 | echo "\n</div>"; |
| 496 | 496 | //} |
| 497 | 497 | //else |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | break; |
| 503 | 503 | |
| 504 | 504 | case 'execute': |
| 505 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 505 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 506 | 506 | break; |
| 507 | 507 | |
| 508 | 508 | default: // give a warning |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | // assume this is either a standalone install, or installed as Composer dependency |
| 20 | 20 | /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level |
| 21 | 21 | /// debugger include this one, taking care of autoloading ? |
| 22 | - include_once __DIR__ . "/../src/Autoloader.php"; |
|
| 22 | + include_once __DIR__."/../src/Autoloader.php"; |
|
| 23 | 23 | PhpXmlRpc\Autoloader::register(); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | // Variables that shouldn't be unset |
| 36 | - $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 36 | + $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 37 | 37 | |
| 38 | 38 | $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, |
| 39 | 39 | isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array() |
@@ -53,8 +53,7 @@ discard block |
||
| 53 | 53 | function stripslashes_deep($value) |
| 54 | 54 | { |
| 55 | 55 | $value = is_array($value) ? |
| 56 | - array_map('stripslashes_deep', $value) : |
|
| 57 | - stripslashes($value); |
|
| 56 | + array_map('stripslashes_deep', $value) : stripslashes($value); |
|
| 58 | 57 | |
| 59 | 58 | return $value; |
| 60 | 59 | } |
@@ -99,7 +98,7 @@ discard block |
||
| 99 | 98 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
| 100 | 99 | // in case user forgot initial '/' in xmlrpc server path, add it back |
| 101 | 100 | if ($path && ($path[0]) != '/') { |
| 102 | - $path = '/' . $path; |
|
| 101 | + $path = '/'.$path; |
|
| 103 | 102 | } |
| 104 | 103 | |
| 105 | 104 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
@@ -17,15 +17,15 @@ discard block |
||
| 17 | 17 | // Make sure we set the correct charset type for output, so that we can display all characters |
| 18 | 18 | header('Content-Type: text/html; charset=utf-8'); |
| 19 | 19 | |
| 20 | -include __DIR__ . '/common.php'; |
|
| 20 | +include __DIR__.'/common.php'; |
|
| 21 | 21 | if ($action == '') { |
| 22 | 22 | $action = 'list'; |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | // Relative path to the visual xmlrpc editing dialog |
| 26 | 26 | // We allow to easily configure this path via defines |
| 27 | -$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/debugger/'; |
|
| 28 | -$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/lib/'; |
|
| 27 | +$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/debugger/'; |
|
| 28 | +$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/lib/'; |
|
| 29 | 29 | ?> |
| 30 | 30 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
| 31 | 31 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
@@ -230,9 +230,9 @@ discard block |
||
| 230 | 230 | echo ' document.forms[2].submit();'; |
| 231 | 231 | } ?>"> |
| 232 | 232 | <h1>XMLRPC |
| 233 | - <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
| 233 | + <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
| 234 | 234 | / |
| 235 | - <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
| 235 | + <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
| 236 | 236 | JSONRPC Debugger (based on the <a href="http://gggeek.github.io/phpxmlrpc/">PHP-XMLRPC</a> library) |
| 237 | 237 | </h1> |
| 238 | 238 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | </select> |
| 288 | 288 | </td> |
| 289 | 289 | <td class="labelcell">Timeout:</td> |
| 290 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
| 290 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
| 291 | 291 | <td class="labelcell">Protocol:</td> |
| 292 | 292 | <td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();"> |
| 293 | 293 | <option value="0"<?php if ($protocol == 0) { echo ' selected="selected"'; } ?>>HTTP 1.0</option> |
@@ -1,10 +1,10 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | 4 | |
| 5 | -include_once __DIR__ . '/parse_args.php'; |
|
| 5 | +include_once __DIR__.'/parse_args.php'; |
|
| 6 | 6 | |
| 7 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 7 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 8 | 8 | |
| 9 | 9 | use PHPUnit\Runner\BaseTestRunner; |
| 10 | 10 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | $this->client->server .= 'XXX'; |
| 59 | 59 | $dnsinfo = @dns_get_record($this->client->server); |
| 60 | 60 | if ($dnsinfo) { |
| 61 | - $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found'); |
|
| 61 | + $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found'); |
|
| 62 | 62 | } else { |
| 63 | 63 | $r = $this->client->send($m, 5); |
| 64 | 64 | // make sure there's no freaking catchall DNS in effect |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | // now test a successful connection |
| 87 | 87 | $server = explode(':', $this->args['HTTPSERVER']); |
| 88 | - if (count($server) > 1) { |
|
| 88 | + if (count($server)>1) { |
|
| 89 | 89 | $this->client->port = $server[1]; |
| 90 | 90 | } |
| 91 | 91 | $this->client->server = $server[0]; |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 9 | 9 | |
| 10 | 10 | use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage; |
| 11 | 11 | use PHPUnit\Framework\TestResult; |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | // (but only if not called from subclass objects / multitests) |
| 42 | 42 | if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'localhosttests') { |
| 43 | 43 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 44 | - for ($i = 0; $i < count($trace); $i++) { |
|
| 44 | + for ($i = 0; $i<count($trace); $i++) { |
|
| 45 | 45 | if (strpos($trace[$i]['function'], 'test') === 0) { |
| 46 | 46 | self::$failed_tests[$trace[$i]['function']] = true; |
| 47 | 47 | break; |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | public function _run($result = NULL) |
| 66 | 66 | { |
| 67 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
| 67 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
| 68 | 68 | |
| 69 | 69 | if ($result === NULL) { |
| 70 | 70 | $result = $this->createResult(); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $this->args = argParser::getArgs(); |
| 96 | 96 | |
| 97 | 97 | $server = explode(':', $this->args['HTTPSERVER']); |
| 98 | - if (count($server) > 1) { |
|
| 98 | + if (count($server)>1) { |
|
| 99 | 99 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $server[0], $server[1]); |
| 100 | 100 | } else { |
| 101 | 101 | $this->client = new xmlrpc_client($this->args['HTTPURI'], $this->args['HTTPSERVER']); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | $this->client->request_compression = $this->request_compression; |
| 106 | 106 | $this->client->accepted_compression = $this->accepted_compression; |
| 107 | 107 | |
| 108 | - $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] ); |
|
| 108 | + $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].'/'.str_replace('/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI']); |
|
| 109 | 109 | |
| 110 | 110 | if ($this->args['DEBUG'] == 1) |
| 111 | 111 | ob_start(); |
@@ -141,9 +141,9 @@ discard block |
||
| 141 | 141 | return $r; |
| 142 | 142 | } |
| 143 | 143 | if (is_array($errorCode)) { |
| 144 | - $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 144 | + $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 145 | 145 | } else { |
| 146 | - $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 146 | + $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 147 | 147 | } |
| 148 | 148 | if (!$r->faultCode()) { |
| 149 | 149 | if ($returnResponse) { |
@@ -165,20 +165,20 @@ discard block |
||
| 165 | 165 | $query = parse_url($this->client->path, PHP_URL_QUERY); |
| 166 | 166 | parse_str($query, $vars); |
| 167 | 167 | $query = http_build_query(array_merge($vars, $data)); |
| 168 | - $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query; |
|
| 168 | + $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query; |
|
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | public function testString() |
| 172 | 172 | { |
| 173 | - $sendString = "here are 3 \"entities\": < > & " . |
|
| 174 | - "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) . |
|
| 175 | - " - isn't that great? \\\"hackery\\\" at it's best " . |
|
| 176 | - " also don't want to miss out on \$item[0]. " . |
|
| 177 | - "The real weird stuff follows: CRLF here" . chr(13) . chr(10) . |
|
| 178 | - "a simple CR here" . chr(13) . |
|
| 179 | - "a simple LF here" . chr(10) . |
|
| 180 | - "and then LFCR" . chr(10) . chr(13) . |
|
| 181 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->"; |
|
| 173 | + $sendString = "here are 3 \"entities\": < > & ". |
|
| 174 | + "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92). |
|
| 175 | + " - isn't that great? \\\"hackery\\\" at it's best ". |
|
| 176 | + " also don't want to miss out on \$item[0]. ". |
|
| 177 | + "The real weird stuff follows: CRLF here".chr(13).chr(10). |
|
| 178 | + "a simple CR here".chr(13). |
|
| 179 | + "a simple LF here".chr(10). |
|
| 180 | + "and then LFCR".chr(10).chr(13). |
|
| 181 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->"; |
|
| 182 | 182 | $m = new xmlrpcmsg('examples.stringecho', array( |
| 183 | 183 | new xmlrpcval($sendString, 'string'), |
| 184 | 184 | )); |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | public function testLatin1String() |
| 200 | 200 | { |
| 201 | 201 | $sendString = |
| 202 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
| 202 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne"; |
|
| 203 | 203 | $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'. |
| 204 | 204 | $sendString. |
| 205 | 205 | '</value></param></params></methodCall>'; |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | public function testUtf8Method() |
| 304 | 304 | { |
| 305 | 305 | PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8'; |
| 306 | - $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array( |
|
| 306 | + $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array( |
|
| 307 | 307 | new xmlrpcval('hello') |
| 308 | 308 | )); |
| 309 | 309 | $v = $this->send($m); |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | )); |
| 326 | 326 | $v = $this->send($m); |
| 327 | 327 | if ($v) { |
| 328 | - $this->assertEquals($a + $b, $v->scalarval()); |
|
| 328 | + $this->assertEquals($a+$b, $v->scalarval()); |
|
| 329 | 329 | } |
| 330 | 330 | } |
| 331 | 331 | |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | )); |
| 338 | 338 | $v = $this->send($m); |
| 339 | 339 | if ($v) { |
| 340 | - $this->assertEquals(12 - 23, $v->scalarval()); |
|
| 340 | + $this->assertEquals(12-23, $v->scalarval()); |
|
| 341 | 341 | } |
| 342 | 342 | } |
| 343 | 343 | |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | if ($v) { |
| 372 | 372 | $sz = $v->arraysize(); |
| 373 | 373 | $got = ''; |
| 374 | - for ($i = 0; $i < $sz; $i++) { |
|
| 374 | + for ($i = 0; $i<$sz; $i++) { |
|
| 375 | 375 | $b = $v->arraymem($i); |
| 376 | 376 | if ($b->scalarval()) { |
| 377 | 377 | $got .= '1'; |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | $got = ''; |
| 435 | 435 | $expected = '37210'; |
| 436 | 436 | $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes'); |
| 437 | - foreach($expect_array as $val) { |
|
| 437 | + foreach ($expect_array as $val) { |
|
| 438 | 438 | $b = $v->structmem($val); |
| 439 | 439 | $got .= $b->me['int']; |
| 440 | 440 | } |
@@ -863,7 +863,7 @@ discard block |
||
| 863 | 863 | { |
| 864 | 864 | // make a 'deep client copy' as the original one might have many properties set |
| 865 | 865 | // also for speed only wrap one method of the whole server |
| 866 | - $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' )); |
|
| 866 | + $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/')); |
|
| 867 | 867 | if ($class == '') { |
| 868 | 868 | $this->fail('Registration of remote server failed'); |
| 869 | 869 | } else { |
@@ -902,9 +902,9 @@ discard block |
||
| 902 | 902 | $cookies = array( |
| 903 | 903 | //'c1' => array(), |
| 904 | 904 | 'c2' => array('value' => 'c2'), |
| 905 | - 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30), |
|
| 906 | - 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'), |
|
| 907 | - 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 905 | + 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30), |
|
| 906 | + 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'), |
|
| 907 | + 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 908 | 908 | ); |
| 909 | 909 | $cookiesval = php_xmlrpc_encode($cookies); |
| 910 | 910 | $m = new xmlrpcmsg('examples.setcookies', array($cookiesval)); |
@@ -952,10 +952,10 @@ discard block |
||
| 952 | 952 | $m = new xmlrpcmsg('examples.getcookies', array()); |
| 953 | 953 | foreach ($cookies as $cookie => $val) { |
| 954 | 954 | $this->client->setCookie($cookie, $val); |
| 955 | - $cookies[$cookie] = (string)$cookies[$cookie]; |
|
| 955 | + $cookies[$cookie] = (string) $cookies[$cookie]; |
|
| 956 | 956 | } |
| 957 | 957 | $r = $this->client->send($m, $this->timeout, $this->method); |
| 958 | - $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 958 | + $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 959 | 959 | if (!$r->faultCode()) { |
| 960 | 960 | $v = $r->value(); |
| 961 | 961 | $v = php_xmlrpc_decode($v); |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * @author JoakimLofgren |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 6 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 7 | 7 | |
| 8 | 8 | use PhpXmlRpc\Helper\Charset; |
| 9 | 9 | |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | { |
| 33 | 33 | // construct a latin string with all chars (except control ones) |
| 34 | 34 | $this->latinString = "\n\r\t"; |
| 35 | - for($i = 32; $i < 127; $i++) { |
|
| 35 | + for ($i = 32; $i<127; $i++) { |
|
| 36 | 36 | $this->latinString .= chr($i); |
| 37 | 37 | } |
| 38 | - for($i = 160; $i < 256; $i++) { |
|
| 38 | + for ($i = 160; $i<256; $i++) { |
|
| 39 | 39 | $this->latinString .= chr($i); |
| 40 | 40 | } |
| 41 | 41 | } |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 9 | 9 | |
| 10 | 10 | use PHPUnit\Runner\BaseTestRunner; |
| 11 | 11 | |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 9 | 9 | |
| 10 | 10 | use PHPUnit\Runner\BaseTestRunner; |
| 11 | 11 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | public function testI8() |
| 105 | 105 | { |
| 106 | - if (PHP_INT_SIZE == 4 ) { |
|
| 106 | + if (PHP_INT_SIZE == 4) { |
|
| 107 | 107 | $this->markTestSkipped('Can not test i8 as php is compiled in 32 bit mode'); |
| 108 | 108 | return; |
| 109 | 109 | } |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | public function testUnicodeInMemberName() |
| 135 | 135 | { |
| 136 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
| 136 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
| 137 | 137 | $v = array($str => new xmlrpcval(1)); |
| 138 | 138 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
| 139 | 139 | $r = $r->serialize(); |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | '<?xml version="1.0"?> |
| 150 | 150 | <!-- $Id --> |
| 151 | 151 | <!-- found by G. Giunta, covers what happens when lib receives UTF8 chars in response text and comments --> |
| 152 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
| 152 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
| 153 | 153 | <methodResponse> |
| 154 | 154 | <fault> |
| 155 | 155 | <value> |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | </member> |
| 161 | 161 | <member> |
| 162 | 162 | <name>faultString</name> |
| 163 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
| 163 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
| 164 | 164 | </member> |
| 165 | 165 | </struct> |
| 166 | 166 | </value> |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | $m = $this->newMsg('dummy'); |
| 170 | 170 | $r = $m->parseResponse($response); |
| 171 | 171 | $v = $r->faultString(); |
| 172 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
| 172 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | public function testBrokenRequests() |
@@ -409,11 +409,11 @@ discard block |
||
| 409 | 409 | |
| 410 | 410 | public function testUTF8Response() |
| 411 | 411 | { |
| 412 | - $string = chr(224) . chr(252) . chr(232); |
|
| 412 | + $string = chr(224).chr(252).chr(232); |
|
| 413 | 413 | |
| 414 | 414 | $s = $this->newMsg('dummy'); |
| 415 | - $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
| 416 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 415 | + $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
| 416 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 417 | 417 | '; |
| 418 | 418 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 419 | 419 | $v = $r->value(); |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | $this->assertEquals($string, $v); |
| 422 | 422 | |
| 423 | 423 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
| 424 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 424 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 425 | 425 | '; |
| 426 | 426 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 427 | 427 | $v = $r->value(); |
@@ -437,11 +437,11 @@ discard block |
||
| 437 | 437 | |
| 438 | 438 | public function testLatin1Response() |
| 439 | 439 | { |
| 440 | - $string = chr(224) . chr(252) . chr(232); |
|
| 440 | + $string = chr(224).chr(252).chr(232); |
|
| 441 | 441 | |
| 442 | 442 | $s = $this->newMsg('dummy'); |
| 443 | - $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
| 444 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 443 | + $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
| 444 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 445 | 445 | '; |
| 446 | 446 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 447 | 447 | $v = $r->value(); |
@@ -449,7 +449,7 @@ discard block |
||
| 449 | 449 | $this->assertEquals($string, $v); |
| 450 | 450 | |
| 451 | 451 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
| 452 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 452 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 453 | 453 | '; |
| 454 | 454 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 455 | 455 | $v = $r->value(); |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/5ServerTest.php'; |
|
| 8 | +include_once __DIR__.'/5ServerTest.php'; |
|
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * Tests which stress http features of the library. |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | ); |
| 28 | 28 | |
| 29 | 29 | $methods = array(); |
| 30 | - foreach(get_class_methods('ServerTest') as $method) |
|
| 30 | + foreach (get_class_methods('ServerTest') as $method) |
|
| 31 | 31 | { |
| 32 | 32 | if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods)) |
| 33 | 33 | { |
