@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | |
124 | 124 | xml_set_object($parser, $this); |
125 | 125 | |
126 | - switch($returnType) { |
|
126 | + switch ($returnType) { |
|
127 | 127 | case self::RETURN_PHP: |
128 | 128 | xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast'); |
129 | 129 | break; |
@@ -140,10 +140,10 @@ discard block |
||
140 | 140 | $this->accept = $accept; |
141 | 141 | |
142 | 142 | // @see ticket #70 - we have to parse big xml docks in chunks to avoid errors |
143 | - for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) { |
|
143 | + for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) { |
|
144 | 144 | $chunk = substr($data, $offset, $this->maxChunkLength); |
145 | 145 | // error handling: xml not well formed |
146 | - if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) { |
|
146 | + if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) { |
|
147 | 147 | $errCode = xml_get_error_code($parser); |
148 | 148 | $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode), |
149 | 149 | xml_get_current_line_number($parser), xml_get_current_column_number($parser)); |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
168 | 168 | { |
169 | 169 | // if invalid xmlrpc already detected, skip all processing |
170 | - if ($this->_xh['isf'] < 2) { |
|
170 | + if ($this->_xh['isf']<2) { |
|
171 | 171 | |
172 | 172 | // check for correct element nesting |
173 | 173 | if (count($this->_xh['stack']) == 0) { |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | $this->_xh['rt'] = strtolower($name); |
188 | 188 | } else { |
189 | 189 | $this->_xh['isf'] = 2; |
190 | - $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name; |
|
190 | + $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name; |
|
191 | 191 | |
192 | 192 | return; |
193 | 193 | } |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | break; |
282 | 282 | case 'MEMBER': |
283 | 283 | // set member name to null, in case we do not find in the xml later on |
284 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = ''; |
|
284 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = ''; |
|
285 | 285 | //$this->_xh['ac']=''; |
286 | 286 | // Drop trough intentionally |
287 | 287 | case 'PARAM': |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | */ |
342 | 342 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1) |
343 | 343 | { |
344 | - if ($this->_xh['isf'] < 2) { |
|
344 | + if ($this->_xh['isf']<2) { |
|
345 | 345 | // push this element name from stack |
346 | 346 | // NB: if XML validates, correct opening/closing is guaranteed and |
347 | 347 | // we do not have to check for $name == $currElem. |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | $this->_xh['vt'] = Value::$xmlrpcString; |
357 | 357 | } |
358 | 358 | |
359 | - if ($rebuildXmlrpcvals > 0) { |
|
359 | + if ($rebuildXmlrpcvals>0) { |
|
360 | 360 | // build the xmlrpc val out of the data received, and substitute it |
361 | 361 | $temp = new Value($this->_xh['value'], $this->_xh['vt']); |
362 | 362 | // in case we got info about underlying php class, save it |
@@ -365,15 +365,15 @@ discard block |
||
365 | 365 | $temp->_php_class = $this->_xh['php_class']; |
366 | 366 | } |
367 | 367 | $this->_xh['value'] = $temp; |
368 | - } elseif ($rebuildXmlrpcvals < 0) { |
|
368 | + } elseif ($rebuildXmlrpcvals<0) { |
|
369 | 369 | if ($this->_xh['vt'] == Value::$xmlrpcDateTime) { |
370 | - $this->_xh['value'] = (object)array( |
|
370 | + $this->_xh['value'] = (object) array( |
|
371 | 371 | 'xmlrpc_type' => 'datetime', |
372 | 372 | 'scalar' => $this->_xh['value'], |
373 | 373 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value']) |
374 | 374 | ); |
375 | 375 | } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) { |
376 | - $this->_xh['value'] = (object)array( |
|
376 | + $this->_xh['value'] = (object) array( |
|
377 | 377 | 'xmlrpc_type' => 'base64', |
378 | 378 | 'scalar' => $this->_xh['value'] |
379 | 379 | ); |
@@ -389,8 +389,8 @@ discard block |
||
389 | 389 | // check if we are inside an array or struct: |
390 | 390 | // if value just built is inside an array, let's move it into array on the stack |
391 | 391 | $vscount = count($this->_xh['valuestack']); |
392 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
393 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
392 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
393 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
394 | 394 | } |
395 | 395 | break; |
396 | 396 | case 'BOOLEAN': |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | $this->_xh['value'] = $this->_xh['ac']; |
410 | 410 | } elseif ($name == 'DATETIME.ISO8601') { |
411 | 411 | if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) { |
412 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']); |
|
412 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']); |
|
413 | 413 | } |
414 | 414 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
415 | 415 | $this->_xh['value'] = $this->_xh['ac']; |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | } else { |
429 | 429 | // log if receiving something strange, even though we set the value to false anyway |
430 | 430 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) { |
431 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']); |
|
431 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']); |
|
432 | 432 | } |
433 | 433 | $this->_xh['value'] = false; |
434 | 434 | } |
@@ -438,37 +438,37 @@ discard block |
||
438 | 438 | // NOTE: regexp could be much stricter than this... |
439 | 439 | if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) { |
440 | 440 | /// @todo: find a better way of throwing an error than this! |
441 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']); |
|
441 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']); |
|
442 | 442 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
443 | 443 | } else { |
444 | 444 | // it's ok, add it on |
445 | - $this->_xh['value'] = (double)$this->_xh['ac']; |
|
445 | + $this->_xh['value'] = (double) $this->_xh['ac']; |
|
446 | 446 | } |
447 | 447 | } else { |
448 | 448 | // we have an I4/I8/INT |
449 | 449 | // we must check that only 0123456789-<space> are characters here |
450 | 450 | if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) { |
451 | 451 | /// @todo find a better way of throwing an error than this! |
452 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']); |
|
452 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']); |
|
453 | 453 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
454 | 454 | } else { |
455 | 455 | // it's ok, add it on |
456 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
456 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
457 | 457 | } |
458 | 458 | } |
459 | 459 | $this->_xh['lv'] = 3; // indicate we've found a value |
460 | 460 | break; |
461 | 461 | case 'NAME': |
462 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
462 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
463 | 463 | break; |
464 | 464 | case 'MEMBER': |
465 | 465 | // add to array in the stack the last element built, |
466 | 466 | // unless no VALUE was found |
467 | 467 | if ($this->_xh['vt']) { |
468 | 468 | $vscount = count($this->_xh['valuestack']); |
469 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
469 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
470 | 470 | } else { |
471 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml'); |
|
471 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml'); |
|
472 | 472 | } |
473 | 473 | break; |
474 | 474 | case 'DATA': |
@@ -491,7 +491,7 @@ discard block |
||
491 | 491 | $this->_xh['params'][] = $this->_xh['value']; |
492 | 492 | $this->_xh['pt'][] = $this->_xh['vt']; |
493 | 493 | } else { |
494 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml'); |
|
494 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml'); |
|
495 | 495 | } |
496 | 496 | break; |
497 | 497 | case 'METHODNAME': |
@@ -547,7 +547,7 @@ discard block |
||
547 | 547 | public function xmlrpc_cd($parser, $data) |
548 | 548 | { |
549 | 549 | // skip processing if xml fault already detected |
550 | - if ($this->_xh['isf'] < 2) { |
|
550 | + if ($this->_xh['isf']<2) { |
|
551 | 551 | // "lookforvalue==3" means that we've found an entire value |
552 | 552 | // and should discard any further character data |
553 | 553 | if ($this->_xh['lv'] != 3) { |
@@ -565,7 +565,7 @@ discard block |
||
565 | 565 | public function xmlrpc_dh($parser, $data) |
566 | 566 | { |
567 | 567 | // skip processing if xml fault already detected |
568 | - if ($this->_xh['isf'] < 2) { |
|
568 | + if ($this->_xh['isf']<2) { |
|
569 | 569 | if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') { |
570 | 570 | $this->_xh['ac'] .= $data; |
571 | 571 | } |
@@ -636,8 +636,8 @@ discard block |
||
636 | 636 | // Details: |
637 | 637 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
638 | 638 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
639 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
640 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
639 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
640 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
641 | 641 | $xmlChunk, $matches)) { |
642 | 642 | return strtoupper(substr($matches[2], 1, -1)); |
643 | 643 | } |
@@ -655,7 +655,7 @@ discard block |
||
655 | 655 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
656 | 656 | // IANA also likes better US-ASCII, so go with it |
657 | 657 | if ($enc == 'ASCII') { |
658 | - $enc = 'US-' . $enc; |
|
658 | + $enc = 'US-'.$enc; |
|
659 | 659 | } |
660 | 660 | |
661 | 661 | return $enc; |
@@ -690,8 +690,8 @@ discard block |
||
690 | 690 | // Details: |
691 | 691 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
692 | 692 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
693 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
694 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
693 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
694 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
695 | 695 | $xmlChunk, $matches)) { |
696 | 696 | return true; |
697 | 697 | } |
@@ -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 |
@@ -17,7 +17,12 @@ discard block |
||
17 | 17 | <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> |
18 | 18 | <head> |
19 | 19 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
20 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
20 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
21 | + echo 'JSONRPC'; |
|
22 | +} else { |
|
23 | + echo 'XMLRPC'; |
|
24 | +} |
|
25 | +?> Debugger</title> |
|
21 | 26 | <meta name="robots" content="index,nofollow"/> |
22 | 27 | <style type="text/css"> |
23 | 28 | <!-- |
@@ -366,7 +371,9 @@ discard block |
||
366 | 371 | echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
367 | 372 | if ($x->count() > 1) { |
368 | 373 | foreach($x as $k => $y) { |
369 | - if ($k == 0) continue; |
|
374 | + if ($k == 0) { |
|
375 | + continue; |
|
376 | + } |
|
370 | 377 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
371 | 378 | if ($wstype != 1) { |
372 | 379 | $type = $y->scalarval(); |
@@ -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> |
@@ -32,7 +32,12 @@ |
||
32 | 32 | <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> |
33 | 33 | <head> |
34 | 34 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
35 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
35 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
36 | + echo 'JSONRPC'; |
|
37 | +} else { |
|
38 | + echo 'XMLRPC'; |
|
39 | +} |
|
40 | +?> Debugger</title> |
|
36 | 41 | <meta name="robots" content="index,nofollow"/> |
37 | 42 | <script type="text/javascript" language="Javascript"> |
38 | 43 | if (window.name != 'frmcontroller') |
@@ -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]; |
@@ -24,14 +24,16 @@ |
||
24 | 24 | $this->client = new xmlrpc_client('/NOTEXIST.php', $this->args['HTTPSERVER'], 80); |
25 | 25 | $this->client->setDebug($this->args['DEBUG']); |
26 | 26 | |
27 | - if ($this->args['DEBUG'] == 1) |
|
28 | - ob_start(); |
|
27 | + if ($this->args['DEBUG'] == 1) { |
|
28 | + ob_start(); |
|
29 | + } |
|
29 | 30 | } |
30 | 31 | |
31 | 32 | protected function tear_down() |
32 | 33 | { |
33 | - if ($this->args['DEBUG'] != 1) |
|
34 | - return; |
|
34 | + if ($this->args['DEBUG'] != 1) { |
|
35 | + return; |
|
36 | + } |
|
35 | 37 | $out = ob_get_clean(); |
36 | 38 | $status = $this->getStatus(); |
37 | 39 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -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); |
@@ -107,14 +107,16 @@ |
||
107 | 107 | |
108 | 108 | $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . '/' . str_replace( '/demo/server/server.php', 'tests/phpunit_coverage.php', $this->args['HTTPURI'] ); |
109 | 109 | |
110 | - if ($this->args['DEBUG'] == 1) |
|
111 | - ob_start(); |
|
110 | + if ($this->args['DEBUG'] == 1) { |
|
111 | + ob_start(); |
|
112 | + } |
|
112 | 113 | } |
113 | 114 | |
114 | 115 | protected function tear_down() |
115 | 116 | { |
116 | - if ($this->args['DEBUG'] != 1) |
|
117 | - return; |
|
117 | + if ($this->args['DEBUG'] != 1) { |
|
118 | + return; |
|
119 | + } |
|
118 | 120 | $out = ob_get_clean(); |
119 | 121 | $status = $this->getStatus(); |
120 | 122 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -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 |
@@ -21,14 +21,16 @@ |
||
21 | 21 | protected function set_up() |
22 | 22 | { |
23 | 23 | $this->args = argParser::getArgs(); |
24 | - if ($this->args['DEBUG'] == 1) |
|
25 | - ob_start(); |
|
24 | + if ($this->args['DEBUG'] == 1) { |
|
25 | + ob_start(); |
|
26 | + } |
|
26 | 27 | } |
27 | 28 | |
28 | 29 | protected function tear_down() |
29 | 30 | { |
30 | - if ($this->args['DEBUG'] != 1) |
|
31 | - return; |
|
31 | + if ($this->args['DEBUG'] != 1) { |
|
32 | + return; |
|
33 | + } |
|
32 | 34 | $out = ob_get_clean(); |
33 | 35 | $status = $this->getStatus(); |
34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -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(); |
@@ -21,14 +21,16 @@ |
||
21 | 21 | protected function set_up() |
22 | 22 | { |
23 | 23 | $this->args = argParser::getArgs(); |
24 | - if ($this->args['DEBUG'] == 1) |
|
25 | - ob_start(); |
|
24 | + if ($this->args['DEBUG'] == 1) { |
|
25 | + ob_start(); |
|
26 | + } |
|
26 | 27 | } |
27 | 28 | |
28 | 29 | protected function tear_down() |
29 | 30 | { |
30 | - if ($this->args['DEBUG'] != 1) |
|
31 | - return; |
|
31 | + if ($this->args['DEBUG'] != 1) { |
|
32 | + return; |
|
33 | + } |
|
32 | 34 | $out = ob_get_clean(); |
33 | 35 | $status = $this->getStatus(); |
34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |