From 38cbc21bc076004760b56603fd4c4d0905632660 Mon Sep 17 00:00:00 2001
From: hexcoded <hexcoded@gmail.com>
Date: Tue, 4 Jun 2013 11:16:44 +0300
Subject: [PATCH 1/4] Occupied/Unoccupied Oasis name fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix the name of Oasis.The own Oasis is show like Unoccupied after when we try to send troops etc.

from:
$villageName = “Unoccupied oasis”;
to:
$villageName = $database->getOasisField($oid,"name");
---
 GameEngine/Units.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GameEngine/Units.php b/GameEngine/Units.php
index 50a90b40..b0e32587 100644
--- a/GameEngine/Units.php
+++ b/GameEngine/Units.php
@@ -197,7 +197,7 @@ class Units {
                     header("Location: a2b.php");
                 }else{
 
-                $villageName = "Unoccupied Oasis";
+                $villageName = $database->getOasisField($oid,"name");
                 $speed= 300;
                 $timetaken = $generator->procDistanceTime($coor,$village->coor,INCREASE_SPEED,1);
                 array_push($post, "$id", "$villageName", "2","$timetaken");

From f4dc572e7021f134f2ed9fedc16634d56edcc689 Mon Sep 17 00:00:00 2001
From: hexcoded <hexcoded@gmail.com>
Date: Tue, 4 Jun 2013 11:21:19 +0300
Subject: [PATCH 2/4] Occupied/Unoccupied Oasis name fix

Fix the name of Oasis.The own Oasis is show like Unoccupied after when we try to send troops etc.

from:
$otext = ($basearray['occupied'] == 1)? "occupied" : "unoccupied";
to
$otext = ($oasis['name']);


from:
"<a href=\"a2b.php?z=".$_GET['d']."&o\">&raquo; Raid $otext oasis.</a>" :
to:
"<a href=\"a2b.php?z=".$_GET['d']."&o\">&raquo; Raid $otext .</a>" :
---
 Templates/Map/vilview.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Templates/Map/vilview.tpl b/Templates/Map/vilview.tpl
index 87904918..6b9a4146 100644
--- a/Templates/Map/vilview.tpl
+++ b/Templates/Map/vilview.tpl
@@ -469,7 +469,7 @@ if($type==18 or $type==19 or $type==20 or $type==21){
         $enough_cp = false;
       }
       
-			$otext = ($basearray['occupied'] == 1)? "occupied" : "unoccupied"; 
+			$otext = ($oasis['name']); 
 			if($village->unitarray['u'.$session->tribe.'0'] >= 3 AND $enough_cp) {
         $test = "<a href=\"a2b.php?id=".$_GET['d']."&amp;s=1\">&raquo;  Found new village.</a>";
       } elseif($village->unitarray['u'.$session->tribe.'0'] >= 3 AND !$enough_cp) {
@@ -487,7 +487,7 @@ if($type==18 or $type==19 or $type==20 or $type==21){
 		"&raquo; Raid $otext oasis. (build a rally point)" : 
 		
 		
-		"<a href=\"a2b.php?z=".$_GET['d']."&o\">&raquo; Raid $otext oasis.</a>" :
+		"<a href=\"a2b.php?z=".$_GET['d']."&o\">&raquo; Raid $otext.</a>" :
 		"$test"
 			?>
 		</tr>

From 9be57ca904574ff8d8eb9e604650d9dcc864bde3 Mon Sep 17 00:00:00 2001
From: hexcoded <hexcoded@gmail.com>
Date: Thu, 6 Jun 2013 16:18:48 +0300
Subject: [PATCH 3/4] Update 17_4.tpl

(Gold Club Active)MarketPlace -Trade Routes .The user get error when try to delete/expand non selected  route or non route in  list.(You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1).

TravianZ\trunk\Templates\Build\17_4_test.tpl
before  line 60 :
<a href="build.php?action=extendRoute&routeid=<?php echo $routeid; ?>">extend</a>*
add line:
<?php $routeid=$routeid == 0? $routeid=0:$routeid; ?>
---
 Templates/Build/17_4.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Templates/Build/17_4.tpl b/Templates/Build/17_4.tpl
index ef7cc3b9..da00b854 100644
--- a/Templates/Build/17_4.tpl
+++ b/Templates/Build/17_4.tpl
@@ -57,6 +57,7 @@ echo "Trade route to <a href=karte.php?d=".$route['wid']."&c=".$generator->getMa
 <th>
 </th>
 	<th colspan="4">
+   <?php $routeid=$routeid == 0? $routeid=0:$routeid; ?>	
    <a href="build.php?action=extendRoute&routeid=<?php echo $routeid; ?>">extend</a>*
  | <a href="build.php?id=<?php echo $id; ?>&t=4&action=editRoute&routeid=<?php echo $routeid; ?>">edit</a>
  | <a href="build.php?action=delRoute&routeid=<?php echo $routeid; ?>">delete</a>
@@ -71,4 +72,4 @@ echo "Trade route to <a href=karte.php?d=".$route['wid']."&c=".$generator->getMa
 }}else{
 header("Location: build.php?id=".$_GET['id']."");
 }
-?>
\ No newline at end of file
+?>

From 6f29cdadfbf4b0770d0aa0af55861635ad9d926d Mon Sep 17 00:00:00 2001
From: hexcoded <hexcoded@gmail.com>
Date: Thu, 6 Jun 2013 17:59:05 +0300
Subject: [PATCH 4/4] Update Automation.php

Fixed syntax error in line 976.
from:micrtime(true)
to:  microtime(true)
---
 GameEngine/Automation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index 96b7c1f3..0c3a7946 100644
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -973,7 +973,7 @@ class Automation {
 					if($res!=0){
 					$reference = $database->sendResource($resource[0],$resource[1],$resource[2],$resource[3],$reqMerc,0);
 					$database->modifyResource($from,$resource[0],$resource[1],$resource[2],$resource[3],0);
-					$database->addMovement(0,$from,$to,$reference,micrtime(true),microtime(true)+$timetaken,$send);
+					$database->addMovement(0,$from,$to,$reference,microtime(true),microtime(true)+$timetaken,$send);
 					}
 				}
 		}
@@ -4410,4 +4410,4 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
 	}
 }
 $automation = new Automation;
-?>
\ No newline at end of file
+?>