From e19a039d2861d5591bc01d50dcfbdde2c5579327 Mon Sep 17 00:00:00 2001
From: Martin Ambrus <martin@martinambrus.com>
Date: Sun, 22 Oct 2017 22:29:39 +0200
Subject: [PATCH] fix: more crazy SQL calculations

---
 Templates/News/newsbox1.tpl   | 12 ++++++++++--
 Templates/News/newsbox2.tpl   | 13 ++++++++++---
 Templates/Ranking/general.tpl |  9 +++++++--
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Templates/News/newsbox1.tpl b/Templates/News/newsbox1.tpl
index 49bc74cb..1d7ab953 100644
--- a/Templates/News/newsbox1.tpl
+++ b/Templates/News/newsbox1.tpl
@@ -1,7 +1,7 @@
 <h5><img src="img/en/t2/newsbox1.gif" alt="newsbox 1"></h5>
 <?php
 
-$online = mysqli_num_rows(mysqli_query($GLOBALS['link'],"SELECT * FROM " . TB_PREFIX . "users WHERE " . time() . "-timestamp < (60*10) AND tribe!=0 AND tribe!=4 AND tribe!=5"));
+$online = mysqli_query($GLOBALS['link'],"SELECT Count(*) as Total FROM " . TB_PREFIX . "users WHERE timestamp > ".(time() - (60*10))." AND tribe!=0 AND tribe!=4 AND tribe!=5");
 $top_rank = mysqli_fetch_assoc(mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE ".(INCLUDE_ADMIN ? '' : 'access< 8 AND ')."id > 5 AND tribe<=3 AND tribe > 0 ORDER BY oldrank ASC Limit 1"));
 
 ?>
@@ -10,7 +10,15 @@ $top_rank = mysqli_fetch_assoc(mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB
 <table width="100%" border="0">
 <tr>
 <td align="left"><b>Online Users</td>
-<td>: <font color="Red"><?php echo $online ?> users</font></b></td>
+<td>: <font color="Red"><?php
+
+	if (!empty($online)) {
+    	echo mysqli_fetch_assoc($online)['Total'];
+    } else {
+    	echo 0;
+    }
+
+?> users</font></b></td>
 </tr>
 <tr>
 <td><b>Server Speed</td>
diff --git a/Templates/News/newsbox2.tpl b/Templates/News/newsbox2.tpl
index aeda3cda..2787ee98 100644
--- a/Templates/News/newsbox2.tpl
+++ b/Templates/News/newsbox2.tpl
@@ -1,8 +1,7 @@
 <h5><img src="img/en/t2/newsbox2.gif" alt="newsbox 2"></h5>
 <?php
 
-$online = mysqli_num_rows(mysqli_query($GLOBALS['link'],"SELECT * FROM " . TB_PREFIX . "users WHERE " . time() . "-timestamp < (60*10) AND tribe!=0 AND tribe!=4 AND tribe!=5"));
-
+$online = mysqli_query($GLOBALS['link'],"SELECT Count(*) as Total FROM " . TB_PREFIX . "users WHERE timestamp > ".(time() - (60*10))." AND tribe!=0 AND tribe!=4 AND tribe!=5");
 
 ?>
 
@@ -10,7 +9,15 @@ $online = mysqli_num_rows(mysqli_query($GLOBALS['link'],"SELECT * FROM " . TB_PR
 <table width="100%" border="0">
 <tr>
 <td align="left"><b>Online Users</td>
-<td>: <font color="Red"><?php echo $online ?> users</font></b></td>
+<td>: <font color="Red"><?php
+
+	if (!empty($online)) {
+    	echo mysqli_fetch_assoc($online)['Total'];
+    } else {
+    	echo 0;
+    }
+
+?> users</font></b></td>
 </tr>
 <tr>
 <td><b>Server Speed</td>
diff --git a/Templates/Ranking/general.tpl b/Templates/Ranking/general.tpl
index eb69e258..19d41170 100644
--- a/Templates/Ranking/general.tpl
+++ b/Templates/Ranking/general.tpl
@@ -42,8 +42,13 @@
                 <th>Players online</th>
 
                 <td><?php
-                   $online = mysqli_num_rows(mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE ".time()."-timestamp < (60*10) AND tribe!=0 AND tribe!=4 AND tribe!=5"));
-                   echo $online; ?></td>
+                    $online = mysqli_query($GLOBALS['link'],"SELECT Count(*) as Total FROM ".TB_PREFIX."users WHERE timestamp > ".(time() - (60*10))." AND tribe!=0 AND tribe!=4 AND tribe!=5");
+                    if (!empty($online)) {
+                   		echo mysqli_fetch_assoc($online)['Total'];
+                   	} else {
+                   		echo 0;
+                   	}
+                   ?></td>
             </tr>
         </tbody>
     </table>