From 680cb209f4b7ffbfa7d53622d8da4320ef657939 Mon Sep 17 00:00:00 2001
From: Martin Ambrus <martin@martinambrus.com>
Date: Sun, 22 Oct 2017 00:06:07 +0200
Subject: [PATCH] fix: Enter when editing additional user info in Admin saves
 data

---
 Admin/Templates/editAdditional.tpl   | 6 ++++--
 GameEngine/Admin/Mods/additional.php | 2 +-
 todo.txt                             | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Admin/Templates/editAdditional.tpl b/Admin/Templates/editAdditional.tpl
index fa50a9ad..55fa440f 100644
--- a/Admin/Templates/editAdditional.tpl
+++ b/Admin/Templates/editAdditional.tpl
@@ -137,8 +137,10 @@ function go_url(url) {
 				</tbody>
 				<thead>
 				<tr>
-					<td style="border-right:none; text-align:left"><input name="back" type="image" id="btn_back" class="dynamic_img" src="img/x.gif" value="back" alt="back" onclick="return go_url('../Admin/admin.php?p=player&uid=<?php echo $_GET["uid"];?>')" /></td>
-					<td style="border-left:none; text-align:right" colspan="5"><input name="save" type="image" id="btn_save" class="dynamic_img" src="img/x.gif" value="save" alt="save" /></td>
+					<td colspan="2">
+						<input style="float: right" name="save" type="image" id="btn_save" class="dynamic_img" src="img/x.gif" value="save" alt="save" />
+						<input style="float: left" name="back" type="image" id="btn_back" class="dynamic_img" src="img/x.gif" value="back" alt="back" onclick="return go_url('../Admin/admin.php?p=player&uid=<?php echo $_GET["uid"];?>')" />
+					</td>
 				</tr>
 				</thead>				
 			</table>
diff --git a/GameEngine/Admin/Mods/additional.php b/GameEngine/Admin/Mods/additional.php
index 108e24a1..983369a1 100755
--- a/GameEngine/Admin/Mods/additional.php
+++ b/GameEngine/Admin/Mods/additional.php
@@ -47,7 +47,7 @@ mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET
 	RR = '".(int) $_POST['res']."', 
 	apall = '".(int) $_POST['ooff']."', 
 	dpall = '".(int) $_POST['odef']."' 
-	WHERE id = ".$id."") or die(mysqli_error($database->dblink));
+	WHERE id = ".$id) or die(mysqli_error($database->dblink));
 
 header("Location: ../../../Admin/admin.php?p=player&uid=".$id."");
 ?>
\ No newline at end of file
diff --git a/todo.txt b/todo.txt
index d275eebb..05d822cf 100644
--- a/todo.txt
+++ b/todo.txt
@@ -4,7 +4,6 @@
 - cannot delete a single medal in admin
 - add back buttons to Admin where there are not (like editing a user)
 - disallow installation if existing data are in place, or world map would end up screwed and villages not showing (because there can be multiple villages/oasis generated for one square then)
-- when editing Additional Information for user and adjusting gold, sometimes the first time will not record the new gold amount (when pressing Enter)
 - allow to redirect Support messages to admin's nickname (for when there's only a single admin and doesn't like switching between Support and themselves) 
 - disallow Support to play (single cookie for Admin and the game means support gets no village and lots of warnings when they switch to game now)
 - resetting res bonus in admin actually says that bonus was given after OK is pressed