fix some things in admin panel

Admin/Templates/deletion.tpl

@@ -42,7 +42,7 @@ if($_GET['uid'])
 					</tr>
 					<tr>
 						<td>Rank:</td>
-						<td>???.</td>
+						<td><?php $ranking->procRankArray();echo $ranking->getUserRank($user['id']); ?></td>
 						<td>Population:</td>
 						<td><?php echo $totalpop;?></td>
 					</tr>

Admin/Templates/map.tpl

@@ -3,42 +3,127 @@
 ##              -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                 ##
 ## --------------------------------------------------------------------------- ##
 ##  Filename       map.tpl                                                     ##
-##  Developed by:  Dzoki                                                       ##
+##  Developed by:  ronix                                                       ##
-##  License:       TravianX Project                                            ##
+##  License:       TravianZ Project                                            ##
-##  Copyright:     TravianX (c) 2010-2011. All rights reserved.                ##
+##  Copyright:     TravianZ (c) 2010-2014. All rights reserved.                ##
 ##                                                                             ##
 #################################################################################
+$check1="";
+$check2="";
+if(isset($_POST['show1']) || isset($_POST['show2'])) {
+ $check1=isset($_POST['show1'])? "checked ":"";
+ $check2=isset($_POST['show2'])? "checked ":"";
+ if ($check1!="" && $check2!="") {$criteria="";}
+ if ($check1!="" && $check2=="") {$criteria="WHERE tribe<>5";}
+ if ($check1=="" && $check2!="") {$criteria="WHERE tribe IN(0,5)";}
+}elseif(!isset($_GET['c'])){
+	$check1="checked ";
+	$criteria="WHERE tribe<>5";
+}
+if ($check1=="" && $check2=="") {$criteria="WHERE tribe NOT IN(1,2,3,4,5)";}
 ?>
+<link rel="stylesheet" href="../img/admin/map.css" type="text/css" media="all">
+			<div id="start">
 
-comming soon
+			<div class="clear">
-<div>
+					<h2 class="left"><?php echo SERVER_NAME;?> Map!</h2>
-<img style="border: 1px solid blue;" src="img/x.gif" usemap="#mymap" alt="imagemap" border="0" height="525 width="525">
+				</div>
-</div>
+				<p>This is the map of <?php echo SERVER_NAME;?>. Search and find players.</p>
+				<h1>Show Option</h1>
+				<form id="show" name="show" action="admin.php?p=map&c=1" method="POST">
+				<table width="50%">
+					<tr><td>
+						<input id="show1" name="show1" type="checkbox" <?php echo $check1;?>value="1">Player
+						</td>
+						<td>
+						<input id="show2" name="show2" type="checkbox" <?php echo $check2;?>value="2">Natar
+						</td>
+						<td>
+						<input id="btnshow" type="button" value="Show" style="font-size:9px" onclick=submit()>
+						</td>
+					</tr>
+				</table>
+				</form>
+			</div>
 
-<map name="mymap">
+			<div id="kaart">
 
-<?php
+				<div id="map" title="">
-function line($x,$W){
-$a = 0;
-for ($i = 0; $i <= $x; $i++) {
-$X = $W.'-'.$i;
-$c += 25;
-$d = $W*25+25;
-$b = 25*($W-1);
-echo '<area shape="rect" coords="'.$a.','.$b.','.$c.','.$d.'" href="?x='.$W.'&y='.$i.'" alt="frames">';
-$a += 25;
-}
-}
 
