@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function echoInput() |
| 56 | 56 | { |
| 57 | - $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string')); |
|
| 57 | + $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string')); |
|
| 58 | 58 | print $r->serialize(); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -65,12 +65,12 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function __get($name) |
| 67 | 67 | { |
| 68 | - switch($name) { |
|
| 68 | + switch ($name) { |
|
| 69 | 69 | case 'dmap': |
| 70 | 70 | return $this->dmap; |
| 71 | 71 | default: |
| 72 | 72 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 73 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . |
|
| 73 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '. |
|
| 74 | 74 | $trace[0]['line'], E_USER_NOTICE); |
| 75 | 75 | return null; |
| 76 | 76 | } |
@@ -97,30 +97,30 @@ discard block |
||
| 97 | 97 | Server::xmlrpc_debugmsg($m); |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | -function _xmlrpcs_getCapabilities($server, $m=null) |
|
| 100 | +function _xmlrpcs_getCapabilities($server, $m = null) |
|
| 101 | 101 | { |
| 102 | 102 | return Server::_xmlrpcs_getCapabilities($server, $m); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | -$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
| 106 | -$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
| 107 | -$_xmlrpcs_listMethods_sdoc=array(array('list of method names')); |
|
| 108 | -function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing |
|
| 105 | +$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray)); |
|
| 106 | +$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch'; |
|
| 107 | +$_xmlrpcs_listMethods_sdoc = array(array('list of method names')); |
|
| 108 | +function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing |
|
| 109 | 109 | { |
| 110 | 110 | return Server::_xmlrpcs_listMethods($server, $m); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | -$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
| 114 | -$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
| 115 | -$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
| 113 | +$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString'])); |
|
| 114 | +$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)'; |
|
| 115 | +$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described')); |
|
| 116 | 116 | function _xmlrpcs_methodSignature($server, $m) |
| 117 | 117 | { |
| 118 | 118 | return Server::_xmlrpcs_methodSignature($server, $m); |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | -$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
| 122 | -$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
| 123 | -$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described')); |
|
| 121 | +$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString'])); |
|
| 122 | +$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string'; |
|
| 123 | +$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described')); |
|
| 124 | 124 | function _xmlrpcs_methodHelp($server, $m) |
| 125 | 125 | { |
| 126 | 126 | return Server::_xmlrpcs_methodHelp($server, $m); |
@@ -14,5 +14,5 @@ |
||
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | // Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer |
| 17 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
| 17 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
| 18 | 18 | PhpXmlRpc\Autoloader::register(); |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | // Use the custom class autoloader. These two lines not needed when the phpxmlrpc library is installed using Composer |
| 17 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
| 17 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
| 18 | 18 | PhpXmlRpc\Autoloader::register(); |
| 19 | 19 | |
| 20 | 20 | // Let unit tests run against localhost, 'plain' demos against a known public server |
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>xmlrpc - Proxy demo</title></head> |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777); |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 18 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | $targetFile = null; |
@@ -38,5 +38,5 @@ discard block |
||
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { |
| 41 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 41 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 42 | 42 | } |
@@ -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 | } |
@@ -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; |