From d236a21d38ce710f514c36aad07b1f749956775d Mon Sep 17 00:00:00 2001
From: iopietro <iopietro@hotmail.it>
Date: Sat, 7 Apr 2018 23:15:23 +0200
Subject: [PATCH] Fixed some bugs

+Level upgrades in Blacksmith and Armoury are now shown correctly
+Corrected a typo
+Upgrades in the Blacksmith and the Armoury should be ordered correctly
---
 GameEngine/Database.php         | 2 +-
 GameEngine/Lang/en.php          | 2 +-
 Templates/Build/12_upgrades.tpl | 6 ++++--
 Templates/Build/13_upgrades.tpl | 6 ++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/GameEngine/Database.php b/GameEngine/Database.php
index f7525280..725d5fce 100755
--- a/GameEngine/Database.php
+++ b/GameEngine/Database.php
@@ -6014,7 +6014,7 @@ References: User ID/Message ID, Mode
             return $cachedValue;
         }
 
-		$q = "SELECT * FROM " . TB_PREFIX . "research where vref = $vid";
+		$q = "SELECT * FROM " . TB_PREFIX . "research where vref = $vid ORDER BY timestamp ASC";
 		$result = mysqli_query($this->dblink,$q);
         $researchingCache[$vid] = $this->mysqli_fetch_all($result);
         return $researchingCache[$vid];
diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php
index 0cd25810..6fa17f27 100755
--- a/GameEngine/Lang/en.php
+++ b/GameEngine/Lang/en.php
@@ -63,7 +63,7 @@ define("LOGIN_PASS_EMPTY","Enter password.");
 define("EMAIL_ERROR","Email does not match existing");
 define("PASS_MISMATCH","Passwords do not match");
 define("ALLI_OWNER","Please appoint an alliance owner before deleting");
-define("SIT_ERROR","Sitter already set or player inexistent");
+define("SIT_ERROR","Sitter already set or player not found");
 define("USR_NT_FOUND","Name does not exist.");
 define("LOGIN_PW_ERROR","The password is wrong.");
 define("WEL_TOPIC","Useful tips & information ");
diff --git a/Templates/Build/12_upgrades.tpl b/Templates/Build/12_upgrades.tpl
index 6b21c22d..552bfaad 100644
--- a/Templates/Build/12_upgrades.tpl
+++ b/Templates/Build/12_upgrades.tpl
@@ -82,9 +82,11 @@
 </thead><tbody>";
 		$timer = 1;
 		foreach($ABups as $black) {
-			$unit = ($session->tribe-1)*10 + substr($black['tech'],1,2);
+		    $ABUnit = substr($black['tech'],1,2);
+		    $abdata['b'.$ABUnit]++;
+			$unit = ($session->tribe-1)*10 + $ABUnit;
 			echo "<tr><td class=\"desc\"><img class=\"unit u$unit\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($unit)."\" title=\"".$technology->getUnitName($unit)."\" />".$technology->getUnitName($unit);
-			echo "<span class=\"none\"> (".LEVEL." ".($timer+$ups).")</span>";
+			echo "<span class=\"none\"> (".LEVEL." ".$abdata['b'.$ABUnit].")</span>";
 			if($timer > 1) echo "<span class=\"none\"> ".WAITING."</span>";
 			echo "</td>";
 			echo "<td class=\"dur\"><span id=\"timer$timer\">".$generator->getTimeFormat($black['timestamp']-time())."</span></td>";
diff --git a/Templates/Build/13_upgrades.tpl b/Templates/Build/13_upgrades.tpl
index b1bc14e3..4d98cae5 100644
--- a/Templates/Build/13_upgrades.tpl
+++ b/Templates/Build/13_upgrades.tpl
@@ -82,9 +82,11 @@
 </thead><tbody>";
 		$timer = 1;
 		foreach($ABups as $arms) {
-			$unit = ($session->tribe-1)*10 + substr($arms['tech'],1,2);
+		    $ABUnit = substr($arms['tech'],1,2);
+		    $abdata['a'.$ABUnit]++;
+		    $unit = ($session->tribe-1)*10 + $ABUnit;
 			echo "<tr><td class=\"desc\"><img class=\"unit u$unit\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($unit)."\" title=\"".$technology->getUnitName($unit)."\" />".$technology->getUnitName($unit);
-			echo "<span class=\"none\"> (".LEVEL." ".($timer+$ups).")</span>";
+			echo "<span class=\"none\"> (".LEVEL." ".$abdata['a'.$ABUnit].")</span>";
 			if($timer > 1) echo "<span class=\"none\"> ".WAITING."</span>";
 			echo "</td>";
 			echo "<td class=\"dur\"><span id=\"timer$timer\">".$generator->getTimeFormat($arms['timestamp']-time())."</span></td>";