diff --git a/Admin/Templates/editAdditional.tpl b/Admin/Templates/editAdditional.tpl
index 7cc37c34..8b71f753 100644
--- a/Admin/Templates/editAdditional.tpl
+++ b/Admin/Templates/editAdditional.tpl
@@ -35,7 +35,7 @@ if(isset($id)) {
.editAdd-head h2 a{color:#71D000;text-decoration:none;}
.editAdd-head .uid{font-size:12px;color:#666;}
-.grid-2{display:grid;grid-template-columns:1fr 1fr;gap:12px;}
+.grid-2{display:grid;grid-template-columns:1fr;gap:12px;}
@media(max-width:800px){.grid-2{grid-template-columns:1fr;}}
.card{background:#fff;border:1px solid #d4d4d4;border-radius:4px;overflow:hidden;margin-bottom:12px;box-shadow:0 1px 2px rgba(0,0,0,.04);}
diff --git a/Admin/admin.php b/Admin/admin.php
index 88a8d44c..5d7b0f78 100644
--- a/Admin/admin.php
+++ b/Admin/admin.php
@@ -282,7 +282,7 @@ if (!empty($_GET['p'])) {
$village = $database->getVillage($did);
if ($village) {
$user = $database->getUserArray($village['owner'], 1);
- $subpage = 'Edit Village ('.$village['name'].' » '.($user['username'] ?? '?').')';
+ $subpage = 'Edit Village ('.$village['name'].' » '.($user['username'] ?? '?').')';
} else {
$subpage = 'Edit Village (ID '.$did.' not found)';
$village = null; // important, ca să nu crape template-ul mai jos
@@ -297,7 +297,7 @@ if (!empty($_GET['p'])) {
$village = $database->getVillage($_GET['did']);
if ($village) {
$user = $database->getUserArray($village['owner'], 1);
- $subpage = 'Edit Troops ('.$village['name'].' » '.$user['username'].')';
+ $subpage = 'Edit Resources ('.$village['name'].' » '.$user['username'].')';
} else {
$subpage = 'Edit Resources (ID '.$did.' not found)';
$village = null;
@@ -311,7 +311,7 @@ if (!empty($_GET['p'])) {
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
$user = $database->getUserArray($village['owner'], 1);
- $subpage = 'Edit Troops ('.$village['name'].' » '.$user['username'].')';
+ $subpage = 'Edit Troops ('.$village['name'].' » '.$user['username'].')';
} else {
$subpage = 'Edit Troops (no village)';
}
@@ -321,7 +321,7 @@ if (!empty($_GET['p'])) {
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
$user = $database->getUserArray($village['owner'],1);
- $subpage = 'Upgrade Troops ('.$village['name'].' » '.$user['username'].')';
+ $subpage = 'Upgrade Troops ('.$village['name'].' » '.$user['username'].')';
} else {
$subpage = 'Upgrade Troops (no village)';
}
@@ -331,7 +331,7 @@ if (!empty($_GET['p'])) {
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
$user = $database->getUserArray($village['owner'],1);
- $subpage = 'Edit Village ('.$village['name'].' » '.$user['username'].')';
+ $subpage = 'Edit Village ('.$village['name'].' » '.$user['username'].')';
} else {
$subpage = 'Edit Village (no village)';
}
@@ -341,7 +341,7 @@ if (!empty($_GET['p'])) {
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
$user = $database->getUserArray($village['owner'],1);
- $subpage = 'Build Log ('.$village['name'].' » '.$user['username'].')';
+ $subpage = 'Build Log ('.$village['name'].' » '.$user['username'].')';
} else {
$subpage = 'Build Log (no village)';
}
@@ -351,7 +351,7 @@ if (!empty($_GET['p'])) {
if (!empty($_GET['did'])) {
$village = $database->getVillage($_GET['did']);
$user = $database->getUserArray($village['owner'],1);
- $subpage = 'Research Log ('.$village['name'].' » '.$user['username'].')';
+ $subpage = 'Research Log ('.$village['name'].' » '.$user['username'].')';
} else {
$subpage = 'Research Log (no village)';
}
diff --git a/GameEngine/Artifacts.php b/GameEngine/Artifacts.php
index 19ebdf2b..6455deb9 100644
--- a/GameEngine/Artifacts.php
+++ b/GameEngine/Artifacts.php
@@ -45,6 +45,14 @@ class Artifacts
NATARS_DESC = "**************************
[#natars]
**************************",
+
+ /**
+ * @var string Default Natars' description 2
+ */
+
+ NATARS_DESC2 = "**************************
+ [#WW]
+ **************************",
/**
* @var array Possible Natars' capital locations
@@ -204,7 +212,7 @@ class Artifacts
//Register the Natars account, the Natars' password is the same as the MH's one
$password = $database->getUserField(5, 'password', 0);
- $database->register(TRIBE5, $password, self::NATARS_EMAIL, self::NATARS_TRIBE, null, self::NATARS_UID, self::NATARS_DESC);
+ $database->register(TRIBE5, $password, self::NATARS_EMAIL, self::NATARS_TRIBE, null, self::NATARS_UID, self::NATARS_DESC, self::NATARS_DESC2);
//Convert from coordinates to village IDs
$possibleWids = $database->getVilWrefs(self::NATARS_CAPITAL_COORDINATES);
diff --git a/GameEngine/Profile.php b/GameEngine/Profile.php
index 4107d605..0a4b656e 100755
--- a/GameEngine/Profile.php
+++ b/GameEngine/Profile.php
@@ -219,6 +219,21 @@ class Profile {
$form->addError("email", EMAIL_ERROR);
}
}
+
+ // Language change
+ if (!empty($post['sprache'])) {
+ // whitelist – pune aici limbile pe care le ai în /lang/
+ $allowed = ['en','ro','de','it','fr','es'];
+ $lang = strtolower(trim($post['sprache']));
+
+ if (in_array($lang, $allowed, true)) {
+ $database->updateUserField($session->uid, "language", $lang, 1);
+
+ // update sesiunea ca să se vadă imediat, fără relog
+ $_SESSION['lang'] = $lang;
+ $session->userinfo['language'] = $lang;
+ }
+ }
// Delete request cancel
if (!empty($post['del_pw']) && !empty($post['del'])) {
diff --git a/Templates/Build/15_1.tpl b/Templates/Build/15_1.tpl
index 7a758201..26a44490 100644
--- a/Templates/Build/15_1.tpl
+++ b/Templates/Build/15_1.tpl
@@ -116,7 +116,7 @@ $inProgress =!empty($Demolition)? $Demolition[0] : null;
diff --git a/Templates/Manual/1126.tpl b/Templates/Manual/1126.tpl
new file mode 100644
index 00000000..8e7d0aea
--- /dev/null
+++ b/Templates/Manual/1126.tpl
@@ -0,0 +1,20 @@
+
Special Medals
+
+
The medal of which is awarded to players losing by the same email address of 10 or more years. Can be added to the profile description. This function was presented in Travian T4.
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Templates/Manual/1331.tpl b/Templates/Manual/1331.tpl
index 848d0bf8..c7b744ef 100644
--- a/Templates/Manual/1331.tpl
+++ b/Templates/Manual/1331.tpl
@@ -16,7 +16,7 @@
Special Medals
