MDL-24767 webservices logs use hard coded site id 1 instead of SITEID

diff --git a/admin/webservice/service.php b/admin/webservice/service.php
index f95f6e8..0789838 100644 (file)
--- a/admin/webservice/service.php
+++ b/admin/webservice/service.php
@@ -57,7 +57,7 @@ if ($action == 'delete' and confirm_sesskey() and $service and empty($service->c
     }
     //The user has confirmed the deletion, delete and redirect
     $webservicemanager->delete_service($service->id);
-    add_to_log(1, 'webservice', 'delete', $returnurl, get_string('deleteservice', 'webservice', $service));
+    add_to_log(SITEID, 'webservice', 'delete', $returnurl, get_string('deleteservice', 'webservice', $service));
     redirect($returnurl);
 }
 
@@ -74,7 +74,7 @@ if ($mform->is_cancelled()) {
     //create operation
     if (empty($servicedata->id)) {
         $servicedata->id = $webservicemanager->add_external_service($servicedata);
-        add_to_log(1, 'webservice', 'add', $returnurl, get_string('addservice', 'webservice', $servicedata));
+        add_to_log(SITEID, 'webservice', 'add', $returnurl, get_string('addservice', 'webservice', $servicedata));
 
         //redirect to the 'add functions to service' page
         $addfunctionpage = new moodle_url(
@@ -84,7 +84,7 @@ if ($mform->is_cancelled()) {
     } else {
         //update operation
         $webservicemanager->update_external_service($servicedata);
-        add_to_log(1, 'webservice', 'edit', $returnurl, get_string('editservice', 'webservice', $servicedata));
+        add_to_log(SITEID, 'webservice', 'edit', $returnurl, get_string('editservice', 'webservice', $servicedata));
     }
 
     redirect($returnurl);

diff --git a/admin/webservice/service_users.php b/admin/webservice/service_users.php
index b88081b..33f098c 100644 (file)
--- a/admin/webservice/service_users.php
+++ b/admin/webservice/service_users.php
@@ -57,7 +57,7 @@ if (optional_param('add', false, PARAM_BOOL) && confirm_sesskey()) {
             $serviceuser->externalserviceid = $id;
             $serviceuser->userid = $adduser->id;
             $webservicemanager->add_ws_authorised_user($serviceuser);
-            add_to_log(1, 'core', 'assign', $CFG->admin . '/webservice/service_users.php?id='
+            add_to_log(SITEID, 'core', 'assign', $CFG->admin . '/webservice/service_users.php?id='
                     . $id, 'add', '', $adduser->id);
         }
         $potentialuserselector->invalidate_selected_users();
@@ -71,7 +71,7 @@ if (optional_param('remove', false, PARAM_BOOL) && confirm_sesskey()) {
     if (!empty($userstoremove)) {
         foreach ($userstoremove as $removeuser) {
             $webservicemanager->remove_ws_authorised_user($removeuser, $id);
-            add_to_log(1, 'core', 'assign', $CFG->admin . '/webservice/service_users.php?id='
+            add_to_log(SITEID, 'core', 'assign', $CFG->admin . '/webservice/service_users.php?id='
                     . $id, 'remove', '', $removeuser->id);
         }
         $potentialuserselector->invalidate_selected_users();

diff --git a/webservice/lib.php b/webservice/lib.php
index bc9c4ce..5caece8 100644 (file)
--- a/webservice/lib.php
+++ b/webservice/lib.php
@@ -607,7 +607,7 @@ abstract class webservice_server implements webservice_server_interface {
 
             if (!$auth->user_login_webservice($this->username, $this->password)) {
                 // log failed login attempts
-                add_to_log(1, 'webservice', get_string('simpleauthlog', 'webservice'), '' , get_string('failedtolog', 'webservice').": ".$this->username."/".$this->password." - ".getremoteaddr() , 0);
+                add_to_log(SITEID, 'webservice', get_string('simpleauthlog', 'webservice'), '' , get_string('failedtolog', 'webservice').": ".$this->username."/".$this->password." - ".getremoteaddr() , 0);
                 throw new webservice_access_exception(get_string('wrongusernamepassword', 'webservice'));
             }
 
@@ -634,7 +634,7 @@ abstract class webservice_server implements webservice_server_interface {
         global $DB;
         if (!$token = $DB->get_record('external_tokens', array('token'=>$this->token, 'tokentype'=>$tokentype))) {
             // log failed login attempts
-            add_to_log(1, 'webservice', get_string('tokenauthlog', 'webservice'), '' , get_string('failedtolog', 'webservice').": ".$this->token. " - ".getremoteaddr() , 0);
+            add_to_log(SITEID, 'webservice', get_string('tokenauthlog', 'webservice'), '' , get_string('failedtolog', 'webservice').": ".$this->token. " - ".getremoteaddr() , 0);
             throw new webservice_access_exception(get_string('invalidtoken', 'webservice'));
         }
 
@@ -652,7 +652,7 @@ abstract class webservice_server implements webservice_server_interface {
         }
 
         if ($token->iprestriction and !address_in_subnet(getremoteaddr(), $token->iprestriction)) {
-            add_to_log(1, 'webservice', get_string('tokenauthlog', 'webservice'), '' , get_string('failedtolog', 'webservice').": ".getremoteaddr() , 0);
+            add_to_log(SITEID, 'webservice', get_string('tokenauthlog', 'webservice'), '' , get_string('failedtolog', 'webservice').": ".getremoteaddr() , 0);
             throw new webservice_access_exception(get_string('invalidiptoken', 'webservice'));
         }
 
@@ -729,7 +729,7 @@ abstract class webservice_zend_server extends webservice_server {
         $this->zend_server->setClass($this->service_class);
 
         //log the web service request
-        add_to_log(1, 'webservice', '', '' , $this->zend_class." ".getremoteaddr() , 0, $this->userid);
+        add_to_log(SITEID, 'webservice', '', '' , $this->zend_class." ".getremoteaddr() , 0, $this->userid);
 
         // execute and return response, this sends some headers too
         $response = $this->zend_server->handle();
@@ -1164,7 +1164,7 @@ abstract class webservice_base_server extends webservice_server {
         $this->load_function_info();
 
         //log the web service request
-        add_to_log(1, 'webservice', $this->functionname, '' , getremoteaddr() , 0, $this->userid);
+        add_to_log(SITEID, 'webservice', $this->functionname, '' , getremoteaddr() , 0, $this->userid);
 
         // finally, execute the function - any errors are catched by the default exception handler
         $this->execute();