From 42b650f4f14543d9562c7d099b10ff9f58db4d91 Mon Sep 17 00:00:00 2001
From: Janos SUTO <sj@acts.hu>
Date: Thu, 9 Dec 2021 11:13:06 +0100
Subject: [PATCH] Timestamping shall use sort by id column

Signed-off-by: Janos SUTO <sj@acts.hu>
---
 RELEASE_NOTES                  | 2 +-
 util/sign.php                  | 2 +-
 webui/model/search/message.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 8782d927..37a2c369 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,7 +1,7 @@
 - Introduced the archive_address feature, see etc/example.conf for the details
 - Introduced the raw: search label
 - Added Italian translation. Credits: Stefano Gatto
-
+- timestamp signing sorts by 'id' column
 
 1.3.12:
 -------
diff --git a/util/sign.php b/util/sign.php
index 2903121f..26d3f575 100644
--- a/util/sign.php
+++ b/util/sign.php
@@ -130,7 +130,7 @@ function get_hash_values() {
       else { $stop_id = 1000000000; }
    }
 
-   $query = $db->query("SELECT id, digest FROM " . TABLE_META . " WHERE id >= ? AND id <= ?", array($start_id, $stop_id));
+   $query = $db->query("SELECT id, digest FROM " . TABLE_META . " WHERE id >= ? AND id <= ? ORDER BY id", array($start_id, $stop_id));
 
    foreach($query->rows as $q) {
       $count++;
diff --git a/webui/model/search/message.php b/webui/model/search/message.php
index 2351a1de..4fb5bea7 100644
--- a/webui/model/search/message.php
+++ b/webui/model/search/message.php
@@ -353,7 +353,7 @@ class ModelSearchMessage extends Model {
        * If the hashes are the same, then verify by the public key as well
        */
 
-      $query = $this->db->query("SELECT `start_id`, `stop_id`, `hash_value`, `response_time`, `response_string` FROM " . TABLE_TIMESTAMP . " WHERE start_id <= ? AND stop_id >= ?", array($id, $id));
+      $query = $this->db->query("SELECT `start_id`, `stop_id`, `hash_value`, `response_time`, `response_string` FROM " . TABLE_TIMESTAMP . " WHERE start_id <= ? AND stop_id >= ? ORDER BY id", array($id, $id));
 
       if(isset($query->row['start_id']) && isset($query->row['stop_id'])) {