Natars automation system

+Natars will now spawn automatically, you can set how many day should
pass before the spawn of Natars (and artifacts), WW Villages and WW
building plans (Note: WW villages and WW building plans won't spawn
until the creation of the natar account)
+Added 3 timers under the left menu which indicate the spawn of
Natars/Artifacts, WW villages and WW building plans
+Added an option in the installation, to set the resource production of
oasis
+Fixed a bug that didn't permit to add multiple Units, Abtech and tech
rows with one query
+Added a new information to the Artifact of the fool, the next effect
reroll will now be displayed in his informations (in the treasury)
+Fixed a bug that dind't permit the correct timers flow in Dorf3.php
(Warehouse tab), they'll now flow correctly
+Timers and resources percentage of villages with a negative production
of crop will now be marked in red (in the Warehouse tab, Dorf3.php) and
will now be displayed in how much time the granary will be emptied
+Fixed a possible bug that prevented to add raids to farm lists
+Fixed a bug that didn't permit to create WW Villages from the
Multihunter control panel
+Reworked all timers, there will be only one timer field now (in
Session.php)
+Minor bug fixing and optimization

NOTE: To play this version of the game, you need to reinstall the server
OR you can simply add these lines of code into your "config.php" file:

// ***** Natars Spawn Time
define("NATARS_SPAWN_TIME",260);
define("NATARS_WW_SPAWN_TIME",260);
define("NATARS_WW_BUILDING_PLAN_SPAWN_TIME",260);

// ***** Oasis production
define("OASIS_WOOD_MULTIPLIER",40);
define("OASIS_CLAY_MULTIPLIER",40);
define("OASIS_IRON_MULTIPLIER",40);
define("OASIS_CROP_MULTIPLIER",40);
define("OASIS_WOOD_PRODUCTION",OASIS_WOOD_MULTIPLIER*SPEED);
define("OASIS_CLAY_PRODUCTION",OASIS_CLAY_MULTIPLIER*SPEED);
define("OASIS_IRON_PRODUCTION",OASIS_IRON_MULTIPLIER*SPEED);
define("OASIS_CROP_PRODUCTION",OASIS_CROP_MULTIPLIER*SPEED);

P.S: from the next version, the possibility to add manual WWs, WW
building plans and to create the natar account will be REMOVED.

Templates/goldClub/farmlist_addraid.tpl

@@ -1,6 +1,4 @@
 <?php
