From 02c05f677d914f3015b3a122f4e6880a20ba46f1 Mon Sep 17 00:00:00 2001
From: Catalin Novgorodschi <1140613+Shadowss@users.noreply.github.com>
Date: Sat, 9 Jun 2018 09:32:11 +0300
Subject: [PATCH 1/2] Added oasis part

+must to be coded to activate from the install section
---
 Templates/Profile/overview.tpl | 58 ++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 6 deletions(-)

diff --git a/Templates/Profile/overview.tpl b/Templates/Profile/overview.tpl
index da44f481..d13accda 100644
--- a/Templates/Profile/overview.tpl
+++ b/Templates/Profile/overview.tpl
@@ -1,11 +1,17 @@
 <?php
+
 #################################################################################
 ##              -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                 ##
 ## --------------------------------------------------------------------------- ##
-##  Filename       overview.tpl                                                ##
+##  Project:       TravianZ      					       		 		  	   ##
+##  Version:       01.09.2013 						       	 				   ##
+##  Filename       overview.php                                                ##
 ##  Developed by:  Dzoki                                                       ##
-##  License:       TravianX Project                                            ##
-##  Copyright:     TravianX (c) 2010-2011. All rights reserved.                ##
+##  Fixed by:      Shadow / Skype : cata7007                                   ##
+##  License:       TravianZ Project                                            ##
+##  Copyright:     TravianZ (c) 2010-2013. All rights reserved.                ##
+##  URLs:          http://travian.shadowss.ro 				       	 		   ##
+##  Source code:   http://github.com/Shadowss/TravianZ/	       	   			   ##
 ##                                                                             ##
 #################################################################################
 
@@ -162,11 +168,11 @@ include("menu2.tpl");
 </table><table cellpadding="1" cellspacing="1" id="villages">
     <thead>
     <tr>
-        <th colspan="3">Villages</th>
+        <th colspan="4">Villages</th>
     </tr>
     <tr>
         <td>Name</td>
-
+        <td>Oasis</td>
         <td>Inhabitants</td>
         <td>Coordinates</td>
     </tr>
@@ -178,7 +184,47 @@ include("menu2.tpl");
         if($vil['capital'] == 1) {
         echo "<span class=\"none3\"> (capital)</span>";
         }
-        echo "</td>";
+		echo "<td class=\"oases\"></td>";
+		
+		// OASIS PART - must to be activated from install part
+		
+		$prefix = "".TB_PREFIX."odata";
+		$uid = $_GET['uid']; $wref = $vil['wref'];
+		$sql = mysqli_query("SELECT * FROM $prefix WHERE owner = $uid AND conqured = $wref");
+		while($row = mysqli_fetch_array($sql)){
+		$type = $row["type"];
+		switch($type) {
+		case 1:
+		case 2:
+		echo  "<img class='r1' src='img/x.gif' title='Lumber'>";
+		break;
+		case 3:
+		echo  "<img class='r1' src='img/x.gif' title='Lumber'> <img class='r4' src='img/x.gif' title='Crop'>";
+		break;
+		case 4:
+		case 5:
+		echo  "<img class='r2' src='img/x.gif' title='Clay'>";
+		break;
+		case 6:
+		echo  "<img class='r2' src='img/x.gif' title='Clay'> <img class='r4' src='img/x.gif' title='Crop'>";
+		case 7:
+		case 8:
+		echo  "<img class='r3' src='img/x.gif' title='Iron'>";
+		break;
+		case 9:
+		echo  "<img class='r3' src='img/x.gif' title='Iron'> <img class='r4' src='img/x.gif' title='Crop'>";
+		break;
+		case 10:
+		case 11:
+		case 12:
+		echo  "<img class='r4' src='img/x.gif' title='Crop'>";
+		break;
+		}
+		}
+		
+		// OASIS PART - must to be activated from install part
+		
+		echo "</td>";
         echo "<td class=\"hab\">".$vil['pop']."</td><td class=\"aligned_coords\">";
         echo "<div class=\"cox\">(".$coor['x']."</div><div class=\"pi\">|</div><div class=\"coy\">".$coor['y'].")</div></td></tr>";
     }

From 29cf71f95f6476a00a7dba6f1474c893c47f4990 Mon Sep 17 00:00:00 2001
From: Vladyslav <security_2007@ukr.net>
Date: Sat, 9 Jun 2018 11:16:26 +0300
Subject: [PATCH 2/2] A small fix of newsbox 2

---
 Templates/News/newsbox2.tpl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Templates/News/newsbox2.tpl b/Templates/News/newsbox2.tpl
index 3434cc3f..407a621d 100644
--- a/Templates/News/newsbox2.tpl
+++ b/Templates/News/newsbox2.tpl
@@ -1,6 +1,5 @@
 <?php
-$textArray = ["Natars Spawn", "WW Spawn", "WW Plan Spawn"];
-$newTextArray = ["Natars Tribe", "WW Village", "Construction Plan"];
+$textArray = [["Natars Spawn", "WW Spawn", "WW Plan Spawn"], ["Natars Tribe", "WW Village", "Construction Plan"]];
 $spawnTimeArray = [NATARS_SPAWN_TIME, NATARS_WW_SPAWN_TIME, NATARS_WW_BUILDING_PLAN_SPAWN_TIME];
 $areSpawned = [$database->areArtifactsSpawned(), $database->areWWVillagesSpawned(), $database->areArtifactsSpawned(true)];
 
@@ -12,8 +11,8 @@ $areSpawned = [$database->areArtifactsSpawned(), $database->areWWVillagesSpawned
 <tr>
 <td><b>
 <?php
-    if($areSpawned[$i]) echo $newTextArray[$i];
-    else echo $textArray[$i];
+    if($areSpawned[$i]) echo $textArray[1][$i];
+    else echo $textArray[0][$i];
     ?></b></td>
 <td><b>: <font color="Red"><?php
     if($areSpawned[$i]) echo "Released";