diff --git a/Admin/Templates/msg.tpl b/Admin/Templates/msg.tpl index 649351dd..73127c79 100644 --- a/Admin/Templates/msg.tpl +++ b/Admin/Templates/msg.tpl @@ -25,7 +25,7 @@ if(!empty($allMessages)){ -

Players Messages

+

Players Message

5){ $_SESSION['error_p'] = ''; } -if($_POST and $_GET['action'] == 'change_capital'){ +if($_POST and $_GET['action'] == 'change_capital' && !$village->capital){ $pass = mysqli_escape_string($database->dblink, $_POST['pass']); $query = mysqli_query($database->dblink, 'SELECT password FROM `'.TB_PREFIX.'users` WHERE `id` = '.(int)$session->uid); $data = mysqli_fetch_assoc($query); @@ -16,29 +16,31 @@ if($_POST and $_GET['action'] == 'change_capital'){ if($data2['vref'] != $village->wid){ for($i = 1; $i <= 18; ++$i){ if($data2['f'.$i] > 10){ - $query2 = mysqli_query($database->dblink, 'UPDATE `'.TB_PREFIX.'fdata` SET `f'.$i.'` = 10 WHERE `vref` = '.(int)$data2['vref']) or die(mysqli_error($database->dblink)); + $query2 = mysqli_query($database->dblink, 'UPDATE `'.TB_PREFIX.'fdata` SET `f'.$i.'` = 10 WHERE `vref` = '.(int)$data2['vref']); } } for($i = 19; $i <= 40; ++$i){ if($data2['f'.$i.'t'] == 34){ - $query3 = mysqli_query($database->dblink, 'UPDATE `'.TB_PREFIX.'fdata` SET `f'.$i.'t` = 0, `f'.$i.'` = 0 WHERE `vref` = '.(int)$data2['vref']) or die(mysqli_error($database->dblink)); + $query3 = mysqli_query($database->dblink, 'UPDATE `'.TB_PREFIX.'fdata` SET `f'.$i.'t` = 0, `f'.$i.'` = 0 WHERE `vref` = '.(int)$data2['vref']); } } for($i = 19; $i <= 40; ++$i){ if($data2['f'.$i.'t'] == 29 || $data2['f'.$i.'t'] == 30 || $data2['f'.$i.'t'] == 38 || $data2['f'.$i.'t'] == 39 || $data2['f'.$i.'t'] == 42){ - $query3 = mysqli_query($database->dblink, 'UPDATE `'.TB_PREFIX.'fdata` SET `f'.$i.'t` = 0, `f'.$i.'` = 0 WHERE `vref` = '.(int)$village->wid) or die(mysqli_error($database->dblink)); + $query3 = mysqli_query($database->dblink, 'UPDATE `'.TB_PREFIX.'fdata` SET `f'.$i.'t` = 0, `f'.$i.'` = 0 WHERE `vref` = '.(int)$village->wid); } } $database->changeCapital((int)$data1['wref'], 0); $database->changeCapital($village->wid); + header("location: build.php?gid=26"); + exit; } }else{ $error = '
'.LOGIN_PW_ERROR.'
'; $_SESSION['error_p'] = $error; $_SESSION['time_p'] = time(); - print ''; + echo ''; } } ?> @@ -62,7 +64,7 @@ else echo '
'.PALACE_TRAIN_DESC.'
'; ?> capital == $village->wid) { +if($village->capital == 1) { ?>

getOasis($village->wid); -if(isset($_GET['gid']) && $_GET['gid']==37 && isset($_GET['del']) && $database->getOasisField($_GET['del'], 'owner') == $session->uid){ +if(isset($_GET['gid']) && $_GET['gid'] == 37 && isset($_GET['del']) && $database->getOasisField($_GET['del'], 'owner') == $session->uid){ if($session->access != BANNED){ $database->removeOases($_GET['del']); header("Location: build.php?id=".$id."&land"); diff --git a/Templates/Profile/overview.tpl b/Templates/Profile/overview.tpl index d13accda..9c23c758 100644 --- a/Templates/Profile/overview.tpl +++ b/Templates/Profile/overview.tpl @@ -48,10 +48,12 @@ include("menu2.tpl"); Player -
This player is Admin.
"; } ?> -
This player is Multihunter.
"; } ?> -
This player is BANNED.
"; } ?> -
This player is on VACATION.
"; } ?> +
This player is Admin.
"; +if($displayarray['access'] == MULTIHUNTER) echo "
This player is Multihunter.
"; +if($displayarray['access'] == BANNED) echo "
This player is BANNED.
"; +if($displayarray['vac_mode'] == 1) echo "
This player is on VACATION.
"; +?> Details Description @@ -65,7 +67,7 @@ include("menu2.tpl"); -"; } ?> +"; } ?> @@ -75,29 +77,17 @@ include("menu2.tpl"); + $tribeArrays = [TRIBE1, TRIBE2, TRIBE3, TRIBE4, TRIBE5]; + echo $tribeArrays[$displayarray['tribe'] - 1]; + ?> - @@ -114,21 +104,21 @@ include("menu2.tpl"); "; } //Gender if(isset($displayarray['gender']) && $displayarray['gender'] != 0) { - $gender = ($displayarray['gender']== 1)? "Male" : "Female"; - echo ""; + $gender = ($displayarray['gender']== 1)? "Male" : "Female"; + echo ""; } //Location if($displayarray['location'] != "") { - echo ""; + echo ""; } ?> @@ -159,10 +149,7 @@ include("menu2.tpl");
- - -
Banned
Banned
Tribe
AlliancegetAllianceName($displayarray['alliance']); echo "".$displayalliance.""; } ?>Age$age
Gender".$gender."
Gender".$gender."
Location".$displayarray['location']."
Location".$displayarray['location']."
@@ -181,48 +168,41 @@ include("menu2.tpl"); foreach($varray as $vil) { $coor = $database->getCoor($vil['wref']); echo ""; - - // OASIS PART - must to be activated from install part - - $prefix = "".TB_PREFIX."odata"; - $uid = $_GET['uid']; $wref = $vil['wref']; - $sql = mysqli_query("SELECT * FROM $prefix WHERE owner = $uid AND conqured = $wref"); - while($row = mysqli_fetch_array($sql)){ - $type = $row["type"]; - switch($type) { - case 1: - case 2: - echo ""; - break; - case 3: - echo ""; - break; - case 4: - case 5: - echo ""; - break; - case 6: - echo ""; - case 7: - case 8: - echo ""; - break; - case 9: - echo ""; - break; - case 10: - case 11: - case 12: - echo ""; - break; - } - } - - // OASIS PART - must to be activated from install part echo ""; echo "
getMapCheck($vil['wref'])."\">".$vil['name'].""; - if($vil['capital'] == 1) { - echo " (capital)"; + if($vil['capital'] == 1) echo " (capital)"; + echo ""; + + // OASIS PART - must to be activated from install part + + $oases = $database->getOasis($vil['wref']); + foreach ($oases as $oasis){ + switch ($oasis['type']) { + case 1: + case 2: + echo " "; + break; + case 3: + echo " "; + break; + case 4: + case 5: + echo " "; + break; + case 6: + echo " "; + case 7: + case 8: + echo " "; + break; + case 9: + echo " "; + break; + case 10: + case 11: + case 12: + echo " "; + break; + } } - echo " ".$vil['pop'].""; diff --git a/img/admin/admin.css b/img/admin/admin.css index 9966bda4..2eda97b6 100644 --- a/img/admin/admin.css +++ b/img/admin/admin.css @@ -17,10 +17,10 @@ font-family: Verdana, Arial, Helvetica, sans-serif; /* Fix */ .online1, .online2, .online3, .online4, .online5 {width:12px; height:12px;} /* Oberer Layer mit Menue ohne Werbung */ -#ltop1 {position:relative; padding-left: 25%; width:100%; min-width:980px; height:100px; z-index:2; background-image:url(../un/l/mp.gif); background-repeat:repeat-x; left:0px; top:0px;} +#ltop1 {position:relative; width:100%; min-width:980px; height:100px; z-index:2; background-image:url(../un/l/mp.gif); background-repeat:repeat-x; left:0px; top:0px;} /* Oberer Layer mit Menue mit Werbung */ -#ltop2 {position:relative; padding-left: 25%; width:100%; min-width:980px; height:100px; z-index:2; background-image:url(../un/l/mw.gif); background-repeat:repeat-x; left:0px; top:0px;} +#ltop2 {position:relative; width:100%; min-width:980px; height:100px; z-index:2; background-image:url(../un/l/mw.gif); background-repeat:repeat-x; left:0px; top:0px;} /* - VERALTET - Oberer Layer mit Mindestbreite fuer IE6 */ /*#ltop3 {width:777px;} */