-function map($x,$y){
+					<div class="zoomlevels">
-for ($i = 0; $i <= $y; $i++) {
+						<span id="zl">-<?php echo WORLD_MAX;?></span>
-line($x,$i);
+						<span id="zr"><?php echo WORLD_MAX;?></span>
-}
+						<span id="zb"><?php echo WORLD_MAX;?></span>
-}
+						<span id="zo">-<?php echo WORLD_MAX;?></span>
+						<span id="zc">(0,0)</span>
+						<div id="lijn_hor"></div>
+						<div id="lijn_ver"></div>
+					</div>
+
+					<!-- Contents of the folder -->
+					<div style="top: 0px; left: 0px;" id="map_bg">
+					<?php
+					$array_tribe=array('-',TRIBE1,TRIBE2,TRIBE3,TRIBE4,TRIBE5,TRIBE6);
+					$q="SELECT v.wref, v.owner, v.name, v.capital, v.pop,u.username, u.tribe, u.access, w.x, w.y FROM ".TB_PREFIX."vdata AS v LEFT JOIN ".TB_PREFIX."users AS u ON v.owner=u.id LEFT JOIN ".TB_PREFIX."wdata AS w ON v.wref=w.id ".$criteria;
+					$player_info=$database->query_return($q);
+					foreach($player_info as $p_array) {
+						$p_name=$p_array['username'];
+						$p_village=mysql_real_escape_string($p_array['name']);
+						$p_coor="(".$p_array['x']."|".$p_array['y'].")";
+						$p_pop=$p_array['pop'];
+						$p_tribe=$array_tribe[$p_array['tribe']];
+						$p_info="<a href=\"?p=village&did=".$p_array['wref']."\" target=\"_blank\"><img src=\"../img/admin/map_".$p_array['tribe'].".gif\" border=\"0\" onmouseout=\"med_closeDescription()\" onmousemove=\"med_mouseMoveHandler(arguments[0],'<ul class=\'p_info\'><li>Player name : <b>$p_name</b></li><li>Village name : <b>$p_village</b></li><li>Coordinat : <b>$p_coor</b></li><li>Population : <b>$p_pop</b></li><li>Tribe : <b>$p_tribe</b></li></ul>')\"></a>";
+						//250px=0
+						$xdiv=250/WORLD_MAX;
+						if ($p_array['x']<0) { //-
+							$p_x=250-intval(abs($p_array['x'])*$xdiv);
+						}
+						if ($p_array['x']>0) { //+
+							$p_x=250+intval(abs($p_array['x'])*$xdiv);
+						}
+						if ($p_array['y']<0) { //-
+							$p_y=250+intval(abs($p_array['y'])*$xdiv);
+						}
+						if ($p_array['y']>0) { //+
+							$p_y=250-intval(abs($p_array['y'])*$xdiv);
+						}
+						if ($p_array['x']==0 && $p_array['y']==0) { //multihunter
+							$p_x=250;
+							$p_y=250;
+						}
+						
+					echo '<div style="left:'.$p_x.'px; top:'.$p_y.'px; position:absolute">'.$p_info.'</div>';
+					}
+					?>
+					</div>
 
 
-map(20,20);
+				</div>
+				<div id="legenda">
+					<div class="content">
+						<h3>Legend</h3>
+						<div id="items">
+							<div class="first"></div>
+							<table>
+							<tr>
+							<td><img src="../img/admin/map_1.gif" height="11" width="11"></td><td class="show"><?php echo TRIBE1;?></td>
+							</tr>
+							<tr>
+							<td><img src="../img/admin/map_2.gif" height="11" width="11"></td><td class="show"><?php echo TRIBE2;?></td>
+							</tr>
+							<tr>
+							<td><img src="../img/admin/map_3.gif" height="11" width="11"></td><td class="show"><?php echo TRIBE3;?></td>
+							</tr>
+							<tr>
+							<td><img src="../img/admin/map_5.gif" height="11" width="11"></td><td class="show"><?php echo TRIBE5;?></td>
+							</tr>
+							<tr>
+							<td><img src="../img/admin/map_0.gif" height="11" width="11"></td><td class="show">Multihunter</td>
+							</tr>
+							</table>		
+						</div>
+						
+					</div>
+				</div>
 
-
+			</div>
-?>
-</map>

Admin/Templates/village.tpl

