gggeek /
phpxmlrpc
@@ -159,20 +159,20 @@ discard block |
||
| 159 | 159 | $callable = explode('::', $callable); |
| 160 | 160 | } |
| 161 | 161 | if (is_array($callable)) { |
| 162 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 163 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 162 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 163 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 164 | 164 | return false; |
| 165 | 165 | } |
| 166 | 166 | if (is_string($callable[0])) { |
| 167 | 167 | $plainFuncName = implode('::', $callable); |
| 168 | 168 | } elseif (is_object($callable[0])) { |
| 169 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 169 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 170 | 170 | } |
| 171 | 171 | $exists = method_exists($callable[0], $callable[1]); |
| 172 | 172 | } else if ($callable instanceof \Closure) { |
| 173 | 173 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 174 | 174 | if (!$buildIt) { |
| 175 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 175 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 176 | 176 | return false; |
| 177 | 177 | } |
| 178 | 178 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | if (!$exists) { |
| 187 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 187 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 188 | 188 | return false; |
| 189 | 189 | } |
| 190 | 190 | |
@@ -228,23 +228,23 @@ discard block |
||
| 228 | 228 | if (is_array($callable)) { |
| 229 | 229 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 230 | 230 | if ($func->isPrivate()) { |
| 231 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 231 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 232 | 232 | return false; |
| 233 | 233 | } |
| 234 | 234 | if ($func->isProtected()) { |
| 235 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 235 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 236 | 236 | return false; |
| 237 | 237 | } |
| 238 | 238 | if ($func->isConstructor()) { |
| 239 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 239 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 240 | 240 | return false; |
| 241 | 241 | } |
| 242 | 242 | if ($func->isDestructor()) { |
| 243 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 243 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 244 | 244 | return false; |
| 245 | 245 | } |
| 246 | 246 | if ($func->isAbstract()) { |
| 247 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 247 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 248 | 248 | return false; |
| 249 | 249 | } |
| 250 | 250 | /// @todo add more checks for static vs. nonstatic? |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | if ($func->isInternal()) { |
| 255 | 255 | // Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs |
| 256 | 256 | // instead of getparameters to fully reflect internal php functions ? |
| 257 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 257 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 258 | 258 | return false; |
| 259 | 259 | } |
| 260 | 260 | |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | $i = 0; |
| 307 | 307 | foreach ($func->getParameters() as $paramObj) { |
| 308 | 308 | $params[$i] = array(); |
| 309 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 309 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 310 | 310 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 311 | 311 | $i++; |
| 312 | 312 | } |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | // build a signature |
| 372 | 372 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 373 | 373 | $pSig = array($funcDesc['returnsDocs']); |
| 374 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 374 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 375 | 375 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 376 | 376 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 377 | 377 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | } |
| 427 | 427 | } |
| 428 | 428 | $numPars = $req->getNumParams(); |
| 429 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 429 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 430 | 430 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 431 | 431 | } |
| 432 | 432 | |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | |
| 440 | 440 | $result = call_user_func_array($callable, $params); |
| 441 | 441 | |
| 442 | - if (! is_a($result, $responseClass)) { |
|
| 442 | + if (!is_a($result, $responseClass)) { |
|
| 443 | 443 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 444 | 444 | $result = new $valueClass($result, $funcDesc['returns']); |
| 445 | 445 | } else { |
@@ -474,9 +474,9 @@ discard block |
||
| 474 | 474 | if ($newFuncName == '') { |
| 475 | 475 | if (is_array($callable)) { |
| 476 | 476 | if (is_string($callable[0])) { |
| 477 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 477 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 478 | 478 | } else { |
| 479 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 479 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 480 | 480 | } |
| 481 | 481 | } else { |
| 482 | 482 | if ($callable instanceof \Closure) { |
@@ -512,8 +512,8 @@ discard block |
||
| 512 | 512 | { |
| 513 | 513 | $namespace = '\\PhpXmlRpc\\'; |
| 514 | 514 | |
| 515 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 516 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 515 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 516 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 517 | 517 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 518 | 518 | |
| 519 | 519 | $i = 0; |
@@ -548,7 +548,7 @@ discard block |
||
| 548 | 548 | // build body of new function |
| 549 | 549 | |
| 550 | 550 | $innerCode = "\$paramCount = \$req->getNumParams();\n"; |
| 551 | - $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 551 | + $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 552 | 552 | |
| 553 | 553 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 554 | 554 | if ($decodePhpObjects) { |
@@ -562,13 +562,13 @@ discard block |
||
| 562 | 562 | if (is_array($callable) && is_object($callable[0])) { |
| 563 | 563 | self::$objHolder[$newFuncName] = $callable[0]; |
| 564 | 564 | $innerCode .= "\$obj = PhpXmlRpc\\Wrapper::\$objHolder['$newFuncName'];\n"; |
| 565 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 565 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 566 | 566 | } else { |
| 567 | 567 | $realFuncName = $plainFuncName; |
| 568 | 568 | } |
| 569 | 569 | foreach ($parsVariations as $i => $pars) { |
| 570 | - $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 571 | - if ($i < (count($parsVariations) - 1)) |
|
| 570 | + $innerCode .= "if (\$paramCount == ".count($pars).") \$retval = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 571 | + if ($i<(count($parsVariations)-1)) |
|
| 572 | 572 | $innerCode .= "else\n"; |
| 573 | 573 | } |
| 574 | 574 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | // if($func->returnsReference()) |
| 586 | 586 | // return false; |
| 587 | 587 | |
| 588 | - $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}"; |
|
| 588 | + $code = "function $newFuncName(\$req) {\n".$innerCode."\n}"; |
|
| 589 | 589 | |
| 590 | 590 | return $code; |
| 591 | 591 | } |
@@ -622,7 +622,7 @@ discard block |
||
| 622 | 622 | if ($methodWrap) { |
| 623 | 623 | if (is_object($className)) { |
| 624 | 624 | $realClassName = get_class($className); |
| 625 | - }else { |
|
| 625 | + } else { |
|
| 626 | 626 | $realClassName = $className; |
| 627 | 627 | } |
| 628 | 628 | $results[$prefix."$realClassName.$mName"] = $methodWrap; |
@@ -723,21 +723,21 @@ discard block |
||
| 723 | 723 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 724 | 724 | { |
| 725 | 725 | $namespace = '\\PhpXmlRpc\\'; |
| 726 | - $reqClass = $namespace . 'Request'; |
|
| 727 | - $valClass = $namespace . 'Value'; |
|
| 728 | - $decoderClass = $namespace . 'Encoder'; |
|
| 726 | + $reqClass = $namespace.'Request'; |
|
| 727 | + $valClass = $namespace.'Value'; |
|
| 728 | + $decoderClass = $namespace.'Encoder'; |
|
| 729 | 729 | |
| 730 | 730 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 731 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 731 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 732 | 732 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 733 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 733 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 734 | 734 | |
| 735 | 735 | $req = new $reqClass('system.methodSignature'); |
| 736 | 736 | $req->addparam(new $valClass($methodName)); |
| 737 | 737 | $client->setDebug($debug); |
| 738 | 738 | $response = $client->send($req, $timeout, $protocol); |
| 739 | 739 | if ($response->faultCode()) { |
| 740 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 740 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 741 | 741 | return false; |
| 742 | 742 | } |
| 743 | 743 | |
@@ -747,8 +747,8 @@ discard block |
||
| 747 | 747 | $mSig = $decoder->decode($mSig); |
| 748 | 748 | } |
| 749 | 749 | |
| 750 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 751 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 750 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 751 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 752 | 752 | return false; |
| 753 | 753 | } |
| 754 | 754 | |
@@ -764,11 +764,11 @@ discard block |
||
| 764 | 764 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 765 | 765 | { |
| 766 | 766 | $namespace = '\\PhpXmlRpc\\'; |
| 767 | - $reqClass = $namespace . 'Request'; |
|
| 768 | - $valClass = $namespace . 'Value'; |
|
| 767 | + $reqClass = $namespace.'Request'; |
|
| 768 | + $valClass = $namespace.'Value'; |
|
| 769 | 769 | |
| 770 | 770 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 771 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 771 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 772 | 772 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 773 | 773 | |
| 774 | 774 | $mDesc = ''; |
@@ -802,10 +802,10 @@ discard block |
||
| 802 | 802 | $clientClone = clone $client; |
| 803 | 803 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 804 | 804 | { |
| 805 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 805 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 806 | 806 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 807 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 808 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 807 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 808 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 809 | 809 | if (isset($extraOptions['return_on_fault'])) { |
| 810 | 810 | $decodeFault = true; |
| 811 | 811 | $faultResponse = $extraOptions['return_on_fault']; |
@@ -814,9 +814,9 @@ discard block |
||
| 814 | 814 | } |
| 815 | 815 | |
| 816 | 816 | $namespace = '\\PhpXmlRpc\\'; |
| 817 | - $reqClass = $namespace . 'Request'; |
|
| 818 | - $encoderClass = $namespace . 'Encoder'; |
|
| 819 | - $valueClass = $namespace . 'Value'; |
|
| 817 | + $reqClass = $namespace.'Request'; |
|
| 818 | + $encoderClass = $namespace.'Encoder'; |
|
| 819 | + $valueClass = $namespace.'Value'; |
|
| 820 | 820 | |
| 821 | 821 | $encoder = new $encoderClass(); |
| 822 | 822 | $encodeOptions = array(); |
@@ -839,7 +839,7 @@ discard block |
||
| 839 | 839 | } |
| 840 | 840 | |
| 841 | 841 | $xmlrpcArgs = array(); |
| 842 | - foreach($currentArgs as $i => $arg) { |
|
| 842 | + foreach ($currentArgs as $i => $arg) { |
|
| 843 | 843 | if ($i == $maxArgs) { |
| 844 | 844 | break; |
| 845 | 845 | } |
@@ -887,13 +887,13 @@ discard block |
||
| 887 | 887 | * @param string $mDesc |
| 888 | 888 | * @return string[] keys: source, docstring |
| 889 | 889 | */ |
| 890 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 890 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 891 | 891 | { |
| 892 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 892 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 893 | 893 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 894 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 895 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 896 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 894 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 895 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 896 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 897 | 897 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 898 | 898 | if (isset($extraOptions['return_on_fault'])) { |
| 899 | 899 | $decodeFault = true; |
@@ -906,7 +906,7 @@ discard block |
||
| 906 | 906 | $namespace = '\\PhpXmlRpc\\'; |
| 907 | 907 | |
| 908 | 908 | $code = "function $newFuncName ("; |
| 909 | - if ($clientCopyMode < 2) { |
|
| 909 | + if ($clientCopyMode<2) { |
|
| 910 | 910 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 911 | 911 | $verbatimClientCopy = !$clientCopyMode; |
| 912 | 912 | $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace); |
@@ -921,7 +921,7 @@ discard block |
||
| 921 | 921 | |
| 922 | 922 | if ($mDesc != '') { |
| 923 | 923 | // take care that PHP comment is not terminated unwillingly by method description |
| 924 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 924 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 925 | 925 | } else { |
| 926 | 926 | $mDesc = "/**\nFunction $newFuncName\n"; |
| 927 | 927 | } |
@@ -930,7 +930,7 @@ discard block |
||
| 930 | 930 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 931 | 931 | $plist = array(); |
| 932 | 932 | $pCount = count($mSig); |
| 933 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 933 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 934 | 934 | $plist[] = "\$p$i"; |
| 935 | 935 | $pType = $mSig[$i]; |
| 936 | 936 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -946,19 +946,19 @@ discard block |
||
| 946 | 946 | } |
| 947 | 947 | } |
| 948 | 948 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 949 | - $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 949 | + $mDesc .= '* @param '.$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 950 | 950 | } |
| 951 | - if ($clientCopyMode < 2) { |
|
| 951 | + if ($clientCopyMode<2) { |
|
| 952 | 952 | $plist[] = '$debug=0'; |
| 953 | 953 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 954 | 954 | } |
| 955 | 955 | $plist = implode(', ', $plist); |
| 956 | - $mDesc .= '* @return ' . $this->xmlrpc2PhpType($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 956 | + $mDesc .= '* @return '.$this->xmlrpc2PhpType($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 957 | 957 | |
| 958 | 958 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 959 | 959 | if ($decodeFault) { |
| 960 | 960 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 961 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 961 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 962 | 962 | } else { |
| 963 | 963 | $respCode = var_export($faultResponse, true); |
| 964 | 964 | } |
@@ -971,7 +971,7 @@ discard block |
||
| 971 | 971 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 972 | 972 | } |
| 973 | 973 | |
| 974 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 974 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 975 | 975 | |
| 976 | 976 | return array('source' => $code, 'docstring' => $mDesc); |
| 977 | 977 | } |
@@ -997,23 +997,23 @@ discard block |
||
| 997 | 997 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 998 | 998 | { |
| 999 | 999 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1000 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1000 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1001 | 1001 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1002 | 1002 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1003 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1004 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1003 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1004 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1005 | 1005 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1006 | 1006 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1007 | 1007 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1008 | 1008 | $namespace = '\\PhpXmlRpc\\'; |
| 1009 | 1009 | |
| 1010 | - $reqClass = $namespace . 'Request'; |
|
| 1011 | - $decoderClass = $namespace . 'Encoder'; |
|
| 1010 | + $reqClass = $namespace.'Request'; |
|
| 1011 | + $decoderClass = $namespace.'Encoder'; |
|
| 1012 | 1012 | |
| 1013 | 1013 | $req = new $reqClass('system.listMethods'); |
| 1014 | 1014 | $response = $client->send($req, $timeout, $protocol); |
| 1015 | 1015 | if ($response->faultCode()) { |
| 1016 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1016 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1017 | 1017 | |
| 1018 | 1018 | return false; |
| 1019 | 1019 | } else { |
@@ -1023,7 +1023,7 @@ discard block |
||
| 1023 | 1023 | $mList = $decoder->decode($mList); |
| 1024 | 1024 | } |
| 1025 | 1025 | if (!is_array($mList) || !count($mList)) { |
| 1026 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1026 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1027 | 1027 | |
| 1028 | 1028 | return false; |
| 1029 | 1029 | } else { |
@@ -1031,8 +1031,8 @@ discard block |
||
| 1031 | 1031 | if ($newClassName != '') { |
| 1032 | 1032 | $xmlrpcClassName = $newClassName; |
| 1033 | 1033 | } else { |
| 1034 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1035 | - array('_', ''), $client->server) . '_client'; |
|
| 1034 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1035 | + array('_', ''), $client->server).'_client'; |
|
| 1036 | 1036 | } |
| 1037 | 1037 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1038 | 1038 | $xmlrpcClassName .= 'x'; |
@@ -1063,20 +1063,20 @@ discard block |
||
| 1063 | 1063 | if (!$buildIt) { |
| 1064 | 1064 | $source .= $methodWrap['docstring']; |
| 1065 | 1065 | } |
| 1066 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1066 | + $source .= $methodWrap['source']."\n"; |
|
| 1067 | 1067 | } else { |
| 1068 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1068 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1069 | 1069 | } |
| 1070 | 1070 | } |
| 1071 | 1071 | } |
| 1072 | 1072 | $source .= "}\n"; |
| 1073 | 1073 | if ($buildIt) { |
| 1074 | 1074 | $allOK = 0; |
| 1075 | - eval($source . '$allOK=1;'); |
|
| 1075 | + eval($source.'$allOK=1;'); |
|
| 1076 | 1076 | if ($allOK) { |
| 1077 | 1077 | return $xmlrpcClassName; |
| 1078 | 1078 | } else { |
| 1079 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
| 1079 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
| 1080 | 1080 | return false; |
| 1081 | 1081 | } |
| 1082 | 1082 | } else { |
@@ -1097,10 +1097,10 @@ discard block |
||
| 1097 | 1097 | * |
| 1098 | 1098 | * @return string |
| 1099 | 1099 | */ |
| 1100 | - protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\' ) |
|
| 1100 | + protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
|
| 1101 | 1101 | { |
| 1102 | - $code = "\$client = new {$namespace}Client('" . str_replace("'", "\'", $client->path) . |
|
| 1103 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
| 1102 | + $code = "\$client = new {$namespace}Client('".str_replace("'", "\'", $client->path). |
|
| 1103 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
| 1104 | 1104 | |
| 1105 | 1105 | // copy all client fields to the client that will be generated runtime |
| 1106 | 1106 | // (this provides for future expansion or subclassing of client obj) |
@@ -91,15 +91,15 @@ discard block |
||
| 91 | 91 | <body> |
| 92 | 92 | <?php |
| 93 | 93 | |
| 94 | -include __DIR__ . '/common.php'; |
|
| 94 | +include __DIR__.'/common.php'; |
|
| 95 | 95 | if ($action) { |
| 96 | 96 | |
| 97 | - include_once __DIR__ . "/../src/Autoloader.php"; |
|
| 97 | + include_once __DIR__."/../src/Autoloader.php"; |
|
| 98 | 98 | PhpXmlRpc\Autoloader::register(); |
| 99 | 99 | |
| 100 | 100 | // make sure the script waits long enough for the call to complete... |
| 101 | 101 | if ($timeout) { |
| 102 | - set_time_limit($timeout + 10); |
|
| 102 | + set_time_limit($timeout+10); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | if ($wstype == 1) { |
@@ -124,13 +124,13 @@ discard block |
||
| 124 | 124 | $server = "$host$path"; |
| 125 | 125 | } |
| 126 | 126 | if ($protocol == 2) { |
| 127 | - $server = 'https://' . $server; |
|
| 127 | + $server = 'https://'.$server; |
|
| 128 | 128 | } else { |
| 129 | - $server = 'http://' . $server; |
|
| 129 | + $server = 'http://'.$server; |
|
| 130 | 130 | } |
| 131 | 131 | if ($proxy != '') { |
| 132 | 132 | $pproxy = explode(':', $proxy); |
| 133 | - if (count($pproxy) > 1) { |
|
| 133 | + if (count($pproxy)>1) { |
|
| 134 | 134 | $pport = $pproxy[1]; |
| 135 | 135 | } else { |
| 136 | 136 | $pport = 8080; |
@@ -199,9 +199,9 @@ discard block |
||
| 199 | 199 | case 'wrap': |
| 200 | 200 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 201 | 201 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 202 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 202 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 203 | 203 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 204 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 204 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 205 | 205 | break; |
| 206 | 206 | case 'list': |
| 207 | 207 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | $msg[0] = new $requestClass($method, array(), $id); |
| 215 | 215 | // hack! build xml payload by hand |
| 216 | 216 | if ($wstype == 1) { |
| 217 | - $msg[0]->payload = "{\n" . |
|
| 218 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 219 | - $payload . |
|
| 217 | + $msg[0]->payload = "{\n". |
|
| 218 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 219 | + $payload. |
|
| 220 | 220 | "\n],\n\"id\": "; |
| 221 | 221 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 222 | 222 | if ($id == "") { |
@@ -229,20 +229,20 @@ discard block |
||
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | } else { |
| 232 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . |
|
| 233 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 234 | - $payload . |
|
| 235 | - "</params>\n" . $msg[0]->xml_footer(); |
|
| 232 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). |
|
| 233 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 234 | + $payload. |
|
| 235 | + "</params>\n".$msg[0]->xml_footer(); |
|
| 236 | 236 | } |
| 237 | - $actionname = 'Execution of method ' . $method; |
|
| 237 | + $actionname = 'Execution of method '.$method; |
|
| 238 | 238 | break; |
| 239 | 239 | default: // give a warning |
| 240 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 240 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 244 | 244 | // this gives good user feedback for long-running methods... |
| 245 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 245 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 246 | 246 | flush(); |
| 247 | 247 | |
| 248 | 248 | $response = null; |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | break; |
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | - $time = microtime(true) - $time; |
|
| 263 | + $time = microtime(true)-$time; |
|
| 264 | 264 | if ($debug) { |
| 265 | 265 | echo "</div>\n"; |
| 266 | 266 | } |
@@ -270,8 +270,8 @@ discard block |
||
| 270 | 270 | // call failed! echo out error msg! |
| 271 | 271 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 272 | 272 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 273 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 274 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 273 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 274 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 275 | 275 | echo(strftime("%d/%b/%Y:%H:%M:%S\n")); |
| 276 | 276 | } else { |
| 277 | 277 | // call succeeded: parse results |
@@ -287,36 +287,36 @@ discard block |
||
| 287 | 287 | $max = $v->count(); |
| 288 | 288 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 289 | 289 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 290 | - foreach($v as $i => $rec) { |
|
| 290 | + foreach ($v as $i => $rec) { |
|
| 291 | 291 | if ($i % 2) { |
| 292 | 292 | $class = ' class="oddrow"'; |
| 293 | 293 | } else { |
| 294 | 294 | $class = ' class="evenrow"'; |
| 295 | 295 | } |
| 296 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 297 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 298 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 299 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 300 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 301 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 302 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 296 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 297 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 298 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 299 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 300 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 301 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 302 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 320 | 320 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 321 | 321 | //echo("</tr>\n"); |
| 322 | 322 | |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | $r2 = $resp[1]->value(); |
| 344 | 344 | |
| 345 | 345 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 346 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 346 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 347 | 347 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 348 | 348 | if ($desc == "") { |
| 349 | 349 | $desc = "-"; |
@@ -353,41 +353,41 @@ discard block |
||
| 353 | 353 | if ($r2->kindOf() != "array") { |
| 354 | 354 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 355 | 355 | } else { |
| 356 | - foreach($r2 as $i => $x) { |
|
| 356 | + foreach ($r2 as $i => $x) { |
|
| 357 | 357 | $payload = ""; |
| 358 | 358 | $alt_payload = ""; |
| 359 | - if ($i + 1 % 2) { |
|
| 359 | + if ($i+1 % 2) { |
|
| 360 | 360 | $class = ' class="oddrow"'; |
| 361 | 361 | } else { |
| 362 | 362 | $class = ' class="evenrow"'; |
| 363 | 363 | } |
| 364 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 364 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 365 | 365 | if ($x->kindOf() == "array") { |
| 366 | 366 | $ret = $x[0]; |
| 367 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 368 | - if ($x->count() > 1) { |
|
| 369 | - foreach($x as $k => $y) { |
|
| 367 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 368 | + if ($x->count()>1) { |
|
| 369 | + foreach ($x as $k => $y) { |
|
| 370 | 370 | if ($k == 0) continue; |
| 371 | 371 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 372 | 372 | if ($wstype != 1) { |
| 373 | 373 | $type = $y->scalarval(); |
| 374 | 374 | $payload .= '<param><value>'; |
| 375 | - switch($type) { |
|
| 375 | + switch ($type) { |
|
| 376 | 376 | case 'undefined': |
| 377 | 377 | break; |
| 378 | 378 | case 'null'; |
| 379 | 379 | $type = 'nil'; |
| 380 | 380 | // fall thru intentionally |
| 381 | 381 | default: |
| 382 | - $payload .= '<' . |
|
| 383 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 384 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 382 | + $payload .= '<'. |
|
| 383 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 384 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 385 | 385 | '>'; |
| 386 | 386 | } |
| 387 | 387 | $payload .= "</value></param>\n"; |
| 388 | 388 | } |
| 389 | 389 | $alt_payload .= $y->scalarval(); |
| 390 | - if ($k < $x->count() - 1) { |
|
| 390 | + if ($k<$x->count()-1) { |
|
| 391 | 391 | $alt_payload .= ';'; |
| 392 | 392 | echo ", "; |
| 393 | 393 | } |
@@ -400,63 +400,63 @@ discard block |
||
| 400 | 400 | echo '</td>'; |
| 401 | 401 | // button to test this method |
| 402 | 402 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 403 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 404 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 405 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 406 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 407 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 408 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 409 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 410 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 411 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 412 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 413 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 414 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 415 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 416 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 417 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 418 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 419 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 420 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 421 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 422 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 423 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 424 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 425 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 426 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 403 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 404 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 405 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 406 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 407 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 408 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 409 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 410 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 411 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 412 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 413 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 414 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 415 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 416 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 417 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 418 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 419 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 420 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 421 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 422 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 423 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 424 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 425 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 426 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 427 | 427 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 428 | 428 | if ($wstype != 1) { |
| 429 | 429 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 430 | 430 | } |
| 431 | 431 | echo "</form></td>\n"; |
| 432 | 432 | |
| 433 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 434 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 435 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 436 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 437 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 438 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 439 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 440 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 441 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 433 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 434 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 435 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 436 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 437 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 438 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 439 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 440 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 441 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 460 | 460 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 461 | 461 | echo "</form></td></tr>\n"; |
| 462 | 462 | } |
@@ -468,14 +468,14 @@ discard block |
||
| 468 | 468 | case 'wrap': |
| 469 | 469 | $r1 = $resp[0]->value(); |
| 470 | 470 | $r2 = $resp[1]->value(); |
| 471 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 471 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 472 | 472 | echo "Error: signature unknown\n"; |
| 473 | 473 | } else { |
| 474 | 474 | $mdesc = $r1->scalarval(); |
| 475 | 475 | $encoder = new PhpXmlRpc\Encoder(); |
| 476 | 476 | $msig = $encoder->decode($r2); |
| 477 | 477 | $msig = $msig[$methodsig]; |
| 478 | - $proto = $protocol == 2 ? 'https' : ( $protocol == 1 ? 'http11' : '' ); |
|
| 478 | + $proto = $protocol == 2 ? 'https' : ($protocol == 1 ? 'http11' : ''); |
|
| 479 | 479 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 480 | 480 | $clientcookies == '' |
| 481 | 481 | ) { |
@@ -489,11 +489,11 @@ discard block |
||
| 489 | 489 | $prefix = 'xmlrpc'; |
| 490 | 490 | } |
| 491 | 491 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 492 | - $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc); |
|
| 492 | + $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc); |
|
| 493 | 493 | //if ($code) |
| 494 | 494 | //{ |
| 495 | 495 | echo "<div id=\"phpcode\">\n"; |
| 496 | - highlight_string("<?php\n" . $code['docstring'] . $code['source'] . '?>'); |
|
| 496 | + highlight_string("<?php\n".$code['docstring'].$code['source'].'?>'); |
|
| 497 | 497 | echo "\n</div>"; |
| 498 | 498 | //} |
| 499 | 499 | //else |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | break; |
| 505 | 505 | |
| 506 | 506 | case 'execute': |
| 507 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 507 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 508 | 508 | break; |
| 509 | 509 | |
| 510 | 510 | default: // give a warning |