-$FLData = $database->getFLData($_GET['lid']);
-if($FLData['owner'] == $session->uid){
 if(isset($_POST['action']) == 'addSlot' && $_POST['lid']) {
     
     $troops = 0;
@@ -56,7 +54,7 @@ if(isset($_POST['action']) == 'addSlot' && $_POST['lid']) {
             return round($dist, 1);
         }
             
-        $distance = getDistance($coor['x'], $coor['y'], $WrefX, $WrefY); 
+        $distance = getDistance($coor['x'], $coor['y'], $WrefX, $WrefY);
         $database->addSlotFarm($_POST['lid'], $session->uid, $Wref, $WrefX, $WrefY, $distance, $_POST['t1'], $_POST['t2'], $_POST['t3'], $_POST['t4'], $_POST['t5'], $_POST['t6'], $_POST['t7'], $_POST['t8'], $_POST['t9'], $_POST['t10']);
         
         header("Location: build.php?id=39&t=99");
@@ -71,7 +69,7 @@ if(isset($_POST['action']) == 'addSlot' && $_POST['lid']) {
 <?php echo $errormsg; ?>
 </b></font>
     
-    <form action="build.php?id=39&t=99&action=addraid&lid=<?php echo $_GET['lid']; ?>" method="post">
+    <form action="build.php?id=39&t=99&action=addraid" method="post">
         <div class="boxes boxesColor gray"><div class="boxes-tl"></div><div class="boxes-tr"></div><div class="boxes-tc"></div><div class="boxes-ml"></div><div class="boxes-mr"></div><div class="boxes-mc"></div><div class="boxes-bl"></div><div class="boxes-br"></div><div class="boxes-bc"></div><div class="boxes-contents cf">   
         <input type="hidden" name="action" value="addSlot">
             <table cellpadding="1" cellspacing="1" class="transparent" id="raidList">
@@ -81,17 +79,16 @@ if(isset($_POST['action']) == 'addSlot' && $_POST['lid']) {
                         <select name="lid">
 <?php
 
-$sql = mysqli_query($database->dblink,"SELECT id, name, owner, wref FROM ".TB_PREFIX."farmlist WHERE owner = ".(int) $session->uid." ORDER BY name ASC");
-while($row = mysqli_fetch_array($sql)){ 
-$lid = $row["id"];
-$lname = $row["name"];
-$lowner = $row["owner"];
-$lwref = $row["wref"];
-$lvname = $database->getVillageField($row["wref"], 'name');
-    if($_GET['lid']==$lid){
-        $selected = 'selected=""';
-        }else{ $selected = ''; }
-    echo '<option value="'.$lid.'" '.$selected.'>'.$lvname.' - '.$lname.'</option>';
+$sql = mysqli_query($database->dblink, "SELECT id, name, owner, wref FROM ".TB_PREFIX."farmlist WHERE owner = ".(int)$session->uid." ORDER BY name ASC");
+	while($row = mysqli_fetch_array($sql)){
+		$lid = $row["id"];
+		$lname = $row["name"];
+		$lowner = $row["owner"];
+		$lwref = $row["wref"];
+		$lvname = $database->getVillageField($row["wref"], 'name');
+		if($_GET['lid'] == $lid) $selected = 'selected=""';
+		else $selected = '';
+		echo '<option value="'.$lid.'" '.$selected.'>'.$lvname.' - '.$lname.'</option>';
 }
 ?>    
                         </select>
@@ -126,12 +123,11 @@ if(mysqli_num_rows(mysqli_query($database->dblink,$getwref)) != 0){
         $towref = $row["towref"];
         $tocoor = $database->getCoor($towref);
         $totype = $database->getVillageType2($towref);
-        $tooasistype = $type['oasistype'];
-        if($tooasistype == 0) $tovname = $database->getVillageField($towref, 'name');
+        if($totype == 0) $tovname = $database->getVillageField($towref, 'name');
         else $tovname = $database->getOasisField($towref, 'name');
         
         if($vill[$towref] == 0){
-            echo '<option value="'.$towref.'">'.$tovname.'('.$tocoor['x'].'|'.$tocoor['y'].')</option>';
+            echo '<option value="'.$towref.'">'.$tovname.' ('.$tocoor['x'].'|'.$tocoor['y'].')</option>';
         }
         $vill[$towref] = 1;
     }
@@ -147,13 +143,6 @@ if(mysqli_num_rows(mysqli_query($database->dblink,$getwref)) != 0){
                 </div>
         <?php include("Templates/goldClub/trooplist2.tpl"); ?>
 <br />
-<button type="submit" value="save" name="save" id="save" class="trav_buttons">Save</button>
-        
+<button type="submit" value="save" name="save" id="save" class="trav_buttons">Create</button>
 </form>
 </div>
-<?php
-}else{
-header("Location: build.php?id=39&t=99");
-exit;
-}
-?>

Templates/goldClub/farmlist_editraid.tpl

@@ -135,14 +135,14 @@ if(mysqli_num_rows(mysqli_query($database->dblink, $getwref)) != 0){
 			$towref = $row["towref"];
 			$tocoor = $database->getCoor($towref);
 			$totype = $database->getVillageType2($towref);
-			$tooasistype = $type['oasistype'];
-			if($tooasistype == 0) $tovname = $database->getVillageField($towref, 'name');			
+			if($totype == 0) $tovname = $database->getVillageField($towref, 'name');			
 			else $tovname = $database->getOasisField($towref, 'name');
 					
 			if($row["id"] == $_GET['eid']) $selected = 'selected=""';
 			else $selected = '';
+			
 			if($vill[$towref] == 0){
-				echo '<option value="' . $towref . '" ' . $selected . '>' . $tovname . '(' . $tocoor['x'] . '|' . $tocoor['y'] . ')</option>';
+				echo '<option value="'.$towref.'" '.$selected.'>'.$tovname.' ('.$tocoor['x'].'|'.$tocoor['y'].')</option>';
 			}
 			$vill[$towref] = 1;
 		}