@@ -48,6 +48,7 @@ if(isset($id))
 	91l+gRNDLzw6f+nepcsPrl14cPXW8wcMWqVaEYdtPdZYubUHww0AMs5cusygU68UtVUr87CPWbdd
 	9Ly83TcO7Lq2I7ozoXfZTAalCjWZemnlaYo2u0wVFkoJdwoyZDOZNDi//vqRwbkjac+dC827p2h3
 	Gyh3S6m0a0Qszrnz6RnQWAAxV5tT/VAiNQAAAABJRU5ErkJggg==";
+	/*
 	class Generator
 	{
 		public function getMapCheck($wref)
@@ -56,6 +57,7 @@ if(isset($id))
 		}
 	};
 	$generator = new Generator;
+	*/
 	if($village and $user)
 	{
 		include("search2.tpl"); ?>
@@ -195,7 +197,7 @@ if(isset($id))
 					for($e=1; $e<4; $e++)
 					{
 						$exp = $village['exp'.$e.''];
-						if($exp['wref'] == 0)
+						if($exp == 0)
 						{
 							echo '
 								<tr>
@@ -294,7 +296,7 @@ if(isset($id))
 							elseif($type==12){ $type = '<img src="../img/admin/r/4.gif"> + 50%'; }
 							echo "
 							<tr>
-								<td><a href=\"?delOas&oid=\" onClick=\"return del(\'oas\','.$varray[$i]['wref'].');\"><img src=\"../img/admin/del.gif\"></a></td>
+								<td><a href=\"?delOas&oid=\" onClick=\"return del('oas',".$varray[$i]['wref'].")\"><img src=\"../img/admin/del.gif\"></a></td> 
 								<td class=\"hab\">".$row['name']."</td>
 								<td class=\"hab\"><a href=\"../karte.php?d=".$row['wref']."&c=".$generator->getMapCheck($row['wref'])."\" target=\"blank\">(".$oasisx."|".$oasisy.")</a></td>
 								<td class=\"hab\">".$row['loyalty']."%</td>

Admin/admin.php

@@ -11,10 +11,10 @@
 #################################################################################
 
 session_start();
-include("../GameEngine/Database.php");
+include_once("../GameEngine/Database.php");
-include("../GameEngine/Admin/database.php");
+include_once("../GameEngine/Admin/database.php");
-include("../GameEngine/config.php");
+include_once("../GameEngine/Data/buidata.php");
-include("../GameEngine/Data/buidata.php");
+include_once ("../GameEngine/Lang/" . LANG . ".php");  
 
 class timeFormatGenerator
 {

Templates/Profile/medal.php

@@ -1,10 +1,11 @@
 <?php			   
-	//gp link
+    //gp link
     $separator=isset($separator)? $separator:"";
-    if($session->gpack == null || GP_ENABLE == false) {
+    $gpack_load=isset($user['gpack'])? $user['gpack']:$database->getUserField($_SESSION['username'], 'gpack', 1);
+    if($gpack_load== null || GP_ENABLE == false) {
     $gpack= $separator.GP_LOCATE;
     } else {
-    $gpack= $separator.$session->gpack;
+    $gpack= $separator.$gpack_load;
     }  
 
 	

img/admin/map.css

@@ -0,0 +1,246 @@
+body {
+	font-size: 12px;
+	color: #000;
+
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	margin-top: 3px;
+}
+
+img,form {
+	margin:0;
+	padding:0;
+	border:0;
+}
+
+.left {
+	float:left;
+}
+.right {
+	float:right;
+}
+
+a {
+	color: #000;
+}
+a:hover {
+	color: #777;
+}
+
+p {
+	line-height: 15px;
+	margin-top: 6px;
+	margin-bottom: 7px;
+}
+
+.center {
+	text-align:center;
+}
+
+.cursor {
+	cursor: pointer;
+}
+
+.border {
+	border:1px solid #000;
+}
+.und,
+div.info a {
+	text-decoration: underline;
+	cursor: pointer;
+}
+
+/* Float lefts en clear alles eromheen */
+.clear {
+	height: 45px;
+	width: 100%;
+}
+
+h1 {
+	font-size: 13pt;
+	color: blue;
+}
+h2 {
+	margin-top: 8px;
+	font-size: 15pt;
+}
+h3 {
+	font-size: 12pt;
+}
+#kaart {
+	height: 610px;
+	width: 900px;
+	padding-top: 2px;
+	position:relative;
+}
+#map {
+	width: 510px;
+	height: 510px;
+	background-repeat:no-repeat;
+	background-color: #ebebeb;
+	border: 1px solid #000;
+	position:relative;
+	float:left;
+	z-index: 10;
+	overflow: hidden;
+}
+
+#map_bg {
+	background-image: url(map_piece.jpg);
+	width: 	510px;
+	height: 510px;
+/*
+	margin-top: 0px;
+	margin-left:0px;
+*/
+	position: relative;
+	top: 0px;
+	left: 0px;
+}
+#zl {
+	left: 5px;
+	top: 235px;
+}
+
+#zr {
+	top: 235px;
+	left: 488px;
+}
+
+#zb {
+	top:1px;
+	left: 260px;
+}
+
+#zo {
+	left: 260px;
+	top: 498px;
+}
+
+#zc {
+	top: 235px;
+	left: 260px;
+}
+
+#lijn_hor {
+	border-left: 1px solid #000;
+	left: 250px;
+	top: 0px;
+	height: 520px;
+}
+
+#lijn_ver {
+	border-top: 1px solid #000;
+	left: 0px;
+	top: 250px;
+	width: 520px;
+}
+#mapp {
+	position: relative;
+	top: 0px;
+	left: 0px;
+	margin-left: 505px;
+	z-index: 45;
+}
+.p_info {
+	padding-left:15px;
+	line-height:100%;
+	list-style:none;
+}	
+.clear span.left {
+	font-size: 10px;
+	margin-top: 10px;
+}
+
+.nbd {
+	color: #000;
+	position:absolute;
+	display: block;
+	font-size: 8pt;
+}
+
+/* Legenda */
+#legenda {
+	width: 238px;
+	height: 200px;
+	background: #fff;
+	border: 1px solid #000;
+	float:left;
+	padding-left: 3px;
+	margin-left:30px;
+}
+
+#legenda .content {
+	padding-left: 3px;
+	padding-right: 0px;
+	height: 250px;
+	width: 214px;
+	float:left;
+	overflow:auto;
+}
+
+#legenda h3 {
+	margin: 0px;
+}
+
+#items {
+	margin-top: 4px;
+}
+#items .first {
+	width: 90px;
+	border-bottom: 1px solid #000;
+	padding: 2px;
+}
+.show{
+	font-size: 9pt;
+}
+.weg {
+	cursor: pointer;
+}
+
+/* Start */
+#start {
+	height: 130px;
+	overflow:hidden;
+}
+
+/* Loader */
+#loader {
+	display:none;
+	position:absolute;
+	z-index: 50;
+	top: 27px;
+	left: 320px;
+}
+
+
+/* Zoomlevels */
+#map .zoomlevels span,#map .zoomlevels div {
+	position: absolute;
+	font-size: 10px;
+	cursor: default;
+	z-index: 40;
+}
+
+.plusmin {
+	margin-left: 19px;
+}
+
+#navi span,.plusmin span {
+	display: block;
+	float:left;
+	width: 15px;
+	height: 15px;
+	margin: 1px;
+	cursor: pointer;
+	background-repeat: no-repeat;
+	border: 1px solid #000;
+
+}
+
+#zoomlevelman {
+	display: block;
+	height: 80px;
+	width: 20px;
+	background-position: 2px -1px;
+	background-repeat: no-repeat;
+}