MNet goes from ISO8859-1 -> UTF-8; #MDL-8514 MDL-8514

diff --git a/mnet/lib.php b/mnet/lib.php
index 8aba4009b6f4e4f5b71286a79e4764569225afc4..ff5aca1fb260c90e087e46a607fe590f017e080a 100644 (file)
--- a/mnet/lib.php
+++ b/mnet/lib.php
@@ -54,7 +54,7 @@ function mnet_get_public_key($uri) {
         return $key;
     }
 
-    $rq = xmlrpc_encode_request('system/keyswap', array($CFG->wwwroot, $MNET->public_key));
+    $rq = xmlrpc_encode_request('system/keyswap', array($CFG->wwwroot, $MNET->public_key), array("encoding" => "utf-8"));
     $ch = curl_init($uri.'/mnet/xmlrpc/server.php');
 
     curl_setopt($ch, CURLOPT_TIMEOUT, 60);

diff --git a/mnet/xmlrpc/client.php b/mnet/xmlrpc/client.php
index 65778262a3ddf5c3edfadd18e26d1e062b582e6b..efd494f79839243692d856abdbe81112b7a645a8 100644 (file)
--- a/mnet/xmlrpc/client.php
+++ b/mnet/xmlrpc/client.php
@@ -173,7 +173,7 @@ class mnet_xmlrpc_client {
             }
 
         }
-        $this->requesttext = xmlrpc_encode_request($this->method, $this->params);
+        $this->requesttext = xmlrpc_encode_request($this->method, $this->params, array("encoding" => "utf-8"));
         $rq = $this->requesttext;
         $rq = mnet_sign_message($this->requesttext);
         $this->signedrequest = $rq;

diff --git a/mnet/xmlrpc/server.php b/mnet/xmlrpc/server.php
index 2682ec8eb19c475cb6eee8a7796e3025390b4f4e..0f6bb7187ece5ffeb848f6b243156ba8b0e9111c 100644 (file)
--- a/mnet/xmlrpc/server.php
+++ b/mnet/xmlrpc/server.php
@@ -19,7 +19,7 @@ require_once $CFG->dirroot.'/mnet/lib.php';
 require_once $CFG->dirroot.'/mnet/remote_client.php';
 
 // Content type for output is not html:
-header('Content-type: text/xml');
+header('Content-type: text/xml; charset=utf-8');
 
 if (!empty($CFG->mnet_rpcdebug)) {
     trigger_error("HTTP_RAW_POST_DATA");
@@ -414,7 +414,7 @@ function mnet_server_dispatch($payload) {
             $method == 'system.keyswap'      ||
             $method == 'system/keyswap') {
 
-            $response = xmlrpc_server_call_method($xmlrpcserver, $payload, $MNET_REMOTE_CLIENT);
+            $response = xmlrpc_server_call_method($xmlrpcserver, $payload, $MNET_REMOTE_CLIENT, array("encoding" => "utf-8"));
             $response = mnet_server_prepare_response($response);
         } else {
             exit(mnet_server_fault(7018, 'nosuchfunction'));
@@ -704,7 +704,7 @@ function mnet_server_invoke_method($includefile, $methodname, $method, $payload,
     if (RPC_OK == $permission) {
         $xmlrpcserver = xmlrpc_server_create();
         $bool = xmlrpc_server_register_method($xmlrpcserver, $method, 'mnet_server_dummy_method');
-        $response = xmlrpc_server_call_method($xmlrpcserver, $payload, $methodname);
+        $response = xmlrpc_server_call_method($xmlrpcserver, $payload, $methodname, array("encoding" => "utf-8"));
         $bool = xmlrpc_server_destroy($xmlrpcserver);
         return $response;
     }