From 86070d1691656a0739c246947455f8d019ae3283 Mon Sep 17 00:00:00 2001 From: Pietro Fallanca Date: Fri, 13 Apr 2018 19:20:19 +0200 Subject: [PATCH] Fixed a rounding bug +General statistics and server info tribe percentages are now shown correctly --- Admin/Templates/server_info.tpl | 8 +++--- Templates/News/newsbox1.tpl | 7 ++--- Templates/News/newsbox2.tpl | 5 +--- Templates/Ranking/general.tpl | 50 +++++---------------------------- 4 files changed, 14 insertions(+), 56 deletions(-) diff --git a/Admin/Templates/server_info.tpl b/Admin/Templates/server_info.tpl index 328c9b9a..80d8c57b 100644 --- a/Admin/Templates/server_info.tpl +++ b/Admin/Templates/server_info.tpl @@ -13,7 +13,7 @@ $tribe1 = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."u $tribe2 = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE tribe = 2"); $tribe3 = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE tribe = 3"); $tribes = Array(mysqli_num_rows($tribe1),mysqli_num_rows($tribe2),mysqli_num_rows($tribe3)); -$users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users")) - 1; +$users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE tribe > 0 AND tribe < 4")); ?>

@@ -73,17 +73,17 @@ $users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM Romans - + 0) ? ($percents[0] = round(100 * ($tribes[0] / $users), 2))."%" : "---"; ?> Teutons - + 0) ? ($percents[1] = round(100 * ($tribes[1] / $users), 2))."%" : "---"; ?> Gauls - + 0) ? (100-$percents[0]-$percents[1])."%" : "---"; ?> diff --git a/Templates/News/newsbox1.tpl b/Templates/News/newsbox1.tpl index 85c853f6..7a890098 100644 --- a/Templates/News/newsbox1.tpl +++ b/Templates/News/newsbox1.tpl @@ -54,13 +54,10 @@ $top_rank = mysqli_fetch_assoc(mysqli_query($database->dblink,"SELECT username F Peace system -: +: -Best Player +Best Player : diff --git a/Templates/News/newsbox2.tpl b/Templates/News/newsbox2.tpl index aadb8b0d..febf7cc4 100644 --- a/Templates/News/newsbox2.tpl +++ b/Templates/News/newsbox2.tpl @@ -53,10 +53,7 @@ $online = mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_P Peace system -: +: diff --git a/Templates/Ranking/general.tpl b/Templates/Ranking/general.tpl index 3b4141b3..ee5afa32 100644 --- a/Templates/Ranking/general.tpl +++ b/Templates/Ranking/general.tpl @@ -13,7 +13,7 @@ $tribe2 = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM ".TB_PREFIX."users WHERE tribe = 2"), MYSQLI_ASSOC); $tribe3 = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM ".TB_PREFIX."users WHERE tribe = 3"), MYSQLI_ASSOC); $tribes = array($tribe1['Total'], $tribe2['Total'], $tribe3['Total']); - $users = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "users WHERE tribe!=0 AND tribe!=4 AND tribe!=5"), MYSQLI_ASSOC); + $users = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "users WHERE tribe > 0 AND tribe < 4"), MYSQLI_ASSOC); $users = $users['Total']; ?> @@ -74,55 +74,19 @@ Romans - - - - 0){ - $percents = 100 * (($tribes[0]) / $users); - echo $percents = intval($percents); - echo "%"; - }else{ - echo '---'; - } - ?> - - + + 0) ? ($percents[0] = round(100 * ($tribes[0] / $users), 2))."%" : '---'; ?> - Teutons - - - 0){ - $percents = 100 * ($tribes[1] / $users); - echo $percents = intval($percents); - echo "%"; - }else{ - echo '---'; - } - ?> + + 0) ? ($percents[1] = round(100 * ($tribes[1] / $users), 2))."%" : "---"; ?> - Gauls - - - - 0){ - $percents = 100 * ($tribes[2] / $users); - echo $percents = intval($percents); - echo "%"; - }else{ - echo '---'; - } - ?> + + 0) ? (100-$percents[0]-$percents[1])."%" : '---'; ?>