Merge pull request #819 from boxwise/fix-timestamp-creating-qr

Fix more timestamps

Author: HaGuesto

include/people_deactivated.php

@@ -161,7 +161,7 @@ function () use (&$data) {
                 }
 
                 // Optimized by using bulk inserts and transactions over delete queries
-                [$success, $message, $redirect] = listBulkRealDelete($table, $ids);
+                [$success, $message, $redirect] = listBulkRealDelete($table, $ids, $now);
 
                 return [$success, $message, $redirect];
             });

library/lib/list.php

@@ -91,7 +91,7 @@ function listBulkMove($table, $ids, $regardparent = true, $hook = '', $updatetra
     return [true, $return, false, $aftermove];
 }
 
-function listBulkRealDelete($table, $ids, $uri = false)
+function listBulkRealDelete($table, $ids, $now = null)
 {
     global $translate, $action;
 
@@ -108,7 +108,7 @@ function listBulkRealDelete($table, $ids, $uri = false)
         }
     }
 
-    simpleBulkSaveChangeHistory($table, $deletedIds, 'Record deleted without undelete');
+    simpleBulkSaveChangeHistory($table, $deletedIds, 'Record deleted without undelete', $now);
 
     if ($count) {
         return [true, $translate['cms_list_deletesuccess'], true];

pdf/qr.php

@@ -37,6 +37,7 @@ function () {
             $_GET['count'] = count($labels);
         }
 
+        $now = date('Y-m-d H:i:s');
         $box_ids_without_qr = [];
         for ($i = 0; $i < intval($_GET['count']); ++$i) {
             if (!($i % 2)) {
@@ -85,7 +86,7 @@ function () {
                 [$id, $hash] = generateQRIDForDB();
 
                 if ($labels[$i]) {
-                    db_query('UPDATE stock SET qr_id = :qr_id, modified = NOW(), modified_by = :user WHERE id = :id', ['id' => $labels[$i], 'qr_id' => $id, 'user' => $_SESSION['user']['id']]);
+                    db_query('UPDATE stock SET qr_id = :qr_id, modified = :now, modified_by = :user WHERE id = :id', ['id' => $labels[$i], 'qr_id' => $id, 'now' => $now, 'user' => $_SESSION['user']['id']]);
                     $box_ids_without_qr[] = $labels[$i];
                 }
             }
@@ -138,7 +139,7 @@ function () {
                 // $pdf->Text(140,
             }
         }
-        simpleBulkSaveChangeHistory('stock', $box_ids_without_qr, 'New Qr-code assigned by pdf generation.');
+        simpleBulkSaveChangeHistory('stock', $box_ids_without_qr, 'New Qr-code assigned by pdf generation.', $now);
 
         $pdf->Output('I');
     }