X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=debugger%2Faction.php;h=3e22c692ad1085c680fadf78eeb50518e22e43c8;hb=e1923b6d55b69e592b2fba8ce0f097751416823e;hp=0345798e716b35e39864b8ea39a354fa5ff9116d;hpb=da824472c0045c183f40792b8c760c11d024005d;p=plcapi.git
diff --git a/debugger/action.php b/debugger/action.php
index 0345798..3e22c69 100644
--- a/debugger/action.php
+++ b/debugger/action.php
@@ -8,6 +8,9 @@
* @todo use ob_start to catch debug info and echo it AFTER method call results?
* @todo be smarter in creating client stub for proxy/auth cases: only set appropriate property of client obj
**/
+
+header('Content-Type: text/html; charset=utf-8');
+
?>
@@ -104,11 +107,11 @@ if ($action) {
if (!class_exists('jsonrpc_client')) {
die('Error: to debug the jsonrpc protocol the jsonrpc.inc file is needed');
}
- $clientClass = 'PhpJsRpc\client';
- $requestClass = 'PhpJsRpc\request';
+ $clientClass = 'PhpJsRpc\Client';
+ $requestClass = 'PhpJsRpc\Request';
$protoName = 'JSONRPC';
} else {
- $clientClass = 'PhpXmlRpc\client';
+ $clientClass = 'PhpXmlRpc\Client';
$requestClass = 'PhpXmlRpc\Request';
$protoName = 'XMLRPC';
}
@@ -239,7 +242,7 @@ if ($action) {
// Before calling execute, echo out brief description of action taken + date and time ???
// this gives good user feedback for long-running methods...
- echo '' . htmlspecialchars($actionname) . ' on server ' . htmlspecialchars($server) . " ...
\n";
+ echo '' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...
\n";
flush();
$response = null;
@@ -265,14 +268,14 @@ if ($action) {
if ($response) {
if ($response->faultCode()) {
// call failed! echo out error msg!
- //echo ''.htmlspecialchars($actionname).' on server '.htmlspecialchars($server).'
';
+ //echo ''.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'
';
echo "$protoName call FAILED!
\n";
- echo "Fault code: [" . htmlspecialchars($response->faultCode()) .
- "] Reason: '" . htmlspecialchars($response->faultString()) . "'
\n";
+ echo "Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
+ "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'
\n";
echo(strftime("%d/%b/%Y:%H:%M:%S\n"));
} else {
// call succeeded: parse results
- //echo ''.htmlspecialchars($actionname).' on server '.htmlspecialchars($server).'
';
+ //echo ''.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'
';
printf("%s call(s) OK (%.2f secs.)
\n", $protoName, $time);
echo(strftime("%d/%b/%Y:%H:%M:%S\n"));
@@ -291,27 +294,27 @@ if ($action) {
} else {
$class = ' class="evenrow"';
}
- echo("" . htmlspecialchars($rec->scalarval()) . "