From b5592d32f3b9fb1b3bc416fd7f2e568dbd685fe2 Mon Sep 17 00:00:00 2001
From: Joost Agterhoek <mail@joostagterhoek.nl>
Date: Thu, 29 Aug 2024 21:30:59 +0200
Subject: [PATCH] reordered result lookups, AbuseIPDB higher

---
 templates/IPv4.html   | 41 +++++++++++++++++++++--------------------
 templates/URL.html    | 41 +++++++++++++++++++++--------------------
 templates/domain.html | 43 ++++++++++++++++++++++---------------------
 3 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/templates/IPv4.html b/templates/IPv4.html
index 9f1dfaf..3ee0e9c 100644
--- a/templates/IPv4.html
+++ b/templates/IPv4.html
@@ -19,6 +19,27 @@
     </tbody>
   </table>
 
+  <table id="abuseipdb" class="table table-striped">
+    <thead>
+      <tr>
+        <th>Abuse IPDB confidence score</th>
+        <th>Total reports</th>
+        <th>Last reported</th>
+        <th>Tor or not</th>
+        <th>Hostnames</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>{{ result.abuseipdb.data.abuseConfidenceScore }}</td>
+        <td>{{ result.abuseipdb.data.totalReports }}</td>
+        <td>{{ result.abuseipdb.data.lastReportedAt }}</td>
+        <td>{{ result.abuseipdb.data.isTor }}</td>
+        <td>{{result.abuseipdb.data.hostnames }}</td>
+      </tr>
+    </tbody>
+  </table>
+
   <table id="virustotal_stats" class="table table-striped">
     <thead>
       <tr>
@@ -75,26 +96,6 @@
     </tbody>
   </table>
 
-  <table id="abuseipdb" class="table table-striped">
-    <thead>
-      <tr>
-        <th>Abuse IPDB confidence score</th>
-        <th>Total reports</th>
-        <th>Last reported</th>
-        <th>Tor or not</th>
-        <th>Hostnames</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>{{ result.abuseipdb.data.abuseConfidenceScore }}</td>
-        <td>{{ result.abuseipdb.data.totalReports }}</td>
-        <td>{{ result.abuseipdb.data.lastReportedAt }}</td>
-        <td>{{ result.abuseipdb.data.isTor }}</td>
-        <td>{{result.abuseipdb.data.hostnames }}</td>
-      </tr>
-    </tbody>
-  </table>
 </div>
 {% elif results %}
 <div>
diff --git a/templates/URL.html b/templates/URL.html
index 71d8fc7..48ffdc3 100644
--- a/templates/URL.html
+++ b/templates/URL.html
@@ -17,6 +17,27 @@
     </tbody>
   </table>
 
+  <table id="abuseipdb" class="table table-striped">
+    <thead>
+      <tr>
+        <th>Abuse IPDB confidence score</th>
+        <th>Total reports</th>
+        <th>Last reported</th>
+        <th>Tor or not</th>
+        <th>Hostnames</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>{{ result.abuseipdb.data.abuseConfidenceScore }}</td>
+        <td>{{ result.abuseipdb.data.totalReports }}</td>
+        <td>{{ result.abuseipdb.data.lastReportedAt }}</td>
+        <td>{{ result.abuseipdb.data.isTor }}</td>
+        <td>{{result.abuseipdb.data.hostnames }}</td>
+      </tr>
+    </tbody>
+  </table>
+
   <table id="virustotal_stats" class="table table-striped">
     <thead>
       <tr>
@@ -52,26 +73,6 @@
       {% endfor %}
     </tbody>
   </table>
-  <table id="abuseipdb" class="table table-striped">
-    <thead>
-      <tr>
-        <th>Abuse IPDB confidence score</th>
-        <th>Total reports</th>
-        <th>Last reported</th>
-        <th>Tor or not</th>
-        <th>Hostnames</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>{{ result.abuseipdb.data.abuseConfidenceScore }}</td>
-        <td>{{ result.abuseipdb.data.totalReports }}</td>
-        <td>{{ result.abuseipdb.data.lastReportedAt }}</td>
-        <td>{{ result.abuseipdb.data.isTor }}</td>
-        <td>{{result.abuseipdb.data.hostnames }}</td>
-      </tr>
-    </tbody>
-  </table>
 </div>
 {% elif results %}
 <div>
diff --git a/templates/domain.html b/templates/domain.html
index df8ec75..82c30d8 100644
--- a/templates/domain.html
+++ b/templates/domain.html
@@ -26,7 +26,6 @@
         <th>DMARC validity</th>
         <th>SPF record</th>
         <th>SPF validity</th>
-        <th>SPF keys()</th>
         <th>SPF dns lookups</th>
       </tr>
     </thead>
@@ -42,6 +41,28 @@
         {% endfor %}
       </tr>
     </tbody>
+ 
+    <table id="abuseipdb" class="table table-striped">
+    <thead>
+      <tr>
+        <th>Abuse IPDB confidence score</th>
+        <th>Total reports</th>
+        <th>Last reported</th>
+        <th>Tor or not</th>
+        <th>Hostnames</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>{{ result.abuseipdb.data.abuseConfidenceScore }}</td>
+        <td>{{ result.abuseipdb.data.totalReports }}</td>
+        <td>{{ result.abuseipdb.data.lastReportedAt }}</td>
+        <td>{{ result.abuseipdb.data.isTor }}</td>
+        <td>{{result.abuseipdb.data.hostnames }}</td>
+      </tr>
+    </tbody>
+  </table>
+
   </table>
   <table id="virustotal_stats" class="table table-striped">
     <thead>
@@ -81,26 +102,6 @@
     </tbody>
   </table>
 
-  <table id="abuseipdb" class="table table-striped">
-    <thead>
-      <tr>
-        <th>Abuse IPDB confidence score</th>
-        <th>Total reports</th>
-        <th>Last reported</th>
-        <th>Tor or not</th>
-        <th>Hostnames</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>{{ result.abuseipdb.data.abuseConfidenceScore }}</td>
-        <td>{{ result.abuseipdb.data.totalReports }}</td>
-        <td>{{ result.abuseipdb.data.lastReportedAt }}</td>
-        <td>{{ result.abuseipdb.data.isTor }}</td>
-        <td>{{result.abuseipdb.data.hostnames }}</td>
-      </tr>
-    </tbody>
-  </table>
 </div>
 {% elif results %}
 <div>