Add optional now-timestamp parameter to simpleBulkSaveChangeHistory

Author: pylipp

include/people.php

@@ -514,14 +514,15 @@ function () use ($cmsmain, $data) {
                     case 'touch':
                         $ids = explode(',', (string) $_POST['ids']);
                         $userId = $_SESSION['user']['id'];
+                        $now = date('Y-m-d H:i:s');
                         // Query speed optimised for 500 records from 6.2 seconds to 0.54 seconds using  transaction blocks over UPDATE and bulk inserts
-                        db_transaction(function () use ($ids, $userId) {
+                        db_transaction(function () use ($ids, $userId, $now) {
                             foreach ($ids as $id) {
-                                db_query('UPDATE people SET modified = NOW(), modified_by = :user WHERE id = :id', ['id' => $id, 'user' => $userId]);
+                                db_query('UPDATE people SET modified = :now, modified_by = :user WHERE id = :id', ['id' => $id, 'user' => $userId, 'now' => $now]);
                             }
                         });
                         // Bulk insert used to insert into history table
-                        simpleBulkSaveChangeHistory('people', $ids, 'Touched');
+                        simpleBulkSaveChangeHistory('people', $ids, 'Touched', $now);
 
                         $success = true;
                         $message = 'Selected people have been touched';

library/lib/list.php

@@ -326,10 +326,11 @@ function listBulkUndelete($table, $ids, $uri = false, $overwritehastree = false)
 
 function listBulkUnDeleteAction($table, $ids, $count = 0, $hasTree = false)
 {
-    [$finalIds, $count] = db_transaction(function () use ($table, $ids, $count, $hasTree) {
+    $now = date('Y-m-d H:i:s');
+    [$finalIds, $count] = db_transaction(function () use ($table, $ids, $count, $hasTree, $now) {
         $finalIds = [];
         foreach ($ids as $id) {
-            $result = db_query('UPDATE '.$table.' SET deleted = 0, modified = NOW(), modified_by = :user_id WHERE id = :id', ['id' => $id, 'user_id' => $_SESSION['user']['id']]);
+            $result = db_query('UPDATE '.$table.' SET deleted = 0, modified = :now, modified_by = :user_id WHERE id = :id', ['id' => $id, 'user_id' => $_SESSION['user']['id'], 'now' => $now]);
             $count += $result->rowCount();
             if ($result->rowCount()) {
                 $finalIds[] = $id;
@@ -338,7 +339,7 @@ function listBulkUnDeleteAction($table, $ids, $count = 0, $hasTree = false)
             if ($hasTree) {
                 $childs = db_array('SELECT id FROM '.$table.' WHERE parent_id = :id', ['id' => $id]);
                 foreach ($childs as $child) {
-                    $result = db_query('UPDATE '.$table.' SET deleted = 0, modified = NOW(), modified_by = :user_id WHERE id = :id', ['id' => $child['id'], 'user_id' => $_SESSION['user']['id']]);
+                    $result = db_query('UPDATE '.$table.' SET deleted = 0, modified = :now, modified_by = :user_id WHERE id = :id', ['id' => $child['id'], 'user_id' => $_SESSION['user']['id'], 'now' => $now]);
                     $count += $result->rowCount();
                     if ($result->rowCount()) {
                         $finalIds[] = $child['id'];
@@ -350,7 +351,7 @@ function listBulkUnDeleteAction($table, $ids, $count = 0, $hasTree = false)
         return [$finalIds, $count];
     });
 
-    simpleBulkSaveChangeHistory($table, $finalIds, 'Record recovered');
+    simpleBulkSaveChangeHistory($table, $finalIds, 'Record recovered', $now);
 
     return $count;
 }

library/lib/tools.php

@@ -298,17 +298,20 @@ function simpleSaveChangeHistory($table, $record, $changes, $now = null, $from =
     db_query('INSERT INTO history (tablename, record_id, changes, user_id, ip, changedate, from_int, from_float, to_int, to_float) VALUES (:table,:id,:change,:user_id,:ip,:now, :from_int, :from_float, :to_int, :to_float)', ['table' => $table, 'id' => $record, 'change' => $changes, 'user_id' => $_SESSION['user']['id'], 'ip' => $_SERVER['REMOTE_ADDR'], 'now' => $now, 'from_int' => $from['int'], 'from_float' => $from['float'], 'to_int' => $to['int'], 'to_float' => $to['float']]);
 }
 
-function simpleBulkSaveChangeHistory($table, $records, $changes)
+function simpleBulkSaveChangeHistory($table, $records, $changes, $now = null)
 {
     if (!db_tableexists('history')) {
         return;
     }
+    if (null === $now) {
+        $now = date('Y-m-d H:i:s');
+    }
     $query = '';
     $params = [];
     if (is_iterable($records)) {
         for ($i = 0; $i < sizeof($records); ++$i) {
-            $query .= "(:table{$i},:id{$i},:change{$i},:user_id{$i},:ip{$i},NOW())";
-            $params = array_merge($params, ['table'.$i => $table, 'id'.$i => $records[$i], 'change'.$i => $changes, 'user_id'.$i => $_SESSION['user']['id'], 'ip'.$i => $_SERVER['REMOTE_ADDR']]);
+            $query .= "(:table{$i},:id{$i},:change{$i},:user_id{$i},:ip{$i},:now)";
+            $params = array_merge($params, ['table'.$i => $table, 'id'.$i => $records[$i], 'change'.$i => $changes, 'user_id'.$i => $_SESSION['user']['id'], 'ip'.$i => $_SERVER['REMOTE_ADDR'], 'now' => $now]);
             if ($i !== sizeof($records) - 1) {
                 $query .= ',';
             }