diff --git a/Admin/Templates/alliance.tpl b/Admin/Templates/alliance.tpl
index 211049a3..8d211d51 100644
--- a/Admin/Templates/alliance.tpl
+++ b/Admin/Templates/alliance.tpl
@@ -91,7 +91,7 @@ if($_GET['aid'])
$player = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE id = ".(int) $row['uid'].""));
if($row['opt1'] == 1) { $position1 = "Assign To Position"; } else { $position1 = "No Assigning Positions"; }
if($row['opt2'] == 1) { $position2 = "Kick Players"; } else { $position2 = "No Kicking Players"; }
- if($row['opt3'] == 1) { $position3 = "Change Alliance Description"; } else { $position3 = "No Changing Description"; }
+ if($row['opt3'] == 1) { $position3 = "Change Description"; } else { $position3 = "No Changing Description"; }
if($row['opt4'] == 1) { $position4 = "Invite Players"; } else { $position4 = "No Invitations"; }
if($row['opt5'] == 1) { $position5 = "Manage Forums"; } else { $position5 = "No Forum Management"; }
if($row['opt6'] == 1) { $position6 = "Alliance Diplomacy"; } else { $position6 = "No Diplomacy"; }
@@ -151,9 +151,9 @@ if($_GET['aid'])
|
-
-
-
+
+
+
|
@@ -163,9 +163,9 @@ if($_GET['aid'])
|
-
-
-
+
+
+
|
diff --git a/Admin/Templates/playerinfo.tpl b/Admin/Templates/playerinfo.tpl
index 370b0afd..103d6705 100644
--- a/Admin/Templates/playerinfo.tpl
+++ b/Admin/Templates/playerinfo.tpl
@@ -261,9 +261,9 @@
-
+ |
- |
+
diff --git a/GameEngine/Admin/Mods/addUsers.php b/GameEngine/Admin/Mods/addUsers.php
index b5124ad7..32382fd3 100755
--- a/GameEngine/Admin/Mods/addUsers.php
+++ b/GameEngine/Admin/Mods/addUsers.php
@@ -135,7 +135,7 @@ WHERE id = ".(int) $uid) or die(mysqli_error($database->dblink));
}
$database->updateUserField($uid,"act","",1);
- $wid = $database->generateBase($kid,0,false);
+ $wid = $database->generateBase($kid);
$database->setFieldTaken($wid);
//calculate random generate value and level building
diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index c7ba7a7c..82ebcd9d 100755
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -3889,7 +3889,7 @@ class Automation {
$starv = $getVillage['starv'];
if ($crop < $villageUpkeep){
//Add starvation data
- $database->setVillageFields($wref, ['starv', 'starvupdate'], [$villageUpkeep, time()]);
+ $database->setVillageFields($wref, ['starv'], [$villageUpkeep]);
}
}
}
diff --git a/GameEngine/Database.php b/GameEngine/Database.php
index 0c6f8e8a..7e5fca93 100755
--- a/GameEngine/Database.php
+++ b/GameEngine/Database.php
@@ -1288,17 +1288,17 @@ class MYSQLi_DB implements IDbConnection {
}
switch($sector){
- case 1:
- $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x < -$wide1 and x > -$wide2) and (y > $wide1 and y < $wide2) and occupied = 0"; //x- y+
- break;
- case 2:
- $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x > $wide1 and x < $wide2) and (y > $wide1 and y < $wide2) and occupied = 0"; //x+ y+
- break;
- case 3:
- $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x < -$wide1 and x > -$wide2) and (y < -$wide1 and y > -$wide2) and occupied = 0"; //x- y-
- break;
- default:
- $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x > $wide1 and x < $wide2) and (y < -$wide1 and y > -$wide2) and occupied = 0"; //x+ y-
+ case 1:
+ $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x < -$wide1 and x > -$wide2) and (y > $wide1 and y < $wide2) and occupied = 0"; //x- y+
+ break;
+ case 2:
+ $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x > $wide1 and x < $wide2) and (y > $wide1 and y < $wide2) and occupied = 0"; //x+ y+
+ break;
+ case 3:
+ $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x < -$wide1 and x > -$wide2) and (y < -$wide1 and y > -$wide2) and occupied = 0"; //x- y-
+ break;
+ default:
+ $q = "Select * from ".TB_PREFIX."wdata where fieldtype = 3 and (x > $wide1 and x < $wide2) and (y < -$wide1 and y > -$wide2) and occupied = 0"; //x+ y-
}
$result = mysqli_query($this->dblink,$q);
diff --git a/Templates/Alliance/overview.tpl b/Templates/Alliance/overview.tpl
index 8a779d8f..e59fd865 100644
--- a/Templates/Alliance/overview.tpl
+++ b/Templates/Alliance/overview.tpl
@@ -106,12 +106,14 @@ include("alli_menu.tpl");
- |
+ |
+
|
-
+ |
+
|
diff --git a/Templates/Build/27_1.tpl b/Templates/Build/27_1.tpl
index 05cf54a4..4fac77b5 100644
--- a/Templates/Build/27_1.tpl
+++ b/Templates/Build/27_1.tpl
@@ -45,7 +45,7 @@ Treasury ' . $reqlvl . ', Effect ' . $effect . '
';
echo '' . $database->getVillageField($artefact['vref'], "name") . ' | ';
- echo '' . date("d/m/Y H:i", $artefact['conquered']) . ' | ';
+ echo '' . date("d.m.Y H:i", $artefact['conquered']) . ' | ';
}
}
diff --git a/Templates/Plus/3.tpl b/Templates/Plus/3.tpl
index 348eb151..e080d736 100644
--- a/Templates/Plus/3.tpl
+++ b/Templates/Plus/3.tpl
@@ -71,6 +71,7 @@ else
$holdmr = intval($holdtotmin - (($holdhr * 60) + ($holdtotday * 1440)));
echo " " . ($holdmr) . " mins";
}
+}
?>
= 86400) {
echo 'too little gold';
}
}
-}
?>
|
diff --git a/Templates/Profile/overview.tpl b/Templates/Profile/overview.tpl
index 7b533045..7e5deca9 100644
--- a/Templates/Profile/overview.tpl
+++ b/Templates/Profile/overview.tpl
@@ -146,7 +146,7 @@ if($displayarray['vac_mode'] == 1) echo "
+ pageLoadTimeEnd()-$start_timer)*1000);
+?> ms
+
+
diff --git a/a2b2.php b/a2b2.php
index e2547f3f..66033233 100644
--- a/a2b2.php
+++ b/a2b2.php
@@ -359,9 +359,11 @@ include("Templates/res.tpl");
-Calculated in pageLoadTimeEnd()-$start_timer)*1000); ?> ms
+ pageLoadTimeEnd()-$start_timer)*1000);
+?> ms
-
Server time:
+
diff --git a/berichte.php b/berichte.php
index f0ec9520..add05dbf 100644
--- a/berichte.php
+++ b/berichte.php
@@ -136,15 +136,15 @@ include("Templates/res.tpl");
-Calculated in pageLoadTimeEnd()-$start_timer)*1000);
?> ms
-
Server time:
+
|
|---|
-