Merge remote-tracking branch 'origin/improvement/LIMS-202/make-AdminActivity-logging-optional' into pre-release/2022-R4.2.2

Author: JPHall-DLS

api/index.php

@@ -73,7 +73,10 @@
 $login = $auth->get_user();
 $user = new User($login, $db, $app);
 
-if ($user->login) {
+global $log_activity_to_ispyb;
+$log_activity = isset($log_activity_to_ispyb) ? $log_activity_to_ispyb : true;
+
+if ($user->login && $log_activity) {
     $chk = $db->pq("SELECT TIMESTAMPDIFF('SECOND', datetime, CURRENT_TIMESTAMP) AS lastupdate, comments FROM adminactivity WHERE username LIKE :1", array($user->login));
     if (sizeof($chk)) {
         if ($chk[0]['LASTUPDATE'] > 20) $db->pq("UPDATE adminactivity SET datetime=CURRENT_TIMESTAMP WHERE username=:1", array($user->login));

api/src/Page.php

@@ -361,8 +361,11 @@ function log_action($act=1,$com='') {
             if (get_class($this) == 'Download') return;
 
             $action = $act ? 'LOGON' : 'LOGOFF';
+
+            global $log_activity_to_ispyb;
+            $log_activity = isset($log_activity_to_ispyb) ? $log_activity_to_ispyb : true;
 
-            if ($this->user) {
+            if ($this->user && $log_activity) {
                 $com = 'ISPyB2: '.($com ? $com : $_SERVER['REQUEST_URI']);
                 $chk = $this->db->pq("SELECT comments FROM adminactivity WHERE username LIKE :1", array($this->user->login));