diff --git a/Admin/admin.php b/Admin/admin.php index a244fc50..988a6cd2 100644 --- a/Admin/admin.php +++ b/Admin/admin.php @@ -92,6 +92,7 @@ $timeformat = new timeFormatGenerator; { ?> Server Homepage Control Panel Home + Return to the server
Logout
diff --git a/GameEngine/Admin/Mods/delallymedal.php b/GameEngine/Admin/Mods/delallymedal.php index 254058ff..bd90f7db 100644 --- a/GameEngine/Admin/Mods/delallymedal.php +++ b/GameEngine/Admin/Mods/delallymedal.php @@ -24,7 +24,7 @@ $sessionaccess = $access['access']; if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("DELETE FROM ".TB_PREFIX."allimedal WHERE id = ".$delete.""); +mysql_query("UPDATE ".TB_PREFIX."allimedal set del = 1 WHERE id = ".$delete.""); header("Location: ../../../Admin/admin.php?p=alliance&aid=".$aid.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/delallymedalbyaid.php b/GameEngine/Admin/Mods/delallymedalbyaid.php index ca9eeaa6..914e4779 100644 --- a/GameEngine/Admin/Mods/delallymedalbyaid.php +++ b/GameEngine/Admin/Mods/delallymedalbyaid.php @@ -24,7 +24,7 @@ $sessionaccess = $access['access']; if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("DELETE FROM ".TB_PREFIX."allimedal WHERE allyid = ".$aid.""); +mysql_query("UPDATE ".TB_PREFIX."allimedal set del = 1 WHERE allyid = ".$aid.""); header("Location: ../../../Admin/admin.php?p=alliance&aid=".$aid.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/delallymedalbyweek.php b/GameEngine/Admin/Mods/delallymedalbyweek.php index 0f9e4311..dcd99d2d 100644 --- a/GameEngine/Admin/Mods/delallymedalbyweek.php +++ b/GameEngine/Admin/Mods/delallymedalbyweek.php @@ -23,7 +23,7 @@ $sessionaccess = $access['access']; if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("DELETE FROM ".TB_PREFIX."allimedal WHERE week = ".$deleteweek.""); +mysql_query("UPDATE ".TB_PREFIX."allimedal set del = 1 WHERE week = ".$deleteweek.""); header("Location: ../../../Admin/admin.php?p=delallymedal"); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/deletemedalbyuser.php b/GameEngine/Admin/Mods/deletemedalbyuser.php index 9f5bcfdc..1812c0b6 100644 --- a/GameEngine/Admin/Mods/deletemedalbyuser.php +++ b/GameEngine/Admin/Mods/deletemedalbyuser.php @@ -23,7 +23,7 @@ $sessionaccess = $access['access']; if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("DELETE FROM ".TB_PREFIX."medal WHERE userid = ".$userid.""); +mysql_query("UPDATE ".TB_PREFIX."medal set del = 1 WHERE userid = ".$userid.""); header("Location: ../../../Admin/admin.php?p=player&uid=".$userid.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/deletemedalbyweek.php b/GameEngine/Admin/Mods/deletemedalbyweek.php index 96e6ee26..872d0f5f 100644 --- a/GameEngine/Admin/Mods/deletemedalbyweek.php +++ b/GameEngine/Admin/Mods/deletemedalbyweek.php @@ -23,7 +23,7 @@ $sessionaccess = $access['access']; if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("DELETE FROM ".TB_PREFIX."medal WHERE week = ".$deleteweek.""); +mysql_query("UPDATE ".TB_PREFIX."medal set del = 1 WHERE week = ".$deleteweek.""); header("Location: ../../../Admin/admin.php?p=delmedal"); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/medals.php b/GameEngine/Admin/Mods/medals.php index 0a2cdbad..8d23dc37 100644 --- a/GameEngine/Admin/Mods/medals.php +++ b/GameEngine/Admin/Mods/medals.php @@ -19,7 +19,7 @@ if ($session->access < ADMIN) die("Access Denied: You are not Admin!"); $medalid = $_POST['medalid']; $uid = $_POST['uid']; -mysql_query("DELETE FROM ".TB_PREFIX."medal WHERE id = ".$medalid.""); +mysql_query("UPDATE ".TB_PREFIX."medal set del = 1 WHERE id = ".$medalid.""); $name = mysql_query("SELECT name FROM ".TB_PREFIX."users WHERE id= ".$uid.""); $name = mysql_result($name, 0); @@ -28,7 +28,7 @@ mysql_query("Insert into ".TB_PREFIX."admin_log values (0,$admid,'Deleted medal $deleteweek = $_POST['medalweek']; -mysql_query("DELETE FROM ".TB_PREFIX."medal WHERE week = ".$deleteweek.""); +mysql_query("UPDATE ".TB_PREFIX."medal set del = 1 WHERE week = ".$deleteweek.""); header("Location: ../../../Admin/admin.php?p=player&uid=".$uid.""); ?> \ No newline at end of file diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 49a24982..468484b7 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -143,7 +143,7 @@ class Automation { return $popT; } - public function Automation() { + public function Automation() { $this->ClearUser(); $this->ClearInactive(); @@ -205,6 +205,7 @@ class Automation { $this->updateGeneralAttack(); $this->checkInvitedPlayes(); $this->updateStore(); + $this->procClimbers(); } private function loyaltyRegeneration() { @@ -3828,6 +3829,61 @@ $crannyimg = "query_return($users); + $ranking->procRankArray(); + foreach($array as $session){ + $oldrank = $ranking->searchRank($session['username'], "username"); + $q = "SELECT * FROM ".TB_PREFIX."medal order by week DESC LIMIT 0, 1"; + $result = mysql_query($q); + if(mysql_num_rows($result)) { + $row=mysql_fetch_assoc($result); + $week=($row['week']+1); + } else { + $week='1'; + } + if($week > 1){ + if($session['oldrank'] > $oldrank) { + $totalpoints = $session['oldrank'] - $oldrank; + $database->addclimberrankpop($session['id'], $totalpoints); + $database->updateoldrank($session['id'], $oldrank); + } else + if($session['oldrank'] < $oldrank) { + $totalpoints = $oldrank - $session['oldrank']; + $database->removeclimberrankpop($session['id'], $session['oldrank']); + $database->updateoldrank($session['id'], $oldrank); + } + }else{ + $totalpoints = count($ranking->getRank()) - $oldrank; + $database->setclimberrankpop($session['id'], $totalpoints); + $database->updateoldrank($session['id'], $oldrank); + } + $database->updateoldrank($session['id'], $oldrank); + } + $countally = count($database->countAlli()); + if($countally > 0){ + for($i=1;$i<=$countally;$i++){ + $memberlist = $database->getAllMember($i); + $oldrank = 0; + foreach($memberlist as $member) { + $oldrank += $database->getVSumField($member['id'],"pop"); + } + $ally = $database->getAlliance($i); + if($ally['oldrank'] < $oldrank) { + $totalpoints = $oldrank - $ally['oldrank']; + $database->addclimberrankpopAlly($ally['id'], $totalpoints); + $database->updateoldrankAlly($ally['id'], $oldrank); + } else + if($ally['oldrank'] > $oldrank) { + $totalpoints = $ally['oldrank'] - $oldrank; + $database->removeclimberrankpopAlly($ally['id'], $totalpoints); + $database->updateoldrankAlly($ally['id'], $oldrank); + } + } + } + } } $automation = new Automation; ?> \ No newline at end of file diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php index f198d5b8..828ff766 100644 --- a/GameEngine/Database/db_MYSQL.php +++ b/GameEngine/Database/db_MYSQL.php @@ -659,14 +659,14 @@ class MYSQL_DB { } function getProfileMedal($uid) { - $q = "SELECT id,categorie,plaats,week,img,points from " . TB_PREFIX . "medal where userid = $uid order by id desc"; + $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); } function getProfileMedalAlly($uid) { - $q = "SELECT id,categorie,plaats,week,img,points from " . TB_PREFIX . "allimedal where allyid = $uid order by id desc"; + $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); @@ -2584,6 +2584,10 @@ class MYSQL_DB { $q = "UPDATE " . TB_PREFIX . "users set clp = clp - '$cp'' where id = $user"; return mysql_query($q, $this->connection); } + function setclimberrankpop($user, $cp) { + $q = "UPDATE " . TB_PREFIX . "users set clp = '$cp' where id = $user"; + return mysql_query($q, $this->connection); + } function updateoldrank($user, $cp) { $q = "UPDATE " . TB_PREFIX . "users set oldrank = '$cp' where id = $user"; return mysql_query($q, $this->connection); diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php index 725a24a9..eba1f988 100644 --- a/GameEngine/Ranking.php +++ b/GameEngine/Ranking.php @@ -66,21 +66,6 @@ $this->getStart(1); } else { $this->getStart($this->searchRank($session->alliance, "id")); - $oldrank = $this->searchRank($session->alliance, "id"); - - - $ally = $database->getAlliance($session->alliance); - if($ally['oldrank'] > $oldrank) { - $totalpoints = $ally['oldrank'] - $oldrank; - $database->addclimberrankpopAlly($ally['id'], $totalpoints); - $database->updateoldrankAlly($ally['id'], $oldrank); - } else - if($ally['oldrank'] < $oldrank) { - $totalpoints = $oldrank - $ally['oldrank']; - $database->removeclimberrankpopAlly($ally['id'], $totalpoints); - $database->updateoldrankAlly($ally['id'], $oldrank); - } - $database->updateoldrankAlly($ally['id'], $oldrank); } break; case 41: @@ -103,18 +88,6 @@ } else { $this->procRankArray(); $this->getStart($this->searchRank($session->username, "username")); - $oldrank = $this->searchRank($session->username, "username"); - if($session->oldrank > $oldrank) { - $totalpoints = $session->oldrank - $oldrank; - $database->addclimberrankpop($session->uid, $totalpoints); - $database->updateoldrank($session->uid, $oldrank); - } else - if($session->oldrank < $oldrank) { - $totalpoints = $oldrank - $session->oldrank; - $database->removeclimberrankpop($session->uid, $session->oldrank); - $database->updateoldrank($session->uid, $oldrank); - } - $database->updateoldrank($session->uid, $oldrank); } } @@ -198,7 +171,7 @@ } } - private function procRankArray() { + public function procRankArray() { global $database, $multisort; //$array = $database->getRanking(); $holder = array(); diff --git a/GameEngine/Session.php b/GameEngine/Session.php index 6db45be9..c70fca71 100644 --- a/GameEngine/Session.php +++ b/GameEngine/Session.php @@ -27,12 +27,12 @@ include ("Database.php"); include ("Mailer.php"); include ("Form.php"); include ("Generator.php"); +include ("Multisort.php"); +include ("Ranking.php"); include ("Automation.php"); include ("Lang/" . LANG . ".php"); include ("Logging.php"); include ("Message.php"); -include ("Multisort.php"); -include ("Ranking.php"); include ("Alliance.php"); include ("Profile.php"); diff --git a/GameEngine/Units.php b/GameEngine/Units.php index 9453146b..2526b1ca 100644 --- a/GameEngine/Units.php +++ b/GameEngine/Units.php @@ -161,20 +161,13 @@ class Units { $form->addError("error","Player is under beginners protection. You can't attack him"); } - //check if banned: + //check if banned/admin: $villageOwner = $database->getVillageField($id,'owner'); $userAccess = $database->getUserField($villageOwner,'access',0); - if($userAccess == '0'){ + if($userAccess == '0' or $userAccess == '8' or $userAccess == '9'){ $form->addError("error","Player is Banned. You can't attack him"); //break; } - //check if admin: - $villageOwner = $database->getVillageField($id,'owner'); - $userAccess = $database->getUserField($villageOwner,'access',0); - if($userAccess == '9'){ - $form->addError("error","Player is Admin. You can't attack him"); - //break; - } //check if attacking same village that units are in if($id == $village->wid){ diff --git a/Templates/Build/16_99.tpl b/Templates/Build/16_99.tpl index 8eeb44f3..172472b9 100644 --- a/Templates/Build/16_99.tpl +++ b/Templates/Build/16_99.tpl @@ -21,6 +21,7 @@ if(!$session->goldclub) {
+ @@ -72,5 +73,6 @@ if(!$session->goldclub) {

merchantAvail()) { echo "DISABLED"; }?>/>

+ \ No newline at end of file diff --git a/Templates/Build/17.tpl b/Templates/Build/17.tpl index f2ddc0d1..248c5314 100644 --- a/Templates/Build/17.tpl +++ b/Templates/Build/17.tpl @@ -23,6 +23,8 @@ else if($_POST['dname']!=""){ $getwref = $database->getVillageByName($_POST['dname']); $checkexist = $database->checkVilExist($getwref); } +$villageOwner = $database->getVillageField($getwref,'owner'); +$userAccess = $database->getUserField($villageOwner,'access',0); $maxcarry = $market->maxcarry; $maxcarry *= $market->merchantAvail(); if(isset($_POST['ft'])=='check' && $allres!=0 && $allres <= $maxcarry && ($_POST['x']!="" && $_POST['y']!="" or $_POST['dname']!="") && $checkexist){ @@ -209,6 +211,9 @@ if(isset($_POST['ft'])=='check'){ if(!$checkexist){ $error = 'No Coordinates selected'; + }elseif($userAccess == '0' or $userAccess == '8' or $userAccess == '9'){ + $error = 'Player is Banned. You cannot send resources to him.'; + } }elseif($_POST['r1']==0 && $_POST['r2']==0 && $_POST['r3']==0 && $_POST['r4']==0){ $error = 'Resources not selected.'; }elseif(!$_POST['x'] && !$_POST['y'] && !$_POST['dname']){ diff --git a/Templates/Map/vilview.tpl b/Templates/Map/vilview.tpl index 4e3987bf..aef47f30 100644 --- a/Templates/Map/vilview.tpl +++ b/Templates/Map/vilview.tpl @@ -504,12 +504,8 @@ if($type==18 or $type==19 or $type==20 or $type==21){ $data1 = mysql_fetch_assoc($query1); $query2 = mysql_query('SELECT * FROM `' . TB_PREFIX . 'users` WHERE `id` = ' . $data1['owner']); $data2 = mysql_fetch_assoc($query2); - if($data2['access']=='0') { - echo "» Send troops. (Player is banned)"; - } else if($data2['access']=='8') { - echo "» Send Troops. (Moderator)"; - } else if($data2['access']=='9') { - echo "» Send Troops. (Administrator)"; + if($data2['access']=='0' or $data2['access']=='8' or $data2['access']=='9') { + echo "» Send troops. (Player is banned)"; } else if($data2['protect'] < time()) { echo $village->resarray['f39']? "» Send troops." : "» Send troops. (build a rally point)"; } else { @@ -517,11 +513,18 @@ if($type==18 or $type==19 or $type==20 or $type==21){ } ?> - - - + diff --git a/Templates/Ranking/ally_top10.tpl b/Templates/Ranking/ally_top10.tpl index e020ad52..9f832e1e 100644 --- a/Templates/Ranking/ally_top10.tpl +++ b/Templates/Ranking/ally_top10.tpl @@ -136,7 +136,7 @@ - + diff --git a/Templates/a2b/startRaid.tpl b/Templates/a2b/startRaid.tpl index d280a99e..4f89800e 100644 --- a/Templates/a2b/startRaid.tpl +++ b/Templates/a2b/startRaid.tpl @@ -13,6 +13,9 @@ $t1 = $row['t1'];$t2 = $row['t2'];$t3 = $row['t3'];$t4 = $row['t4'];$t5 = $row['t5']; $t6 = $row['t6'];$t7 = $row['t7'];$t8 = $row['t8'];$t9 = $row['t9'];$t10 = $row['t10']; $t11 = 0; + $villageOwner = $database->getVillageField($wref,'owner'); + $userAccess = $database->getUserField($villageOwner,'access',0); + if($userAccess != '0' && $userAccess != '8' && $userAccess != '9'){ if($tribe == 1){ $uname = "u"; } elseif($tribe == 2){ $uname = "u1"; } elseif($tribe == 3){ $uname = "u2"; }elseif($tribe == 4){ $uname = "u3"; }else {$uname = "u4"; } if($tribe == 1){ $uname1 = "u1"; } elseif($tribe == 2){ $uname1 = "u2"; } elseif($tribe == 3){ $uname1 = "u3"; }elseif($tribe == 4){ $uname1 = "u4"; }else {$uname1 = "u5"; } if($tribe == 1){ $uname2 = ""; } elseif($tribe == 2){ $uname2 = "1"; } elseif($tribe == 3){ $uname2 = "2"; }elseif($tribe == 4){ $uname2 = "3"; }else {$uname2 = "4"; } @@ -79,5 +82,6 @@ } } } + } header("Location: build.php?id=39&t=99"); ?> \ No newline at end of file diff --git a/Templates/goldClub/farmlist.tpl b/Templates/goldClub/farmlist.tpl index 79364e3d..48aa8fd5 100644 --- a/Templates/goldClub/farmlist.tpl +++ b/Templates/goldClub/farmlist.tpl @@ -360,9 +360,12 @@ $NUM1++; getVillageType2($Wref); $oasistype = $type['oasistype']; $vdata = $database->getVillage($Wref); -$villageOwner = $database->getVillageField($Wref,'owner'); -$userAccess = $database->getUserField($villageOwner,'access',0); }elseif($_POST['x']!="" && $_POST['y']!="" && is_numeric($_POST['x']) && is_numeric($_POST['y'])){ $Wref = $database->getVilWref($_POST['x'], $_POST['y']); $WrefX = $_POST['x']; @@ -22,15 +20,11 @@ $WrefY = $_POST['y']; $type = $database->getVillageType2($Wref); $oasistype = $type['oasistype']; $vdata = $database->getVillage($Wref); -$villageOwner = $database->getVillageField($Wref,'owner'); -$userAccess = $database->getUserField($villageOwner,'access',0); } if($_POST['x']=="" && $_POST['y']=="" && $_POST['target_id'] == ""){ $errormsg .= "Enter coordinates."; }elseif(($_POST['x']=="" || $_POST['y']=="") && $_POST['target_id'] == ""){ $errormsg .= "Enter the correct coordinates."; - }elseif($userAccess == '9'){ - $errormsg .= "Player is Admin. You can't attack him."; }elseif($oasistype == 0 && $vdata == 0){ $errormsg .= "There is no village on those coordinates."; }elseif($troops == 0){ diff --git a/Templates/goldClub/farmlist_editraid.tpl b/Templates/goldClub/farmlist_editraid.tpl index 04d37997..9e39369c 100644 --- a/Templates/goldClub/farmlist_editraid.tpl +++ b/Templates/goldClub/farmlist_editraid.tpl @@ -16,8 +16,6 @@ $WrefY = $WrefCoor['y']; $type = $database->getVillageType2($Wref); $oasistype = $type['oasistype']; $vdata = $database->getVillage($Wref); -$villageOwner = $database->getVillageField($Wref,'owner'); -$userAccess = $database->getUserField($villageOwner,'access',0); }elseif($_POST['x']!="" && $_POST['y']!="" && is_numeric($_POST['x']) && is_numeric($_POST['y'])){ $Wref = $database->getVilWref($_POST['x'], $_POST['y']); $WrefX = $_POST['x']; @@ -25,8 +23,6 @@ $WrefY = $_POST['y']; $type = $database->getVillageType2($Wref); $oasistype = $type['oasistype']; $vdata = $database->getVillage($Wref); -$villageOwner = $database->getVillageField($Wref,'owner'); -$userAccess = $database->getUserField($villageOwner,'access',0); } $troops = "".$_POST['t1']."+".$_POST['t2']."+".$_POST['t3']."+".$_POST['t4']."+".$_POST['t5']."+".$_POST['t6']."+".$_POST['t7']."+".$_POST['t8']."+".$_POST['t9']."+".$_POST['t10'].""; @@ -34,8 +30,6 @@ $troops = "".$_POST['t1']."+".$_POST['t2']."+".$_POST['t3']."+".$_POST['t4']."+" $errormsg .= "Enter coordinates."; }elseif(($_POST['x']=="" || $_POST['y']=="") && $_POST['target_id'] == ""){ $errormsg .= "Enter the correct coordinates."; - }elseif($userAccess == '9'){ - $errormsg .= "Player is Admin. You can't attack him."; }elseif($oasistype == 0 && $vdata == 0){ $errormsg .= "There is no village on those coordinates."; }elseif($troops == 0){ diff --git a/gpack/travian_default/lang/en/lang.css b/gpack/travian_default/lang/en/lang.css index 1d640f0e..f4d832eb 100644 --- a/gpack/travian_default/lang/en/lang.css +++ b/gpack/travian_default/lang/en/lang.css @@ -1,18 +1,18 @@ -@CHARSET "UTF-8"; - -/* - *------------------------------------------------------------------------------ - * LANG is used to define the language-specific images and settings. - * - * Contains: - * width, height, background-image, background-repeat, background-position - *------------------------------------------------------------------------------ - */ - -@import "../../modules/new_layout_ltr.css"; - -/* --- Colors ------------------------- */ -@import "../../modules/new_colors.css"; - -/* --- Icons, Images and Backgrounds ---------- */ +@CHARSET "UTF-8"; + +/* + *------------------------------------------------------------------------------ + * LANG is used to define the language-specific images and settings. + * + * Contains: + * width, height, background-image, background-repeat, background-position + *------------------------------------------------------------------------------ + */ + +@import "../../modules/new_layout_ltr.css"; + +/* --- Colors ------------------------- */ +@import "../../modules/new_colors.css"; + +/* --- Icons, Images and Backgrounds ---------- */ @import "../../modules/new_images.css"; input#btn_login {width:97px; background-image: url(b/login.gif);} input#btn_signup {width:97px; background-image: url(b/signup.gif);} input#btn_ok {width:47px; background-image: url(b/ok.gif);} input#btn_reply {width:97px; background-image: url(b/reply.gif);} input#btn_send {width:97px; background-image: url(b/send.gif);} input#btn_save {width:97px; background-image: url(b/save.gif);} input#btn_delete {width:97px; background-image: url(b/delete.gif);} input#btn_archiv {width:97px; background-image: url(b/archiv.gif);} input#btn_back {width:97px; background-image: url(b/zurueck.html);} input#btn_train {width:97px; background-image: url(b/train.gif);} input#btn_back {width:97px; background-image: url(b/back.gif);} input#btn_forward {width:97px; background-image: url(b/forward.gif);} input#btn_demolish {width:97px; background-image: url(b/demolish.gif);} input#btn_search {width:97px; background-image: url(b/search.gif);} /* Ally Forum */ div.forum input#fbtn_ok {width:47px; background-image:url(b/ok.gif);} div.forum input#fbtn_vote {width:97px; background-image:url(f/vote.gif);} div.forum input#fbtn_result {width:97px; background-image:url(f/result.gif);} div.forum input#fbtn_voting {width:97px; background-image:url(f/voting.gif);} div.forum img#fbtn_reply {width:97px; background-image:url(f/reply.gif);} div.forum img#fbtn_post {width:97px; background-image:url(f/post.gif);} div.forum img#fbtn_newforum {width:97px; background-image:url(f/newforum.gif);} /* ------------------- Texts ------------------- */ /* --------------------------------------------- */ /* news */ div#side_info h5 img {width:160px; height:15px;} /* login */ div.login h1 img.img_login {width:468px; height:60px; background-image:url(t1/login.gif);} div.login h5 img.img_u04 {width:160px; height:15px; background-image:url(t2/u04.gif);} /* signup */ div.signup h1 img.anmelden {width:468px; height:60px; background-image:url(t1/anmelden.gif);} div.signup h5 img.img_u05 {width:160px; height:15px; background-image:url(t2/u05.gif);} div.signup img.img_u06 {width:160px; height:15px; background-image:url(t2/u06.gif);} div.signup img.img_u07 {width:160px; height:15px; background-image:url(t2/u07.gif);} /* activate */ div.activate h1 img.passwort {width:468px; height:60px; background-image:url(t1/passwort.gif);} div.activate h5 img.img_u22 {width:160px; height:15px; background-image:url(t2/u22.gif);} /* read/write message */ div.messages div.msg_content img#label {width:77px; height:34px;} div.messages div.msg_content img.send {background-image:url(msg/block_bg24b.gif);} div.messages div.msg_content img.read {background-image:url(msg/block_bg24a.gif);} /* ------------------- Images ------------------- */ /* ---------------------------------------------- */ /* travian logo */ div#side_navi a#logo img {width:116px; height:60px; background-image:url(a/travian0.gif);} div#side_navi a#logo img.logo_plus {background-image:url(a/travian1.gif);} /* plus previews */ div.plus table#plus_features td.preview img.autovv {width:200px; height:56px; background-image:url(p/autovv.gif);} div.plus table#plus_features td.preview img.bfilter {width:200px; height:45px; background-image:url(p/bfilter.gif);} div.plus table#plus_features td.preview img.dorf3 {width:200px; height:186px; background-image:url(p/dorf3.jpg);} div.plus table#plus_features td.preview img.p1 {width:179px; height:29px; background-image:url(p/p1.gif);} div.plus table#plus_features td.preview img.p3 {width:163px; height:120px; background-image:url(p/p3.gif);} div.plus table#plus_features td.preview img.p4 {width:197px; height:41px; background-image:url(p/p4.gif);} div.plus table#plus_features td.preview img.p5 {width:132px; height:51px; background-image:url(p/p5.gif);} div.plus table#plus_features td.preview img.p6 {width:111px; height:29px; background-image:url(p/p6.gif);} div.plus table#plus_features td.preview img.p7 {width:61px; height:86px; background-image:url(p/p7.gif);} div.plus table#plus_features td.preview img.p8 {width:117px; height:121px; background-image:url(p/p8.gif);} div.plus table#plus_features td.preview img.sort {width:200px; height:38px; background-image:url(p/sort.jpg);} div.plus table#plus_features td.preview img.st1 {width:200px; height:90px; background-image:url(p/st1.gif);} div.plus table#plus_features td.preview img.xxl_map {width:146px; height:112px; background-image:url(p/xxl_map.gif);} input#btn_search {width:97px; background-image: url(b/search.gif);} diff --git a/gpack/travian_default/modules/new_images.css b/gpack/travian_default/modules/new_images.css index 8ec1817f..4eb17ad4 100644 --- a/gpack/travian_default/modules/new_images.css +++ b/gpack/travian_default/modules/new_images.css @@ -1,58 +1,58 @@ -@CHARSET "UTF-8"; - -.wrapper {background: transparent url(../images/header_background.jpg) repeat-x left top;} - -div#footer {background: #F1F1F1 url(../images/footer_background.gif) repeat-x center top;} - -div#footer div#mfoot {background: transparent url(../images/footer_logo.gif) no-repeat 0px 21px;} - -div#dynamic_header, -body.mod1 div#dynamic_header, -body.mod3 div#dynamic_header {background: transparent url(../images/artwork1-ltr.jpg) no-repeat center top;} - -body.mod2 div#dynamic_header {background: transparent url(../images/artwork2-ltr.jpg) no-repeat center top;} - -div#header {background-image: none;} - -div#side_navi {background: transparent url(../images/shadow-a-ltr.png) no-repeat right top; margin-top: 30px;} -div#side_navi a:hover {background: transparent url(../images/menu-bg-ltr.gif) no-repeat left top;} - -body.v35 a#n1 img {background-image: url(../images/n1-ltr.gif);} -body.v35 a#n2 img {background-image: url(../images/n2-ltr.gif);} -body.v35 a#n3 img {background-image: url(../images/n3-ltr.gif);} -body.v35 a#n4 img {background-image: url(../images/n4-ltr.gif);} -body.v35 div.i1 {background-image:url(../images/m1-ltr.gif);} /* beide */ -body.v35 div.i2 {background-image:url(../images/m2-ltr.gif);} /* IGM */ -body.v35 div.i3 {background-image:url(../images/m3-ltr.gif);} /* Report */ -body.v35 div.i4 {background-image:url(../images/m4-ltr.gif);} /* none */ - - -div#mtop a#plus {background: transparent url(../images/plus_bg.gif) repeat-x 0 0px; margin-left:135px;} -div#mtop a#plus span.plus_text { - display: block; - background: transparent url(../images/plus_start-ltr.gif) no-repeat left top; - height: 29px; - padding: 6px 14px; - float:left; - cursor: pointer; -} -div#mtop a#plus span span {display: inline; cursor: pointer;} -div#mtop a#plus {display: block; font-size: 13px; height: 40px; margin-top:16px; position: relative;} -img#btn_plus { - background-position: left top; - background-repeat: no-repeat; - height: 29px; - width: 36px; - float:left; -} -#plus img.active {background-image: url(../images/plus_active-ltr.gif);} -#plus img.inactive {background-image: url(../images/plus_inactive-ltr.gif);} - - - -div#side_info, -body.mod1 div#side_info, -body.mod2 div#side_info, -body.mod3 div#side_info {background: transparent url(../images/shadow-b-ltr.png) no-repeat left top;} - - +@CHARSET "UTF-8"; + +.wrapper {background: transparent url(../images/header_background.jpg) repeat-x left top;} + +div#footer {background: #F1F1F1 url(../images/footer_background.gif) repeat-x center top;} + +div#footer div#mfoot {background: transparent url(../images/footer_logo.gif) no-repeat 0px 21px;} + +div#dynamic_header, +body.mod1 div#dynamic_header, +body.mod3 div#dynamic_header {background: transparent url(../images/artwork1-ltr.jpg) no-repeat center top;} + +body.mod2 div#dynamic_header {background: transparent url(../images/artwork2-ltr.jpg) no-repeat center top;} + +div#header {background-image: none;} + +div#side_navi {background: transparent url(../images/shadow-a-ltr.png) no-repeat right top; margin-top: 30px;} +div#side_navi a:hover {background: transparent url(../images/menu-bg-ltr.gif) no-repeat left top;} + +body.v35 a#n1 img {background-image: url(../images/n1-ltr.gif);} +body.v35 a#n2 img {background-image: url(../images/n2-ltr.gif);} +body.v35 a#n3 img {background-image: url(../images/n3-ltr.gif);} +body.v35 a#n4 img {background-image: url(../images/n4-ltr.gif);} +body.v35 div.i1 {background-image:url(../images/m1-ltr.gif);} /* beide */ +body.v35 div.i2 {background-image:url(../images/m2-ltr.gif);} /* IGM */ +body.v35 div.i3 {background-image:url(../images/m3-ltr.gif);} /* Report */ +body.v35 div.i4 {background-image:url(../images/m4-ltr.gif);} /* none */ + + +div#mtop a#plus {background: transparent url(../images/plus_bg.gif) repeat-x 0 0px; margin-left:135px;} +div#mtop a#plus span.plus_text { + display: block; + background: transparent url(../images/plus_start-ltr.gif) no-repeat left top; + height: 29px; + padding: 6px 14px; + float:left; + cursor: pointer; +} +div#mtop a#plus span span {display: inline; cursor: pointer;} +div#mtop a#plus {display: block; font-size: 13px; height: 40px; margin-top:16px; position: relative;} +img#btn_plus { + background-position: left top; + background-repeat: no-repeat; + height: 29px; + width: 36px; + float:left; +} +#plus img.active {background-image: url(../images/plus_active-ltr.gif);} +#plus img.inactive {background-image: url(../images/plus_inactive-ltr.gif);} + + + +div#side_info, +body.mod1 div#side_info, +body.mod2 div#side_info, +body.mod3 div#side_info {background: transparent url(../images/shadow-b-ltr.png) no-repeat left top;} + + diff --git a/gpack/travian_default/modules/new_layout_ltr.css b/gpack/travian_default/modules/new_layout_ltr.css index e4b9c1bd..dd74c4a5 100644 --- a/gpack/travian_default/modules/new_layout_ltr.css +++ b/gpack/travian_default/modules/new_layout_ltr.css @@ -1,189 +1,189 @@ -@CHARSET "UTF-8"; - -/* --- Scrollbarantiwackler --- */ -body {overflow-y:scroll;} - -body.manual {overflow-y: hidden; } - - -/* Layout */ -html, body {height: 100%;} -.wrapper {height: auto !important; /* Important Regel für moderne Browser */ height: 100%; /* Mindesthöhe für den IE */ min-height: 100%; position: relative;} - -.ie6 .wrapper {text-align: center;} /* IE6 Hack damit das alles zentriert wird */ -.ie6 .wrapper * {text-align: left;} /* IE6 Hack im Content rückgängig machgen */ - -/* --- Table Row Highlight --- */ -table.row_table_data tr.hlight td {background-color: #fffaf0;} -table.row_table_data tr.marked td {background-color: #fff8dc;} - -/* Body */ -body {background-color: #FFFFFF;} -body.manual {background-image: none;} - - -div.popup3 { - left: 50%; - top:170px; - margin-left: -285px; -} -#ce { - width: 100%; - height: 0; -} - -/* --- Main Header --- */ -body.mod1 div#dynamic_header div.dyn1, -body.mod1 div#dynamic_header div.dyn2, -body.mod2 div#dynamic_header div.dyn1, -body.mod2 div#dynamic_header div.dyn2, -body.mod3 div#dynamic_header div.dyn1, -body.mod3 div#dynamic_header div.dyn2 {display: none;} - -body.mod2 div#dynamic_header { - height: 100px; -} - -body.mod2 div#dynamic_header #ad_iframe{ - left: 50%; - margin-left: -303px; -} - -div#dynamic_header, -body.mod1 div#dynamic_header, -body.mod2 div#dynamic_header, -body.mod3 div#dynamic_header { height: 100px;} - -/* Header Menu */ -div#header {height: 72px;} -div#mtop, -body.mod1 div#mtop, -body.mod2 div#mtop, -body.mod3 div#mtop {height: 72px; left: 50%; margin-left: -241px; z-index: 2; width: 700px;} -a#n1 img, a#n2 img, a#n3 img, a#n4 img, div#n5 {height: 72px;} -div#mtop div#n5 .reports {float: left;} -div#mtop div#n5 .messages {float: right;} - - -a#logo {display: none;} - -/* World Status Peace, Day Night */ -img.day, img.night, div.peace {left: 12px; top: -89px;} -div.peace {left: 12px; top: -98px;} - -/* Exe Time */ -div#stime {display: inline; height: 0; left: 0; top: 0; width: 0;} -div#ltime, -body.mod1 div#ltime, -body.mod2 div#ltime, -body.mod3 div#ltime {min-width: 980px; left: 0; top: 111px; width: 100%; z-index: 1;} -div#ltime div#ltimeWrap {margin: 0 auto 0 auto; width: 905px; position: relative;} -div#ltime div.devEvents {position: absolute; bottom: -25px; left: 0px;} - -/* Ressources */ -div#res, -body.mod1 div#res, -body.mod2 div#res, -body.mod3 div#res {left: 0; min-width: 980px; top: 175px; width: 100%; z-index: 2;} -div#resWrap {left: 50%; margin-left: -335px; position: relative; width: 552px;} -div#res table {background-color: transparent;} -div#res table td {background-color: transparent;} - -/* Content */ -div#mid {background-image: none; float: none; height: auto; margin: 0 auto; width: 980px;} -div#content, -body.mod1 div#content, -body.mod2 div#content, -body.mod3 div#content {height: auto !important; /* Important Regel für moderne Browser */ /* Mindesthöhe für den IE */ min-height: 450px;} - -.ie6div#content {padding-bottom: 5px;} -/* Content Menu */ -div#side_navi {height: auto !important; /* Important Regel für moderne Browser */ height: 453px; /* Mindesthöhe für den IE */ min-height: 453px; width: 155px;} - - -/* Content Villages & Links */ -div#side_info, -body.mod1 div#side_info, -body.mod2 div#side_info, -body.mod3 div#side_info { height: auto !important; /* Important Regel für moderne Browser */ height: 453px; /* Mindesthöhe für den IE */ margin-left: 0; min-height: 453px; padding-left: 16px; width: 257px; z-index: 3;} -div#side_info td.dot { - width: 8px; - -} -div#side_info td.link { - padding-right: 0px; - white-space: normal; - line-height: 18px; -} -div#side_info td { - vertical-align: top; -} - -/* Footer */ -.footer-stopper {float: left; margin-bottom: 100px;} /* Stoppt den Footer beim nach obenschieben */ -.ie6 .footer-stopper, .ie7 .footer-stopper {height: 100px;} /* IE 6 und IE7 Hack damit Footer nicht über dem Content steht */ -div#footer {bottom: 0px; height: 90px; left: 0; margin-top: 90px; min-width: 980px; position: absolute; right: 0; - font-size: 11px; line-height: 19px; -} -div#footer div#mfoot {height: 28px; margin: 0 auto; width: 905px;} -div#footer div.footer-menu {color: #797979; text-align: right;} -div#footer div#mfoot {text-align: right;} -div#footer div#mfoot a, div#footer div#mfoot a:visited, div#footer div#mfoot a:active {color: #797979;} -div#footer div#mfoot div.copyright {text-align: right; font-size: 11px;} - -/* Footer Menu */ -div#footer ul.menu {list-style-type: none; margin: 0; padding: 0; position: absolute; top: 31px;} -div#footer ul.menu.menu2 {right: 210px;} -div#footer ul.menu li {float: left; margin: 0 5px;} -div#footer ul.menu li a {color: #797979; margin: 0 3px;} -div#footer ul.menu li.copyright {direction: ltr;} - - -div#side_info table td { - -} - -#guide1 { - position: fixed; - width: 0; - border-left: 1px dashed red; - height: 100%; - left: 50%; - margin-left: -480px; - z-index: 9999; -} - -#guide2 { - position: fixed; - width: 0; - border-left: 1px dashed red; - height: 100%; - left: 50%; - margin-left: -336px; - z-index: 9999; -} - -#guide3 { - position: fixed; - width: 0; - border-right: 1px dashed red; - height: 100%; - right: 50%; - margin-right: -218px; - z-index: 9999; -} - -#guide4 { - position: fixed; - width: 0; - border-right: 1px dashed red; - height: 100%; - right: 50%; - margin-right: -480px; - z-index: 9999; -} - -div.player p.btn, div.login p.btn { - text-align: center; -} - +@CHARSET "UTF-8"; + +/* --- Scrollbarantiwackler --- */ +body {overflow-y:scroll;} + +body.manual {overflow-y: hidden; } + + +/* Layout */ +html, body {height: 100%;} +.wrapper {height: auto !important; /* Important Regel für moderne Browser */ height: 100%; /* Mindesthöhe für den IE */ min-height: 100%; position: relative;} + +.ie6 .wrapper {text-align: center;} /* IE6 Hack damit das alles zentriert wird */ +.ie6 .wrapper * {text-align: left;} /* IE6 Hack im Content rückgängig machgen */ + +/* --- Table Row Highlight --- */ +table.row_table_data tr.hlight td {background-color: #fffaf0;} +table.row_table_data tr.marked td {background-color: #fff8dc;} + +/* Body */ +body {background-color: #FFFFFF;} +body.manual {background-image: none;} + + +div.popup3 { + left: 50%; + top:170px; + margin-left: -285px; +} +#ce { + width: 100%; + height: 0; +} + +/* --- Main Header --- */ +body.mod1 div#dynamic_header div.dyn1, +body.mod1 div#dynamic_header div.dyn2, +body.mod2 div#dynamic_header div.dyn1, +body.mod2 div#dynamic_header div.dyn2, +body.mod3 div#dynamic_header div.dyn1, +body.mod3 div#dynamic_header div.dyn2 {display: none;} + +body.mod2 div#dynamic_header { + height: 100px; +} + +body.mod2 div#dynamic_header #ad_iframe{ + left: 50%; + margin-left: -303px; +} + +div#dynamic_header, +body.mod1 div#dynamic_header, +body.mod2 div#dynamic_header, +body.mod3 div#dynamic_header { height: 100px;} + +/* Header Menu */ +div#header {height: 72px;} +div#mtop, +body.mod1 div#mtop, +body.mod2 div#mtop, +body.mod3 div#mtop {height: 72px; left: 50%; margin-left: -241px; z-index: 2; width: 700px;} +a#n1 img, a#n2 img, a#n3 img, a#n4 img, div#n5 {height: 72px;} +div#mtop div#n5 .reports {float: left;} +div#mtop div#n5 .messages {float: right;} + + +a#logo {display: none;} + +/* World Status Peace, Day Night */ +img.day, img.night, div.peace {left: 12px; top: -89px;} +div.peace {left: 12px; top: -98px;} + +/* Exe Time */ +div#stime {display: inline; height: 0; left: 0; top: 0; width: 0;} +div#ltime, +body.mod1 div#ltime, +body.mod2 div#ltime, +body.mod3 div#ltime {min-width: 980px; left: 0; top: 111px; width: 100%; z-index: 1;} +div#ltime div#ltimeWrap {margin: 0 auto 0 auto; width: 905px; position: relative;} +div#ltime div.devEvents {position: absolute; bottom: -25px; left: 0px;} + +/* Ressources */ +div#res, +body.mod1 div#res, +body.mod2 div#res, +body.mod3 div#res {left: 0; min-width: 980px; top: 175px; width: 100%; z-index: 2;} +div#resWrap {left: 50%; margin-left: -335px; position: relative; width: 552px;} +div#res table {background-color: transparent;} +div#res table td {background-color: transparent;} + +/* Content */ +div#mid {background-image: none; float: none; height: auto; margin: 0 auto; width: 980px;} +div#content, +body.mod1 div#content, +body.mod2 div#content, +body.mod3 div#content {height: auto !important; /* Important Regel für moderne Browser */ /* Mindesthöhe für den IE */ min-height: 450px;} + +.ie6div#content {padding-bottom: 5px;} +/* Content Menu */ +div#side_navi {height: auto !important; /* Important Regel für moderne Browser */ height: 453px; /* Mindesthöhe für den IE */ min-height: 453px; width: 155px;} + + +/* Content Villages & Links */ +div#side_info, +body.mod1 div#side_info, +body.mod2 div#side_info, +body.mod3 div#side_info { height: auto !important; /* Important Regel für moderne Browser */ height: 453px; /* Mindesthöhe für den IE */ margin-left: 0; min-height: 453px; padding-left: 16px; width: 257px; z-index: 3;} +div#side_info td.dot { + width: 8px; + +} +div#side_info td.link { + padding-right: 0px; + white-space: normal; + line-height: 18px; +} +div#side_info td { + vertical-align: top; +} + +/* Footer */ +.footer-stopper {float: left; margin-bottom: 100px;} /* Stoppt den Footer beim nach obenschieben */ +.ie6 .footer-stopper, .ie7 .footer-stopper {height: 100px;} /* IE 6 und IE7 Hack damit Footer nicht über dem Content steht */ +div#footer {bottom: 0px; height: 90px; left: 0; margin-top: 90px; min-width: 980px; position: absolute; right: 0; + font-size: 11px; line-height: 19px; +} +div#footer div#mfoot {height: 28px; margin: 0 auto; width: 905px;} +div#footer div.footer-menu {color: #797979; text-align: right;} +div#footer div#mfoot {text-align: right;} +div#footer div#mfoot a, div#footer div#mfoot a:visited, div#footer div#mfoot a:active {color: #797979;} +div#footer div#mfoot div.copyright {text-align: right; font-size: 11px;} + +/* Footer Menu */ +div#footer ul.menu {list-style-type: none; margin: 0; padding: 0; position: absolute; top: 31px;} +div#footer ul.menu.menu2 {right: 210px;} +div#footer ul.menu li {float: left; margin: 0 5px;} +div#footer ul.menu li a {color: #797979; margin: 0 3px;} +div#footer ul.menu li.copyright {direction: ltr;} + + +div#side_info table td { + +} + +#guide1 { + position: fixed; + width: 0; + border-left: 1px dashed red; + height: 100%; + left: 50%; + margin-left: -480px; + z-index: 9999; +} + +#guide2 { + position: fixed; + width: 0; + border-left: 1px dashed red; + height: 100%; + left: 50%; + margin-left: -336px; + z-index: 9999; +} + +#guide3 { + position: fixed; + width: 0; + border-right: 1px dashed red; + height: 100%; + right: 50%; + margin-right: -218px; + z-index: 9999; +} + +#guide4 { + position: fixed; + width: 0; + border-right: 1px dashed red; + height: 100%; + right: 50%; + margin-right: -480px; + z-index: 9999; +} + +div.player p.btn, div.login p.btn { + text-align: center; +} + diff --git a/gpack/travian_default/travian.css b/gpack/travian_default/travian.css index 6f3528d5..0118d4bb 100644 --- a/gpack/travian_default/travian.css +++ b/gpack/travian_default/travian.css @@ -1,7 +1,7 @@ -@CHARSET "UTF-8"; - -/* Travian 3.6 Redesign Grafikpack */ -/* Version 1.05 */ - - - +@CHARSET "UTF-8"; + +/* Travian 3.6 Redesign Grafikpack */ +/* Version 1.05 */ + + + diff --git a/gpack/travianx_v1/lang/en/lang.css b/gpack/travianx_v1/lang/en/lang.css index 1d640f0e..f4d832eb 100644 --- a/gpack/travianx_v1/lang/en/lang.css +++ b/gpack/travianx_v1/lang/en/lang.css @@ -1,18 +1,18 @@ -@CHARSET "UTF-8"; - -/* - *------------------------------------------------------------------------------ - * LANG is used to define the language-specific images and settings. - * - * Contains: - * width, height, background-image, background-repeat, background-position - *------------------------------------------------------------------------------ - */ - -@import "../../modules/new_layout_ltr.css"; - -/* --- Colors ------------------------- */ -@import "../../modules/new_colors.css"; - -/* --- Icons, Images and Backgrounds ---------- */ +@CHARSET "UTF-8"; + +/* + *------------------------------------------------------------------------------ + * LANG is used to define the language-specific images and settings. + * + * Contains: + * width, height, background-image, background-repeat, background-position + *------------------------------------------------------------------------------ + */ + +@import "../../modules/new_layout_ltr.css"; + +/* --- Colors ------------------------- */ +@import "../../modules/new_colors.css"; + +/* --- Icons, Images and Backgrounds ---------- */ @import "../../modules/new_images.css"; input#btn_login {width:97px; background-image: url(b/login.gif);} input#btn_signup {width:97px; background-image: url(b/signup.gif);} input#btn_ok {width:47px; background-image: url(b/ok.gif);} input#btn_reply {width:97px; background-image: url(b/reply.gif);} input#btn_send {width:97px; background-image: url(b/send.gif);} input#btn_save {width:97px; background-image: url(b/save.gif);} input#btn_delete {width:97px; background-image: url(b/delete.gif);} input#btn_archiv {width:97px; background-image: url(b/archiv.gif);} input#btn_back {width:97px; background-image: url(b/zurueck.html);} input#btn_train {width:97px; background-image: url(b/train.gif);} input#btn_back {width:97px; background-image: url(b/back.gif);} input#btn_forward {width:97px; background-image: url(b/forward.gif);} input#btn_demolish {width:97px; background-image: url(b/demolish.gif);} input#btn_search {width:97px; background-image: url(b/search.gif);} /* Ally Forum */ div.forum input#fbtn_ok {width:47px; background-image:url(b/ok.gif);} div.forum input#fbtn_vote {width:97px; background-image:url(f/vote.gif);} div.forum input#fbtn_result {width:97px; background-image:url(f/result.gif);} div.forum input#fbtn_voting {width:97px; background-image:url(f/voting.gif);} div.forum img#fbtn_reply {width:97px; background-image:url(f/reply.gif);} div.forum img#fbtn_post {width:97px; background-image:url(f/post.gif);} div.forum img#fbtn_newforum {width:97px; background-image:url(f/newforum.gif);} /* ------------------- Texts ------------------- */ /* --------------------------------------------- */ /* news */ div#side_info h5 img {width:160px; height:15px;} /* login */ div.login h1 img.img_login {width:468px; height:60px; background-image:url(t1/login.gif);} div.login h5 img.img_u04 {width:160px; height:15px; background-image:url(t2/u04.gif);} /* signup */ div.signup h1 img.anmelden {width:468px; height:60px; background-image:url(t1/anmelden.gif);} div.signup h5 img.img_u05 {width:160px; height:15px; background-image:url(t2/u05.gif);} div.signup img.img_u06 {width:160px; height:15px; background-image:url(t2/u06.gif);} div.signup img.img_u07 {width:160px; height:15px; background-image:url(t2/u07.gif);} /* activate */ div.activate h1 img.passwort {width:468px; height:60px; background-image:url(t1/passwort.gif);} div.activate h5 img.img_u22 {width:160px; height:15px; background-image:url(t2/u22.gif);} /* read/write message */ div.messages div.msg_content img#label {width:77px; height:34px;} div.messages div.msg_content img.send {background-image:url(msg/block_bg24b.gif);} div.messages div.msg_content img.read {background-image:url(msg/block_bg24a.gif);} /* ------------------- Images ------------------- */ /* ---------------------------------------------- */ /* travian logo */ div#side_navi a#logo img {width:116px; height:60px; background-image:url(a/travian0.gif);} div#side_navi a#logo img.logo_plus {background-image:url(a/travian1.gif);} /* plus previews */ div.plus table#plus_features td.preview img.autovv {width:200px; height:56px; background-image:url(p/autovv.gif);} div.plus table#plus_features td.preview img.bfilter {width:200px; height:45px; background-image:url(p/bfilter.gif);} div.plus table#plus_features td.preview img.dorf3 {width:200px; height:186px; background-image:url(p/dorf3.jpg);} div.plus table#plus_features td.preview img.p1 {width:179px; height:29px; background-image:url(p/p1.gif);} div.plus table#plus_features td.preview img.p3 {width:163px; height:120px; background-image:url(p/p3.gif);} div.plus table#plus_features td.preview img.p4 {width:197px; height:41px; background-image:url(p/p4.gif);} div.plus table#plus_features td.preview img.p5 {width:132px; height:51px; background-image:url(p/p5.gif);} div.plus table#plus_features td.preview img.p6 {width:111px; height:29px; background-image:url(p/p6.gif);} div.plus table#plus_features td.preview img.p7 {width:61px; height:86px; background-image:url(p/p7.gif);} div.plus table#plus_features td.preview img.p8 {width:117px; height:121px; background-image:url(p/p8.gif);} div.plus table#plus_features td.preview img.sort {width:200px; height:38px; background-image:url(p/sort.jpg);} div.plus table#plus_features td.preview img.st1 {width:200px; height:90px; background-image:url(p/st1.gif);} div.plus table#plus_features td.preview img.xxl_map {width:146px; height:112px; background-image:url(p/xxl_map.gif);} input#btn_search {width:97px; background-image: url(b/search.gif);} diff --git a/gpack/travianx_v1/modules/new_images.css b/gpack/travianx_v1/modules/new_images.css index 8ec1817f..4eb17ad4 100644 --- a/gpack/travianx_v1/modules/new_images.css +++ b/gpack/travianx_v1/modules/new_images.css @@ -1,58 +1,58 @@ -@CHARSET "UTF-8"; - -.wrapper {background: transparent url(../images/header_background.jpg) repeat-x left top;} - -div#footer {background: #F1F1F1 url(../images/footer_background.gif) repeat-x center top;} - -div#footer div#mfoot {background: transparent url(../images/footer_logo.gif) no-repeat 0px 21px;} - -div#dynamic_header, -body.mod1 div#dynamic_header, -body.mod3 div#dynamic_header {background: transparent url(../images/artwork1-ltr.jpg) no-repeat center top;} - -body.mod2 div#dynamic_header {background: transparent url(../images/artwork2-ltr.jpg) no-repeat center top;} - -div#header {background-image: none;} - -div#side_navi {background: transparent url(../images/shadow-a-ltr.png) no-repeat right top; margin-top: 30px;} -div#side_navi a:hover {background: transparent url(../images/menu-bg-ltr.gif) no-repeat left top;} - -body.v35 a#n1 img {background-image: url(../images/n1-ltr.gif);} -body.v35 a#n2 img {background-image: url(../images/n2-ltr.gif);} -body.v35 a#n3 img {background-image: url(../images/n3-ltr.gif);} -body.v35 a#n4 img {background-image: url(../images/n4-ltr.gif);} -body.v35 div.i1 {background-image:url(../images/m1-ltr.gif);} /* beide */ -body.v35 div.i2 {background-image:url(../images/m2-ltr.gif);} /* IGM */ -body.v35 div.i3 {background-image:url(../images/m3-ltr.gif);} /* Report */ -body.v35 div.i4 {background-image:url(../images/m4-ltr.gif);} /* none */ - - -div#mtop a#plus {background: transparent url(../images/plus_bg.gif) repeat-x 0 0px; margin-left:135px;} -div#mtop a#plus span.plus_text { - display: block; - background: transparent url(../images/plus_start-ltr.gif) no-repeat left top; - height: 29px; - padding: 6px 14px; - float:left; - cursor: pointer; -} -div#mtop a#plus span span {display: inline; cursor: pointer;} -div#mtop a#plus {display: block; font-size: 13px; height: 40px; margin-top:16px; position: relative;} -img#btn_plus { - background-position: left top; - background-repeat: no-repeat; - height: 29px; - width: 36px; - float:left; -} -#plus img.active {background-image: url(../images/plus_active-ltr.gif);} -#plus img.inactive {background-image: url(../images/plus_inactive-ltr.gif);} - - - -div#side_info, -body.mod1 div#side_info, -body.mod2 div#side_info, -body.mod3 div#side_info {background: transparent url(../images/shadow-b-ltr.png) no-repeat left top;} - - +@CHARSET "UTF-8"; + +.wrapper {background: transparent url(../images/header_background.jpg) repeat-x left top;} + +div#footer {background: #F1F1F1 url(../images/footer_background.gif) repeat-x center top;} + +div#footer div#mfoot {background: transparent url(../images/footer_logo.gif) no-repeat 0px 21px;} + +div#dynamic_header, +body.mod1 div#dynamic_header, +body.mod3 div#dynamic_header {background: transparent url(../images/artwork1-ltr.jpg) no-repeat center top;} + +body.mod2 div#dynamic_header {background: transparent url(../images/artwork2-ltr.jpg) no-repeat center top;} + +div#header {background-image: none;} + +div#side_navi {background: transparent url(../images/shadow-a-ltr.png) no-repeat right top; margin-top: 30px;} +div#side_navi a:hover {background: transparent url(../images/menu-bg-ltr.gif) no-repeat left top;} + +body.v35 a#n1 img {background-image: url(../images/n1-ltr.gif);} +body.v35 a#n2 img {background-image: url(../images/n2-ltr.gif);} +body.v35 a#n3 img {background-image: url(../images/n3-ltr.gif);} +body.v35 a#n4 img {background-image: url(../images/n4-ltr.gif);} +body.v35 div.i1 {background-image:url(../images/m1-ltr.gif);} /* beide */ +body.v35 div.i2 {background-image:url(../images/m2-ltr.gif);} /* IGM */ +body.v35 div.i3 {background-image:url(../images/m3-ltr.gif);} /* Report */ +body.v35 div.i4 {background-image:url(../images/m4-ltr.gif);} /* none */ + + +div#mtop a#plus {background: transparent url(../images/plus_bg.gif) repeat-x 0 0px; margin-left:135px;} +div#mtop a#plus span.plus_text { + display: block; + background: transparent url(../images/plus_start-ltr.gif) no-repeat left top; + height: 29px; + padding: 6px 14px; + float:left; + cursor: pointer; +} +div#mtop a#plus span span {display: inline; cursor: pointer;} +div#mtop a#plus {display: block; font-size: 13px; height: 40px; margin-top:16px; position: relative;} +img#btn_plus { + background-position: left top; + background-repeat: no-repeat; + height: 29px; + width: 36px; + float:left; +} +#plus img.active {background-image: url(../images/plus_active-ltr.gif);} +#plus img.inactive {background-image: url(../images/plus_inactive-ltr.gif);} + + + +div#side_info, +body.mod1 div#side_info, +body.mod2 div#side_info, +body.mod3 div#side_info {background: transparent url(../images/shadow-b-ltr.png) no-repeat left top;} + + diff --git a/gpack/travianx_v1/modules/new_layout_ltr.css b/gpack/travianx_v1/modules/new_layout_ltr.css index e4b9c1bd..dd74c4a5 100644 --- a/gpack/travianx_v1/modules/new_layout_ltr.css +++ b/gpack/travianx_v1/modules/new_layout_ltr.css @@ -1,189 +1,189 @@ -@CHARSET "UTF-8"; - -/* --- Scrollbarantiwackler --- */ -body {overflow-y:scroll;} - -body.manual {overflow-y: hidden; } - - -/* Layout */ -html, body {height: 100%;} -.wrapper {height: auto !important; /* Important Regel für moderne Browser */ height: 100%; /* Mindesthöhe für den IE */ min-height: 100%; position: relative;} - -.ie6 .wrapper {text-align: center;} /* IE6 Hack damit das alles zentriert wird */ -.ie6 .wrapper * {text-align: left;} /* IE6 Hack im Content rückgängig machgen */ - -/* --- Table Row Highlight --- */ -table.row_table_data tr.hlight td {background-color: #fffaf0;} -table.row_table_data tr.marked td {background-color: #fff8dc;} - -/* Body */ -body {background-color: #FFFFFF;} -body.manual {background-image: none;} - - -div.popup3 { - left: 50%; - top:170px; - margin-left: -285px; -} -#ce { - width: 100%; - height: 0; -} - -/* --- Main Header --- */ -body.mod1 div#dynamic_header div.dyn1, -body.mod1 div#dynamic_header div.dyn2, -body.mod2 div#dynamic_header div.dyn1, -body.mod2 div#dynamic_header div.dyn2, -body.mod3 div#dynamic_header div.dyn1, -body.mod3 div#dynamic_header div.dyn2 {display: none;} - -body.mod2 div#dynamic_header { - height: 100px; -} - -body.mod2 div#dynamic_header #ad_iframe{ - left: 50%; - margin-left: -303px; -} - -div#dynamic_header, -body.mod1 div#dynamic_header, -body.mod2 div#dynamic_header, -body.mod3 div#dynamic_header { height: 100px;} - -/* Header Menu */ -div#header {height: 72px;} -div#mtop, -body.mod1 div#mtop, -body.mod2 div#mtop, -body.mod3 div#mtop {height: 72px; left: 50%; margin-left: -241px; z-index: 2; width: 700px;} -a#n1 img, a#n2 img, a#n3 img, a#n4 img, div#n5 {height: 72px;} -div#mtop div#n5 .reports {float: left;} -div#mtop div#n5 .messages {float: right;} - - -a#logo {display: none;} - -/* World Status Peace, Day Night */ -img.day, img.night, div.peace {left: 12px; top: -89px;} -div.peace {left: 12px; top: -98px;} - -/* Exe Time */ -div#stime {display: inline; height: 0; left: 0; top: 0; width: 0;} -div#ltime, -body.mod1 div#ltime, -body.mod2 div#ltime, -body.mod3 div#ltime {min-width: 980px; left: 0; top: 111px; width: 100%; z-index: 1;} -div#ltime div#ltimeWrap {margin: 0 auto 0 auto; width: 905px; position: relative;} -div#ltime div.devEvents {position: absolute; bottom: -25px; left: 0px;} - -/* Ressources */ -div#res, -body.mod1 div#res, -body.mod2 div#res, -body.mod3 div#res {left: 0; min-width: 980px; top: 175px; width: 100%; z-index: 2;} -div#resWrap {left: 50%; margin-left: -335px; position: relative; width: 552px;} -div#res table {background-color: transparent;} -div#res table td {background-color: transparent;} - -/* Content */ -div#mid {background-image: none; float: none; height: auto; margin: 0 auto; width: 980px;} -div#content, -body.mod1 div#content, -body.mod2 div#content, -body.mod3 div#content {height: auto !important; /* Important Regel für moderne Browser */ /* Mindesthöhe für den IE */ min-height: 450px;} - -.ie6div#content {padding-bottom: 5px;} -/* Content Menu */ -div#side_navi {height: auto !important; /* Important Regel für moderne Browser */ height: 453px; /* Mindesthöhe für den IE */ min-height: 453px; width: 155px;} - - -/* Content Villages & Links */ -div#side_info, -body.mod1 div#side_info, -body.mod2 div#side_info, -body.mod3 div#side_info { height: auto !important; /* Important Regel für moderne Browser */ height: 453px; /* Mindesthöhe für den IE */ margin-left: 0; min-height: 453px; padding-left: 16px; width: 257px; z-index: 3;} -div#side_info td.dot { - width: 8px; - -} -div#side_info td.link { - padding-right: 0px; - white-space: normal; - line-height: 18px; -} -div#side_info td { - vertical-align: top; -} - -/* Footer */ -.footer-stopper {float: left; margin-bottom: 100px;} /* Stoppt den Footer beim nach obenschieben */ -.ie6 .footer-stopper, .ie7 .footer-stopper {height: 100px;} /* IE 6 und IE7 Hack damit Footer nicht über dem Content steht */ -div#footer {bottom: 0px; height: 90px; left: 0; margin-top: 90px; min-width: 980px; position: absolute; right: 0; - font-size: 11px; line-height: 19px; -} -div#footer div#mfoot {height: 28px; margin: 0 auto; width: 905px;} -div#footer div.footer-menu {color: #797979; text-align: right;} -div#footer div#mfoot {text-align: right;} -div#footer div#mfoot a, div#footer div#mfoot a:visited, div#footer div#mfoot a:active {color: #797979;} -div#footer div#mfoot div.copyright {text-align: right; font-size: 11px;} - -/* Footer Menu */ -div#footer ul.menu {list-style-type: none; margin: 0; padding: 0; position: absolute; top: 31px;} -div#footer ul.menu.menu2 {right: 210px;} -div#footer ul.menu li {float: left; margin: 0 5px;} -div#footer ul.menu li a {color: #797979; margin: 0 3px;} -div#footer ul.menu li.copyright {direction: ltr;} - - -div#side_info table td { - -} - -#guide1 { - position: fixed; - width: 0; - border-left: 1px dashed red; - height: 100%; - left: 50%; - margin-left: -480px; - z-index: 9999; -} - -#guide2 { - position: fixed; - width: 0; - border-left: 1px dashed red; - height: 100%; - left: 50%; - margin-left: -336px; - z-index: 9999; -} - -#guide3 { - position: fixed; - width: 0; - border-right: 1px dashed red; - height: 100%; - right: 50%; - margin-right: -218px; - z-index: 9999; -} - -#guide4 { - position: fixed; - width: 0; - border-right: 1px dashed red; - height: 100%; - right: 50%; - margin-right: -480px; - z-index: 9999; -} - -div.player p.btn, div.login p.btn { - text-align: center; -} - +@CHARSET "UTF-8"; + +/* --- Scrollbarantiwackler --- */ +body {overflow-y:scroll;} + +body.manual {overflow-y: hidden; } + + +/* Layout */ +html, body {height: 100%;} +.wrapper {height: auto !important; /* Important Regel für moderne Browser */ height: 100%; /* Mindesthöhe für den IE */ min-height: 100%; position: relative;} + +.ie6 .wrapper {text-align: center;} /* IE6 Hack damit das alles zentriert wird */ +.ie6 .wrapper * {text-align: left;} /* IE6 Hack im Content rückgängig machgen */ + +/* --- Table Row Highlight --- */ +table.row_table_data tr.hlight td {background-color: #fffaf0;} +table.row_table_data tr.marked td {background-color: #fff8dc;} + +/* Body */ +body {background-color: #FFFFFF;} +body.manual {background-image: none;} + + +div.popup3 { + left: 50%; + top:170px; + margin-left: -285px; +} +#ce { + width: 100%; + height: 0; +} + +/* --- Main Header --- */ +body.mod1 div#dynamic_header div.dyn1, +body.mod1 div#dynamic_header div.dyn2, +body.mod2 div#dynamic_header div.dyn1, +body.mod2 div#dynamic_header div.dyn2, +body.mod3 div#dynamic_header div.dyn1, +body.mod3 div#dynamic_header div.dyn2 {display: none;} + +body.mod2 div#dynamic_header { + height: 100px; +} + +body.mod2 div#dynamic_header #ad_iframe{ + left: 50%; + margin-left: -303px; +} + +div#dynamic_header, +body.mod1 div#dynamic_header, +body.mod2 div#dynamic_header, +body.mod3 div#dynamic_header { height: 100px;} + +/* Header Menu */ +div#header {height: 72px;} +div#mtop, +body.mod1 div#mtop, +body.mod2 div#mtop, +body.mod3 div#mtop {height: 72px; left: 50%; margin-left: -241px; z-index: 2; width: 700px;} +a#n1 img, a#n2 img, a#n3 img, a#n4 img, div#n5 {height: 72px;} +div#mtop div#n5 .reports {float: left;} +div#mtop div#n5 .messages {float: right;} + + +a#logo {display: none;} + +/* World Status Peace, Day Night */ +img.day, img.night, div.peace {left: 12px; top: -89px;} +div.peace {left: 12px; top: -98px;} + +/* Exe Time */ +div#stime {display: inline; height: 0; left: 0; top: 0; width: 0;} +div#ltime, +body.mod1 div#ltime, +body.mod2 div#ltime, +body.mod3 div#ltime {min-width: 980px; left: 0; top: 111px; width: 100%; z-index: 1;} +div#ltime div#ltimeWrap {margin: 0 auto 0 auto; width: 905px; position: relative;} +div#ltime div.devEvents {position: absolute; bottom: -25px; left: 0px;} + +/* Ressources */ +div#res, +body.mod1 div#res, +body.mod2 div#res, +body.mod3 div#res {left: 0; min-width: 980px; top: 175px; width: 100%; z-index: 2;} +div#resWrap {left: 50%; margin-left: -335px; position: relative; width: 552px;} +div#res table {background-color: transparent;} +div#res table td {background-color: transparent;} + +/* Content */ +div#mid {background-image: none; float: none; height: auto; margin: 0 auto; width: 980px;} +div#content, +body.mod1 div#content, +body.mod2 div#content, +body.mod3 div#content {height: auto !important; /* Important Regel für moderne Browser */ /* Mindesthöhe für den IE */ min-height: 450px;} + +.ie6div#content {padding-bottom: 5px;} +/* Content Menu */ +div#side_navi {height: auto !important; /* Important Regel für moderne Browser */ height: 453px; /* Mindesthöhe für den IE */ min-height: 453px; width: 155px;} + + +/* Content Villages & Links */ +div#side_info, +body.mod1 div#side_info, +body.mod2 div#side_info, +body.mod3 div#side_info { height: auto !important; /* Important Regel für moderne Browser */ height: 453px; /* Mindesthöhe für den IE */ margin-left: 0; min-height: 453px; padding-left: 16px; width: 257px; z-index: 3;} +div#side_info td.dot { + width: 8px; + +} +div#side_info td.link { + padding-right: 0px; + white-space: normal; + line-height: 18px; +} +div#side_info td { + vertical-align: top; +} + +/* Footer */ +.footer-stopper {float: left; margin-bottom: 100px;} /* Stoppt den Footer beim nach obenschieben */ +.ie6 .footer-stopper, .ie7 .footer-stopper {height: 100px;} /* IE 6 und IE7 Hack damit Footer nicht über dem Content steht */ +div#footer {bottom: 0px; height: 90px; left: 0; margin-top: 90px; min-width: 980px; position: absolute; right: 0; + font-size: 11px; line-height: 19px; +} +div#footer div#mfoot {height: 28px; margin: 0 auto; width: 905px;} +div#footer div.footer-menu {color: #797979; text-align: right;} +div#footer div#mfoot {text-align: right;} +div#footer div#mfoot a, div#footer div#mfoot a:visited, div#footer div#mfoot a:active {color: #797979;} +div#footer div#mfoot div.copyright {text-align: right; font-size: 11px;} + +/* Footer Menu */ +div#footer ul.menu {list-style-type: none; margin: 0; padding: 0; position: absolute; top: 31px;} +div#footer ul.menu.menu2 {right: 210px;} +div#footer ul.menu li {float: left; margin: 0 5px;} +div#footer ul.menu li a {color: #797979; margin: 0 3px;} +div#footer ul.menu li.copyright {direction: ltr;} + + +div#side_info table td { + +} + +#guide1 { + position: fixed; + width: 0; + border-left: 1px dashed red; + height: 100%; + left: 50%; + margin-left: -480px; + z-index: 9999; +} + +#guide2 { + position: fixed; + width: 0; + border-left: 1px dashed red; + height: 100%; + left: 50%; + margin-left: -336px; + z-index: 9999; +} + +#guide3 { + position: fixed; + width: 0; + border-right: 1px dashed red; + height: 100%; + right: 50%; + margin-right: -218px; + z-index: 9999; +} + +#guide4 { + position: fixed; + width: 0; + border-right: 1px dashed red; + height: 100%; + right: 50%; + margin-right: -480px; + z-index: 9999; +} + +div.player p.btn, div.login p.btn { + text-align: center; +} + diff --git a/gpack/travianx_v1/travian.css b/gpack/travianx_v1/travian.css index 6f3528d5..0118d4bb 100644 --- a/gpack/travianx_v1/travian.css +++ b/gpack/travianx_v1/travian.css @@ -1,7 +1,7 @@ -@CHARSET "UTF-8"; - -/* Travian 3.6 Redesign Grafikpack */ -/* Version 1.05 */ - - - +@CHARSET "UTF-8"; + +/* Travian 3.6 Redesign Grafikpack */ +/* Version 1.05 */ + + + diff --git a/install/data/sql.sql b/install/data/sql.sql index 866d2c83..27e9c517 100644 --- a/install/data/sql.sql +++ b/install/data/sql.sql @@ -167,6 +167,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%allimedal` ( `week` int(11) NOT NULL, `points` bigint(255) NOT NULL, `img` varchar(255) NOT NULL, + `del` tinyint(1) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -935,6 +936,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%medal` ( `week` int(10) unsigned NOT NULL, `points` varchar(15) NOT NULL, `img` varchar(10) NOT NULL, + `del` tinyint(1) unsigned NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; diff --git a/install/templates/config.tpl b/install/templates/config.tpl deleted file mode 100644 index 184a1b5f..00000000 --- a/install/templates/config.tpl +++ /dev/null @@ -1,273 +0,0 @@ -Error creating constant.php check cmod.
"; -} -?> -
- -

- SERVER RELATED -

getTypeLevel(17)? "getTypeField(17) . "\">» Send merchant(s)." : "» Send merchant(s). (build marketplace)"; ?> + getTypeLevel(17)? "getTypeField(17) . "\">» Send merchant(s)." : "» Send merchant(s). (build marketplace)"; + } + + ?> +
No. AllianceRanksPopulation
- - - - - - - - - - - - - - - - - - - -
Server name:
Server speed:
Troop speed:
Evasion speed:
Trader capacity (1 = 1x...):
World size: - -
Register Open: - -
Server:
Domain:
Homepage:
Language: - -
Beginners protection length: - -
Plus account length: - -
+25% production length: - -
Storage Multipler:
Tourn Threshold:
Great Workshop: - -
ww: - -
Peace system: - -
-

- -

- ADMIN ACCOUNT - - - - - -
Admin name:
Admin email:
Show admin in stats: - -
-

- -

- SQL RELATED - - - - - - - -
Hostname:
Username:
Password:
DB name:
Prefix:
Type:
-

- - - - - - - -

- NEWSBOX OPTIONS - - - - -
Newsbox 1:
Newsbox 2:
Newsbox 3:
-

- -

- LOG RELATED (You should disable them) - - - - - - - - - - - -
Log Building:
Log Tech:
Log Login:
Log Gold:
Log Admin:
Log War:
Log Market:
Log Illegal:
Log :
-

- -

- EXTRA OPTIONS - - - - - - - - - - -
Quest:
Activate:
Limit Mailbox: (NOT DONE)
Max mails: (NOT DONE)
Demolish - lvl required:
Village Expand:
Error Reporting:
T4 is Coming screen:
-

-
- Server Start Settings - - - -
Start Date:
Start Time:
- -
- -
- - - \ No newline at end of file diff --git a/install/templates/dataform.tpl b/install/templates/dataform.tpl deleted file mode 100644 index ffc2788a..00000000 --- a/install/templates/dataform.tpl +++ /dev/null @@ -1,25 +0,0 @@ -Error importing database. Check configuration.
"; -} -?> -
- - -

- Create SQL Structure - - - -
Warning: This can take some time. Do not click, just wait till the next page has been loaded!
-

-
- \ No newline at end of file diff --git a/install/templates/end.tpl b/install/templates/end.tpl deleted file mode 100644 index 6c2dee05..00000000 --- a/install/templates/end.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -

-Thanks for installing TravianX. -

Please remove/rename the installation folder.

-All the files are placed. The database is created, so you can now start playing on your own Travian. -

- - -

-

> My TravianX homepage <
-

- \ No newline at end of file diff --git a/install/templates/field.tpl b/install/templates/field.tpl deleted file mode 100644 index 60374858..00000000 --- a/install/templates/field.tpl +++ /dev/null @@ -1,25 +0,0 @@ -Error creating wdata. Check configuration or file.
"; -} -?> -
- - -

- Create World Data - - - -
Warning: This can take some time. Do not click, just wait till the next page has been loaded!
-

-
- \ No newline at end of file diff --git a/install/templates/greet.tpl b/install/templates/greet.tpl deleted file mode 100644 index 20e9df2d..00000000 --- a/install/templates/greet.tpl +++ /dev/null @@ -1,43 +0,0 @@ - -
- -

  Disclaimer

- - - - - -
- TravianX Team -
-
- -
-
- -
-
- - diff --git a/install/templates/menu.tpl b/install/templates/menu.tpl deleted file mode 100644 index 01be4f88..00000000 --- a/install/templates/menu.tpl +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/install/templates/multihunter.tpl b/install/templates/multihunter.tpl deleted file mode 100644 index 13bc860d..00000000 --- a/install/templates/multihunter.tpl +++ /dev/null @@ -1,29 +0,0 @@ - - - - -
- -

- Create Multihunter account - - - - -
Name:
Password:
Note: Rember this password! You need it for the ACP
-

- -
-
-
- - \ No newline at end of file diff --git a/install/templates/oasis.tpl b/install/templates/oasis.tpl deleted file mode 100644 index eeb1dacb..00000000 --- a/install/templates/oasis.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -
-

- Populate Oasis - - - -
Warning: This can take some time. Do not click, just wait till the next page has been loaded!
-

-
diff --git a/install/templates/script.tpl b/install/templates/script.tpl deleted file mode 100644 index 26c9141f..00000000 --- a/install/templates/script.tpl +++ /dev/null @@ -1,145 +0,0 @@ - - -bar_id = uniqid('progressbar'); - $this->label = $label; - - $this->max_ticks = $max_ticks; - $this->ticks = 0; - } - - public function tick() { - $this->ticks++; - $this->draw_progress(); - } - - public function draw() { - $this->draw_bar(); - $this->draw_progress(); - } - - static public function draw_css() { - echo ' - - '; - } - - protected function draw_bar() { - echo ' -
- -
- -
-
- '; - echo ' - - '; - - $this->flush(); - } - - protected function draw_progress() { - - $width = round($this->ticks / $this->max_ticks * 100, 2); - $label = sprintf($this->label, $this->ticks, $this->max_ticks); - - echo ' - - - '; - $this->flush(); - } - - protected function flush() { - while(ob_get_level() > 0) { - ob_end_flush(); - } - - flush(); - } -} -?> \ No newline at end of file diff --git a/install/winner.php b/install/winner.php new file mode 100644 index 00000000..5c653acb --- /dev/null +++ b/install/winner.php @@ -0,0 +1,1178 @@ +pageLoadTimeStart(); +if(isset($_GET['newdid'])) { + $_SESSION['wid'] = $_GET['newdid']; + header("Location: ".$_SERVER['PHP_SELF']); +} +else { + $building->procBuild($_GET); +} + +## Get Rankings for Ranking Section +## Top 3 Population +$q = " + SELECT ".TB_PREFIX."users.id userid, ".TB_PREFIX."users.username username,".TB_PREFIX."users.alliance alliance, ( + SELECT SUM( ".TB_PREFIX."vdata.pop ) + FROM ".TB_PREFIX."vdata + WHERE ".TB_PREFIX."vdata.owner = userid + )totalpop, ( + SELECT COUNT( " . TB_PREFIX . "vdata.wref ) + FROM " . TB_PREFIX . "vdata + WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99 + )totalvillages, ( + SELECT " . TB_PREFIX . "alidata.tag + FROM " . TB_PREFIX . "alidata, " . TB_PREFIX . "users + WHERE " . TB_PREFIX . "alidata.id = " . TB_PREFIX . "users.alliance + AND " . TB_PREFIX . "users.id = userid + )allitag + FROM " . TB_PREFIX . "users + WHERE " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " + ORDER BY totalpop DESC, totalvillages DESC, username ASC"; + + $result = (mysql_query($q)); + while($row = mysql_fetch_assoc($result)) + { + $datas[] = $row; + } + foreach($datas as $result) + { + $value['userid'] = $result['userid']; + $value['username'] = $result['username']; + $value['alliance'] = $result['alliance']; + $value['aname'] = $result['allitag']; + $value['totalpop'] = $result['totalpop']; + $value['totalvillage'] = $result['totalvillages']; + } + ## Top Attacker + $q = " + SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.apall, ( + SELECT COUNT( " . TB_PREFIX . "vdata.wref ) + FROM " . TB_PREFIX . "vdata + WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99 + )totalvillages, ( + SELECT SUM( " . TB_PREFIX . "vdata.pop ) + FROM " . TB_PREFIX . "vdata + WHERE " . TB_PREFIX . "vdata.owner = userid + )pop + FROM " . TB_PREFIX . "users + WHERE " . TB_PREFIX . "users.apall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND " . TB_PREFIX . "users.tribe <= 3 + ORDER BY " . TB_PREFIX . "users.apall DESC, pop DESC, username ASC"; + + $result = mysql_query($q) or die(mysql_error()); + while($row = mysql_fetch_assoc($result)) + { + $attacker[] = $row; + } + foreach($attacker as $key => $row) + { + $value['username'] = $row['username']; + $value['totalvillages'] = $row['totalvillages']; + $value['id'] = $row['userid']; + $value['totalpop'] = $row['pop']; + $value['apall'] = $row['apall']; + } + ## Top Defender + $q = " + SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.dpall, ( + SELECT COUNT( " . TB_PREFIX . "vdata.wref ) + FROM " . TB_PREFIX . "vdata + WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99 + )totalvillages, ( + SELECT SUM( " . TB_PREFIX . "vdata.pop ) + FROM " . TB_PREFIX . "vdata + WHERE " . TB_PREFIX . "vdata.owner = userid + )pop + FROM " . TB_PREFIX . "users + WHERE " . TB_PREFIX . "users.dpall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " + ORDER BY " . TB_PREFIX . "users.dpall DESC, pop DESC, username ASC"; + $result = mysql_query($q) or die(mysql_error()); + while($row = mysql_fetch_assoc($result)) + { + $defender[] = $row; + } + foreach($defender as $key => $row) + { + $value['username'] = $row['username']; + $value['totalvillages'] = $row['totalvillages']; + $value['id'] = $row['userid']; + $value['totalpop'] = $row['pop']; + $value['dpall'] = $row['dpall']; + } + + ## Get WW Winner Details + $sql = mysql_query("SELECT vref FROM ".TB_PREFIX."fdata WHERE f99 = '100' and f99t = '40'"); + $vref = mysql_result($sql, 0); + + $sql = mysql_query("SELECT name FROM ".TB_PREFIX."vdata WHERE wref = '$vref'")or die(mysql_error()); + $winningvillagename = mysql_result($sql, 0); + + $sql = mysql_query("SELECT owner FROM ".TB_PREFIX."vdata WHERE wref = '$vref'")or die(mysql_error()); + $owner = mysql_result($sql, 0); + + $sql = mysql_query("SELECT username FROM ".TB_PREFIX."users WHERE id = '$owner'")or die(mysql_error()); + $username = mysql_result($sql, 0); + + $sql = mysql_query("SELECT alliance FROM ".TB_PREFIX."users WHERE id = '$owner'")or die(mysql_error()); + $allianceid = mysql_result($sql, 0); + + $sql = mysql_query("SELECT name, tag FROM ".TB_PREFIX."alidata WHERE id = '$allianceid'")or die(mysql_error()); + $winningalliance = mysql_result($sql, 0); + + $sql = mysql_query("SELECT tag FROM ".TB_PREFIX."alidata WHERE id = '$allianceid'")or die(mysql_error()); + $winningalliancetag = mysql_result($sql, 0); + + $sql = mysql_query("SELECT vref FROM ".TB_PREFIX."fdata WHERE f99 = '100' and f99t = '40'"); + $winner = mysql_num_rows($sql); + + if($winner!=0){ +?> + + + + <?php echo SERVER_NAME ?> + + + + + + + + + + + + gpack == null || GP_ENABLE == false) + { + echo " + + "; + } + else + { + echo " + + "; + } + ?> + + + + +
+ +
+ +
+ +
+ +

+ Dear Players, +

+ All good things must come to an end, and so too must this age. Once solomon was given a ring, upon which was inscribed a message that could take away all + the joys or sorrows of the world, that message was roughly translated "this too shall pass". It is both our joy and sorrow to announce to all Players that + this too has now passed! We hope you enjoyed your time with us as much as we enjoyed serving you and thank you for staying until the very end!

+ + The results: Day had long since passed into night, yet the workers in getMapCheck($vref)."\">$winningvillagename"; ?>, + laboured on throught the wintery eve, every wary of the countless armies marching to destroy their work, knowing that they raced against time and the greatest + threat that had ever faced the free people. Their tireless struggles were rewared at Time on Date after a + nameless worker laid the dinal stone in what will forever known as the greatest and most magnificent creation in all of history since the fall of the Natars

+ + Together with the alliance "$winningalliancetag"; ?>", "$username"; ?>" + was the first to finish the Wonder of the World, using millions of resources whilst also protecting it with hundereds of thousands of brave defenders. It is therefore $username"; ?> + who recieves the title "Winner of this era"!

+ + + "Total Population: ">" was the ruler over the largest personal empire, followed closely by "Total Population: ">" and "Total Population: ">".
+ "Attack Points: ">" slew more than any other, and was the mightiest, most fearsome commander.
+ "Defence Points: ">" was the most glorious defender, slaugtering enemies at the village gates, staining the lands around those villages with their blood. +

+

Congratulations to everyone.

+

+ Best Regards,
+ Team



+ (By: aggenkeech & Eyas95)

+ +

+
» Continue
+
+
+ +
+
+
+ +
+ +
+
+
+ Calculated in pageLoadTimeEnd()-$start)*1000);?> ms +
Server time: +
+
+
+
+ + + \ No newline at end of file diff --git a/medals.php b/medals.php index ec87cf89..7fcecfec 100644 --- a/medals.php +++ b/medals.php @@ -524,11 +524,9 @@ Done:
-Top 10 Alliance Attacker
-Top 10 Alliance Defencer
-Top 10 Alliance Robbers
--Top 10 Alliance Climbers(Rank)
--Top 10 Pop Climbers
+-Top 10 Alliance Climbers
-Top 10 Rank Climbers
-Bonus: Attacker AND Defender
--Bonus: 3/5/10 times in a row top 3 Pop Climbers
-Bonus: 3/5/10 times in a row top 3 Rank Climbers
-Bonus: 3/5/10 times top 3 Attack
-Bonus: 3/5/10 times top 3 Defence
@@ -536,7 +534,6 @@ Done:
-Bonus: 3/5/10 times in a row top 10 Attack
-Bonus: 3/5/10 times in a row top 10 Defence
--Bonus: 3/5/10 times in a row top 10 Pop Climbers
-Bonus: 3/5/10 times in a row top 10 Rank Climbers
-Bonus: 3/5/10 times in a row top 10 Robber
diff --git a/sysmsg.php b/sysmsg.php index fa44ee16..3bf82a5e 100644 --- a/sysmsg.php +++ b/sysmsg.php @@ -1,179 +1,179 @@ -uid)) != '1') die("Hacking attempt!"); - -if(isset($_GET['del'])){ - $query="SELECT * FROM ".TB_PREFIX."users ORDER BY id + 0 DESC"; - $result=mysql_query($query) or die (mysql_error()); - for ($i=0; $row=mysql_fetch_row($result); $i++) { - $updateattquery = mysql_query("UPDATE ".TB_PREFIX."users SET ok = '0' WHERE id = '".$row[0]."'") - or die(mysql_error()); - } + +include_once("GameEngine/Account.php"); +$max_per_pass = 1000; +mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS); +mysql_select_db(SQL_DB); +if (mysql_num_rows(mysql_query("SELECT id FROM ".TB_PREFIX."users WHERE access = 9 AND id = ".$session->uid)) != '1') die("Hacking attempt!"); + +if(isset($_GET['del'])){ + $query="SELECT * FROM ".TB_PREFIX."users ORDER BY id + 0 DESC"; + $result=mysql_query($query) or die (mysql_error()); + for ($i=0; $row=mysql_fetch_row($result); $i++) { + $updateattquery = mysql_query("UPDATE ".TB_PREFIX."users SET ok = '0' WHERE id = '".$row[0]."'") + or die(mysql_error()); + } } - -if (@$_POST['submit'] == "Send") -{ - unset ($_SESSION['m_message']); - $_SESSION['m_message'] = $_POST['message']; - $NextStep = true; -} - - -if (@isset($_POST['confirm'])) -{ - if ($_POST['confirm'] == 'No' ) $Interupt = true; - if ($_POST['confirm'] == 'Yes'){ - - if(file_exists("Templates/text.tpl")) { - - $myFile = "Templates/text.tpl"; - $fh = fopen($myFile, 'w') or die("


Can't open file: templates/text.tpl"); - $text = file_get_contents("Templates/text_format.tpl"); - $text = preg_replace("'%TEKST%'",$_SESSION['m_message'] ,$text); - fwrite($fh, $text); - - $query="SELECT * FROM ".TB_PREFIX."users ORDER BY id + 0 DESC"; - $result=mysql_query($query) or die (mysql_error()); - for ($i=0; $row=mysql_fetch_row($result); $i++) { - $updateattquery = mysql_query("UPDATE ".TB_PREFIX."users SET ok = '1' WHERE id = '".$row[0]."'") - or die(mysql_error()); - } - $done = true; - } else { die("


wrong"); } -}} - -?> - - - - <?php echo SERVER_NAME ?> - - - - - - - - - - - - - gpack == null || GP_ENABLE == false) { - echo " - - "; - } else { - echo " - - "; - } - ?> - - - gpack == null || GP_ENABLE == false) { - echo " - - "; - } else { - echo " - - "; - } - ?> - - - - - -
- -
-
- -
- - - -
-
- -
-
- - -
- - -
- - - + +if (@$_POST['submit'] == "Send") +{ + unset ($_SESSION['m_message']); + $_SESSION['m_message'] = $_POST['message']; + $NextStep = true; +} + + +if (@isset($_POST['confirm'])) +{ + if ($_POST['confirm'] == 'No' ) $Interupt = true; + if ($_POST['confirm'] == 'Yes'){ + + if(file_exists("Templates/text.tpl")) { + + $myFile = "Templates/text.tpl"; + $fh = fopen($myFile, 'w') or die("


Can't open file: templates/text.tpl"); + $text = file_get_contents("Templates/text_format.tpl"); + $text = preg_replace("'%TEKST%'",$_SESSION['m_message'] ,$text); + fwrite($fh, $text); + + $query="SELECT * FROM ".TB_PREFIX."users ORDER BY id + 0 DESC"; + $result=mysql_query($query) or die (mysql_error()); + for ($i=0; $row=mysql_fetch_row($result); $i++) { + $updateattquery = mysql_query("UPDATE ".TB_PREFIX."users SET ok = '1' WHERE id = '".$row[0]."'") + or die(mysql_error()); + } + $done = true; + } else { die("


wrong"); } +}} + +?> + + + + <?php echo SERVER_NAME ?> + + + + + + + + + + + + + gpack == null || GP_ENABLE == false) { + echo " + + "; + } else { + echo " + + "; + } + ?> + + + gpack == null || GP_ENABLE == false) { + echo " + + "; + } else { + echo " + + "; + } + ?> + + + + + +
+ +
+
+ +
+ + + +
+
+ +
+
+ + +
+ + +
+ + +