MDL16286 - bugfixes

Author: Peter Bulmer <peter.bulmer@catalyst.net.nz>

diff --git a/mnet/xmlrpc/client.php b/mnet/xmlrpc/client.php
index 17ea7e9d4494c737d0d95b55f0dd95e6398ecaa6..c45c1546502e74a06d8b64ff044e1e77beafa9db 100644 (file)
--- a/mnet/xmlrpc/client.php
+++ b/mnet/xmlrpc/client.php
@@ -125,7 +125,7 @@ class mnet_xmlrpc_client {
         global $CFG, $MNET, $DB;
 
 
-        if (!$this->permission_to_call($mnet_peer) {
+        if (!$this->permission_to_call($mnet_peer)) {
             return false;
         }
 

diff --git a/mnet/xmlrpc/server.php b/mnet/xmlrpc/server.php
index fd20d2fb3e0dd423bbe7c7f2655ff71e2f6bce35..71306cf610b24cb618f20c1f56c0b52ddbf788e3 100644 (file)
--- a/mnet/xmlrpc/server.php
+++ b/mnet/xmlrpc/server.php
@@ -48,11 +48,11 @@ $MNET_REMOTE_CLIENT = new mnet_remote_client();
 $plaintextmessage = mnet_server_strip_encryption($HTTP_RAW_POST_DATA);
 $xmlrpcrequest = mnet_server_strip_signature($plaintextmessage);
 
-if($this->pushkey == true) {
+if($MNET_REMOTE_CLIENT->pushkey == true) {
     // The peer used one of our older public keys, we will return a
     // signed/encrypted error message containing our new public key
     // Sign message with our old key, and encrypt to the peer's private key.
-    exit(mnet_server_fault_xml(7025, $MNET->public_key, $this->useprivatekey));
+    exit(mnet_server_fault_xml(7025, $MNET->public_key, $MNET_REMOTE_CLIENT->useprivatekey));
 }
 // Have a peek at what the request would be if we were to process it
 $params = xmlrpc_decode_request($xmlrpcrequest, $method);