gggeek /
phpxmlrpc
@@ -151,35 +151,35 @@ discard block |
||
| 151 | 151 | public function serialize($charsetEncoding = '') |
| 152 | 152 | { |
| 153 | 153 | if ($charsetEncoding != '') { |
| 154 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 154 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 155 | 155 | } else { |
| 156 | 156 | $this->content_type = 'text/xml'; |
| 157 | 157 | } |
| 158 | 158 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 159 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 159 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 160 | 160 | } else { |
| 161 | 161 | $result = "<methodResponse>\n"; |
| 162 | 162 | } |
| 163 | 163 | if ($this->errno) { |
| 164 | 164 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 165 | - $result .= "<fault>\n" . |
|
| 166 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 167 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 168 | - Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" . |
|
| 165 | + $result .= "<fault>\n". |
|
| 166 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 167 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 168 | + Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n". |
|
| 169 | 169 | "</struct>\n</value>\n</fault>"; |
| 170 | 170 | } else { |
| 171 | 171 | if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) { |
| 172 | 172 | if (is_string($this->val) && $this->valtyp == 'xml') { |
| 173 | - $result .= "<params>\n<param>\n" . |
|
| 174 | - $this->val . |
|
| 173 | + $result .= "<params>\n<param>\n". |
|
| 174 | + $this->val. |
|
| 175 | 175 | "</param>\n</params>"; |
| 176 | 176 | } else { |
| 177 | 177 | /// @todo try to build something serializable using the Encoder... |
| 178 | 178 | throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values'); |
| 179 | 179 | } |
| 180 | 180 | } else { |
| 181 | - $result .= "<params>\n<param>\n" . |
|
| 182 | - $this->val->serialize($charsetEncoding) . |
|
| 181 | + $result .= "<params>\n<param>\n". |
|
| 182 | + $this->val->serialize($charsetEncoding). |
|
| 183 | 183 | "</param>\n</params>"; |
| 184 | 184 | } |
| 185 | 185 | } |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | return $this->httpResponse['raw_data']; |
| 205 | 205 | default: |
| 206 | 206 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 207 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 207 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 208 | 208 | return null; |
| 209 | 209 | } |
| 210 | 210 | } |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | break; |
| 226 | 226 | default: |
| 227 | 227 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 228 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 228 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | break; |
| 258 | 258 | default: |
| 259 | 259 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 260 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 260 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | } |
@@ -154,10 +154,10 @@ discard block |
||
| 154 | 154 | $this->accept = $accept; |
| 155 | 155 | |
| 156 | 156 | // @see ticket #70 - we have to parse big xml docks in chunks to avoid errors |
| 157 | - for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) { |
|
| 157 | + for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) { |
|
| 158 | 158 | $chunk = substr($data, $offset, $this->maxChunkLength); |
| 159 | 159 | // error handling: xml not well formed |
| 160 | - if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) { |
|
| 160 | + if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) { |
|
| 161 | 161 | $errCode = xml_get_error_code($parser); |
| 162 | 162 | $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode), |
| 163 | 163 | xml_get_current_line_number($parser), xml_get_current_column_number($parser)); |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
| 183 | 183 | { |
| 184 | 184 | // if invalid xmlrpc already detected, skip all processing |
| 185 | - if ($this->_xh['isf'] < 2) { |
|
| 185 | + if ($this->_xh['isf']<2) { |
|
| 186 | 186 | |
| 187 | 187 | // check for correct element nesting |
| 188 | 188 | if (count($this->_xh['stack']) == 0) { |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | $this->_xh['rt'] = strtolower($name); |
| 203 | 203 | } else { |
| 204 | 204 | $this->_xh['isf'] = 2; |
| 205 | - $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name; |
|
| 205 | + $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name; |
|
| 206 | 206 | |
| 207 | 207 | return; |
| 208 | 208 | } |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | break; |
| 297 | 297 | case 'MEMBER': |
| 298 | 298 | // set member name to null, in case we do not find in the xml later on |
| 299 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = ''; |
|
| 299 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = ''; |
|
| 300 | 300 | //$this->_xh['ac']=''; |
| 301 | 301 | // Drop trough intentionally |
| 302 | 302 | case 'PARAM': |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | */ |
| 358 | 358 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1) |
| 359 | 359 | { |
| 360 | - if ($this->_xh['isf'] < 2) { |
|
| 360 | + if ($this->_xh['isf']<2) { |
|
| 361 | 361 | // push this element name from stack |
| 362 | 362 | // NB: if XML validates, correct opening/closing is guaranteed and |
| 363 | 363 | // we do not have to check for $name == $currElem. |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | $this->_xh['vt'] = Value::$xmlrpcString; |
| 373 | 373 | } |
| 374 | 374 | |
| 375 | - if ($rebuildXmlrpcvals > 0) { |
|
| 375 | + if ($rebuildXmlrpcvals>0) { |
|
| 376 | 376 | // build the xmlrpc val out of the data received, and substitute it |
| 377 | 377 | $temp = new Value($this->_xh['value'], $this->_xh['vt']); |
| 378 | 378 | // in case we got info about underlying php class, save it |
@@ -381,15 +381,15 @@ discard block |
||
| 381 | 381 | $temp->_php_class = $this->_xh['php_class']; |
| 382 | 382 | } |
| 383 | 383 | $this->_xh['value'] = $temp; |
| 384 | - } elseif ($rebuildXmlrpcvals < 0) { |
|
| 384 | + } elseif ($rebuildXmlrpcvals<0) { |
|
| 385 | 385 | if ($this->_xh['vt'] == Value::$xmlrpcDateTime) { |
| 386 | - $this->_xh['value'] = (object)array( |
|
| 386 | + $this->_xh['value'] = (object) array( |
|
| 387 | 387 | 'xmlrpc_type' => 'datetime', |
| 388 | 388 | 'scalar' => $this->_xh['value'], |
| 389 | 389 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value']) |
| 390 | 390 | ); |
| 391 | 391 | } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) { |
| 392 | - $this->_xh['value'] = (object)array( |
|
| 392 | + $this->_xh['value'] = (object) array( |
|
| 393 | 393 | 'xmlrpc_type' => 'base64', |
| 394 | 394 | 'scalar' => $this->_xh['value'] |
| 395 | 395 | ); |
@@ -405,8 +405,8 @@ discard block |
||
| 405 | 405 | // check if we are inside an array or struct: |
| 406 | 406 | // if value just built is inside an array, let's move it into array on the stack |
| 407 | 407 | $vscount = count($this->_xh['valuestack']); |
| 408 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
| 409 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
| 408 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
| 409 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
| 410 | 410 | } |
| 411 | 411 | break; |
| 412 | 412 | case 'BOOLEAN': |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | $this->_xh['value'] = $this->_xh['ac']; |
| 426 | 426 | } elseif ($name == 'DATETIME.ISO8601') { |
| 427 | 427 | if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) { |
| 428 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']); |
|
| 428 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']); |
|
| 429 | 429 | } |
| 430 | 430 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
| 431 | 431 | $this->_xh['value'] = $this->_xh['ac']; |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | } else { |
| 445 | 445 | // log if receiving something strange, even though we set the value to false anyway |
| 446 | 446 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) { |
| 447 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']); |
|
| 447 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']); |
|
| 448 | 448 | } |
| 449 | 449 | $this->_xh['value'] = false; |
| 450 | 450 | } |
@@ -454,37 +454,37 @@ discard block |
||
| 454 | 454 | // NOTE: regexp could be much stricter than this... |
| 455 | 455 | if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) { |
| 456 | 456 | /// @todo: find a better way of throwing an error than this! |
| 457 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']); |
|
| 457 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']); |
|
| 458 | 458 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 459 | 459 | } else { |
| 460 | 460 | // it's ok, add it on |
| 461 | - $this->_xh['value'] = (double)$this->_xh['ac']; |
|
| 461 | + $this->_xh['value'] = (double) $this->_xh['ac']; |
|
| 462 | 462 | } |
| 463 | 463 | } else { |
| 464 | 464 | // we have an I4/I8/INT |
| 465 | 465 | // we must check that only 0123456789-<space> are characters here |
| 466 | 466 | if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) { |
| 467 | 467 | /// @todo find a better way of throwing an error than this! |
| 468 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']); |
|
| 468 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']); |
|
| 469 | 469 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 470 | 470 | } else { |
| 471 | 471 | // it's ok, add it on |
| 472 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
| 472 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
| 473 | 473 | } |
| 474 | 474 | } |
| 475 | 475 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 476 | 476 | break; |
| 477 | 477 | case 'NAME': |
| 478 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
| 478 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
| 479 | 479 | break; |
| 480 | 480 | case 'MEMBER': |
| 481 | 481 | // add to array in the stack the last element built, |
| 482 | 482 | // unless no VALUE was found |
| 483 | 483 | if ($this->_xh['vt']) { |
| 484 | 484 | $vscount = count($this->_xh['valuestack']); |
| 485 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
| 485 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
| 486 | 486 | } else { |
| 487 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml'); |
|
| 487 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml'); |
|
| 488 | 488 | } |
| 489 | 489 | break; |
| 490 | 490 | case 'DATA': |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | $this->_xh['params'][] = $this->_xh['value']; |
| 508 | 508 | $this->_xh['pt'][] = $this->_xh['vt']; |
| 509 | 509 | } else { |
| 510 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml'); |
|
| 510 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml'); |
|
| 511 | 511 | } |
| 512 | 512 | break; |
| 513 | 513 | case 'METHODNAME': |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | public function xmlrpc_cd($parser, $data) |
| 567 | 567 | { |
| 568 | 568 | // skip processing if xml fault already detected |
| 569 | - if ($this->_xh['isf'] < 2) { |
|
| 569 | + if ($this->_xh['isf']<2) { |
|
| 570 | 570 | // "lookforvalue==3" means that we've found an entire value |
| 571 | 571 | // and should discard any further character data |
| 572 | 572 | if ($this->_xh['lv'] != 3) { |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | public function xmlrpc_dh($parser, $data) |
| 586 | 586 | { |
| 587 | 587 | // skip processing if xml fault already detected |
| 588 | - if ($this->_xh['isf'] < 2) { |
|
| 588 | + if ($this->_xh['isf']<2) { |
|
| 589 | 589 | if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') { |
| 590 | 590 | $this->_xh['ac'] .= $data; |
| 591 | 591 | } |
@@ -659,8 +659,8 @@ discard block |
||
| 659 | 659 | // Details: |
| 660 | 660 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 661 | 661 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 662 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 663 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 662 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 663 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 664 | 664 | $xmlChunk, $matches)) { |
| 665 | 665 | return strtoupper(substr($matches[2], 1, -1)); |
| 666 | 666 | } |
@@ -678,7 +678,7 @@ discard block |
||
| 678 | 678 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
| 679 | 679 | // IANA also likes better US-ASCII, so go with it |
| 680 | 680 | if ($enc == 'ASCII') { |
| 681 | - $enc = 'US-' . $enc; |
|
| 681 | + $enc = 'US-'.$enc; |
|
| 682 | 682 | } |
| 683 | 683 | |
| 684 | 684 | return $enc; |
@@ -713,8 +713,8 @@ discard block |
||
| 713 | 713 | // Details: |
| 714 | 714 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 715 | 715 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 716 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 717 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 716 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 717 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 718 | 718 | $xmlChunk, $matches)) { |
| 719 | 719 | return true; |
| 720 | 720 | } |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $this->me['struct'] = $val; |
| 120 | 120 | break; |
| 121 | 121 | default: |
| 122 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
| 122 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | if ($typeOf !== 1) { |
| 147 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
| 147 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
| 148 | 148 | return 0; |
| 149 | 149 | } |
| 150 | 150 | |
@@ -161,10 +161,10 @@ discard block |
||
| 161 | 161 | |
| 162 | 162 | switch ($this->mytype) { |
| 163 | 163 | case 1: |
| 164 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
| 164 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
| 165 | 165 | return 0; |
| 166 | 166 | case 3: |
| 167 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 167 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 168 | 168 | return 0; |
| 169 | 169 | case 2: |
| 170 | 170 | // we're adding a scalar value to an array here |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | |
| 207 | 207 | return 1; |
| 208 | 208 | } else { |
| 209 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 209 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 210 | 210 | return 0; |
| 211 | 211 | } |
| 212 | 212 | } |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | |
| 238 | 238 | return 1; |
| 239 | 239 | } else { |
| 240 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 240 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 241 | 241 | return 0; |
| 242 | 242 | } |
| 243 | 243 | } |
@@ -279,19 +279,19 @@ discard block |
||
| 279 | 279 | case 1: |
| 280 | 280 | switch ($typ) { |
| 281 | 281 | case static::$xmlrpcBase64: |
| 282 | - $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>"; |
|
| 282 | + $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>"; |
|
| 283 | 283 | break; |
| 284 | 284 | case static::$xmlrpcBoolean: |
| 285 | - $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>"; |
|
| 285 | + $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>"; |
|
| 286 | 286 | break; |
| 287 | 287 | case static::$xmlrpcString: |
| 288 | 288 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
| 289 | - $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>"; |
|
| 289 | + $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>"; |
|
| 290 | 290 | break; |
| 291 | 291 | case static::$xmlrpcInt: |
| 292 | 292 | case static::$xmlrpcI4: |
| 293 | 293 | case static::$xmlrpcI8: |
| 294 | - $rs .= "<{$typ}>" . (int)$val . "</{$typ}>"; |
|
| 294 | + $rs .= "<{$typ}>".(int) $val."</{$typ}>"; |
|
| 295 | 295 | break; |
| 296 | 296 | case static::$xmlrpcDouble: |
| 297 | 297 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -299,16 +299,16 @@ discard block |
||
| 299 | 299 | // sprintf('%F') could be most likely ok but it fails eg. on 2e-14. |
| 300 | 300 | // The code below tries its best at keeping max precision while avoiding exp notation, |
| 301 | 301 | // but there is of course no limit in the number of decimal places to be used... |
| 302 | - $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>"; |
|
| 302 | + $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>"; |
|
| 303 | 303 | break; |
| 304 | 304 | case static::$xmlrpcDateTime: |
| 305 | 305 | if (is_string($val)) { |
| 306 | 306 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
| 307 | 307 | // DateTimeInterface is not present in php 5.4... |
| 308 | 308 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
| 309 | - $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>"; |
|
| 309 | + $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>"; |
|
| 310 | 310 | } elseif (is_int($val)) { |
| 311 | - $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>"; |
|
| 311 | + $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>"; |
|
| 312 | 312 | } else { |
| 313 | 313 | // not really a good idea here: but what should we output anyway? left for backward compat... |
| 314 | 314 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
@@ -330,14 +330,14 @@ discard block |
||
| 330 | 330 | case 3: |
| 331 | 331 | // struct |
| 332 | 332 | if ($this->_php_class) { |
| 333 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
| 333 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
| 334 | 334 | } else { |
| 335 | 335 | $rs .= "<struct>\n"; |
| 336 | 336 | } |
| 337 | 337 | $charsetEncoder = $this->getCharsetEncoder(); |
| 338 | 338 | /** @var Value $val2 */ |
| 339 | 339 | foreach ($val as $key2 => $val2) { |
| 340 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
| 340 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
| 341 | 341 | //$rs.=$this->serializeval($val2); |
| 342 | 342 | $rs .= $val2->serialize($charsetEncoding); |
| 343 | 343 | $rs .= "</member>\n"; |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | $val = reset($this->me); |
| 374 | 374 | $typ = key($this->me); |
| 375 | 375 | |
| 376 | - return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n"; |
|
| 376 | + return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n"; |
|
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | /** |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | * It uses a Berkeley DB database for storage. |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | -require_once __DIR__ . "/_prepend.php"; |
|
| 7 | +require_once __DIR__."/_prepend.php"; |
|
| 8 | 8 | |
| 9 | 9 | use PhpXmlRpc\Value; |
| 10 | 10 | |
@@ -35,8 +35,8 @@ discard block |
||
| 35 | 35 | $count = 0; |
| 36 | 36 | } |
| 37 | 37 | // add the new comment in |
| 38 | - dba_insert($msgID . "_comment_{$count}", $comment, $dbh); |
|
| 39 | - dba_insert($msgID . "_name_{$count}", $name, $dbh); |
|
| 38 | + dba_insert($msgID."_comment_{$count}", $comment, $dbh); |
|
| 39 | + dba_insert($msgID."_name_{$count}", $name, $dbh); |
|
| 40 | 40 | $count++; |
| 41 | 41 | dba_replace($countID, $count, $dbh); |
| 42 | 42 | dba_close($dbh); |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | $countID = "{$msgID}_count"; |
| 70 | 70 | if (dba_exists($countID, $dbh)) { |
| 71 | 71 | $count = dba_fetch($countID, $dbh); |
| 72 | - for ($i = 0; $i < $count; $i++) { |
|
| 72 | + for ($i = 0; $i<$count; $i++) { |
|
| 73 | 73 | $name = dba_fetch("{$msgID}_name_{$i}", $dbh); |
| 74 | 74 | $comment = dba_fetch("{$msgID}_comment_{$i}", $dbh); |
| 75 | 75 | // push a new struct onto the return array |
@@ -76,13 +76,13 @@ discard block |
||
| 76 | 76 | 'scalar' => $val, |
| 77 | 77 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val) |
| 78 | 78 | ); |
| 79 | - return (object)$xmlrpcVal; |
|
| 79 | + return (object) $xmlrpcVal; |
|
| 80 | 80 | case 'base64': |
| 81 | 81 | $xmlrpcVal = array( |
| 82 | 82 | 'xmlrpc_type' => 'base64', |
| 83 | 83 | 'scalar' => $val |
| 84 | 84 | ); |
| 85 | - return (object)$xmlrpcVal; |
|
| 85 | + return (object) $xmlrpcVal; |
|
| 86 | 86 | case 'string': |
| 87 | 87 | if (isset($options['extension_api_encoding'])) { |
| 88 | 88 | $dval = @iconv('UTF-8', $options['extension_api_encoding'], $val); |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | case 'msg': |
| 146 | 146 | $paramCount = $xmlrpcVal->getNumParams(); |
| 147 | 147 | $arr = array(); |
| 148 | - for ($i = 0; $i < $paramCount; $i++) { |
|
| 148 | + for ($i = 0; $i<$paramCount; $i++) { |
|
| 149 | 149 | $arr[] = $this->decode($xmlrpcVal->getParam($i), $options); |
| 150 | 150 | } |
| 151 | 151 | return $arr; |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | break; |
| 263 | 263 | case 'resource': |
| 264 | 264 | if (in_array('extension_api', $options)) { |
| 265 | - $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt); |
|
| 265 | + $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt); |
|
| 266 | 266 | } else { |
| 267 | 267 | $xmlrpcVal = new Value(); |
| 268 | 268 | } |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | if ($valEncoding == 'ISO-8859-1') { |
| 311 | 311 | $xmlVal = utf8_encode($xmlVal); |
| 312 | 312 | } else { |
| 313 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding); |
|
| 313 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding); |
|
| 314 | 314 | } |
| 315 | 315 | } |
| 316 | 316 | } |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | $parserOptions |
| 333 | 333 | ); |
| 334 | 334 | |
| 335 | - if ($xmlRpcParser->_xh['isf'] > 1) { |
|
| 335 | + if ($xmlRpcParser->_xh['isf']>1) { |
|
| 336 | 336 | // test that $xmlrpc->_xh['value'] is an obj, too??? |
| 337 | 337 | |
| 338 | 338 | $this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']); |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | case 'methodcall': |
| 358 | 358 | $req = new Request($xmlRpcParser->_xh['method']); |
| 359 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
| 359 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
| 360 | 360 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
| 361 | 361 | } |
| 362 | 362 | return $req; |
@@ -41,7 +41,12 @@ |
||
| 41 | 41 | <html lang="en"> |
| 42 | 42 | <head> |
| 43 | 43 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 44 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
| 44 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 45 | + echo 'JSONRPC'; |
|
| 46 | +} else { |
|
| 47 | + echo 'XMLRPC'; |
|
| 48 | +} |
|
| 49 | +?> Debugger</title> |
|
| 45 | 50 | <meta name="robots" content="index,nofollow"/> |
| 46 | 51 | <script type="text/javascript" language="Javascript"> |
| 47 | 52 | if (window.name != 'frmcontroller') |
@@ -17,7 +17,7 @@ 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 | } |
@@ -33,24 +33,24 @@ discard block |
||
| 33 | 33 | /// @const JSXMLRPC_PATH Path to the visual xmlrpc editing dialog's containing folder. Can be absolute, or |
| 34 | 34 | /// relative to this debugger's folder. |
| 35 | 35 | if (defined('JSXMLRPC_PATH')) { |
| 36 | - $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH)); |
|
| 36 | + $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH)); |
|
| 37 | 37 | } else { |
| 38 | 38 | $editorpaths = array( |
| 39 | - __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger |
|
| 40 | - __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger |
|
| 41 | - __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 42 | - __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 43 | - __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 39 | + __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger |
|
| 40 | + __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger |
|
| 41 | + __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 42 | + __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 43 | + __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 44 | 44 | ); |
| 45 | 45 | } |
| 46 | - foreach($editorpaths as $editorpath) { |
|
| 47 | - if (is_file(realpath($editorpath . 'visualeditor.html'))) { |
|
| 46 | + foreach ($editorpaths as $editorpath) { |
|
| 47 | + if (is_file(realpath($editorpath.'visualeditor.html'))) { |
|
| 48 | 48 | $haseditor = true; |
| 49 | 49 | break; |
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | if ($haseditor) { |
| 53 | - $editorurlpath = preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath); |
|
| 53 | + $editorurlpath = preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath); |
|
| 54 | 54 | |
| 55 | 55 | /// @todo for cases 3, 4 and 5 above, look at `parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)` and check if the |
| 56 | 56 | /// web root is not pointing directly at this folder, as in that case the link to the visualeditor will not |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | function activateeditor() { |
| 231 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\","\\'"), $alt_payload); ?>'; |
|
| 231 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
| 232 | 232 | if (document.frmaction.wstype.value == "1") |
| 233 | 233 | url += '&type=jsonrpc'; |
| 234 | 234 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -265,9 +265,9 @@ discard block |
||
| 265 | 265 | echo ' document.forms[2].submit();'; |
| 266 | 266 | } ?>"> |
| 267 | 267 | <h1>XMLRPC |
| 268 | - <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> |
|
| 268 | + <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> |
|
| 269 | 269 | / |
| 270 | - <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> |
|
| 270 | + <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> |
|
| 271 | 271 | JSONRPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHP-XMLRPC</a> library) |
| 272 | 272 | </h1> |
| 273 | 273 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | </select> |
| 331 | 331 | </td> |
| 332 | 332 | <td class="labelcell">Timeout:</td> |
| 333 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
| 333 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
| 334 | 334 | <td></td> |
| 335 | 335 | <td></td> |
| 336 | 336 | </tr> |
@@ -15,7 +15,12 @@ discard block |
||
| 15 | 15 | <html lang="en"> |
| 16 | 16 | <head> |
| 17 | 17 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 18 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
| 18 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 19 | + echo 'JSONRPC'; |
|
| 20 | +} else { |
|
| 21 | + echo 'XMLRPC'; |
|
| 22 | +} |
|
| 23 | +?> Debugger</title> |
|
| 19 | 24 | <meta name="robots" content="index,nofollow"/> |
| 20 | 25 | <style type="text/css"> |
| 21 | 26 | <!-- |
@@ -370,7 +375,9 @@ discard block |
||
| 370 | 375 | echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
| 371 | 376 | if ($x->count() > 1) { |
| 372 | 377 | foreach($x as $k => $y) { |
| 373 | - if ($k == 0) continue; |
|
| 378 | + if ($k == 0) { |
|
| 379 | + continue; |
|
| 380 | + } |
|
| 374 | 381 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 375 | 382 | if ($wstype != 1) { |
| 376 | 383 | $type = $y->scalarval(); |
@@ -90,13 +90,13 @@ discard block |
||
| 90 | 90 | <body> |
| 91 | 91 | <?php |
| 92 | 92 | |
| 93 | -include __DIR__ . '/common.php'; |
|
| 93 | +include __DIR__.'/common.php'; |
|
| 94 | 94 | |
| 95 | 95 | if ($action) { |
| 96 | 96 | |
| 97 | 97 | // avoid php hanging when using the builtin webserver and sending requests to itself |
| 98 | 98 | $skip = false; |
| 99 | - if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) { |
|
| 99 | + if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) { |
|
| 100 | 100 | $localHost = explode(':', $_SERVER['HTTP_HOST']); |
| 101 | 101 | /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters, |
| 102 | 102 | /// and that proxy is us |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | if (!$skip) { |
| 110 | 110 | // make sure the script waits long enough for the call to complete... |
| 111 | 111 | if ($timeout) { |
| 112 | - set_time_limit($timeout + 10); |
|
| 112 | + set_time_limit($timeout+10); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | if ($wstype == 1) { |
@@ -133,13 +133,13 @@ discard block |
||
| 133 | 133 | $server = "$host$path"; |
| 134 | 134 | } |
| 135 | 135 | if ($protocol == 2 || $protocol == 3) { |
| 136 | - $server = 'https://' . $server; |
|
| 136 | + $server = 'https://'.$server; |
|
| 137 | 137 | } else { |
| 138 | - $server = 'http://' . $server; |
|
| 138 | + $server = 'http://'.$server; |
|
| 139 | 139 | } |
| 140 | 140 | if ($proxy != '') { |
| 141 | 141 | $pproxy = explode(':', $proxy); |
| 142 | - if (count($pproxy) > 1) { |
|
| 142 | + if (count($pproxy)>1) { |
|
| 143 | 143 | $pport = $pproxy[1]; |
| 144 | 144 | } else { |
| 145 | 145 | $pport = 8080; |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | case 'wrap': |
| 215 | 215 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 216 | 216 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 217 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 217 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 218 | 218 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 219 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 219 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 220 | 220 | break; |
| 221 | 221 | case 'list': |
| 222 | 222 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -229,9 +229,9 @@ discard block |
||
| 229 | 229 | $msg[0] = new $requestClass($method, array(), $id); |
| 230 | 230 | // hack! build xml payload by hand |
| 231 | 231 | if ($wstype == 1) { |
| 232 | - $msg[0]->payload = "{\n" . |
|
| 233 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 234 | - $payload . |
|
| 232 | + $msg[0]->payload = "{\n". |
|
| 233 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 234 | + $payload. |
|
| 235 | 235 | "\n],\n\"id\": "; |
| 236 | 236 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 237 | 237 | if ($id == "") { |
@@ -244,21 +244,21 @@ discard block |
||
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | } else { |
| 247 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . |
|
| 248 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 249 | - $payload . |
|
| 250 | - "</params>\n" . $msg[0]->xml_footer(); |
|
| 247 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). |
|
| 248 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 249 | + $payload. |
|
| 250 | + "</params>\n".$msg[0]->xml_footer(); |
|
| 251 | 251 | } |
| 252 | - $actionname = 'Execution of method ' . $method; |
|
| 252 | + $actionname = 'Execution of method '.$method; |
|
| 253 | 253 | break; |
| 254 | 254 | default: // give a warning |
| 255 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 255 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 256 | 256 | } |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 260 | 260 | // this gives good user feedback for long-running methods... |
| 261 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 261 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 262 | 262 | flush(); |
| 263 | 263 | |
| 264 | 264 | $response = null; |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | break; |
| 276 | 276 | } |
| 277 | 277 | } |
| 278 | - $time = microtime(true) - $time; |
|
| 278 | + $time = microtime(true)-$time; |
|
| 279 | 279 | if ($debug) { |
| 280 | 280 | echo "</div>\n"; |
| 281 | 281 | } |
@@ -285,8 +285,8 @@ discard block |
||
| 285 | 285 | // call failed! echo out error msg! |
| 286 | 286 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 287 | 287 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 288 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 289 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 288 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 289 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 290 | 290 | echo(date("d/M/Y:H:i:s\n")); |
| 291 | 291 | } else { |
| 292 | 292 | // call succeeded: parse results |
@@ -302,36 +302,36 @@ discard block |
||
| 302 | 302 | $max = $v->count(); |
| 303 | 303 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 304 | 304 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 305 | - foreach($v as $i => $rec) { |
|
| 305 | + foreach ($v as $i => $rec) { |
|
| 306 | 306 | if ($i % 2) { |
| 307 | 307 | $class = ' class="oddrow"'; |
| 308 | 308 | } else { |
| 309 | 309 | $class = ' class="evenrow"'; |
| 310 | 310 | } |
| 311 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 312 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 320 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 321 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 322 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 323 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 324 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 325 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 326 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 327 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 328 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 329 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 330 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 331 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 332 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 333 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 334 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 311 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 312 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 320 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 321 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 322 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 323 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 324 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 325 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 326 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 327 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 328 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 329 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 330 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 331 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 332 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 333 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 334 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 335 | 335 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 336 | 336 | //echo("</tr>\n"); |
| 337 | 337 | |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | $r2 = $resp[1]->value(); |
| 359 | 359 | |
| 360 | 360 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 361 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 361 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 362 | 362 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 363 | 363 | if ($desc == "") { |
| 364 | 364 | $desc = "-"; |
@@ -368,41 +368,41 @@ discard block |
||
| 368 | 368 | if ($r2->kindOf() != "array") { |
| 369 | 369 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 370 | 370 | } else { |
| 371 | - foreach($r2 as $i => $x) { |
|
| 371 | + foreach ($r2 as $i => $x) { |
|
| 372 | 372 | $payload = ""; |
| 373 | 373 | $alt_payload = ""; |
| 374 | - if ($i + 1 % 2) { |
|
| 374 | + if ($i+1 % 2) { |
|
| 375 | 375 | $class = ' class="oddrow"'; |
| 376 | 376 | } else { |
| 377 | 377 | $class = ' class="evenrow"'; |
| 378 | 378 | } |
| 379 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 379 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 380 | 380 | if ($x->kindOf() == "array") { |
| 381 | 381 | $ret = $x[0]; |
| 382 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 383 | - if ($x->count() > 1) { |
|
| 384 | - foreach($x as $k => $y) { |
|
| 382 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 383 | + if ($x->count()>1) { |
|
| 384 | + foreach ($x as $k => $y) { |
|
| 385 | 385 | if ($k == 0) continue; |
| 386 | 386 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 387 | 387 | if ($wstype != 1) { |
| 388 | 388 | $type = $y->scalarval(); |
| 389 | 389 | $payload .= '<param><value>'; |
| 390 | - switch($type) { |
|
| 390 | + switch ($type) { |
|
| 391 | 391 | case 'undefined': |
| 392 | 392 | break; |
| 393 | 393 | case 'null'; |
| 394 | 394 | $type = 'nil'; |
| 395 | 395 | // fall thru intentionally |
| 396 | 396 | default: |
| 397 | - $payload .= '<' . |
|
| 398 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 399 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 397 | + $payload .= '<'. |
|
| 398 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 399 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 400 | 400 | '>'; |
| 401 | 401 | } |
| 402 | 402 | $payload .= "</value></param>\n"; |
| 403 | 403 | } |
| 404 | 404 | $alt_payload .= $y->scalarval(); |
| 405 | - if ($k < $x->count() - 1) { |
|
| 405 | + if ($k<$x->count()-1) { |
|
| 406 | 406 | $alt_payload .= ';'; |
| 407 | 407 | echo ", "; |
| 408 | 408 | } |
@@ -415,63 +415,63 @@ discard block |
||
| 415 | 415 | echo '</td>'; |
| 416 | 416 | // button to test this method |
| 417 | 417 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 418 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 419 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 420 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 421 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 422 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 423 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 424 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 425 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 426 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 427 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 428 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 429 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 430 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 431 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 432 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 433 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 434 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 435 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 436 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 437 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 438 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 439 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 440 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 441 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 418 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 419 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 420 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 421 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 422 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 423 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 424 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 425 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 426 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 427 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 428 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 429 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 430 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 431 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 432 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 433 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 434 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 435 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 436 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 437 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 438 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 439 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 440 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 441 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 442 | 442 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 443 | 443 | if ($wstype != 1) { |
| 444 | 444 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 445 | 445 | } |
| 446 | 446 | echo "</form></td>\n"; |
| 447 | 447 | |
| 448 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 449 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 460 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 461 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 462 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 463 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 464 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 465 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 466 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 467 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 468 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 469 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 470 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 471 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 472 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 473 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 474 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 448 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 449 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 460 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 461 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 462 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 463 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 464 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 465 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 466 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 467 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 468 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 469 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 470 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 471 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 472 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 473 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 474 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 475 | 475 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 476 | 476 | echo "</form></td></tr>\n"; |
| 477 | 477 | } |
@@ -483,14 +483,14 @@ discard block |
||
| 483 | 483 | case 'wrap': |
| 484 | 484 | $r1 = $resp[0]->value(); |
| 485 | 485 | $r2 = $resp[1]->value(); |
| 486 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 486 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 487 | 487 | echo "Error: signature unknown\n"; |
| 488 | 488 | } else { |
| 489 | 489 | $mdesc = $r1->scalarval(); |
| 490 | 490 | $encoder = new PhpXmlRpc\Encoder(); |
| 491 | 491 | $msig = $encoder->decode($r2); |
| 492 | 492 | $msig = $msig[$methodsig]; |
| 493 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 493 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 494 | 494 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 495 | 495 | $clientcookies == '' |
| 496 | 496 | ) { |
@@ -504,11 +504,11 @@ discard block |
||
| 504 | 504 | $prefix = 'xmlrpc'; |
| 505 | 505 | } |
| 506 | 506 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 507 | - $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc); |
|
| 507 | + $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc); |
|
| 508 | 508 | //if ($code) |
| 509 | 509 | //{ |
| 510 | 510 | echo "<div id=\"phpcode\">\n"; |
| 511 | - highlight_string("<?php\n" . $code['docstring'] . $code['source'] . '?>'); |
|
| 511 | + highlight_string("<?php\n".$code['docstring'].$code['source'].'?>'); |
|
| 512 | 512 | echo "\n</div>"; |
| 513 | 513 | //} |
| 514 | 514 | //else |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | break; |
| 520 | 520 | |
| 521 | 521 | case 'execute': |
| 522 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 522 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 523 | 523 | break; |
| 524 | 524 | |
| 525 | 525 | default: // give a warning |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | // assume this is either a standalone install, or installed as Composer dependency |
| 21 | 21 | /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level |
| 22 | 22 | /// debugger include this one, taking care of autoloading? |
| 23 | - include_once __DIR__ . "/../src/Autoloader.php"; |
|
| 23 | + include_once __DIR__."/../src/Autoloader.php"; |
|
| 24 | 24 | PhpXmlRpc\Autoloader::register(); |
| 25 | 25 | } |
| 26 | 26 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | // Variables that shouldn't be unset |
| 37 | - $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 37 | + $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 38 | 38 | |
| 39 | 39 | $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, |
| 40 | 40 | isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array() |
@@ -54,8 +54,7 @@ discard block |
||
| 54 | 54 | function stripslashes_deep($value) |
| 55 | 55 | { |
| 56 | 56 | $value = is_array($value) ? |
| 57 | - array_map('stripslashes_deep', $value) : |
|
| 58 | - stripslashes($value); |
|
| 57 | + array_map('stripslashes_deep', $value) : stripslashes($value); |
|
| 59 | 58 | |
| 60 | 59 | return $value; |
| 61 | 60 | } |
@@ -105,7 +104,7 @@ discard block |
||
| 105 | 104 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
| 106 | 105 | // in case user forgot initial '/' in xmlrpc server path, add it back |
| 107 | 106 | if ($path && ($path[0]) != '/') { |
| 108 | - $path = '/' . $path; |
|
| 107 | + $path = '/'.$path; |
|
| 109 | 108 | } |
| 110 | 109 | |
| 111 | 110 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
@@ -16,9 +16,9 @@ |
||
| 16 | 16 | $target = $_SERVER['argv'][3]; |
| 17 | 17 | |
| 18 | 18 | if (!file_exists($doc)) |
| 19 | - error("KO: file $doc cannot be found"); |
|
| 19 | + error("KO: file $doc cannot be found"); |
|
| 20 | 20 | if (!file_exists($xss)) |
| 21 | - error("KO: file $xss cannot be found"); |
|
| 21 | + error("KO: file $xss cannot be found"); |
|
| 22 | 22 | |
| 23 | 23 | info("Starting xsl conversion process..."); |
| 24 | 24 | |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | * @todo rename to something akin to xsltproc |
| 8 | 8 | */ |
| 9 | 9 | |
| 10 | -if ($_SERVER['argc'] < 4) { |
|
| 10 | +if ($_SERVER['argc']<4) { |
|
| 11 | 11 | error("Usage: php convert.php docbook.xml stylesheet.xsl output-dir|output_file"); |
| 12 | 12 | } |
| 13 | 13 | |
@@ -15,10 +15,12 @@ |
||
| 15 | 15 | $xss = $_SERVER['argv'][2]; |
| 16 | 16 | $target = $_SERVER['argv'][3]; |
| 17 | 17 | |
| 18 | -if (!file_exists($doc)) |
|
| 18 | +if (!file_exists($doc)) { |
|
| 19 | 19 | error("KO: file $doc cannot be found"); |
| 20 | -if (!file_exists($xss)) |
|
| 20 | +} |
|
| 21 | +if (!file_exists($xss)) { |
|
| 21 | 22 | error("KO: file $xss cannot be found"); |
| 23 | +} |
|
| 22 | 24 | |
| 23 | 25 | info("Starting xsl conversion process..."); |
| 24 | 26 | |
