From 15182ecb3d1d02c6ac67aeb740d92046208787d7 Mon Sep 17 00:00:00 2001 From: Shadow Date: Fri, 31 Jan 2014 08:14:15 +0200 Subject: [PATCH] fix some things in admin panel --- Admin/Templates/deletion.tpl | 2 +- Admin/Templates/map.tpl | 143 +++++++++++++++----- Admin/Templates/village.tpl | 6 +- Admin/admin.php | 8 +- Templates/Profile/medal.php | 7 +- img/admin/map.css | 246 +++++++++++++++++++++++++++++++++++ img/admin/map_0.gif | Bin 0 -> 96 bytes img/admin/map_1.gif | Bin 0 -> 94 bytes img/admin/map_2.gif | Bin 0 -> 94 bytes img/admin/map_3.gif | Bin 0 -> 94 bytes img/admin/map_4.gif | Bin 0 -> 96 bytes img/admin/map_5.gif | Bin 0 -> 94 bytes img/admin/map_piece.jpg | Bin 0 -> 321 bytes 13 files changed, 373 insertions(+), 39 deletions(-) create mode 100644 img/admin/map.css create mode 100644 img/admin/map_0.gif create mode 100644 img/admin/map_1.gif create mode 100644 img/admin/map_2.gif create mode 100644 img/admin/map_3.gif create mode 100644 img/admin/map_4.gif create mode 100644 img/admin/map_5.gif create mode 100644 img/admin/map_piece.jpg diff --git a/Admin/Templates/deletion.tpl b/Admin/Templates/deletion.tpl index ec00455f..3d020b55 100644 --- a/Admin/Templates/deletion.tpl +++ b/Admin/Templates/deletion.tpl @@ -42,7 +42,7 @@ if($_GET['uid']) Rank: - ???. + procRankArray();echo $ranking->getUserRank($user['id']); ?> Population: diff --git a/Admin/Templates/map.tpl b/Admin/Templates/map.tpl index 673f44cf..65c827bb 100644 --- a/Admin/Templates/map.tpl +++ b/Admin/Templates/map.tpl @@ -3,42 +3,127 @@ ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## ## Filename map.tpl ## -## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## Developed by: ronix ## +## License: TravianZ Project ## +## 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)";} ?> + +
-comming soon -
-imagemap -
+
+

Map!

+
+

This is the map of . Search and find players.

+

Show Option

+
+ + + + + +
+ value="1">Player + + value="2">Natar + + +
+
+
- +
-'; -$a += 25; -} -} +
-function map($x,$y){ -for ($i = 0; $i <= $y; $i++) { -line($x,$i); -} -} +
+ - + + + - + (0,0) +
+
+
+ + +
+ 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="
  • Player name : $p_name
  • Village name : $p_village
  • Coordinat : $p_coor
  • Population : $p_pop
  • Tribe : $p_tribe
    • ')\">    "; + //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 '
    '.$p_info.'
    '; + } + ?> +
    -map(20,20); +
    +
    +
    +

    Legend

    +
    +
    + + + + + + + + + + + + + + + + +
    Multihunter
    +
    + +
    +
    - -?> - \ No newline at end of file +
    \ No newline at end of file diff --git a/Admin/Templates/village.tpl b/Admin/Templates/village.tpl index c867489a..5ba20eee 100644 --- a/Admin/Templates/village.tpl +++ b/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 ' @@ -294,7 +296,7 @@ if(isset($id)) elseif($type==12){ $type = ' + 50%'; } echo " - + ".$row['name']." getMapCheck($row['wref'])."\" target=\"blank\">(".$oasisx."|".$oasisy.") ".$row['loyalty']."% diff --git a/Admin/admin.php b/Admin/admin.php index 659cae81..a5072e1e 100644 --- a/Admin/admin.php +++ b/Admin/admin.php @@ -11,10 +11,10 @@ ################################################################################# session_start(); -include("../GameEngine/Database.php"); -include("../GameEngine/Admin/database.php"); -include("../GameEngine/config.php"); -include("../GameEngine/Data/buidata.php"); +include_once("../GameEngine/Database.php"); +include_once("../GameEngine/Admin/database.php"); +include_once("../GameEngine/Data/buidata.php"); +include_once ("../GameEngine/Lang/" . LANG . ".php"); class timeFormatGenerator { diff --git a/Templates/Profile/medal.php b/Templates/Profile/medal.php index 05693737..766cccd7 100644 --- a/Templates/Profile/medal.php +++ b/Templates/Profile/medal.php @@ -1,10 +1,11 @@ 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; } diff --git a/img/admin/map.css b/img/admin/map.css new file mode 100644 index 00000000..172bd1c8 --- /dev/null +++ b/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; +} diff --git a/img/admin/map_0.gif b/img/admin/map_0.gif new file mode 100644 index 0000000000000000000000000000000000000000..2c5486f1216a72c2058fe17ec43d702630208318 GIT binary patch literal 96 zcmZ?wbhEHbb7#PG@zy1IJU-2gkBLf2?gAPyx xsFI6;fmvBXF~rqL*PutT!RIt@LTI_E((@_Tgv*#&rrZ}vnsvxx!XyR;YXF5?8WaEk literal 0 HcmV?d00001 diff --git a/img/admin/map_2.gif b/img/admin/map_2.gif new file mode 100644 index 0000000000000000000000000000000000000000..a85712fe08a3f9fa3106401f6f8e47587d0760ac GIT binary patch literal 94 zcmZ?wbhEHb uGB7K1D1^8=tu^S8RP0LFebVJ=?AaTZ%f5EpV<=2E>x@`pz_&z&!5RQxQy!)O literal 0 HcmV?d00001 diff --git a/img/admin/map_4.gif b/img/admin/map_4.gif new file mode 100644 index 0000000000000000000000000000000000000000..e545c66fe07fd2efa61baf84338b3c254723e22f GIT binary patch literal 96 zcmZ?wbhEHb|L&)%?H_O(Nfu`t=JGh&GW-x3uDYXB8e9F_n8 literal 0 HcmV?d00001 diff --git a/img/admin/map_piece.jpg b/img/admin/map_piece.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3b4014dd8148c12d5fbf9f99f631e818bb19cb61 GIT binary patch literal 321 zcma)$v1$TA5QhJ`+ub|&)^mqb5Ko8?kunejIWTSBz+5T|D~mwvd;-yjNoSEa2!bYs zK7g3K!Ma$8#KvzJ7{2)##;x5B_NnL>pa3X+!R^7l@yqZH1Oec|s{_(*IU2m8TzW(9 z2U92^gcM3jRZ+f^SgANMS|?f?Yfe~`)@&^`Syr!SSv$}3_T3qZqNr-BO>3L21~*#g z#jS%|f@5gtkQf0|$mBlp420yLyg;g${wcr`NM3}1zx(NYvEr+w`-br+0}dIF`0C7l Mv87`2{t>y&5uhe5p#T5? literal 0 HcmV?d00001