diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index bdb427dc..1b9d9e08 100755
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -26,6 +26,24 @@ class MYSQL_DB {
 		mysql_query("SET NAMES 'UTF8'");  //Fix utf8 phpmyadmin by gm4st3r
 	}
 
+    function safe_mysql_fetch_all($result) {
+	    //fix for Warning: mysql_fetch_all() expects parameter 1 to be resource, boolean given 
+		//by tientn 20160821
+		if ($result) {
+			return $this->mysql_fetch_all($result);
+		}
+		return null;
+	}
+
+	function safe_mysql_fetch_array($result) {
+	    //fix for Warning: $this->safe_mysql_fetch_array() expects parameter 1 to be resource, boolean given 
+		//by tientn 20160821
+		if ($result) {
+			return mysql_fetch_array($result);
+		}
+		return null;
+	}
+
 	function register($username, $password, $email, $tribe, $act) {
 		$time = time();
         	$stime = strtotime(START_DATE)-strtotime(date('m/d/Y'))+strtotime(START_TIME);
@@ -100,7 +118,7 @@ class MYSQL_DB {
 	public function hasBeginnerProtection($vid) {
 		$q = "SELECT u.protect FROM ".TB_PREFIX."users u,".TB_PREFIX."vdata v WHERE u.id=v.owner AND v.wref=".$vid;
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		if(!empty($dbarray)) {
 			if(time()<$dbarray[0]) {
 				return true;
@@ -124,13 +142,13 @@ class MYSQL_DB {
 	function getSitee($uid) {
 		$q = "SELECT id from " . TB_PREFIX . "users where sit1 = $uid or sit2 = $uid";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getVilWref($x, $y) {
 		$q = "SELECT * FROM " . TB_PREFIX . "wdata where x = $x AND y = $y";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['id'];
 	}
 	
@@ -149,7 +167,7 @@ class MYSQL_DB {
         }
         $result = mysql_query($q, $this->connection) or die(mysql_error());
         if($result) {
-            $dbarray = mysql_fetch_array($result);
+            $dbarray = $this->safe_mysql_fetch_array($result);
             return $dbarray[$field];
         }elseif($field=="username"){
             return "??";
@@ -159,27 +177,27 @@ class MYSQL_DB {
 	function getInvitedUser($uid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "users where invited = $uid order by regtime desc";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getVrefField($ref, $field){
 			$q = "SELECT $field FROM " . TB_PREFIX . "vdata where wref = '$ref'";
 			$result = mysql_query($q, $this->connection) or die(mysql_error());
-			$dbarray = mysql_fetch_array($result);
+			$dbarray = $this->safe_mysql_fetch_array($result);
 			return $dbarray[$field];
 	}
 
 	function getVrefCapital($ref){
 		$q = "SELECT * FROM " . TB_PREFIX . "vdata where owner = '$ref' and capital = 1";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray;
 	}
 
 	function getStarvation(){
 			$q = "SELECT * FROM " . TB_PREFIX . "vdata where starv != 0 and owner != 3";
 			$result = mysql_query($q, $this->connection);
-			return $this->mysql_fetch_all($result);
+			return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getActivateField($ref, $field, $mode) {
@@ -189,14 +207,14 @@ class MYSQL_DB {
 			$q = "SELECT $field FROM " . TB_PREFIX . "activate where username = '$ref'";
 		}
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray[$field];
 	}
 
 	function login($username, $password) {
 		$q = "SELECT password,sessid FROM " . TB_PREFIX . "users where username = '$username'";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		if($dbarray['password'] == md5($password)) {
 			return true;
 		} else {
@@ -207,16 +225,16 @@ class MYSQL_DB {
 	function sitterLogin($username, $password) {
 		$q = "SELECT sit1,sit2 FROM " . TB_PREFIX . "users where username = '$username' and access != " . BANNED;
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		if($dbarray['sit1'] != 0) {
 			$q2 = "SELECT password FROM " . TB_PREFIX . "users where id = " . $dbarray['sit1'] . " and access != " . BANNED;
 			$result2 = mysql_query($q2, $this->connection);
-			$dbarray2 = mysql_fetch_array($result2);
+			$dbarray2 = $this->safe_mysql_fetch_array($result2);
 		}
 		if($dbarray['sit2'] != 0) {
 				$q3 = "SELECT password FROM " . TB_PREFIX . "users where id = " . $dbarray['sit2'] . " and access != " . BANNED;
 				$result3 = mysql_query($q3, $this->connection);
-				$dbarray3 = mysql_fetch_array($result3);
+				$dbarray3 = $this->safe_mysql_fetch_array($result3);
 		}
 		if($dbarray['sit1'] != 0 || $dbarray['sit2'] != 0) {
 			if($dbarray2['password'] == md5($password) || $dbarray3['password'] == md5($password)) {
@@ -242,7 +260,7 @@ class MYSQL_DB {
 	function isDeleting($uid) {
 		$q = "SELECT timestamp from " . TB_PREFIX . "deleting where uid = $uid";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['timestamp'];
 	}
 
@@ -269,7 +287,7 @@ class MYSQL_DB {
 			$q = "SELECT * FROM " . TB_PREFIX . "users where id = $ref";
 		}
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 
 	function activeModify($username, $mode) {
@@ -316,7 +334,7 @@ class MYSQL_DB {
 	function GetOnline($uid) {
 		$q = "SELECT sit FROM " . TB_PREFIX . "online where uid = $uid";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['sit'];
 	}
 
@@ -443,7 +461,7 @@ class MYSQL_DB {
         $q = "SELECT id, oasistype FROM " . TB_PREFIX . "wdata where id = $wref";
         $result = mysql_query($q, $this->connection);
         if($result){
-            $dbarray = mysql_fetch_array($result);
+            $dbarray = $this->safe_mysql_fetch_array($result);
             return $dbarray['oasistype'];
         }else return 0;    
     }
@@ -459,7 +477,7 @@ class MYSQL_DB {
 		//count oasis troops: $troops_o
 	$troops_o=0;
 	$o_unit2=mysql_query("select * from ".TB_PREFIX."units where `vref`='".$vref."'");
-	$o_unit=mysql_fetch_array($o_unit2);
+	$o_unit=$this->safe_mysql_fetch_array($o_unit2);
 
 	for ($i=1;$i<51;$i++)
 	{
@@ -468,7 +486,7 @@ class MYSQL_DB {
 	$troops_o+=$o_unit['hero'];
 
 	$o_unit2=mysql_query("select * from ".TB_PREFIX."enforcement where `vref`='".$vref."'");
-	while ($o_unit=@mysql_fetch_array($o_unit2))
+	while ($o_unit=@$this->safe_mysql_fetch_array($o_unit2))
 	{
 		for ($i=1;$i<51;$i++)
 		{
@@ -532,7 +550,7 @@ class MYSQL_DB {
 	function populateOasis() {
 		$q = "SELECT * FROM " . TB_PREFIX . "wdata where oasistype != 0";
 		$result = mysql_query($q, $this->connection);
-		while($row = mysql_fetch_array($result)) {
+		while($row = $this->safe_mysql_fetch_array($result)) {
 			$wid = $row['id'];
 
 			$this->addUnits($wid);
@@ -606,7 +624,7 @@ class MYSQL_DB {
 	function populateOasisUnits2() {
 	$q2 = "SELECT * FROM " . TB_PREFIX . "wdata where oasistype != 0";
 	$result2 = mysql_query($q2, $this->connection);
-	while($row = mysql_fetch_array($result2)) {
+	while($row = $this->safe_mysql_fetch_array($result2)) {
 		$wid = $row['id'];
 		switch($row['oasistype']) {
 				case 1:
@@ -670,7 +688,7 @@ class MYSQL_DB {
 	function getVillageType($wref) {
 		$q = "SELECT id, fieldtype FROM " . TB_PREFIX . "wdata where id = $wref";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['fieldtype'];
 	}
 
@@ -683,7 +701,7 @@ class MYSQL_DB {
 	function getVillageState($wref) {
 		$q = "SELECT oasistype,occupied FROM " . TB_PREFIX . "wdata where id = $wref";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		if($dbarray['occupied'] != 0 || $dbarray['oasistype'] != 0) {
 			return true;
 		} else {
@@ -694,27 +712,27 @@ class MYSQL_DB {
 	function getProfileVillages($uid) {
 		$q = "SELECT capital,wref,name,pop,created from " . TB_PREFIX . "vdata where owner = $uid order by pop desc";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getProfileMedal($uid) {
 		$q = "SELECT id,categorie,plaats,week,img,points from " . TB_PREFIX . "medal where userid = $uid and del = 0 order by id desc";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 
 	}
 
 	function getProfileMedalAlly($uid) {
 		$q = "SELECT id,categorie,plaats,week,img,points from " . TB_PREFIX . "allimedal where allyid = $uid and del = 0 order by id desc";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 
 	}
 
 	function getVillageID($uid) {
 		$q = "SELECT wref FROM " . TB_PREFIX . "vdata WHERE owner = $uid";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['wref'];
 	}
 
@@ -740,31 +758,31 @@ class MYSQL_DB {
 	function getVillage($vid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "vdata where wref = $vid";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 
 	function getOasisV($vid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "odata where wref = $vid";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 
 	function getMInfo($id) {
 		$q = "SELECT * FROM " . TB_PREFIX . "wdata left JOIN " . TB_PREFIX . "vdata ON " . TB_PREFIX . "vdata.wref = " . TB_PREFIX . "wdata.id where " . TB_PREFIX . "wdata.id = $id";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 
 	function getOMInfo($id) {
 		$q = "SELECT * FROM " . TB_PREFIX . "wdata left JOIN " . TB_PREFIX . "odata ON " . TB_PREFIX . "odata.wref = " . TB_PREFIX . "wdata.id where " . TB_PREFIX . "wdata.id = $id";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 
 	function getOasis($vid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "odata where conqured = $vid";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getOasisInfo($wid) {
@@ -777,7 +795,7 @@ class MYSQL_DB {
         $q = "SELECT $field FROM " . TB_PREFIX . "vdata where wref = $ref";
         $result = mysql_query($q, $this->connection);
         if($result){
-            $dbarray = mysql_fetch_array($result);
+            $dbarray = $this->safe_mysql_fetch_array($result);
             return $dbarray[$field];
          }elseif($field=="name"){
             return "??";
@@ -787,7 +805,7 @@ class MYSQL_DB {
 	function getOasisField($ref, $field) {
 		$q = "SELECT $field FROM " . TB_PREFIX . "odata where wref = $ref";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray[$field];
 	}
 
@@ -810,14 +828,14 @@ class MYSQL_DB {
 	function getAdminLog() {
 		$q = "SELECT id,user,log,time from " . TB_PREFIX . "admin_log where id != 0 ORDER BY id ASC";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getCoor($wref) {
 		if ($wref !=""){
 		$q = "SELECT x,y FROM " . TB_PREFIX . "wdata where id = $wref";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 		}
 	}
 
@@ -841,7 +859,7 @@ class MYSQL_DB {
 	function LastTopic($id) {
 		$q = "SELECT * from " . TB_PREFIX . "forum_topic where cat = '$id' order by post_date";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function CheckLastTopic($id) {
@@ -867,7 +885,7 @@ class MYSQL_DB {
 	function LastPost($id) {
 		$q = "SELECT * from " . TB_PREFIX . "forum_post where topic = '$id'";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function CountTopic($id) {
@@ -891,26 +909,26 @@ class MYSQL_DB {
 	function ForumCat($id) {
 		$q = "SELECT * from " . TB_PREFIX . "forum_cat where alliance = '$id' ORDER BY id";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function ForumCatEdit($id) {
 		$q = "SELECT * from " . TB_PREFIX . "forum_cat where id = '$id'";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function ForumCatAlliance($id) {
 		$q = "SELECT alliance from " . TB_PREFIX . "forum_cat where id = $id";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['alliance'];
 	}
 
 	function ForumCatName($id) {
 		$q = "SELECT forum_name from " . TB_PREFIX . "forum_cat where id = $id";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['forum_name'];
 	}
 
@@ -937,14 +955,14 @@ class MYSQL_DB {
 	function CheckCloseTopic($id) {
 		$q = "SELECT close from " . TB_PREFIX . "forum_topic where id = '$id'";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['close'];
 	}
 
 	function CheckEditRes($alli) {
 		$q = "SELECT result from " . TB_PREFIX . "forum_edit where alliance = '$alli'";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['result'];
 	}
 
@@ -963,21 +981,21 @@ class MYSQL_DB {
 	function getVillageType2($wref) {
 		$q = "SELECT * FROM " . TB_PREFIX . "wdata where id = $wref";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['oasistype'];
 	}
 
 	function getVillageType3($wref) {
 		$q = "SELECT * FROM " . TB_PREFIX . "wdata where id = $wref";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray;
 	}
 
 	function getFLData($id) {
 		$q = "SELECT * FROM " . TB_PREFIX . "farmlist where id = $id";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 
 	function checkVilExist($wref) {
@@ -1018,31 +1036,31 @@ class MYSQL_DB {
 	function ForumCatTopic($id) {
 		$q = "SELECT * from " . TB_PREFIX . "forum_topic where cat = '$id' AND stick = '' ORDER BY post_date desc";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function ForumCatTopicStick($id) {
 		$q = "SELECT * from " . TB_PREFIX . "forum_topic where cat = '$id' AND stick = '1' ORDER BY post_date desc";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function ShowTopic($id) {
 		$q = "SELECT * from " . TB_PREFIX . "forum_topic where id = '$id'";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function ShowPost($id) {
 		$q = "SELECT * from " . TB_PREFIX . "forum_post where topic = '$id'";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function ShowPostEdit($id) {
 		$q = "SELECT * from " . TB_PREFIX . "forum_post where id = '$id'";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function CreatForum($owner, $alli, $name, $des, $area) {
@@ -1070,7 +1088,7 @@ class MYSQL_DB {
   function getSurvey($topic) {
     $q = "SELECT * FROM " . TB_PREFIX . "forum_survey where topic = $topic";
     $result = mysql_query($q, $this->connection);
-    return mysql_fetch_array($result);
+    return $this->safe_mysql_fetch_array($result);
   }
 
   function checkSurvey($topic) {
@@ -1091,7 +1109,7 @@ class MYSQL_DB {
   function checkVote($topic, $uid) {
         $q = "SELECT * FROM " . TB_PREFIX . "forum_survey where topic = $topic";
     $result = mysql_query($q, $this->connection);
-    $array = mysql_fetch_array($result);
+    $array = $this->safe_mysql_fetch_array($result);
     $text = $array['voted'];
     if(preg_match('/,'.$uid.',/',$text)) {
       return true;
@@ -1103,7 +1121,7 @@ class MYSQL_DB {
   function getVoteSum($topic) {
         $q = "SELECT * FROM " . TB_PREFIX . "forum_survey where topic = $topic";
     $result = mysql_query($q, $this->connection);
-    $array = mysql_fetch_array($result);
+    $array = $this->safe_mysql_fetch_array($result);
     $sum = 0;
     for($i=1;$i<=8;$i++){
     $sum += $array['vote'.$i];
@@ -1179,7 +1197,7 @@ class MYSQL_DB {
 	function getAllianceName($id) {
 		$q = "SELECT tag from " . TB_PREFIX . "alidata where id = $id";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['tag'];
 	}
 
@@ -1190,7 +1208,7 @@ class MYSQL_DB {
 			$q = "SELECT $field FROM " . TB_PREFIX . "ali_permission where username = '$ref'";
 		}
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray[$field];
 	}
 
@@ -1298,7 +1316,7 @@ class MYSQL_DB {
 	function readAlliNotice($aid) {
 		$q = "SELECT * from " . TB_PREFIX . "ali_log where aid = $aid ORDER BY date DESC";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	/*****************************************
@@ -1358,13 +1376,13 @@ class MYSQL_DB {
 	function diplomacyOwnOffers($session_alliance) {
 		$q = "SELECT * FROM " . TB_PREFIX . "diplomacy WHERE alli1 = $session_alliance AND accepted = 0";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getAllianceID($name) {
 		$q = "SELECT id FROM " . TB_PREFIX . "alidata WHERE tag ='" . $this->RemoveXSS($name) . "'";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['id'];
 	}
 
@@ -1386,13 +1404,13 @@ class MYSQL_DB {
 	function diplomacyInviteCheck($session_alliance) {
 		$q = "SELECT * FROM " . TB_PREFIX . "diplomacy WHERE alli2 = $session_alliance AND accepted = 0";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 	
 	function diplomacyInviteCheck2($ally1, $ally2) {
 		$q = "SELECT * FROM " . TB_PREFIX . "diplomacy WHERE alli1 = $ally1 AND alli2 = $ally2 accepted = 0";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getAllianceDipProfile($aid, $type){
@@ -1434,25 +1452,25 @@ class MYSQL_DB {
 	function getAllianceAlly($aid, $type){
 		$q = "SELECT * FROM ".TB_PREFIX."diplomacy WHERE (alli1 = '$aid' or alli2 = '$aid') AND (type = '$type' AND accepted = '1')";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getAllianceWar2($aid){
 		$q = "SELECT * FROM ".TB_PREFIX."diplomacy WHERE alli1 = '$aid' AND type = '3' OR alli2 = '$aid' AND type = '3' AND accepted = '1'";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function diplomacyExistingRelationships($session_alliance) {
 		$q = "SELECT * FROM " . TB_PREFIX . "diplomacy WHERE alli2 = $session_alliance AND accepted = 1";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function diplomacyExistingRelationships2($session_alliance) {
 		$q = "SELECT * FROM " . TB_PREFIX . "diplomacy WHERE alli1 = $session_alliance AND accepted = 1";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function diplomacyCancelExistingRelationship($id, $session_alliance) {
@@ -1482,7 +1500,7 @@ class MYSQL_DB {
 	function getUserAlliance($id) {
 		$q = "SELECT " . TB_PREFIX . "alidata.tag from " . TB_PREFIX . "users join " . TB_PREFIX . "alidata where " . TB_PREFIX . "users.alliance = " . TB_PREFIX . "alidata.id and " . TB_PREFIX . "users.id = $id";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		if($dbarray['tag'] == "") {
 			return "-";
 		} else {
@@ -1570,7 +1588,7 @@ class MYSQL_DB {
         $y1 = intval($coor['y']);
         $prevdist = 0;
         $q2 = "SELECT * FROM " . TB_PREFIX . "vdata where owner = 4";
-        $array2 = mysql_fetch_array(mysql_query($q2));
+        $array2 = $this->safe_mysql_fetch_array(mysql_query($q2));
         $vill = $array2['wref'];
         if(mysql_num_rows(mysql_query($q)) > 0){
             foreach($array as $village){
@@ -1651,7 +1669,7 @@ class MYSQL_DB {
 		$time = time();
 		$q = "SELECT * FROM " . TB_PREFIX . "vdata where celebration < $time AND celebration != 0";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function clearCel($ref) {
@@ -1673,19 +1691,19 @@ class MYSQL_DB {
 	function getInvitation($uid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "ali_invite where uid = $uid";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 	
 	function getInvitation2($uid, $aid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "ali_invite where uid = $uid and alliance = $aid";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getAliInvitations($aid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "ali_invite where alliance = $aid && accept = 0";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function sendInvitation($uid, $alli, $sender) {
@@ -1764,7 +1782,7 @@ class MYSQL_DB {
 		}
 		if($mode <= 3 || $mode == 6 || $mode > 8) {
 			$result = mysql_query($q, $this->connection);
-			return $this->mysql_fetch_all($result);
+			return $this->safe_mysql_fetch_all($result);
 		} else {
 			return mysql_query($q, $this->connection);
 		}
@@ -1801,31 +1819,31 @@ class MYSQL_DB {
 	function getNotice($uid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "ndata where uid = $uid and del = 0 ORDER BY time DESC";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getNotice2($id, $field) {
 		$q = "SELECT ".$field." FROM " . TB_PREFIX . "ndata where `id` = '$id'";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray[$field];
 	}
 
 	function getNotice3($uid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "ndata where uid = $uid ORDER BY time DESC";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getNotice4($id) {
 		$q = "SELECT * FROM " . TB_PREFIX . "ndata where id = $id ORDER BY time DESC";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 	function getUnViewNotice($uid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "ndata where uid = $uid AND viewed=0";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 	function createTradeRoute($uid,$wid,$from,$r1,$r2,$r3,$r4,$start,$deliveries,$merchant,$time) {
 	$x = "UPDATE " . TB_PREFIX . "users SET gold = gold - 2 WHERE id = ".$uid."";
@@ -1838,20 +1856,20 @@ class MYSQL_DB {
 	function getTradeRoute($uid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "route where uid = $uid ORDER BY timestamp ASC";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getTradeRoute2($id) {
 		$q = "SELECT * FROM " . TB_PREFIX . "route where id = $id";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray;
 	}
 
 	function getTradeRouteUid($id) {
 		$q = "SELECT * FROM " . TB_PREFIX . "route where id = $id";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['uid'];
 	}
 
@@ -2009,7 +2027,7 @@ class MYSQL_DB {
 		}
 		$result = mysql_query($q, $this->connection);
 		if(!empty($result)) {
-			return $this->mysql_fetch_all($result);
+			return $this->safe_mysql_fetch_all($result);
 		} else {
 			return NULL;
 		}
@@ -2029,14 +2047,14 @@ class MYSQL_DB {
 	function getJobs($wid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid order by master,timestamp ASC";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function FinishWoodcutter($wid) {
 		$time = time()-1;
 		$q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and type = 1 order by master,timestamp ASC";
 		$result = mysql_query($q);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		$q = "UPDATE ".TB_PREFIX."bdata SET timestamp = $time WHERE id = '".$dbarray['id']."'";
 		$this->query($q);
 		$tribe = $this->getUserField($this->getVillageField($wid, "owner"), "tribe", 0);
@@ -2047,7 +2065,7 @@ class MYSQL_DB {
 		}
 		$result2 = mysql_query($q2);
 		if(mysql_num_rows($result2) > 0){
-		$dbarray2 = mysql_fetch_array($result2);
+		$dbarray2 = $this->safe_mysql_fetch_array($result2);
 		$wc_time = $dbarray['timestamp'];
 		$q2 = "UPDATE ".TB_PREFIX."bdata SET timestamp = timestamp - $wc_time WHERE id = '".$dbarray2['id']."'";
 		$this->query($q2);
@@ -2057,19 +2075,19 @@ class MYSQL_DB {
 	function getMasterJobs($wid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and master = 1 order by master,timestamp ASC";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getMasterJobsByField($wid,$field) {
 		$q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and field = $field and master = 1 order by master,timestamp ASC";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getBuildingByField($wid,$field) {
 		$q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and field = $field and master = 0";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 	
 	function getBuildingByField2($wid,$field) {
@@ -2081,7 +2099,7 @@ class MYSQL_DB {
 	function getBuildingByType($wid,$type) {
 		$q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and type = $type and master = 0";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 	
 	function getBuildingByType2($wid,$type) {
@@ -2093,13 +2111,13 @@ class MYSQL_DB {
 	function getDorf1Building($wid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and field < 19 and master = 0";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getDorf2Building($wid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and field > 18 and master = 0";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function updateBuildingWithMaster($id, $time,$loop) {
@@ -2110,7 +2128,7 @@ class MYSQL_DB {
 	function getVillageByName($name) {
 		$q = "SELECT wref FROM " . TB_PREFIX . "vdata where name = '$name' limit 1";
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['wref'];
 	}
 
@@ -2175,7 +2193,7 @@ class MYSQL_DB {
 	function getMarketField($vref, $field) {
 		$q = "SELECT $field FROM " . TB_PREFIX . "market where vref = '$vref'";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray[$field];
 	}
 
@@ -2214,7 +2232,7 @@ class MYSQL_DB {
 			$q = "SELECT * FROM " . TB_PREFIX . "market where vref != $vid and alliance = $alliance or vref != $vid and alliance = 0 and accept = 0";
 		}
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	/***************************
@@ -2342,49 +2360,49 @@ class MYSQL_DB {
 	function getRanking() {
 		$q = "SELECT id,username,alliance,ap,apall,dp,dpall,access FROM " . TB_PREFIX . "users WHERE tribe<=3 AND access<" . (INCLUDE_ADMIN ? "10" : "8");
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getVRanking() {
 		$q = "SELECT v.wref,v.name,v.owner,v.pop FROM " . TB_PREFIX . "vdata AS v," . TB_PREFIX . "users AS u WHERE v.owner=u.id AND u.tribe<=3 AND v.wref != '' AND u.access<" . (INCLUDE_ADMIN ? "10" : "8");
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getARanking() {
 		$q = "SELECT id,name,tag,oldrank,Aap,Adp FROM " . TB_PREFIX . "alidata where id != '' ORDER BY id DESC";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getUserByTribe($tribe){
 		$q = "SELECT * FROM " . TB_PREFIX . "users where tribe = $tribe";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getUserByAlliance($aid){
 		$q = "SELECT * FROM " . TB_PREFIX . "users where alliance = $aid";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getHeroRanking() {
 		$q = "SELECT * FROM " . TB_PREFIX . "hero WHERE dead = 0";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getAllMember($aid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "users where alliance = $aid order  by (SELECT sum(pop) FROM " . TB_PREFIX . "vdata WHERE owner =  " . TB_PREFIX . "users.id) desc, " . TB_PREFIX . "users.id desc";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 	
 	function getAllMember2($aid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "users where alliance = $aid order  by (SELECT sum(pop) FROM " . TB_PREFIX . "vdata WHERE owner =  " . TB_PREFIX . "users.id) desc, " . TB_PREFIX . "users.id desc LIMIT 1";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 
 	function addUnits($vid) {
@@ -2437,7 +2455,7 @@ class MYSQL_DB {
 		}
 		$result = mysql_query($q, $this->connection);
 		if (!empty($result)) {
-			return $this->mysql_fetch_all($result);
+			return $this->safe_mysql_fetch_all($result);
 		} else {
 			return NULL;
 		}
@@ -2446,7 +2464,7 @@ class MYSQL_DB {
 	function getHeroField($uid,$field){
 			$q = "SELECT * FROM ".TB_PREFIX."hero WHERE uid = $uid";
 			$result = mysql_query($q,$this->connection);
-			return $this->mysql_fetch_all($result);
+			return $this->safe_mysql_fetch_all($result);
 	}
 
 	function modifyHero($column,$value,$heroid,$mode=0) {
@@ -2489,13 +2507,13 @@ class MYSQL_DB {
 	function getResearching($vid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "research where vref = $vid";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function checkIfResearched($vref, $unit) {
 		$q = "SELECT $unit FROM " . TB_PREFIX . "tdata WHERE vref = $vref";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray[$unit];
 	}
 
@@ -2508,7 +2526,7 @@ class MYSQL_DB {
 	function getTraining($vid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "training where vref = $vid ORDER BY id";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function trainUnit($vid, $unit, $amt, $pop, $each, $time, $mode) {
@@ -2632,7 +2650,7 @@ class MYSQL_DB {
             $q = "SELECT e.*,o.conqured FROM ".TB_PREFIX."enforcement as e LEFT JOIN ".TB_PREFIX."odata as o ON e.vref=o.wref where o.conqured = $ref";
         }
         $result = mysql_query($q, $this->connection);
-        return $this->mysql_fetch_all($result);
+        return $this->safe_mysql_fetch_all($result);
     	}
     	
     	function getOasisEnforceArray($id, $mode=0) {
@@ -2720,7 +2738,7 @@ class MYSQL_DB {
 			$q = "SELECT * from " . TB_PREFIX . "enforcement where `from` = $id";
 		}
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getVillageMovement($id) {
@@ -2781,7 +2799,7 @@ class MYSQL_DB {
 	function getUserAllianceID($id) {
 		$q = "SELECT alliance FROM " . TB_PREFIX . "users where id = $id";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['alliance'];
 	}
 
@@ -2793,7 +2811,7 @@ class MYSQL_DB {
 	function getWWName($vref) {
 		$q = "SELECT wwname FROM " . TB_PREFIX . "fdata WHERE vref = $vref";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['wwname'];
 	}
 
@@ -2841,14 +2859,14 @@ class MYSQL_DB {
 	function getTrainingList() {
 		$q = "SELECT * FROM " . TB_PREFIX . "training where vref != ''";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getNeedDelete() {
 		$time = time();
 		$q = "SELECT uid FROM " . TB_PREFIX . "deleting where timestamp < $time";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function countUser() {
@@ -2881,7 +2899,7 @@ class MYSQL_DB {
 
 	function query_return($q) {
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	/***************************
@@ -2900,35 +2918,35 @@ class MYSQL_DB {
 	function getWoodAvailable($wref) {
 		$q = "SELECT wood FROM " . TB_PREFIX . "vdata WHERE wref = $wref";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['wood'];
 	}
 
 	function getClayAvailable($wref) {
 		$q = "SELECT clay FROM " . TB_PREFIX . "vdata WHERE wref = $wref";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['clay'];
 	}
 
 	function getIronAvailable($wref) {
 		$q = "SELECT iron FROM " . TB_PREFIX . "vdata WHERE wref = $wref";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['iron'];
 	}
 
 	function getCropAvailable($wref) {
 		$q = "SELECT crop FROM " . TB_PREFIX . "vdata WHERE wref = $wref";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['crop'];
 	}
 
 	function populateOasisdata() {
 		$q2 = "SELECT * FROM " . TB_PREFIX . "wdata where oasistype != 0";
 		$result2 = mysql_query($q2, $this->connection);
-		while($row = mysql_fetch_array($result2)) {
+		while($row = $this->safe_mysql_fetch_array($result2)) {
 			$wid = $row['id'];
 			$basearray = $this->getOMInfo($wid);
 			if($basearray['oasistype'] < 4) {
@@ -3044,31 +3062,31 @@ class MYSQL_DB {
 	function getOwnArtefactInfo($vref) {
 		$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE vref = $vref";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 	
 	function getOwnArtefactInfo3($uid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE owner = $uid";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getOwnArtefactInfoByType($vref, $type) {
 		$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE vref = $vref AND type = $type order by size";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 
 	function getOwnArtefactInfoByType2($vref, $type) {
 		$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE vref = $vref AND type = $type";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getOwnUniqueArtefactInfo($id, $type, $size) {
 		$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE owner = $id AND type = $type AND size=$size";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 
 	function getOwnUniqueArtefactInfo2($id, $type, $size, $mode) {
@@ -3078,13 +3096,13 @@ class MYSQL_DB {
 		$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE vref = $id AND active = 1 AND type = $type AND size=$size";
 	}
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function getFoolArtefactInfo($type,$vid,$uid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE vref = $vid AND type = 8 AND kind = $type OR owner = $uid AND size > 1 AND active = 1 AND type = 8 AND kind = $type";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 
 	function claimArtefact($vref, $ovref, $id) {
@@ -3170,7 +3188,7 @@ class MYSQL_DB {
 	function getArtefactDetails($id) {
 		$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE id = " . $id . "";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 
 	function getMovementById($id){
@@ -3193,7 +3211,7 @@ class MYSQL_DB {
 	function getVilFarmlist($wref){
 		$q = 'SELECT * FROM ' . TB_PREFIX . 'farmlist WHERE wref = ' . $wref . ' ORDER BY wref ASC';
 		$result = mysql_query($q, $this->connection);
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 
 		if($dbarray['id']!=0) {
 				return true;
@@ -3206,7 +3224,7 @@ class MYSQL_DB {
 	function getRaidList($id) {
 		$q = "SELECT * FROM " . TB_PREFIX . "raidlist WHERE id = ".$id."";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 
 	function delFarmList($id, $owner) {
@@ -3249,7 +3267,7 @@ class MYSQL_DB {
 	function resetPassword($uid, $cpw){
 		$q = "SELECT npw FROM `" . TB_PREFIX . "password` WHERE uid = $uid AND cpw = '$cpw' AND used = 0";
 		$result = mysql_query($q, $this->connection) or die(mysql_error());
-		$dbarray = mysql_fetch_array($result);
+		$dbarray = $this->safe_mysql_fetch_array($result);
 
 		if(!empty($dbarray)) {
 			if(!$this->updateUserField($uid, 'password', md5($dbarray['npw']), 1)) return false;
@@ -3423,25 +3441,25 @@ class MYSQL_DB {
             $q = "SELECT * FROM " . TB_PREFIX . "prisoners where `from` = $wid";
         }    
         $result = mysql_query($q, $this->connection);
-        return $this->mysql_fetch_all($result);
+        return $this->safe_mysql_fetch_all($result);
     }
 
 	function getPrisoners2($wid,$from) {
 		$q = "SELECT * FROM " . TB_PREFIX . "prisoners where wref = $wid and " . TB_PREFIX . "prisoners.from = $from";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 	
 	function getPrisonersByID($id) {
 		$q = "SELECT * FROM " . TB_PREFIX . "prisoners where id = $id";
 		$result = mysql_query($q, $this->connection);
-		return mysql_fetch_array($result);
+		return $this->safe_mysql_fetch_array($result);
 	}
 	
 	function getPrisoners3($from) {
 		$q = "SELECT * FROM " . TB_PREFIX . "prisoners where " . TB_PREFIX . "prisoners.from = $from";
 		$result = mysql_query($q, $this->connection);
-		return $this->mysql_fetch_all($result);
+		return $this->safe_mysql_fetch_all($result);
 	}
 	
 	function deletePrisoners($id) {
@@ -3469,15 +3487,15 @@ References:
    function getvacmodexy($wref){
 	$q = "SELECT id,oasistype,occupied FROM " . TB_PREFIX . "wdata where id = $wref";
      $result = mysql_query($q, $this->connection);
-     $dbarray = mysql_fetch_array($result);
+     $dbarray = $this->safe_mysql_fetch_array($result);
      if($dbarray['occupied'] != 0 && $dbarray['oasistype'] == 0) {
      $q1 = "SELECT owner FROM " . TB_PREFIX . "vdata where wref = ".$dbarray['id']."";
      $result1 = mysql_query($q1, $this->connection);
-     $dbarray1 = mysql_fetch_array($result1);
+     $dbarray1 = $this->safe_mysql_fetch_array($result1);
      if($dbarray1['owner'] != 0){
      $q2 = "SELECT vac_mode,vac_time FROM " . TB_PREFIX . "users where id = ".$dbarray1['owner']."";
      $result2 = mysql_query($q2, $this->connection);
-     $dbarray2 = mysql_fetch_array($result2);
+     $dbarray2 = $this->safe_mysql_fetch_array($result2);
      if($dbarray2['vac_mode'] ==1){
      return true;
      }else{
@@ -3502,7 +3520,7 @@ References:
  	function getHeroDead($id) {
     		$q = "SELECT dead FROM " . TB_PREFIX . "hero WHERE `uid` = $id";
     		$result = mysql_query($q, $this->connection);
-    		$notend= mysql_fetch_array($result);
+    		$notend= $this->safe_mysql_fetch_array($result);
      		return $notend['dead'];
    	}
 	
@@ -3514,7 +3532,7 @@ References:
  	function getHeroInRevive($id) {
     		$q = "SELECT inrevive FROM " . TB_PREFIX . "hero WHERE `uid` = $id";
     		$result = mysql_query($q, $this->connection);
-    		$notend= mysql_fetch_array($result);
+    		$notend= $this->safe_mysql_fetch_array($result);
      		return $notend['inrevive'];
    	}
 	
@@ -3526,7 +3544,7 @@ References:
  	function getHeroInTraining($id) {
     		$q = "SELECT intraining FROM " . TB_PREFIX . "hero WHERE `uid` = $id";
     		$result = mysql_query($q, $this->connection);
-    		$notend= mysql_fetch_array($result);
+    		$notend= $this->safe_mysql_fetch_array($result);
      		return $notend['intraining'];
    	}
 
@@ -3571,7 +3589,7 @@ References:
         function FindHeroInVil($wid) {
             $result = $this->query("SELECT * FROM ".TB_PREFIX."units WHERE hero>0 AND vref='".$wid."'");
             if (!empty($result)) {
-                $dbarray = mysql_fetch_array($result);
+                $dbarray = $this->safe_mysql_fetch_array($result);
                 if(isset($dbarray['hero'])) {
                     $this->query("UPDATE ".TB_PREFIX."units SET hero=0 WHERE vref='".$wid."'");
                     unset($dbarray);
@@ -3584,7 +3602,7 @@ References:
             $delDef=true;
             $result = $this->query_return("SELECT * FROM ".TB_PREFIX."enforcement WHERE hero>0 AND `from` = ".$wid);
             if (!empty($result)) {
-                $dbarray = mysql_fetch_array($result);
+                $dbarray = $this->safe_mysql_fetch_array($result);
                 if(isset($dbarray['hero'])) {
                     $this->query("UPDATE ".TB_PREFIX."enforcement SET hero=0 WHERE `from` = ".$wid);
                     for ($i=0;$i<50;$i++) {
diff --git a/GameEngine/Database/db_MYSQLi.php b/GameEngine/Database/db_MYSQLi.php
index aaf58deb..9366ee4f 100755
--- a/GameEngine/Database/db_MYSQLi.php
+++ b/GameEngine/Database/db_MYSQLi.php
@@ -3863,6 +3863,6 @@ References:
 
 };
 
-$database = new MYSQL_DB;
+$database = new MYSQLi_DB;
 
 ?>
diff --git a/GameEngine/Session.php b/GameEngine/Session.php
index 262166c8..fb5ab71b 100755
--- a/GameEngine/Session.php
+++ b/GameEngine/Session.php
@@ -61,6 +61,8 @@ class Session {
 			var $villages = array();
 
 			function Session() {
+        		global $database; //TienTN fix
+
 				$this->time = time();
 				if (!isset($_SESSION)) session_start();
 
diff --git a/README b/README
index f6884485..a4bd17e4 100644
--- a/README
+++ b/README
@@ -119,3 +119,22 @@ TravianZ is based on TravianX v6.0.0 or TravianZ or TravianX with some grapich c
 106. Fix total of trapper bug is full trapp if 1 troop only you send.</br>
 107. Fix invalid argument supplied if using masterbuilder</br>
 108. Change entire database to InnoDB.
+
+TienTN changes:
+1. Change install/templates/config.tpl to deal with deprecated warning from new PHP version.
+2. Fix install/data/sql.sql, to be executable in current MySQL version.
+3. Fix db_MYSQL.php
+	with safe_mysql_fetch_all, and safe_mysql_fetch_array wrappers, to avoid
+	Warning: mysql_fetch_all/array() expects parameter 1 to be resource, boolean given
+4. Fix the db_MYSQLi.php in class object declaration(if anybody want to use db_MYSQLi.php again)
+5. Fix the unx.js file for error:
+	VM5051:1 Uncaught SyntaxError: Unexpected token )
+	jd.onreadystatechange @ unx.js?0ac36:170
+	This error arises when moving to the border of the map.
+6. Fix the map loop moving bug:
+	Symptom: For map not set to size 400x400, on the map page,
+	when moving on and on in one direction, cross the map border(loop) two times, 
+	the moving function will be crashed(freeze, you can't move any more).
+	I found out that unx.js handle a static map size(400x400).
+	So I fixed this with a m_c.world_max variable from mapview.tpl and changed the unx.js accordingly.
+7. Fix the constructor global variable missing in Session.php
diff --git a/Templates/Map/mapview.tpl b/Templates/Map/mapview.tpl
index 88480ea5..09e2c8fe 100644
--- a/Templates/Map/mapview.tpl
+++ b/Templates/Map/mapview.tpl
@@ -256,6 +256,7 @@ if (isset($neutralarray[0])) {
 			m_c.ad = [<?php echo '['.$map_js;?>];
 			m_c.z = {"x":<?php echo $x ?>,"y":<?php echo $y ?>};
 			m_c.size = 7;
+			m_c.world_max = <?php echo WORLD_MAX; /*TienTN: add a value to handle in unx.js instead of hardcoding*/ ?>;
 			var mdim = {"x":7,"y":7,"rad":3}
 			var mmode = 0;
 			function init_local(){map_init();}
diff --git a/install/data/sql.sql b/install/data/sql.sql
index f504a826..ca68e597 100755
--- a/install/data/sql.sql
+++ b/install/data/sql.sql
@@ -22,7 +22,7 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%a2b` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `ckey` varchar(255) NULL,
  `time_check` int(11) NULL DEFAULT '0',
  `to_vid` int(11) NULL,
@@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%a2b` (
 --
 
 CREATE TABLE `%PREFIX%links` (
- `id` INT( 25 ) NULL AUTO_INCREMENT PRIMARY KEY ,
+ `id` INT( 25 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
  `userid` INT( 25 ) NULL ,
  `name` VARCHAR( 50 ) NULL ,
  `url` VARCHAR( 150 ) NULL ,
@@ -68,7 +68,7 @@ CREATE TABLE `%PREFIX%links` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%abdata` (
- `vref` int(11) NULL,
+ `vref` int(11) NOT NULL,
  `a1` tinyint(2) NULL DEFAULT '0',
  `a2` tinyint(2) NULL DEFAULT '0',
  `a3` tinyint(2) NULL DEFAULT '0',
@@ -100,7 +100,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%abdata` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%activate` (
- `id` int(255) NULL AUTO_INCREMENT,
+ `id` int(255) NOT NULL AUTO_INCREMENT,
  `username` varchar(100) NULL,
  `password` varchar(100) NULL,
  `email` text NULL,
@@ -125,7 +125,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%activate` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%active` (
- `username` varchar(100) NULL,
+ `username` varchar(100) NOT NULL,
  `timestamp` int(11) NULL,
  PRIMARY KEY (`username`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -142,7 +142,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%active` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%admin_log` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `user` text NULL,
  `log` text NULL,
  `time` int(25) NULL,
@@ -160,7 +160,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%admin_log` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%allimedal` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `allyid` int(11) NULL,
  `categorie` int(11) NULL,
  `plaats` int(11) NULL,
@@ -178,7 +178,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%allimedal` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%artefacts` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `vref` int(11) NULL,
  `owner` int(11) NULL,
  `type` tinyint(2) NULL,
@@ -206,7 +206,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%artefacts` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%alidata` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `name` varchar(100) NULL,
  `tag` varchar(100) NULL,
  `leader` int(11) NULL,
@@ -240,7 +240,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%alidata` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%ali_invite` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `uid` int(11) NULL,
  `alliance` int(11) NULL,
  `sender` int(11) NULL,
@@ -261,7 +261,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ali_invite` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%ali_log` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `aid` int(11) NULL,
  `comment` text NULL,
  `date` int(11) NULL,
@@ -280,7 +280,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ali_log` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%ali_permission` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `uid` int(11) NULL,
  `alliance` int(11) NULL,
  `rank` varchar(100) NULL,
@@ -307,7 +307,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ali_permission` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%attacks` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `vref` int(11) NULL,
  `t1` int(11) NULL,
  `t2` int(11) NULL,
@@ -347,7 +347,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%attacks` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%banlist` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `uid` int(11) NULL,
  `name` varchar(100) NULL,
  `reason` varchar(30) NULL,
@@ -370,7 +370,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%banlist` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%bdata` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `wid` int(11) NULL,
  `field` tinyint(2) NULL,
  `type` tinyint(2) NULL,
@@ -393,7 +393,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%bdata` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%build_log` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `wid` int(11) NULL,
  `log` text NULL,
  `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -412,7 +412,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%build_log` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%chat` (
- `id` int(20) NULL AUTO_INCREMENT,
+ `id` int(20) NOT NULL AUTO_INCREMENT,
  `id_user` int(11) NULL,
  `name` varchar(255) NULL,
  `alli` varchar(255) NULL,
@@ -449,7 +449,7 @@ INSERT INTO `%PREFIX%config` VALUES (0);
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%deleting` (
- `uid` int(11) NULL,
+ `uid` int(11) NOT NULL,
  `timestamp` int(11) NULL,
  PRIMARY KEY (`uid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -466,7 +466,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%deleting` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%demolition` (
- `vref` int(11) NULL,
+ `vref` int(11) NOT NULL,
  `buildnumber` int(11) NULL DEFAULT '0',
  `lvl` int(11) NULL DEFAULT '0',
  `timetofinish` int(11) NULL,
@@ -485,7 +485,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%demolition` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%diplomacy` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `alli1` int(11) NULL,
  `alli2` int(11) NULL,
  `type` tinyint(1) NULL,
@@ -504,7 +504,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%diplomacy` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%enforcement` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `u1` int(11) NULL DEFAULT '0',
  `u2` int(11) NULL DEFAULT '0',
  `u3` int(11) NULL DEFAULT '0',
@@ -572,7 +572,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%enforcement` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%farmlist` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `wref` int(11) NULL,
  `owner` int(11) NULL,
  `name` varchar(100) NULL,
@@ -591,7 +591,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%farmlist` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%fdata` (
- `vref` int(11) NULL,
+ `vref` int(11) NOT NULL,
  `f1` tinyint(2) NULL DEFAULT '0',
  `f1t` tinyint(2) NULL DEFAULT '0',
  `f2` tinyint(2) NULL DEFAULT '0',
@@ -676,7 +676,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%fdata` (
  `f99t` tinyint(2) NULL DEFAULT '0',
  `wwname` varchar(100) NULL DEFAULT 'World Wonder',
  PRIMARY KEY (`vref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- Dumping data for table `%prefix%fdata`
@@ -690,7 +690,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%fdata` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%forum_cat` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `owner` varchar(255) NULL,
  `alliance` varchar(255) NULL,
  `forum_name` varchar(255) NULL,
@@ -711,7 +711,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%forum_cat` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%forum_edit` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `alliance` varchar(255) NULL,
  `result` varchar(255) NULL,
  PRIMARY KEY (`id`)
@@ -729,7 +729,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%forum_edit` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%forum_post` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `post` longtext NULL,
  `topic` varchar(255) NULL,
  `owner` varchar(255) NULL,
@@ -787,7 +787,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%forum_survey` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%forum_topic` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `title` varchar(255) NULL,
  `post` longtext NULL,
  `date` varchar(255) NULL,
@@ -817,7 +817,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%forum_topic` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%general` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `casualties` int(11) NULL,
  `time` int(11) NULL,
  `shown` tinyint(1) NULL,
@@ -836,7 +836,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%general` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%gold_fin_log` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `wid` int(11) NULL,
  `log` text NULL,
  `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -855,7 +855,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%gold_fin_log` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%hero` (
- `heroid` int(11) NULL AUTO_INCREMENT,
+ `heroid` int(11) NOT NULL AUTO_INCREMENT,
  `uid` int(11) NULL,
  `unit` smallint(2) NULL,
  `name` tinytext NULL,
@@ -891,7 +891,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%hero` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%illegal_log` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `user` int(11) NULL,
  `log` text NULL,
  `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -910,7 +910,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%illegal_log` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%login_log` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `uid` int(11) NULL,
  `ip` varchar(15) NULL,
  `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -929,7 +929,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%login_log` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%market` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `vref` int(11) NULL,
  `gtype` tinyint(1) NULL,
  `gamt` int(11) NULL,
@@ -954,7 +954,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%market` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%market_log` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `wid` int(11) NULL,
  `log` text NULL,
  `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -973,7 +973,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%market_log` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%mdata` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `target` int(11) NULL,
  `owner` int(11) NULL,
  `topic` varchar(100) NULL,
@@ -1003,7 +1003,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%mdata` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%medal` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `userid` int(11) NULL,
  `categorie` int(11) NULL,
  `plaats` int(11) NULL,
@@ -1026,7 +1026,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%medal` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%movement` (
- `moveid` int(11) NULL AUTO_INCREMENT,
+ `moveid` int(11) NOT NULL AUTO_INCREMENT,
  `sort_type` tinyint(4) NULL DEFAULT '0',
  `from` int(11) NULL DEFAULT '0',
  `to` int(11) NULL DEFAULT '0',
@@ -1055,7 +1055,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%movement` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%ndata` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `uid` int(11) NULL,
  `toWref` int(11) NULL,
  `ally` int(11) NULL,
@@ -1081,7 +1081,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%ndata` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%odata` (
- `wref` int(11) NULL,
+ `wref` int(11) NOT NULL,
  `type` tinyint(2) NULL,
  `conqured` int(11) NULL,
  `wood` int(11) NULL,
@@ -1129,7 +1129,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%online` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%prisoners` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `wref` int(11) NULL,
  `from` int(11) NULL,
  `t1` int(11) NULL,
@@ -1158,7 +1158,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%prisoners` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%raidlist` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `lid` int(11) NULL,
  `towref` int(11) NULL,
  `x` int(11) NULL,
@@ -1189,7 +1189,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%raidlist` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%research` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `vref` int(11) NULL,
  `tech` varchar(3) NULL,
  `timestamp` int(11) NULL,
@@ -1208,7 +1208,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%research` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%route` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `uid` int(11) NULL,
  `wid` int(11) NULL,
  `from` int(11) NULL,
@@ -1236,7 +1236,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%route` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%send` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `wood` int(11) NULL,
  `clay` int(11) NULL,
  `iron` int(11) NULL,
@@ -1257,7 +1257,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%send` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%tdata` (
- `vref` int(11) NULL,
+ `vref` int(11) NOT NULL,
  `t2` tinyint(1) NULL DEFAULT '0',
  `t3` tinyint(1) NULL DEFAULT '0',
  `t4` tinyint(1) NULL DEFAULT '0',
@@ -1313,7 +1313,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%tdata` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%tech_log` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `wid` int(11) NULL,
  `log` text NULL,
  `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -1332,7 +1332,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%tech_log` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%training` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `vref` int(11) NULL,
  `unit` tinyint(2) NULL,
  `amt` int(11) NULL,
@@ -1355,7 +1355,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%training` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%units` (
- `vref` int(11) NULL,
+ `vref` int(11) NOT NULL,
  `u1` int(11) NULL DEFAULT '0',
  `u2` int(11) NULL DEFAULT '0',
  `u3` int(11) NULL DEFAULT '0',
@@ -1424,7 +1424,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%units` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%users` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `username` varchar(100) NULL,
  `password` varchar(100) NULL,
  `email` text NULL,
@@ -1432,7 +1432,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` (
  `access` tinyint(1) NULL DEFAULT '1',
  `gold` int(9) NULL DEFAULT '0',
  `gender` tinyint(1) NULL DEFAULT '0',
- `birthday` date NULL DEFAULT '0000-00-00',
+ `birthday` date NULL DEFAULT '1970-01-01',
  `location` text NULL,
  `desc1` text NULL,
  `desc2` text NULL,
@@ -1518,10 +1518,10 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` (
 --
 
 INSERT INTO `%PREFIX%users` (`id`, `username`, `password`, `email`, `tribe`, `access`, `gold`, `gender`, `birthday`, `location`, `desc1`, `desc2`, `plus`, `b1`, `b2`, `b3`, `b4`, `sit1`, `sit2`, `alliance`, `sessid`, `act`, `timestamp`, `ap`, `apall`, `dp`, `dpall`, `protect`, `quest`, `gpack`, `cp`, `lastupdate`, `RR`, `Rc`, `ok`) VALUES
-(5, 'Multihunter', '', 'multihunter@travianx.mail', 0, 9, 0, 0, '0000-00-00', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
-(1, 'Support', '', 'support@travianx.mail', 0, 8, 0, 0, '0000-00-00', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
-(2, 'Nature', '4262cc190152adfc1a3fcf32af6aa430', 'support@travianx.mail', 4, 9, 0, 0, '0000-00-00', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
-(4, 'Taskmaster', '', 'support@travianx.mail', 0, 8, 0, 0, '0000-00-00', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0);
+(5, 'Multihunter', '', 'multihunter@travianx.mail', 0, 9, 0, 0, '1970-01-01', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
+(1, 'Support', '', 'support@travianx.mail', 0, 8, 0, 0, '1970-01-01', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
+(2, 'Nature', '4262cc190152adfc1a3fcf32af6aa430', 'support@travianx.mail', 4, 9, 0, 0, '1970-01-01', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0),
+(4, 'Taskmaster', '', 'support@travianx.mail', 0, 8, 0, 0, '1970-01-01', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 0, 0, 0, 0, 0, 'gpack/travian_default/', 1, 0, 0, 0, 0);
 
 -- --------------------------------------------------------
 
@@ -1530,7 +1530,7 @@ INSERT INTO `%PREFIX%users` (`id`, `username`, `password`, `email`, `tribe`, `ac
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%vdata` (
-`wref` int(11) NULL,
+`wref` int(11) NOT NULL,
 `owner` int(11) NULL,
 `name` varchar(100) NULL,
 `capital` tinyint(1) NULL,
@@ -1570,7 +1570,7 @@ PRIMARY KEY (`wref`)
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%wdata` (
- `id` int(11) NULL AUTO_INCREMENT,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
  `fieldtype` tinyint(2) NULL,
  `oasistype` tinyint(2) NULL,
  `x` int(11) NULL,
@@ -1590,7 +1590,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%wdata` (
 --
 
 CREATE TABLE IF NOT EXISTS `%PREFIX%password` (
- `uid` int(11) NULL,
+ `uid` int(11) NOT NULL,
  `npw` varchar(100) NULL,
  `cpw` varchar(100) NULL,
  `used` tinyint(1) NULL DEFAULT '0',
diff --git a/install/templates/config.tpl b/install/templates/config.tpl
index ac8d3402..9db82845 100755
--- a/install/templates/config.tpl
+++ b/install/templates/config.tpl
@@ -321,7 +321,7 @@ echo "<div class=\"headline\"><span class=\"f10 c5\">Error creating constant.php
 	  <option value="0">Fast</option>
 	</select></td></tr>
 	<tr>	<td><span class="f9 c6">Error Reporting:</span></td><td><select name="error">
-	  <option value="error_reporting (E_ALL ^ E_NOTICE);" selected="selected">Yes</option>
+	  <option value="error_reporting (E_ALL ^ E_NOTICE ^ E_DEPRECATED);" selected="selected">Yes</option>
 	  <option value="error_reporting (0);">No</option>
 	</select></td></tr><tr>
 	<td><span class="f9 c6">T4 is Coming screen:</span></td><td><select name="t4_coming">
diff --git a/unx.js b/unx.js
index eef5c17c..f6fa7496 100644
--- a/unx.js
+++ b/unx.js
@@ -166,7 +166,11 @@ function fd(url,gd,hd,id){
 				var kd=jd.getResponseHeader('Content-Type');
 				kd=kd.substr(0,kd.indexOf(';'));
 				switch(kd){
-					case'application/json':gd((jd.responseText==''?null:eval('('+jd.responseText+')')));break;
+					case'application/json':
+						if (jd.responseText.indexOf('[]') < 0) {
+							gd((jd.responseText==''?null:eval('('+jd.responseText+')')));
+						}
+						break;
 					case'text/plain':case'text/html':gd(jd.responseText);break;
 					default:throw'Illegal content type';
 				}
@@ -189,16 +193,60 @@ else
 {url+='&'+param;}
 }
 document.location.href=url;}
-var rd={'index':0,'dir':0,'size':null,'fields':[],'cindex':0,'usealternate':false}
-;var m_c=rd;var sd;var td;var ud;var vd;var wd;var xd;var yd;var zd;var $d;var _d=false;var ae;var be;var ce;var de=[];de[38]=1;de[39]=2;de[40]=3;de[37]=4;var ee={}
-;var fe;var ge;function map_init(){sd=false;td=false;ud=false;vd=false;xd=0;wd=0;fe=he('karte2');ie(['i','a','t']);if(null==m_c.az){throw'm_c.az muss seitenspezifisch initialisiert werden.';}
-for(var p in m_c.az){document.getElementById('ma_'+p).onclick=je;}
-var ke=['mcx','mcy','x','y','map_infobox'];for(var i=0;i<ke.length;i++){ee[ke[i]]=document.getElementById(ke[i]);}
-ke=['mcx','mcy'];for(var i=0;i<ke.length;i++){ee[ke[i]].onfocus=function(){vd=true;}
-;ee[ke[i]].onblur=function(){vd=false;}
-;}
+var rd={'index':0,'dir':0,'size':null,'fields':[],'cindex':0,'usealternate':false};
+var m_c=rd;
+var sd;
+var td;
+var ud;
+var vd;
+var wd;
+var xd;
+var yd;
+var zd;
+var $d;
+var _d=false;
+var ae;
+var be;
+var ce;
+var de=[];
+de[38]=1;
+de[39]=2;
+de[40]=3;
+de[37]=4;
+var ee={};
+var fe;
+var ge;
+function map_init(){
+	sd=false;
+	td=false;
+	ud=false;
+	vd=false;
+	xd=0;
+	wd=0;
+	fe=he('karte2');
+	ie(['i','a','t']);
+	if(null==m_c.az){
+		throw'm_c.az muss seitenspezifisch initialisiert werden.';
+	}
+	for(var p in m_c.az){
+		document.getElementById('ma_'+p).onclick=je;
+	}
+	var ke=['mcx','mcy','x','y','map_infobox'];
+	for(var i=0;i<ke.length;i++){
+		ee[ke[i]]=document.getElementById(ke[i]);
+	}
+	ke=['mcx','mcy'];
+	for(var i=0;i<ke.length;i++){
+		ee[ke[i]].onfocus=function(){vd=true;};
+		ee[ke[i]].onblur=function(){vd=false;};
+	}
 
-ee.ibox_cells=[];ee.ibox_cells[0]=ee.map_infobox.firstChild.firstChild.lastChild;for(var i=1;i<=3;i++){ee.ibox_cells[i]=ee.map_infobox.firstChild.nextSibling.childNodes[i-1].lastChild}
+	ee.ibox_cells=[];
+	ee.ibox_cells[0]=ee.map_infobox.firstChild.firstChild.lastChild;
+	for(var i=1;i<=3;i++)
+	{
+		ee.ibox_cells[i]=ee.map_infobox.firstChild.nextSibling.childNodes[i-1].lastChild;
+	}
 	document.onkeyup=le;
 	document.onkeydown=me;
 	document.onkeypress=ne;
@@ -237,7 +285,11 @@ function ef(ff,gf){return((ff-1)*10)+gf
 }
 function hf(jf){ee.x.firstChild.nodeValue=jf.x;ee.y.firstChild.nodeValue=jf.y;}
 function kf(jf){ee.mcx.value=jf.x;ee.mcy.value=jf.y;l=$$('div.cropfinder_icon a').set('href','cropfinder.php?x='+jf.x+'&y='+jf.y);}
-function lf(x,y){return(400+x)+(400-y)*801+1;}
+function lf(x,y){
+	var world_max = m_c.world_max;
+	var world_max_double = (world_max * 2)+1;	
+	return(world_max+x)+(world_max-y)*world_max_double+1;
+}
 function ve(){if(mmode){zd=window.open(this.href,"map","top=100,left=25,width=1007,height=585");zd.focus();}
 else{xe(true);fd('ajax.php?f=kp&z='+lf(m_c.z.x,m_c.z.y),function(mf){xe(false);ae=document.getElementsByTagName('body')[0];be=document.getElementsByTagName('html')[0];ae.parentNode.removeChild(ae);ce=document.createElement('body');ce.innerHTML=mf.lm;ce.style.backgroundColor='#ffffff';be.appendChild(ce);m_c=[];for(var qd in mf.dat.m_c){m_c[qd]=mf.dat.m_c[qd];}
 m_c.fields=[];mdim=mf.dat.mdim;mmode=mf.dat.mmode;map_init();}
@@ -252,49 +304,190 @@ be.removeChild(ce);be.appendChild(ae);map_init();var of;var area;for(var i=0;i<m
 }
 hf(m_c.z);kf(m_c.z);}
 return false;}
-function je(){var qf=1*this.id.substring(4,5);var rf=1*(this.id.substring(5,7)=='p7'?mdim.x:1);map_scroll(qf,rf);return false;}
+
+//this function is executed on map direction icon clicking
+//ma_n1, ma_n2, ma_n3, ma_n4
+//	document.getElementById('ma_'+p).onclick=je;
+function je(){
+	var qf=1*this.id.substring(4,5);
+	var rf=1*(this.id.substring(5,7)=='p7'?mdim.x:1);
+//	console.log(this.id + "--" + qf+"-"+rf);
+	map_scroll(qf,rf);
+	return false;
+}
 function sf(z){var x=z.x-mdim.rad;var y=z.y-mdim.rad;var tf=z.x+mdim.rad;var uf=z.y+mdim.rad;return{'x':x,'y':y,'xx':tf,'yy':uf}
 ;}
-function vf(qf,rf,wf){if(wf==null){wf=0;}
-if(m_c.size==null){throw'Globale Variable m_c.size muss auf den Wert von $travian[map_prefetch_rows]) gesetzt werden.';}
-var xf,yf;if(null===rf||1===rf){yf=m_c.size-1;}
-else if(mdim.x==rf){xf=mdim.x;yf=-(mdim.x-1);}
-else{throw'Parameter steps muss 1 oder Breite der Karte in Feldern sein.';}
-var x,y,tf,uf,z;var z=m_c.z;switch(qf){case 1:x=z.x+mdim.rad;y=z.y+mdim.rad+wf;tf=z.x-mdim.rad;uf=y+yf;break;case 2:x=z.x+mdim.rad+wf;y=z.y-mdim.rad;tf=x+yf;uf=z.y+mdim.rad;break;case 3:x=z.x+mdim.rad;y=z.y-mdim.rad-wf;tf=z.x-mdim.rad;uf=y-yf;break;case 4:x=z.x-mdim.rad-wf;y=z.y-mdim.rad;tf=x-yf;uf=z.y+mdim.rad;break;}
-return{'x':x,'y':y,'xx':tf,'yy':uf}
-;}
-function zf($f){if($f>400){$f-=801;}
-if($f<-400){$f+=801;}
-return $f;}
-function _f($f){if($f>400){$f=400;}
-if($f<-400){$f=-400;}
-return $f;}
-function ag(qf,rf){var z={}
-;z.x=m_c.z.x*1;z.y=m_c.z.y*1;switch(qf){case 1:z.y+=rf;break;case 2:z.x+=rf;break;case 3:z.y-=rf;break;case 4:z.x-=rf;break;}
-m_c.z.x=zf(z.x);m_c.z.y=zf(z.y);}
+function vf(qf,rf,wf){
+	if(wf==null){wf=0;}
+	if(m_c.size==null){
+		throw'Globale Variable m_c.size muss auf den Wert von $travian[map_prefetch_rows]) gesetzt werden.';
+	}
+	var xf,yf;
+	if(null===rf||1===rf){
+		yf=m_c.size-1;
+	}
+	else if(mdim.x==rf){
+		xf=mdim.x;yf=-(mdim.x-1);
+	}
+	else{
+		throw'Parameter steps muss 1 oder Breite der Karte in Feldern sein.';
+	}
+	var x,y,tf,uf,z;var z=m_c.z;
+	switch(qf){
+		case 1:
+			x=z.x+mdim.rad;y=z.y+mdim.rad+wf;
+			tf=z.x-mdim.rad;uf=y+yf;
+			break;
+		case 2:
+			x=z.x+mdim.rad+wf;y=z.y-mdim.rad;
+			tf=x+yf;uf=z.y+mdim.rad;
+			break;
+		case 3:
+			x=z.x+mdim.rad;y=z.y-mdim.rad-wf;
+			tf=z.x-mdim.rad;
+			uf=y-yf;
+			break;
+		case 4:
+			x=z.x-mdim.rad-wf;
+			y=z.y-mdim.rad;
+			tf=x-yf;
+			uf=z.y+mdim.rad;
+			break;
+	}
+	return{'x':x,'y':y,'xx':tf,'yy':uf};
+}
+
+function zf($f){
+	var world_max = m_c.world_max;
+	var world_max_double = (world_max * 2) + 1;
+	if($f>world_max){
+		$f-=world_max_double;
+	}
+	if($f<-world_max){
+		$f+=world_max_double;
+	}
+	return $f;
+}
+
+function _f($f){
+	if($f>m_c.world_max){
+		$f=m_c.world_max;
+	}
+	if($f<-m_c.world_max){
+		$f=-m_c.world_max;
+	}
+	return $f;
+}
+
+//tientn: m_c is the object hold all global variables
+function ag(qf,rf){
+	var z={};
+	z.x=m_c.z.x*1;
+	z.y=m_c.z.y*1;
+	switch(qf){
+		case 1:
+			z.y+=rf;
+			break;
+		case 2:
+			z.x+=rf;
+			break;
+		case 3:
+			z.y-=rf;
+			break;
+		case 4:
+			z.x-=rf;
+			break;
+	}
+	m_c.z.x=zf(z.x);
+	m_c.z.y=zf(z.y);
+}
 function bg(cg){return'ajax.php?f=k7&x='+cg.x+'&y='+cg.y+'&xx='+cg.xx+'&yy='+cg.yy;}
-function map_scroll(qf,rf,dg){var cg,eg;if(sd){return false;}
-if(fg()){if(td){return false;}
-sd=true;gg();m_c.usealternate=false;m_c.cindex=0;if(dg!==undefined){m_c.z.x=_f(dg.x);m_c.z.y=_f(dg.y);cg=sf(m_c.z);}
-else{ag(qf,rf);cg=vf(qf,rf);}
-hg=bg(cg);fd(hg,ig);}
-else{if(jg()){if(td){return false;}
-td=true;ag(qf,rf);cg=vf(qf,rf,2);hg=bg(cg);fd(hg,ig);}
-else if(kg()){ag(qf,rf);lg();gg();}
-else{ag(qf,rf);}
-mg(qf,rf);}
-function ig(ng){var og;if(jg()){og=pg(m_c.cindex);m_c.usealternate=false;td=false;}
-else{og=m_c.cindex;}
-m_c.fields[og]=ng;if(fg()){if(dg!==undefined){mg(0,0,m_c.z);qg('x');qg('y');}
-else{mg(qf,rf);qg(qf);}
-sd=false;}
-}
-function jg(){return m_c.usealternate;}
-function fg(){return(qf!=m_c.dir||rf==mdim.x||(rf==1&&rf!=m_c.steps)||dg!==undefined);}
-function kg(){return(m_c.index==m_c.size);}
-}
+
+function map_scroll(qf,rf,dg) {
+	var cg,eg;
+	if(sd){
+		return false;
+	}
+	if(fg()){
+		if(td){
+			return false;
+		}
+		sd=true;
+		gg();
+		m_c.usealternate=false;
+		m_c.cindex=0;
+		if(dg!==undefined){
+			m_c.z.x=_f(dg.x);
+			m_c.z.y=_f(dg.y);
+			cg=sf(m_c.z);
+		}
+		else{
+			ag(qf,rf);
+			cg=vf(qf,rf);
+		}
+		hg=bg(cg);
+		fd(hg,ig);
+	}
+	else{
+		if(jg()){
+			if(td){
+				return false;
+			}
+			td=true;
+			ag(qf,rf);
+			cg=vf(qf,rf,2);
+			hg=bg(cg);
+			fd(hg,ig);
+		}
+		else if(kg()){
+			ag(qf,rf);
+			lg();
+			gg();
+		}
+		else{
+			ag(qf,rf);
+		}
+		mg(qf,rf);
+	}
+	function ig(ng){
+		var og;
+		if(jg()){
+			og=pg(m_c.cindex);
+			m_c.usealternate=false;
+			td=false;
+		}
+		else{
+			og=m_c.cindex;
+		}
+		m_c.fields[og]=ng;
+		if(fg()){
+			if(dg!==undefined){
+				mg(0,0,m_c.z);
+				qg('x');
+				qg('y');
+			}
+			else{
+				mg(qf,rf);
+				qg(qf);
+			}
+			sd=false;
+		}
+	}
+	function jg(){
+		return m_c.usealternate;
+	}
+	function fg(){
+		return(qf!=m_c.dir||rf==mdim.x||(rf==1&&rf!=m_c.steps)||dg!==undefined);
+	}
+	function kg(){
+		return(m_c.index==m_c.size);
+	}
+} //end of map_scroll
+
 function rg(qf,rf){m_c.dir=qf;m_c.steps=rf;}
-function gg(){m_c.index=0;}
+function gg(){
+	m_c.index=0;
+}
 function sg(){m_c.index++;if(m_c.index==m_c.size-2){m_c.usealternate=true;}
 }
 function lg(){m_c.cindex=pg(m_c.cindex);}
@@ -319,11 +512,25 @@ area.details.normal_field=area.details.name===undefined&&area.details.typ==0;are
 ;area.details.classic_oasis=area.details.querystring==='';}
 function df(dh){switch(dh){case 1:return[3,3,3,9];case 2:return[3,4,5,6];case 3:return[4,4,4,6];case 4:return[4,5,3,6];case 5:return[5,3,4,6];case 6:return[1,1,1,15];case 7:return[4,4,3,7];case 8:return[3,4,4,7];case 9:return[4,3,4,7];case 10:return[3,5,4,6];case 11:return[4,3,5,6];case 12:return[5,4,3,6];default:return false;}
 }
-function oe(){var x=parseInt(this.xp.value);var y=parseInt(this.yp.value);if(!isNaN(x)&&!isNaN(y)){map_scroll(0,0,{'x':x,'y':y}
-);}
-return false;}
-function ne(e){if(vd){return true;}
-var qd=(window.event)?event.keyCode:e.keyCode;var qf=eh(qd);if(qf!=0){return false;}
+//document.map_coords.onsubmit=oe;
+function oe(){
+	var x=parseInt(this.xp.value);
+	var y=parseInt(this.yp.value);
+	if(!isNaN(x)&&!isNaN(y)){
+		map_scroll(0,0,{'x':x,'y':y});
+	}
+	return false;
+}
+//document.onkeypress=ne;
+function ne(e){
+	if(vd){
+		return true;
+	}
+	var qd=(window.event)?event.keyCode:e.keyCode;
+	var qf=eh(qd);
+	if(qf!=0){
+		return false;
+	}
 }
 function qe(){_d=true;hf(this.details);$e(this.details);fh(this);ge=this;}
 function fh(area){if(!area.details.fresh.href){if(area.details.classic_oasis){area.removeAttribute('href');area.style.cursor='default';}
@@ -357,14 +564,31 @@ function vg(qf){for(var i=0;i<mdim.x;i++){for(var j=1;j<mdim.x;j++){switch(qf){c
 }
 }
 }
-function eh(qd){if(de[qd]!==undefined){return de[qd];}
-return 0;}
-function le(e){if(vd){return true;}
-var qd=((window.event)?event.keyCode:e.keyCode);if(16==qd){ud=false;}
-var qf=eh(qd);if(qf==wd&&wd!=0){wd=0;kf(m_c.z);ph();}
+function eh(qd){
+	if(de[qd]!==undefined){
+		return de[qd];
+	}
+	return 0;
 }
-function m_r(qf,qh){if(wd==qf&&qh==xd){window.setTimeout(function(){m_r(qf,qh)}
-,100);map_scroll(qf,1);}
+//document.onkeyup=le;
+function le(e){
+	if(vd){
+		return true;
+	}
+	var qd=((window.event)?event.keyCode:e.keyCode);
+	if(16==qd){
+		ud=false;
+	}
+	var qf=eh(qd);
+	if(qf==wd&&wd!=0){
+		wd=0;kf(m_c.z);ph();
+	}
+}
+function m_r(qf,qh){
+	if(wd==qf&&qh==xd){
+		window.setTimeout(function(){m_r(qf,qh)},100);
+		map_scroll(qf,1);
+	}
 }
 function qg(rh){var jb;switch(rh){case 2:case 4:case'x':jb='x';break;case 1:case 3:case'y':jb='y';break;}
 var sh='m'+jb;var th;var uh;var vh=0;var wh=0;for(var i=0;i<mdim.x;i++){if(jb=='x'){vh=i;}
@@ -372,12 +596,26 @@ else{wh=i;}
 if(ee[sh][i]){th=pe(vh,wh,'a').details[jb];ee[sh][i].firstChild.nodeValue=th;}
 }
 }
-function me(e){if(vd){return true;}
-var qd=(window.event)?event.keyCode:e.keyCode;if(qd==16){ud=true;}
-var qf=eh(qd);if(qf!=0&&qf!=wd){var rf=(ud?mdim.x:1);map_scroll(qf,rf);var qh=new Date().getTime();if(rf==1){window.setTimeout(function(){m_r(qf,qh)}
-,500);}
-xd=qh;wd=qf;ph();}
-if(qf!=0){return false;}
+//document.onkeydown=me;
+function me(e){
+	if(vd){
+		return true;
+	}
+	var qd=(window.event)?event.keyCode:e.keyCode;if(qd==16){ud=true;}
+	var qf=eh(qd);
+	if(qf!=0&&qf!=wd){
+		var rf=(ud?mdim.x:1);
+		map_scroll(qf,rf);
+		var qh=new Date().getTime();
+		if(rf==1){
+			window.setTimeout(function(){m_r(qf,qh)},500);
+		}
+		xd=qh;wd=qf;
+		ph();
+	}
+	if(qf!=0){
+		return false;
+	}
 }
 function ph(){window.setTimeout(function(){if(_d){$e(ge.details);}
 }