diff --git a/Admin/Templates/404.tpl b/Admin/Templates/404.tpl index 076def4b..d4976aca 100644 --- a/Admin/Templates/404.tpl +++ b/Admin/Templates/404.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename 404.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/Message/index.php b/Admin/Templates/Message/index.php index 98297c7a..a81240cd 100644 --- a/Admin/Templates/Message/index.php +++ b/Admin/Templates/Message/index.php @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename 404.tpl ## +## Filename index.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/Newmessage.tpl b/Admin/Templates/Newmessage.tpl index 4bdad74e..662ae672 100644 --- a/Admin/Templates/Newmessage.tpl +++ b/Admin/Templates/Newmessage.tpl @@ -5,8 +5,8 @@ ## Filename newmessage.tpl ## ## Developed by: Dzoki ## ## Reworked: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/Notice/index.php b/Admin/Templates/Notice/index.php index 98297c7a..a81240cd 100644 --- a/Admin/Templates/Notice/index.php +++ b/Admin/Templates/Notice/index.php @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename 404.tpl ## +## Filename index.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/addUsers.tpl b/Admin/Templates/addUsers.tpl index c67e6a34..c051c32d 100644 --- a/Admin/Templates/addUsers.tpl +++ b/Admin/Templates/addUsers.tpl @@ -81,13 +81,13 @@ Submitting this form will create new Users
(and their home Villages) on your $tribe = RANDOM; break; case '1': - $tribe = ROMANS; + $tribe = TRIBE1; // Romans break; case '2': - $tribe = TEUTONS; + $tribe = TRIBE2; // Teutons break; case '3': - $tribe = GAULS; + $tribe = TRIBE3; // Gauls break; default: // Should never reach here @@ -157,9 +157,9 @@ Beginners Protection   
Tribe:

-
-
-
+
+
+


diff --git a/Admin/Templates/add_village.tpl b/Admin/Templates/add_village.tpl index 12650283..f79fd791 100644 --- a/Admin/Templates/add_village.tpl +++ b/Admin/Templates/add_village.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename add_village.tpl ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/alliance.tpl b/Admin/Templates/alliance.tpl index 8d211d51..fed4f60b 100644 --- a/Admin/Templates/alliance.tpl +++ b/Admin/Templates/alliance.tpl @@ -5,8 +5,8 @@ ## Filename alliance.tpl ## ## Developed by: Dzoki ## ## Reworked: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/artifact.tpl b/Admin/Templates/artifact.tpl index 907018b2..d2adf594 100644 --- a/Admin/Templates/artifact.tpl +++ b/Admin/Templates/artifact.tpl @@ -28,7 +28,7 @@ $artifactInfo = Artifacts::getArtifactInfo($artifact); if(empty($artifact)){ ?> -
+
diff --git a/Admin/Templates/ban.tpl b/Admin/Templates/ban.tpl index 02b7450f..deb323be 100644 --- a/Admin/Templates/ban.tpl +++ b/Admin/Templates/ban.tpl @@ -5,8 +5,8 @@ ## Filename ban.tpl ## ## Developed by: Dzoki ## ## Reworked: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/ban_msg.tpl b/Admin/Templates/ban_msg.tpl index 801ee948..8f9e0e05 100644 --- a/Admin/Templates/ban_msg.tpl +++ b/Admin/Templates/ban_msg.tpl @@ -4,7 +4,7 @@ ## --------------------------------------------------------------------------- ## ## Filename ban_msq.tpl ## ## Developed by: yi12345 ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# $time = time(); diff --git a/Admin/Templates/cleanban.tpl b/Admin/Templates/cleanban.tpl index c3d24bde..faba9e4e 100644 --- a/Admin/Templates/cleanban.tpl +++ b/Admin/Templates/cleanban.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename oasis.tpl ## +## Filename cleanban.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/config.tpl b/Admin/Templates/config.tpl index c50caaaf..7e505938 100644 --- a/Admin/Templates/config.tpl +++ b/Admin/Templates/config.tpl @@ -6,7 +6,7 @@ ## Developed by: Dzoki ## ## Rework by: ronix ## ## License: TravianZ Project ## -## Copyright: TravianZ (c) 2010-2014. All rights reserved. ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# if(!isset($_SESSION)) session_start(); diff --git a/Admin/Templates/delallymedal.tpl b/Admin/Templates/delallymedal.tpl index 5b5436f8..943dd2c5 100644 --- a/Admin/Templates/delallymedal.tpl +++ b/Admin/Templates/delallymedal.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename gold.php ## +## Filename delallymedal.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## Improved: aggenkeech ## ################################################################################# diff --git a/Admin/Templates/deletion.tpl b/Admin/Templates/deletion.tpl index b1dab1c0..18ae8247 100644 --- a/Admin/Templates/deletion.tpl +++ b/Admin/Templates/deletion.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename deletion.tpl ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# include_once("../GameEngine/Ranking.php"); diff --git a/Admin/Templates/delmedal.tpl b/Admin/Templates/delmedal.tpl index ec6ddedd..55415a84 100644 --- a/Admin/Templates/delmedal.tpl +++ b/Admin/Templates/delmedal.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename gold.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## Improved: aggenkeech ## ################################################################################# diff --git a/Admin/Templates/editAccess.tpl b/Admin/Templates/editAccess.tpl index 08f03c6b..cb74da62 100644 --- a/Admin/Templates/editAccess.tpl +++ b/Admin/Templates/editAccess.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename gold.tpl ## +## Filename editAccess.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/editHero.tpl b/Admin/Templates/editHero.tpl index 19220085..157c3d4a 100644 --- a/Admin/Templates/editHero.tpl +++ b/Admin/Templates/editHero.tpl @@ -2,7 +2,7 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename playerheroinfo.tpl ## +## Filename editHero.tpl ## ## Developed by: ronix ## ## License: TravianZ Project ## ## Copyright: TravianZ (c) 2010-2014. All rights reserved. ## diff --git a/Admin/Templates/editOverall.tpl b/Admin/Templates/editOverall.tpl index 64e552dc..8f7663ec 100644 --- a/Admin/Templates/editOverall.tpl +++ b/Admin/Templates/editOverall.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename editOverall.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/editPlus.tpl b/Admin/Templates/editPlus.tpl index 1a901b70..6cbe709c 100644 --- a/Admin/Templates/editPlus.tpl +++ b/Admin/Templates/editPlus.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename editPlus.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/editProtection.tpl b/Admin/Templates/editProtection.tpl index f59c6dea..967886cb 100644 --- a/Admin/Templates/editProtection.tpl +++ b/Admin/Templates/editProtection.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename editPlus.tpl ## +## Filename editProtection.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/editResources.tpl b/Admin/Templates/editResources.tpl index aaf3917c..416198c9 100644 --- a/Admin/Templates/editResources.tpl +++ b/Admin/Templates/editResources.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename editVillage.tpl ## +## Filename editResources.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/editSitter.tpl b/Admin/Templates/editSitter.tpl index adc55051..b4a5c4a1 100644 --- a/Admin/Templates/editSitter.tpl +++ b/Admin/Templates/editSitter.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename editPlus.tpl ## +## Filename editSitter.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/editUser.tpl b/Admin/Templates/editUser.tpl index 39dd1578..d4f62bbb 100644 --- a/Admin/Templates/editUser.tpl +++ b/Admin/Templates/editUser.tpl @@ -5,8 +5,8 @@ ## Filename editUser.tpl ## ## Developed by: Dzoki ## ## Reworked: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/editVillage.tpl b/Admin/Templates/editVillage.tpl index 87f1e56d..52d21c33 100644 --- a/Admin/Templates/editVillage.tpl +++ b/Admin/Templates/editVillage.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename editVillage.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/editWeek.tpl b/Admin/Templates/editWeek.tpl index 52b660bb..e8b57ae9 100644 --- a/Admin/Templates/editWeek.tpl +++ b/Admin/Templates/editWeek.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename editOverall.tpl ## +## Filename editWeek.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/givePlus.tpl b/Admin/Templates/givePlus.tpl index 8c9d8af1..e62564b3 100644 --- a/Admin/Templates/givePlus.tpl +++ b/Admin/Templates/givePlus.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename gold.tpl ## +## Filename givePlus.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/givePlusRes.tpl b/Admin/Templates/givePlusRes.tpl index bbad0283..98b333c0 100644 --- a/Admin/Templates/givePlusRes.tpl +++ b/Admin/Templates/givePlusRes.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename gold.tpl ## +## Filename givePlusRes.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/gold.tpl b/Admin/Templates/gold.tpl index 16e0170f..d0c17606 100644 --- a/Admin/Templates/gold.tpl +++ b/Admin/Templates/gold.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename gold.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/home.tpl b/Admin/Templates/home.tpl index 4b3aa40a..089d6aed 100644 --- a/Admin/Templates/home.tpl +++ b/Admin/Templates/home.tpl @@ -5,8 +5,8 @@ ## Filename home.tpl ## ## Developed by: Dzoki ## ## Reworked: aggenekech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/index.php b/Admin/Templates/index.php index 98297c7a..a81240cd 100644 --- a/Admin/Templates/index.php +++ b/Admin/Templates/index.php @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename 404.tpl ## +## Filename index.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/login.tpl b/Admin/Templates/login.tpl index b581e9aa..08ec2848 100644 --- a/Admin/Templates/login.tpl +++ b/Admin/Templates/login.tpl @@ -5,8 +5,8 @@ ## Filename login.tpl ## ## Developed by: Dzoki ## ## Reworked: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/maintenance.tpl b/Admin/Templates/maintenance.tpl index 7e1980e9..467bd993 100644 --- a/Admin/Templates/maintenance.tpl +++ b/Admin/Templates/maintenance.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename maintenance.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/maintenenceResetGold.tpl b/Admin/Templates/maintenenceResetGold.tpl index 99c0acd3..a364b6cc 100644 --- a/Admin/Templates/maintenenceResetGold.tpl +++ b/Admin/Templates/maintenenceResetGold.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename MaintenenceResetGold.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/maintenenceResetPlus.tpl b/Admin/Templates/maintenenceResetPlus.tpl index 7b952cc8..b4900b02 100644 --- a/Admin/Templates/maintenenceResetPlus.tpl +++ b/Admin/Templates/maintenenceResetPlus.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename MaintenenceResetPlus.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/maintenenceResetPlusBonus.tpl b/Admin/Templates/maintenenceResetPlusBonus.tpl index 55bfe22b..5518a451 100644 --- a/Admin/Templates/maintenenceResetPlusBonus.tpl +++ b/Admin/Templates/maintenenceResetPlusBonus.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename MaintenenceResetPlusBonus.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/map_tile.tpl b/Admin/Templates/map_tile.tpl new file mode 100644 index 00000000..8d7d31a2 --- /dev/null +++ b/Admin/Templates/map_tile.tpl @@ -0,0 +1,335 @@ +

Check & Edit Map Tile

+ +

'. + 'New Map Tile Type:
'. + '
'. + ''. + ''. + ''. + ''. + '
'; + return $result; +} + + + +if(isset($_GET['do_save'])){ // update map tile type + //print_r($_POST); // Array ( [new_field_type] => 2_1 [save_x] => 29 [save_y] => 18 [x] => 0 [y] => 1 ) + + $new_tile_numbers = explode('_', $_POST['new_field_type']); + $new_tile_is_type = (int) $new_tile_numbers[0]; // oasis field type OR village - valley - field type + $new_tile_is_oasis_or_village = (int) $new_tile_numbers[1]; // 0 - oasis, 1 - village - valley - field + + $coord_x = (int) $_POST['x']; + $coord_y = (int) $_POST['y']; + if($coord_x > WORLD_MAX){ $coord_x = WORLD_MAX; } + if($coord_x < (-WORLD_MAX)){ $coord_x = (-WORLD_MAX); } + if($coord_y > WORLD_MAX){ $coord_y = WORLD_MAX; } + if($coord_y < (-WORLD_MAX)){ $coord_y = (-WORLD_MAX); } + + $row = get_map_tile_info($coord_x, $coord_y); + + $is_not_oasis_tile_type = ($row['oasistype'] == 0); // not oasis but village - valley - field + + if($is_not_oasis_tile_type && $row['owner_id'] && ($row['owner_id'] != 2) ){ + $msg = 'Can not change map tile type for village that exists!
'; // todo add this feature as other option + + }else if( ($is_not_oasis_tile_type && ($new_tile_is_oasis_or_village == 1) && ($row['fieldtype'] == $new_tile_is_type) ) || + ( (!($is_not_oasis_tile_type)) && ($new_tile_is_oasis_or_village == 0) && ($row['oasistype'] == $new_tile_is_type) ) ){ // check new tile not same as old tile + $msg = 'Can not change to the same field type!
'; + + }else if($is_not_oasis_tile_type && ($new_tile_is_oasis_or_village == 0) ){ // old tile was not oasis - new is oasis + upd_village_to_oasis($row['village_id'], $new_tile_is_type); + + }else if( (!($is_not_oasis_tile_type)) && ($new_tile_is_oasis_or_village == 1) ){ // old tile was oasis - new is village + upd_oasis_to_village($row['village_id'], $new_tile_is_type); + + }else if( (!($is_not_oasis_tile_type)) && ($new_tile_is_oasis_or_village == 0) ){ // from same to same - from oasis to oasis + upd_oasis_to_oasis($row['village_id'], $new_tile_is_type); + + }else{ // from same to same - from village valley to village valley + upd_village_to_village($row['village_id'], $new_tile_is_type); + } + if($msg == ''){ $msg = 'Saved!
'; } + + + +}else if(isset($_GET['do_get']) && isset($_POST['x']) && isset($_POST['y'])){ // get and show map tile type + $coord_x = (int) $_POST['x']; + $coord_y = (int) $_POST['y']; + if($coord_x > WORLD_MAX){ $coord_x = WORLD_MAX; } + if($coord_x < (-WORLD_MAX)){ $coord_x = (-WORLD_MAX); } + if($coord_y > WORLD_MAX){ $coord_y = WORLD_MAX; } + if($coord_y < (-WORLD_MAX)){ $coord_y = (-WORLD_MAX); } + + $row = get_map_tile_info($coord_x, $coord_y); + + //print_r($row); + + $is_not_oasis_tile_type = ($row['oasistype'] == 0); + + if($is_not_oasis_tile_type){ // not oasis map tile + $bonus_or_type = 'type: ['.$row['fieldtype'].'] '.village_type_by_fieldtype_id( $row['fieldtype'] ); + if( is_null($row['owner_id']) || ($row['owner_id'] == 2) ){ + $place_type = 'Abandoned Valley'; + $owner = ''; + //$edit_form = gen_map_tiles_select_list_form($is_ocuppied, $is_oasis, $oasistype_id, $row['fieldtype'], $coord_x, $coord_y); + $edit_form = gen_map_tiles_select_list_form(false, false, false, $row['fieldtype'], $coord_x, $coord_y); + }else{ + $place_type = 'Village'; + $owner = 'owner: '.$row['username'].' [id: '.$row['owner_id'].']
'; + //$edit_form = gen_map_tiles_select_list_form($is_ocuppied, $is_oasis, $oasistype_id, $row['fieldtype'], $coord_x, $coord_y); + $edit_form = gen_map_tiles_select_list_form(true, false, false, $row['fieldtype'], $coord_x, $coord_y); + } + + }else{ // oasis map tile + $bonus_or_type = 'bonus: ['.$row['oasistype'].'] '.oasis_type_by_id( $row['oasistype'] ); + if( is_null($row['owner_id']) || ($row['owner_id'] == 2) ){ // todo check why $row['occupied'] == 0 for ocuppied oasis // todo use only owner_id / status -- not save 'Nature'/'oasis' texts in db + $place_type = 'Unocuppied oasis'; + //$owner = 'owner: '.$row['username'].' [id: '.$row['owner_id'].']
'; // Nature + $owner = ''; + + //$edit_form = gen_map_tiles_select_list_form($is_ocuppied, $is_oasis, $row['oasistype'], $village_filedtype_id, $coord_x, $coord_y); + $edit_form = gen_map_tiles_select_list_form(false, true, $row['oasistype'], false, $coord_x, $coord_y); + }else{ + $place_type = 'Occupied oasis'; + $owner = 'owner: '.$row['username'].' [id: '.$row['owner_id'].']
'; + //$edit_form = gen_map_tiles_select_list_form($is_ocuppied, $is_oasis, $row['oasistype'], $village_filedtype_id, $coord_x, $coord_y); + $edit_form = gen_map_tiles_select_list_form(true, true, $row['oasistype'], false, $coord_x, $coord_y); + } + } + + $search_result = ''. +'

'. +'x: '.$coord_x.'
'. +'y: '.$coord_y.'
'. +'type: '.$place_type.'
'. +$bonus_or_type.'
'.$owner. +'

'. +'
'. +'
'. +'
'. + '
'. +'
'. +'
'. +'
'; + + +//}else{ // show begin search map tile form + +} + +echo $search_result; +?> + + + +
+ +
+ x + y + +

+ +
+ +
\ No newline at end of file diff --git a/Admin/Templates/message.tpl b/Admin/Templates/message.tpl index 91c4e411..d23ae5ef 100644 --- a/Admin/Templates/message.tpl +++ b/Admin/Templates/message.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename message.tpl ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/msg.tpl b/Admin/Templates/msg.tpl index 73127c79..36835524 100644 --- a/Admin/Templates/msg.tpl +++ b/Admin/Templates/msg.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename msg.tpl ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# include_once("../GameEngine/Generator.php"); diff --git a/Admin/Templates/natars.tpl b/Admin/Templates/natars.tpl index d2d4802a..26313642 100644 --- a/Admin/Templates/natars.tpl +++ b/Admin/Templates/natars.tpl @@ -66,7 +66,7 @@ $deletedArtifacts = $database->getDeletedArtifacts(); if(empty($deletedArtifacts)){ ?> -
+
diff --git a/Admin/Templates/player.tpl b/Admin/Templates/player.tpl index 32f2d1df..44dde8fd 100644 --- a/Admin/Templates/player.tpl +++ b/Admin/Templates/player.tpl @@ -5,8 +5,8 @@ ## Filename player.tpl ## ## Developed by: Dzoki ## ## Reworked: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# $id = $_GET['uid']; diff --git a/Admin/Templates/punish.tpl b/Admin/Templates/punish.tpl index 800c69d1..1ca399a8 100644 --- a/Admin/Templates/punish.tpl +++ b/Admin/Templates/punish.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename punish.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/renameVillage.tpl b/Admin/Templates/renameVillage.tpl index 5be29ab9..a9ca4698 100644 --- a/Admin/Templates/renameVillage.tpl +++ b/Admin/Templates/renameVillage.tpl @@ -4,9 +4,9 @@ ## --------------------------------------------------------------------------- ## ## Filename renameVillage.tpl ## ## Developed by: Dzoki & Advocatie ## -## License: TravianX Project ## +## License: TravianZ Project ## ## Thanks to: Dzoki & itay2277(Edit troops) ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## Copyright: TravianZ (c) 2010-2011. All rights reserved. ## ################################################################################# if($_SESSION['access'] < ADMIN) die("Access Denied: You are not Admin!"); diff --git a/Admin/Templates/report.tpl b/Admin/Templates/report.tpl index b006ae35..48b8dfce 100644 --- a/Admin/Templates/report.tpl +++ b/Admin/Templates/report.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename report.tpl ## ## Developed by: Armando ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2014. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# include_once("../GameEngine/Generator.php"); diff --git a/Admin/Templates/resetPlus.tpl b/Admin/Templates/resetPlus.tpl index e64693d5..188b192a 100644 --- a/Admin/Templates/resetPlus.tpl +++ b/Admin/Templates/resetPlus.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename gold.tpl ## +## Filename resetPlus.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/resetPlusBonus.tpl b/Admin/Templates/resetPlusBonus.tpl index 5922434f..6a4ebce9 100644 --- a/Admin/Templates/resetPlusBonus.tpl +++ b/Admin/Templates/resetPlusBonus.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename gold.tpl ## +## Filename resetPlusBonus.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/results_alliances.tpl b/Admin/Templates/results_alliances.tpl index 75275b7a..80c41fb5 100644 --- a/Admin/Templates/results_alliances.tpl +++ b/Admin/Templates/results_alliances.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename results_alliances.tpl ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/results_email.tpl b/Admin/Templates/results_email.tpl index 10d2f3c4..1e5e7e9a 100644 --- a/Admin/Templates/results_email.tpl +++ b/Admin/Templates/results_email.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename resutls_email.tpl ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/results_ip.tpl b/Admin/Templates/results_ip.tpl index 9907236d..bfcb4a0f 100644 --- a/Admin/Templates/results_ip.tpl +++ b/Admin/Templates/results_ip.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename results_ip.tpl ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/results_player.tpl b/Admin/Templates/results_player.tpl index 0b33d266..e8bd7744 100644 --- a/Admin/Templates/results_player.tpl +++ b/Admin/Templates/results_player.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename results_player.tpl ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/results_villages.tpl b/Admin/Templates/results_villages.tpl index eb909413..f015eec4 100644 --- a/Admin/Templates/results_villages.tpl +++ b/Admin/Templates/results_villages.tpl @@ -5,8 +5,8 @@ ## Filename results_villages.tpl ## ## Developed by: Dzoki ## ## Reworked: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/search.tpl b/Admin/Templates/search.tpl index 5aaa8ce6..89f8ed3f 100644 --- a/Admin/Templates/search.tpl +++ b/Admin/Templates/search.tpl @@ -5,8 +5,8 @@ ## Filename search.tpl ## ## Developed by: Dzoki ## ## Reworked: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/Templates/server_info.tpl b/Admin/Templates/server_info.tpl index 80d8c57b..8f9f0600 100644 --- a/Admin/Templates/server_info.tpl +++ b/Admin/Templates/server_info.tpl @@ -4,23 +4,23 @@ ## --------------------------------------------------------------------------- ## ## Filename server_info.tpl ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## Enhanced: aggenkeech ## +## Improoved by: Shadow ## ################################################################################# -$tribe1 = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE tribe = 1"); -$tribe2 = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE tribe = 2"); -$tribe3 = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE tribe = 3"); +$tribe1 = mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE tribe = 1"); +$tribe2 = mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE tribe = 2"); +$tribe3 = mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE tribe = 3"); $tribes = Array(mysqli_num_rows($tribe1),mysqli_num_rows($tribe2),mysqli_num_rows($tribe3)); -$users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE tribe > 0 AND tribe < 4")); +$users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE tribe > 0 AND tribe < 4")); ?> - -

+




- + @@ -30,12 +30,12 @@ $users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM - + @@ -43,7 +43,7 @@ $users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM @@ -57,6 +57,10 @@ $users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ?> + + + +
Player InformationWorld Information
Active players
Players online ".($t - 300)) or die(mysqli_error($database->dblink)); + $result = mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE timestamp > ".($t - 300)) or die(mysqli_error($database->dblink)); $num_rows = mysqli_num_rows($result); echo $num_rows;?>
Players Banned
Total Populationdblink,"SELECT SUM(pop) AS sumofpop FROM ".TB_PREFIX."vdata"); $getpop = mysqli_fetch_assoc($pop); echo $getpop['sumofpop']; ?>
@@ -114,70 +118,64 @@ $users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM Troops on the Server '; } + echo ''; - for($i=1; $i<11; $i++) - { - $t = mysqli_query($GLOBALS["link"], "SELECT SUM(u".$i.") AS sumof FROM ".TB_PREFIX."units"); - $troop = mysqli_fetch_assoc($t); - echo ''.$troop['sumof'].''; + for($i=1; $i<11; $i++) { + echo ''.($units_villages['u'.$i] + $units_enforcements['u'.$i]).''; } echo ""; - for($i=11; $i<21; $i++) - { + for($i=11; $i<21; $i++) { echo ''; } + echo ''; - for($i=11; $i<21; $i++) - { - $t = mysqli_query($GLOBALS["link"], "SELECT SUM(u".$i.") AS sumof FROM ".TB_PREFIX."units"); - $troop = mysqli_fetch_assoc($t); - echo ''.$troop['sumof'].''; + for($i=11; $i<21; $i++) { + echo ''.($units_villages['u'.$i] + $units_enforcements['u'.$i]).''; } echo ""; - for($i=21; $i<31; $i++) - { + for($i=21; $i<31; $i++) { echo ''; } + echo ''; - for($i=21; $i<31; $i++) - { - $t = mysqli_query($GLOBALS["link"], "SELECT SUM(u".$i.") AS sumof FROM ".TB_PREFIX."units"); - $troop = mysqli_fetch_assoc($t); - echo ''.$troop['sumof'].''; + for($i=21; $i<31; $i++) { + echo ''.($units_villages['u'.$i] + $units_enforcements['u'.$i]).''; } echo ""; - for($i=31; $i<41; $i++) - { + for($i=31; $i<41; $i++) { echo ''; } + echo ''; - for($i=31; $i<41; $i++) - { - $t = mysqli_query($GLOBALS["link"], "SELECT SUM(u".$i.") AS sumof FROM ".TB_PREFIX."units"); - $troop = mysqli_fetch_assoc($t); - echo ''.$troop['sumof'].''; + for($i=31; $i<41; $i++) { + echo ''.($units_villages['u'.$i] + $units_enforcements['u'.$i]).''; } echo ""; - for($i=41; $i<51; $i++) - { + for($i=41; $i<51; $i++) { echo ''; } + echo ''; - for($i=41; $i<51; $i++) - { - $t = mysqli_query($GLOBALS["link"], "SELECT SUM(u".$i.") AS sumof FROM ".TB_PREFIX."units"); - $troop = mysqli_fetch_assoc($t); - echo ''.$troop['sumof'].''; + for($i=41; $i<51; $i++) { + echo ''.($units_villages['u'.$i] + $units_enforcements['u'.$i]).''; } ?> -
\ No newline at end of file +
diff --git a/Admin/Templates/usergold.tpl b/Admin/Templates/usergold.tpl index 3776a77f..4e9fea35 100644 --- a/Admin/Templates/usergold.tpl +++ b/Admin/Templates/usergold.tpl @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename gold.tpl ## +## Filename usergold.tpl ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/Admin/Templates/village.tpl b/Admin/Templates/village.tpl index 91659d19..e323bfb1 100644 --- a/Admin/Templates/village.tpl +++ b/Admin/Templates/village.tpl @@ -7,7 +7,7 @@ ## License: TravianX Project ## ## Thanks to: Dzoki & itay2277(Edit some additions) ## ## Fix by: ronix (some additions) ## -## Copyright: TravianZ (c) 2010-2014. All rights reserved. ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## Improved: aggenkeech ## ################################################################################# include_once("../GameEngine/Generator.php"); diff --git a/Admin/Templates/villages.tpl b/Admin/Templates/villages.tpl index d15a42b5..7a7d5bdd 100644 --- a/Admin/Templates/villages.tpl +++ b/Admin/Templates/villages.tpl @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename villages.tpl ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/Admin/admin.php b/Admin/admin.php index ad8b3ca2..77c03fed 100644 --- a/Admin/admin.php +++ b/Admin/admin.php @@ -12,7 +12,7 @@ ## Edited by: Shadow and ronix ## ## License: Creative Commons BY-NC-SA 3.0 ## ## Copyright: TravianZ (c) 2014 - All rights reserved ## -## URLs: http://travian.shadowss/ro ## +## URLs: http://travian.shadowss.ro ## ## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# @@ -30,6 +30,7 @@ include('Templates/update_latest.tpl'); $up_avl = $latest - $ver ; $subpage = 'Login'; +$not_include_mootools_js = false; if (!empty($_GET['p'])) { switch ($_GET['p']) { @@ -60,7 +61,12 @@ if (!empty($_GET['p'])) { case 'map': $subpage = 'Map'; break; - + + case 'map_tile': + $subpage = 'Map Tile'; + $not_include_mootools_js = true; + break; + case 'natars': $subpage = 'Natars Management'; break; @@ -353,9 +359,15 @@ if (!empty($_GET['p'])) { + + @@ -506,6 +518,7 @@ if (!empty($_GET['p'])) {
  • Players Report
  • Players Message
  • Map
  • +
  • Map Tile
  • Natars Management
  • diff --git a/GameEngine/Admin/Mods/addTroops.php b/GameEngine/Admin/Mods/addTroops.php index 770aa5dc..87e28a83 100755 --- a/GameEngine/Admin/Mods/addTroops.php +++ b/GameEngine/Admin/Mods/addTroops.php @@ -6,7 +6,7 @@ ## Developed by: Dzoki & Advocatie ## ## License: TravianZ Project ## ## Reworks by: ronix ## -## Copyright: TravianZ (c) 2010-2014. All rights reserved. ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/GameEngine/Admin/Mods/addUsers.php b/GameEngine/Admin/Mods/addUsers.php index f53f6d10..92a1a7f9 100755 --- a/GameEngine/Admin/Mods/addUsers.php +++ b/GameEngine/Admin/Mods/addUsers.php @@ -1,12 +1,15 @@ diff --git a/GameEngine/Admin/Mods/mainteneceBan.php b/GameEngine/Admin/Mods/mainteneceBan.php index a3ae5ba1..3e986fbd 100755 --- a/GameEngine/Admin/Mods/mainteneceBan.php +++ b/GameEngine/Admin/Mods/mainteneceBan.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename mainteneceBan.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# if (!isset($_SESSION)) session_start(); diff --git a/GameEngine/Admin/Mods/mainteneceCleanBanData.php b/GameEngine/Admin/Mods/mainteneceCleanBanData.php index 8dc08b30..32848872 100755 --- a/GameEngine/Admin/Mods/mainteneceCleanBanData.php +++ b/GameEngine/Admin/Mods/mainteneceCleanBanData.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename mainteneceCleanBanData.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# if (!isset($_SESSION)) session_start(); diff --git a/GameEngine/Admin/Mods/mainteneceResetGold.php b/GameEngine/Admin/Mods/mainteneceResetGold.php index 639fd124..f2dee0c0 100755 --- a/GameEngine/Admin/Mods/mainteneceResetGold.php +++ b/GameEngine/Admin/Mods/mainteneceResetGold.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename mainteneceResetGold.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# if (!isset($_SESSION)) session_start(); diff --git a/GameEngine/Admin/Mods/mainteneceResetPlus.php b/GameEngine/Admin/Mods/mainteneceResetPlus.php index d3360b9e..77210721 100755 --- a/GameEngine/Admin/Mods/mainteneceResetPlus.php +++ b/GameEngine/Admin/Mods/mainteneceResetPlus.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename mainteneceResetPlus.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# if (!isset($_SESSION)) session_start(); diff --git a/GameEngine/Admin/Mods/mainteneceResetPlusBonus.php b/GameEngine/Admin/Mods/mainteneceResetPlusBonus.php index b49d152b..04b93e45 100755 --- a/GameEngine/Admin/Mods/mainteneceResetPlusBonus.php +++ b/GameEngine/Admin/Mods/mainteneceResetPlusBonus.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename mainteneceResetPlusBonus.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# if (!isset($_SESSION)) session_start(); diff --git a/GameEngine/Admin/Mods/mainteneceUnban.php b/GameEngine/Admin/Mods/mainteneceUnban.php index add42f9e..142b8635 100755 --- a/GameEngine/Admin/Mods/mainteneceUnban.php +++ b/GameEngine/Admin/Mods/mainteneceUnban.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename mainteneceUnban.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# if (!isset($_SESSION)) session_start(); diff --git a/GameEngine/Admin/Mods/medals.php b/GameEngine/Admin/Mods/medals.php index 34294590..24897aea 100755 --- a/GameEngine/Admin/Mods/medals.php +++ b/GameEngine/Admin/Mods/medals.php @@ -5,8 +5,9 @@ ## --------------------------------------------------------------------------- ## ## Filename medals.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## +## ## ################################################################################# if (!isset($_SESSION)) session_start(); if($_SESSION['access'] < 9) die("Access Denied: You are not Admin!"); diff --git a/GameEngine/Admin/Mods/recalcWH.php b/GameEngine/Admin/Mods/recalcWH.php index c909e761..26de3c91 100755 --- a/GameEngine/Admin/Mods/recalcWH.php +++ b/GameEngine/Admin/Mods/recalcWH.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename editBuildings.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# if (!isset($_SESSION)) session_start(); diff --git a/GameEngine/Admin/Mods/renameVillage.php b/GameEngine/Admin/Mods/renameVillage.php index e144acb1..2388cb7a 100755 --- a/GameEngine/Admin/Mods/renameVillage.php +++ b/GameEngine/Admin/Mods/renameVillage.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename renameVillage.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# if (!isset($_SESSION)) session_start(); diff --git a/GameEngine/Admin/Mods/sendMessage.php b/GameEngine/Admin/Mods/sendMessage.php index 5e7120ec..81a02b6c 100755 --- a/GameEngine/Admin/Mods/sendMessage.php +++ b/GameEngine/Admin/Mods/sendMessage.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename sendMessage.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# if (!isset($_SESSION)) session_start(); diff --git a/GameEngine/Admin/admin.php b/GameEngine/Admin/admin.php index d2b0db05..b03ab34c 100755 --- a/GameEngine/Admin/admin.php +++ b/GameEngine/Admin/admin.php @@ -12,7 +12,7 @@ ## Edited by: Shadow and ronix ## ## License: Creative Commons BY-NC-SA 3.0 ## ## Copyright: TravianZ (c) 2014 - All rights reserved ## -## URLs: http://travian.shadowss/ro ## +## URLs: http://travian.shadowss.ro ## ## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/GameEngine/Admin/database.php b/GameEngine/Admin/database.php index 8c123eeb..95ec0124 100755 --- a/GameEngine/Admin/database.php +++ b/GameEngine/Admin/database.php @@ -12,7 +12,7 @@ ## Edited by: Shadow and ronix ## ## License: Creative Commons BY-NC-SA 3.0 ## ## Copyright: TravianZ (c) 2014 - All rights reserved ## -## URLs: http://travian.shadowss/ro ## +## URLs: http://travian.shadowss.ro ## ## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# @@ -82,6 +82,7 @@ class adm_DB { $bcrypted = false; } + $username = htmlspecialchars($username); if($pwOk) { // update password to bcrypt, if correct if (!$dbarray['is_bcrypt'] && !$bcrypted) { diff --git a/GameEngine/Admin/function.php b/GameEngine/Admin/function.php index d67461df..617bee11 100755 --- a/GameEngine/Admin/function.php +++ b/GameEngine/Admin/function.php @@ -1,22 +1,22 @@ diff --git a/GameEngine/Admin/welcome.tpl b/GameEngine/Admin/welcome.tpl index 6ce30d8e..21d3b9d3 100755 --- a/GameEngine/Admin/welcome.tpl +++ b/GameEngine/Admin/welcome.tpl @@ -1,9 +1,9 @@ Hello %USER%, Thank you for registering on our server. -Since the %START% at %TIME% Romans, Gauls and Teutons attack each other on this game world. Right now, %PLAYERS% players in %ALLI% Alliances are fighting for supremacy. To not get lost in this devastating battle, you should look for allies even though you are protected by beginner\'s protection for %PROTECTION% hours. +Since the %START% at %TIME% Romans, Gauls and Teutons attack each other on this game world. Right now, %PLAYERS% players in %ALLI% Alliances are fighting for supremacy. To not get lost in this devastating battle, you should look for allies even though you are protected by beginner's protection for %PROTECTION% hours. -The taskmaster will help you on your way to establishing your empire with advice, deed and resources (after a few tasks such as finding out the exact duration of your beginner\'s protection). You can find him on the right side of your village. After successfully completing all of his tasks you will be on your own again. +The taskmaster will help you on your way to establishing your empire with advice, deed and resources (after a few tasks such as finding out the exact duration of your beginner's protection). You can find him on the right side of your village. After successfully completing all of his tasks you will be on your own again. diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 53c07126..1ea28d21 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -4,36 +4,38 @@ ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## ## Project: TravianZ ## -## Version: 22.06.2015 ## +## Version: 22.06.2015 ## ## Filename Automation.php ## ## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix ## -## Fixed by: Shadow - STARVATION , HERO FIXED COMPL. ## -## Fixed by: InCube - double troops ## +## Fixed by: Shadow - STARVATION , HERO FIXED COMPL. ## +## Fixed by: InCube - double troops ## ## License: TravianZ Project ## ## Copyright: TravianZ (c) 2010-2018. All rights reserved. ## -## URLs: http://travian.shadowss.ro ## -## Source code: https://github.com/Shadowss/TravianZ ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# // make sure we only run the automation script once and wait until it's done, // so concurrent AJAX calls from many different users won't overload the server if ( !defined('AUTOMATION_MANUAL_RUN') ) { - if ( file_exists( AUTOMATION_LOCK_FILE_NAME ) ) { - // check that the file is not too old, in which case our PHP script hung - // and we need to remove the lock and run automation again - $fileTime = filemtime( AUTOMATION_LOCK_FILE_NAME ); - - // allow for 60 seconds of old automation script processing time, which is still way too plenty - if ( ! $fileTime || time() - $fileTime > 60 ) { - @unlink( AUTOMATION_LOCK_FILE_NAME ); + if(defined('AUTOMATION_LOCK_FILE_NAME')){ + if ( file_exists( AUTOMATION_LOCK_FILE_NAME ) ) { + // check that the file is not too old, in which case our PHP script hung + // and we need to remove the lock and run automation again + $fileTime = filemtime( AUTOMATION_LOCK_FILE_NAME ); + + // allow for 60 seconds of old automation script processing time, which is still way too plenty + if ( ! $fileTime || time() - $fileTime > 60 ) { + @unlink( AUTOMATION_LOCK_FILE_NAME ); + } else { + // automation file exists and is valid, don't run another automation + exit; + } } else { - // automation file exists and is valid, don't run another automation - exit; + // create automation lock file + file_put_contents( AUTOMATION_LOCK_FILE_NAME, '' ); } - } else { - // create automation lock file - file_put_contents( AUTOMATION_LOCK_FILE_NAME, '' ); } } diff --git a/GameEngine/BBCode.php b/GameEngine/BBCode.php index 65eb6c62..822ffe17 100755 --- a/GameEngine/BBCode.php +++ b/GameEngine/BBCode.php @@ -149,14 +149,14 @@ $replace[50] = "".U48
 $replace[51] = "<img class="; $replace[52] = "".U50.""; $replace[53] = "".U0.""; -$replace[54] = "".R1.""; -$replace[55] = "".R2.""; -$replace[56] = "".R3.""; -$replace[57] = "".R4.""; -$replace[54] = "Lumber"; -$replace[55] = "Clay"; -$replace[56] = "Iron"; -$replace[57] = "Crop"; +$replace[54] = "".LUMBER.""; +$replace[55] = "".CLAY.""; +$replace[56] = "".IRON.""; +$replace[57] = "".CROP.""; +$replace[54] = "".LUMBER.""; +$replace[55] = "".CLAY.""; +$replace[56] = "".IRON.""; +$replace[57] = "".CROP.""; $replace[58] = "*aha*"; $replace[59] = "*angry*"; $replace[60] = "*cool*"; diff --git a/GameEngine/Battle.php b/GameEngine/Battle.php index cc189a92..c90da0a6 100755 --- a/GameEngine/Battle.php +++ b/GameEngine/Battle.php @@ -40,7 +40,7 @@ class Battle { global $form; // receive form and process - if(isset($post['a1_v']) && (isset($post['a2_v1']) || isset($post['a2_v2']) || isset($post['a2_v3']) || isset($post['a2_v4']))){ + if(isset($post['a1_v']) && (isset($post['a2_v1']) || isset($post['a2_v2']) || isset($post['a2_v3']) || isset($post['a2_v4']) || isset($post['a2_v5']))){ $_POST['mytribe'] = $post['a1_v']; $target = []; diff --git a/GameEngine/Chat.php b/GameEngine/Chat.php index 5b1437f0..b71624c5 100755 --- a/GameEngine/Chat.php +++ b/GameEngine/Chat.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename Chat.php ## ## Developed by: TTMMTT ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/GameEngine/Data/buidata.php b/GameEngine/Data/buidata.php index dd4e5db5..119d6b12 100755 --- a/GameEngine/Data/buidata.php +++ b/GameEngine/Data/buidata.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename buidata.php ## ## Developed by: Akakori ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2011. All rights reserved. ## ## ## ################################################################################# diff --git a/GameEngine/Data/cel.php b/GameEngine/Data/cel.php index 77b8b0fc..783c75d1 100755 --- a/GameEngine/Data/cel.php +++ b/GameEngine/Data/cel.php @@ -5,8 +5,8 @@ ## --------------------------------------------------------------------------- ## ## Filename cel.php ## ## Developed by: G3n3s!s & JimJam & LoppyLukas ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/GameEngine/Data/cp.php b/GameEngine/Data/cp.php index a27ebb1e..03427922 100755 --- a/GameEngine/Data/cp.php +++ b/GameEngine/Data/cp.php @@ -5,8 +5,8 @@ ## --------------------------------------------------------------------------- ## ## Filename cp.php ## ## Developed by: G3n3s!s & JimJam & LoppyLukas ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/GameEngine/Data/index.php b/GameEngine/Data/index.php index 98297c7a..a81240cd 100755 --- a/GameEngine/Data/index.php +++ b/GameEngine/Data/index.php @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename 404.tpl ## +## Filename index.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/GameEngine/Data/resdata.php b/GameEngine/Data/resdata.php index f5b04711..2eb6816f 100755 --- a/GameEngine/Data/resdata.php +++ b/GameEngine/Data/resdata.php @@ -4,8 +4,8 @@ ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## ## Filename resdata.php ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/GameEngine/Data/unitdata.php b/GameEngine/Data/unitdata.php index f61ad18a..cc611381 100755 --- a/GameEngine/Data/unitdata.php +++ b/GameEngine/Data/unitdata.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename unitdata.php ## ## Developed by: Akakori ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/GameEngine/Database.php b/GameEngine/Database.php index e244372e..65cf227c 100755 --- a/GameEngine/Database.php +++ b/GameEngine/Database.php @@ -785,19 +785,20 @@ class MYSQLi_DB implements IDbConnection { // no need to cache this method public function hasBeginnerProtection($vid) { - list($vid) = $this->escape_input((int) $vid); - $q = "SELECT u.protect - FROM ". TB_PREFIX ."users u - JOIN ". TB_PREFIX ."vdata v ON u.id = v.owner - JOIN ". TB_PREFIX ."odata o ON u.id = o.owner - WHERE v.wref = ". $vid ." OR o.wref = ". $vid . " - LIMIT 1"; - $result = mysqli_query($this->dblink,$q); - $dbarray = mysqli_fetch_array($result); - - if(!empty($dbarray)) return time() < $dbarray[0]; - else return false; + list($vid) = $this->escape_input($vid); + $q = "SELECT u.protect FROM ".TB_PREFIX."users u,".TB_PREFIX."vdata v WHERE u.id=v.owner AND v.wref=".(int) $vid." LIMIT 1"; + $result = mysqli_query($this->dblink,$q); + $dbarray = mysqli_fetch_array($result); + if(!empty($dbarray)) { + if(time()<$dbarray[0]) { + return true; + } else { + return false; + } + } else { + return false; } +} function updateUserField($ref, $field, $value, $switch) { list($ref) = $this->escape_input($ref); @@ -1356,6 +1357,7 @@ class MYSQLi_DB implements IDbConnection { } function setFieldTaken($id) { + if(empty($id)) return; if (!is_array($id)) { $id = [$id]; } @@ -2994,7 +2996,7 @@ class MYSQLi_DB implements IDbConnection { $q = "SELECT $field FROM " . TB_PREFIX . "ali_permission where username = '$ref' LIMIT 1"; } $result = mysqli_query($this->dblink,$q); - $dbarray = mysqli_fetch_array($result); + //$dbarray = mysqli_fetch_array($result); - some error in here ! return $dbarray[$field]; } @@ -3016,6 +3018,8 @@ class MYSQLi_DB implements IDbConnection { function setAlliName($aid, $name, $tag) { list($aid, $name, $tag) = $this->escape_input((int) $aid, $name, $tag); + $name = $this->RemoveXSS($name); + $tag = $this->RemoveXSS($tag); $q = "UPDATE " . TB_PREFIX . "alidata set name = '$name', tag = '$tag' where id = $aid"; return mysqli_query($this->dblink,$q); @@ -3109,6 +3113,8 @@ class MYSQLi_DB implements IDbConnection { *****************************************/ function createAlliance($tag, $name, $uid, $max) { list($tag, $name, $uid, $max) = $this->escape_input($tag, $name, (int) $uid, (int) $max); + $tag = $this->RemoveXSS($tag); + $name = $this->RemoveXSS($name); $q = "INSERT into " . TB_PREFIX . "alidata values (0,'$name','$tag',$uid,0,0,0,'','',$max,0,0,0,0,0,0,0,0,0)"; mysqli_query($this->dblink,$q); @@ -3588,269 +3594,99 @@ class MYSQLi_DB implements IDbConnection { // please don't scream... // with the current table structure, there really IS NOT another way // (except for stored procedures, which we can't rely on to be allowed on the server) - $result = mysqli_query($this->dblink," - SELECT - IF( - f1t IN ($fieldType), - f1, - IF( - f2t IN ($fieldType), - f2, - IF( - f3t IN ($fieldType), - f3, - IF( - f4t IN ($fieldType), - f4, - IF( - f5t IN ($fieldType), - f5, - IF( - f6t IN ($fieldType), - f6, - IF( - f7t IN ($fieldType), - f7, - IF( - f8t IN ($fieldType), - f8, - IF( - f9t IN ($fieldType), - f9, - IF( - f10t IN ($fieldType), - f10, - IF( - f11t IN ($fieldType), - f11, - IF( - f12t IN ($fieldType), - f12, - IF( - f13t IN ($fieldType), - f13, - IF( - f14t IN ($fieldType), - f14, - IF( - f15t IN ($fieldType), - f15, - IF( - f16t IN ($fieldType), - f16, - IF( - f17t IN ($fieldType), - f17, - IF( - f18t IN ($fieldType), - f18, - IF( - f19t IN ($fieldType), - f19, - IF( - f20t IN ($fieldType), - f20, - IF( - f20t IN ($fieldType), - f20, - IF( - f21t IN ($fieldType), - f21, - IF( - f22t IN ($fieldType), - f22, - IF( - f23t IN ($fieldType), - f23, - IF( - f24t IN ($fieldType), - f24, - IF( - f25t IN ($fieldType), - f25, - IF( - f26t IN ($fieldType), - f26, - IF( - f27t IN ($fieldType), - f27, - IF( - f28t IN ($fieldType), - f28, - IF( - f29t IN ($fieldType), - f29, - IF( - f30t IN ($fieldType), - f30, - IF( - f31t IN ($fieldType), - f31, - IF( - f32t IN ($fieldType), - f32, - IF( - f33t IN ($fieldType), - f33, - IF( - f34t IN ($fieldType), - f34, - IF( - f35t IN ($fieldType), - f35, - IF( - f36t IN ($fieldType), - f36, - IF( - f37t IN ($fieldType), - f37, - IF( - f38t IN ($fieldType), - f38, - IF( - f39t IN ($fieldType), - f39, - IF( - f40t IN ($fieldType), - f40, - IF( - f99t IN ($fieldType), - f99, - 0 - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) as level - FROM - ".TB_PREFIX."fdata - WHERE - vref = $vid - AND - (f1t IN ($fieldType) - OR - f2t IN ($fieldType) - OR - f3t IN ($fieldType) - OR - f4t IN ($fieldType) - OR - f5t IN ($fieldType) - OR - f6t IN ($fieldType) - OR - f7t IN ($fieldType) - OR - f8t IN ($fieldType) - OR - f9t IN ($fieldType) - OR - f10t IN ($fieldType) - OR - f11t IN ($fieldType) - OR - f12t IN ($fieldType) - OR - f13t IN ($fieldType) - OR - f14t IN ($fieldType) - OR - f15t IN ($fieldType) - OR - f16t IN ($fieldType) - OR - f17t IN ($fieldType) - OR - f18t IN ($fieldType) - OR - f19t IN ($fieldType) - OR - f20t IN ($fieldType) - OR - f20t IN ($fieldType) - OR - f21t IN ($fieldType) - OR - f22t IN ($fieldType) - OR - f23t IN ($fieldType) - OR - f24t IN ($fieldType) - OR - f25t IN ($fieldType) - OR - f26t IN ($fieldType) - OR - f27t IN ($fieldType) - OR - f28t IN ($fieldType) - OR - f29t IN ($fieldType) - OR - f30t IN ($fieldType) - OR - f30t IN ($fieldType) - OR - f31t IN ($fieldType) - OR - f32t IN ($fieldType) - OR - f33t IN ($fieldType) - OR - f34t IN ($fieldType) - OR - f35t IN ($fieldType) - OR - f36t IN ($fieldType) - OR - f37t IN ($fieldType) - OR - f38t IN ($fieldType) - OR - f39t IN ($fieldType) - OR - f40t IN ($fieldType) - OR - f99t IN ($fieldType)) - LIMIT 1 - "); + $result = mysqli_query($this->dblink, 'SELECT '. + 'CASE '. + 'WHEN `f1t` IN ('.$fieldType.') THEN `f1` '. + 'WHEN `f2t` IN ('.$fieldType.') THEN `f2` '. + 'WHEN `f3t` IN ('.$fieldType.') THEN `f3` '. + 'WHEN `f4t` IN ('.$fieldType.') THEN `f4` '. + 'WHEN `f5t` IN ('.$fieldType.') THEN `f5` '. + 'WHEN `f6t` IN ('.$fieldType.') THEN `f6` '. + 'WHEN `f7t` IN ('.$fieldType.') THEN `f7` '. + 'WHEN `f8t` IN ('.$fieldType.') THEN `f8` '. + 'WHEN `f9t` IN ('.$fieldType.') THEN `f9` '. + 'WHEN `f10t` IN ('.$fieldType.') THEN `f10` '. + 'WHEN `f11t` IN ('.$fieldType.') THEN `f11` '. + 'WHEN `f12t` IN ('.$fieldType.') THEN `f12` '. + 'WHEN `f13t` IN ('.$fieldType.') THEN `f13` '. + 'WHEN `f14t` IN ('.$fieldType.') THEN `f14` '. + 'WHEN `f15t` IN ('.$fieldType.') THEN `f15` '. + 'WHEN `f16t` IN ('.$fieldType.') THEN `f16` '. + 'WHEN `f17t` IN ('.$fieldType.') THEN `f17` '. + 'WHEN `f18t` IN ('.$fieldType.') THEN `f18` '. + 'WHEN `f19t` IN ('.$fieldType.') THEN `f19` '. + 'WHEN `f20t` IN ('.$fieldType.') THEN `f20` '. + 'WHEN `f21t` IN ('.$fieldType.') THEN `f21` '. + 'WHEN `f22t` IN ('.$fieldType.') THEN `f22` '. + 'WHEN `f23t` IN ('.$fieldType.') THEN `f23` '. + 'WHEN `f24t` IN ('.$fieldType.') THEN `f24` '. + 'WHEN `f25t` IN ('.$fieldType.') THEN `f25` '. + 'WHEN `f26t` IN ('.$fieldType.') THEN `f26` '. + 'WHEN `f27t` IN ('.$fieldType.') THEN `f27` '. + 'WHEN `f28t` IN ('.$fieldType.') THEN `f28` '. + 'WHEN `f29t` IN ('.$fieldType.') THEN `f29` '. + 'WHEN `f30t` IN ('.$fieldType.') THEN `f30` '. + 'WHEN `f31t` IN ('.$fieldType.') THEN `f31` '. + 'WHEN `f32t` IN ('.$fieldType.') THEN `f32` '. + 'WHEN `f33t` IN ('.$fieldType.') THEN `f33` '. + 'WHEN `f34t` IN ('.$fieldType.') THEN `f34` '. + 'WHEN `f35t` IN ('.$fieldType.') THEN `f35` '. + 'WHEN `f36t` IN ('.$fieldType.') THEN `f36` '. + 'WHEN `f37t` IN ('.$fieldType.') THEN `f37` '. + 'WHEN `f38t` IN ('.$fieldType.') THEN `f38` '. + 'WHEN `f39t` IN ('.$fieldType.') THEN `f39` '. + 'WHEN `f40t` IN ('.$fieldType.') THEN `f40` '. + 'WHEN `f99t` IN ('.$fieldType.') THEN `f99` '. + 'ELSE 0 '. + 'END AS level '. + 'FROM `'.TB_PREFIX.'fdata` '. + 'WHERE '. + '`vref` = '.$vid.' '. + 'AND ('. + '`f1t` IN ('.$fieldType.') OR '. + '`f2t` IN ('.$fieldType.') OR '. + '`f3t` IN ('.$fieldType.') OR '. + '`f4t` IN ('.$fieldType.') OR '. + '`f5t` IN ('.$fieldType.') OR '. + '`f6t` IN ('.$fieldType.') OR '. + '`f7t` IN ('.$fieldType.') OR '. + '`f8t` IN ('.$fieldType.') OR '. + '`f9t` IN ('.$fieldType.') OR '. + '`f10t` IN ('.$fieldType.') OR '. + '`f11t` IN ('.$fieldType.') OR '. + '`f12t` IN ('.$fieldType.') OR '. + '`f13t` IN ('.$fieldType.') OR '. + '`f14t` IN ('.$fieldType.') OR '. + '`f15t` IN ('.$fieldType.') OR '. + '`f16t` IN ('.$fieldType.') OR '. + '`f17t` IN ('.$fieldType.') OR '. + '`f18t` IN ('.$fieldType.') OR '. + '`f19t` IN ('.$fieldType.') OR '. + '`f20t` IN ('.$fieldType.') OR '. + '`f20t` IN ('.$fieldType.') OR '. + '`f21t` IN ('.$fieldType.') OR '. + '`f22t` IN ('.$fieldType.') OR '. + '`f23t` IN ('.$fieldType.') OR '. + '`f24t` IN ('.$fieldType.') OR '. + '`f25t` IN ('.$fieldType.') OR '. + '`f26t` IN ('.$fieldType.') OR '. + '`f27t` IN ('.$fieldType.') OR '. + '`f28t` IN ('.$fieldType.') OR '. + '`f29t` IN ('.$fieldType.') OR '. + '`f30t` IN ('.$fieldType.') OR '. + '`f30t` IN ('.$fieldType.') OR '. + '`f31t` IN ('.$fieldType.') OR '. + '`f32t` IN ('.$fieldType.') OR '. + '`f33t` IN ('.$fieldType.') OR '. + '`f34t` IN ('.$fieldType.') OR '. + '`f35t` IN ('.$fieldType.') OR '. + '`f36t` IN ('.$fieldType.') OR '. + '`f37t` IN ('.$fieldType.') OR '. + '`f38t` IN ('.$fieldType.') OR '. + '`f39t` IN ('.$fieldType.') OR '. + '`f40t` IN ('.$fieldType.') OR '. + '`f99t` IN ('.$fieldType.')) '. + 'LIMIT 1'); $row = mysqli_fetch_array($result, MYSQLI_ASSOC); self::$fieldLevelsInVillageSearchCache[$vid.$fieldType] = $row['level']; @@ -5655,6 +5491,8 @@ References: User ID/Message ID, Mode list($moveid) = $this->escape_input($moveid); } + if(empty($moveid)) return; + // rather than re-selecting data and updating cache here, let's just // flush the cache and let it re-cach itself as neccessary self::$marketMovementCache = []; @@ -6012,6 +5850,7 @@ References: User ID/Message ID, Mode function addUnits($vid, $troopsArray = null) { list($vid, $type, $values) = $this->escape_input($vid, $type, $values); + if(empty($vid)) return; if (!is_array($vid)) $vid = [$vid]; $types = $values = ""; @@ -6201,6 +6040,7 @@ References: User ID/Message ID, Mode } function addTech($vid) { + if(empty($vid)) return; if (!is_array($vid)) { $vid = [$vid]; } @@ -6214,6 +6054,7 @@ References: User ID/Message ID, Mode } function addABTech($vid) { + if(empty($vid)) return; if (!is_array($vid)) { $vid = [$vid]; } @@ -7056,9 +6897,13 @@ References: User ID/Message ID, Mode try { // check that we don't have the structure in place already // (we'd have at least 1 user present, since 4 are being created by default - Support, Nature, Multihunter & Taskmaster) - $data_exist = $this->query_return("SELECT * FROM " . TB_PREFIX . "users LIMIT 1"); - if ($data_exist && count($data_exist)) { - return false; + try { + $data_exist = $this->query_return("SELECT * FROM " . TB_PREFIX . "users LIMIT 1"); + if ($data_exist && count($data_exist)) { + return false; + } + } catch (\Exception $e) { + } // load the DB structure SQL file @@ -7073,6 +6918,7 @@ References: User ID/Message ID, Mode return false; } } catch (\Exception $e) { + echo($e); return -1; } diff --git a/GameEngine/Form.php b/GameEngine/Form.php index 00a64981..2196c091 100755 --- a/GameEngine/Form.php +++ b/GameEngine/Form.php @@ -4,8 +4,8 @@ ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## ## Filename Form.php ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/GameEngine/Game/WorldWonderName.php b/GameEngine/Game/WorldWonderName.php index 8d5e3f00..93a12157 100755 --- a/GameEngine/Game/WorldWonderName.php +++ b/GameEngine/Game/WorldWonderName.php @@ -4,8 +4,8 @@ ## --------------------------------------------------------------------------- ## ## Filename WorldWonderName.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# diff --git a/GameEngine/Game/index.php b/GameEngine/Game/index.php index 98297c7a..a81240cd 100755 --- a/GameEngine/Game/index.php +++ b/GameEngine/Game/index.php @@ -2,10 +2,10 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename 404.tpl ## +## Filename index.php ## ## Developed by: aggenkeech ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2012. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# ?> diff --git a/GameEngine/Generator.php b/GameEngine/Generator.php index 2b8ed1e8..65900738 100755 --- a/GameEngine/Generator.php +++ b/GameEngine/Generator.php @@ -4,8 +4,8 @@ ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## ## Filename Generator.php ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2025. All rights reserved. ## ## ## ################################################################################# @@ -18,7 +18,7 @@ class MyGenerator { public function generateRandStr($length){ $randstr = ""; for($i = 0; $i < $length; $i++){ - $randnum = mt_rand(0, 61); + $randnum = random_int(0, 61); if($randnum < 10) $randstr .= chr($randnum + 48); else if($randnum < 36) $randstr .= chr($randnum + 55); else $randstr .= chr($randnum + 61); diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php index a69a58f4..b006d0d0 100755 --- a/GameEngine/Lang/en.php +++ b/GameEngine/Lang/en.php @@ -16,1222 +16,1453 @@ ///////////////////////////// //MAIN MENU -define("TRIBE1","Romans"); -define("TRIBE2","Teutons"); -define("TRIBE3","Gauls"); -define("TRIBE4","Nature"); -define("TRIBE5","Natars"); -define("TRIBE6","Monsters"); +define('TRIBE1', 'Romans'); +define('TRIBE2', 'Teutons'); +define('TRIBE3', 'Gauls'); +define('TRIBE4', 'Nature'); +define('TRIBE5', 'Natars'); +define('TRIBE6', 'Monsters'); -define("HOME","Homepage"); -define("INSTRUCT","Instructions"); -define("ADMIN_PANEL","Admin Panel"); -define("MASS_MESSAGE","Mass Message"); -define("LOGOUT","Logout"); -define("PROFILE","Profile"); -define("SUPPORT","Support"); -define("UPDATE_T_10","Update Top 10"); -define("SYSTEM_MESSAGE","System message"); -define("TRAVIAN_PLUS","Travian Plus"); -define("CONTACT","Contact us!"); -define("GAME_RULES","Game Rules"); +define('HOME', 'Homepage'); +define('INSTRUCT', 'Instructions'); +define('ADMIN_PANEL', 'Admin Panel'); +define('MH_PANEL', 'Multihunter Panel'); +define('MASS_MESSAGE', 'Mass Message'); +define('LOGOUT', 'Logout'); +define('PROFILE', 'Profile'); +define('SUPPORT', 'Support'); +define('UPDATE_T_10', 'Update Top 10'); +define('SYSTEM_MESSAGE', 'System message'); +define('TRAVIAN_PLUS', 'Travian Plus'); +define('CONTACT', 'Contact us!'); +define('GAME_RULES', 'Game Rules'); //MENU -define("REG","Register"); -define("FORUM","Forum"); -define("CHAT","Chat"); -define("IMPRINT","Imprint"); -define("MORE_LINKS","More Links"); -define("TOUR","Game Tour"); +define('REG', 'Register'); +define('FORUM', 'Forum'); +define('CHAT', 'Chat'); +define('IMPRINT', 'Imprint'); +define('MORE_LINKS', 'More Links'); +define('TOUR', 'Game Tour'); //ERRORS -define("USRNM_EMPTY","(Username empty)"); -define("USRNM_TAKEN","(Name is already in use.)"); -define("USRNM_SHORT","(min. ".USRNM_MIN_LENGTH." figures)"); -define("USRNM_CHAR","(Invalid Characters)"); -define("PW_EMPTY","(Password empty)"); -define("PW_SHORT","(min. ".PW_MIN_LENGTH." figures)"); -define("PW_INSECURE","(Password insecure. Please choose a more secure one.)"); -define("EMAIL_EMPTY","(Email Empty)"); -define("EMAIL_INVALID","(Invalid email address)"); -define("EMAIL_TAKEN","(Email is already in use)"); -define("TRIBE_EMPTY","
  • Please choose a tribe.
  • "); -define("AGREE_ERROR","
  • You have to agree to the game rules and the general terms & conditions in order to register.
  • "); -define("LOGIN_USR_EMPTY","Enter name."); -define("LOGIN_PASS_EMPTY","Enter password."); -define("EMAIL_ERROR","Email does not match existing"); -define("PASS_MISMATCH","Passwords do not match"); -define("ALLI_OWNER","Please appoint an alliance owner before deleting"); -define("SIT_ERROR","Sitter already set or player not found"); -define("USR_NT_FOUND","Name does not exist."); -define("LOGIN_PW_ERROR","The password is wrong."); -define("WEL_TOPIC","Useful tips & information "); -define("ATAG_EMPTY","Tag empty"); -define("ANAME_EMPTY","Name empty"); -define("ATAG_EXIST","Tag taken"); -define("ANAME_EXIST","Name taken"); -define("ALREADY_ALLY_MEMBER","You're already in an alliance"); -define("ALLY_TOO_LOW", "You must have a level 3 or greater embassy"); -define("USER_NOT_IN_YOUR_ALLY","This user is not in your alliance!"); -define("CANT_EDIT_YOUR_PERMISSIONS","You can't edit your own permissions!"); -define("CANT_EDIT_LEADER_PERMISSIONS","Alliance leader's permissions can't be edited!"); -define("NO_PERMISSION", "You don't have enough permissions!"); -define("NAME_OR_DIPL_EMPTY", "Name or diplomacy empty"); -define("ALLY_DOESNT_EXISTS","Alliance does not exist"); -define("CANNOT_INVITE_SAME_ALLY","You cannot invite your own alliance"); -define("WRONG_DIPLOMACY","Wrong choice made"); -define("INVITE_ALREADY_SENT","Either you have already sent a pact to this alliance, they sent it to yours or you already have a pact with them"); -define("INVITE_SENT","Invite sent"); -define("DECLARED_WAR_ON","declared war to"); -define("OFFERED_NON_AGGRESION_PACT_TO","offered non-aggression pact to"); -define("OFFERED_CONFED_TO","offered a confederation to"); -define("ALLY_TOO_MUCH_PACTS","Either You cannot offer more pacts of this kind or this alliance has reached the limit for this kind of patcs"); -define("ALLY_PERMISSIONS_UPDATED","Permissions updated"); -define("ALLY_FORUM_LINK_UPDATED", "Forum link updated"); -define("NO_FORUMS_YET","There are no forums yet."); -define("ALLY_USER_KICKED"," has been kicked from the alliance"); -define("NOT_OPENED_YET","Server not started yet."); -define("REGISTER_CLOSED","The register is closed. You can't register to this server."); -define("NAME_EMPTY","Please insert name"); -define("NAME_NO_EXIST","There is no user with the name "); -define("ID_NO_EXIST","There is no user with the id "); -define("SAME_NAME","You can't invite yourself"); -define("ALREADY_INVITED"," already invited"); -define("ALREADY_IN_ALLY"," is already in this alliance"); -define("ALREADY_IN_AN_ALLY"," is already in an alliance"); -define("NAME_OR_TAG_CHANGED","Name or Tag changed"); -define("VAC_MODE_WRONG_DAYS","You've inserted a wrong number of days"); +define('USRNM_EMPTY', '(Username empty)'); +define('USRNM_TAKEN', '(Name is already in use.)'); +define('USRNM_SHORT', '(min. '.USRNM_MIN_LENGTH.' figures)'); +define('USRNM_CHAR', '(Invalid Characters)'); +define('PW_EMPTY', '(Password empty)'); +define('PW_SHORT', '(min. '.PW_MIN_LENGTH.' figures)'); +define('PW_INSECURE', '(Password insecure. Please choose a more secure one.)'); +define('EMAIL_EMPTY', '(Email Empty)'); +define('EMAIL_INVALID', '(Invalid email address)'); +define('EMAIL_TAKEN', '(Email is already in use)'); +define('TRIBE_EMPTY', '
  • Please choose a tribe.
  • '); +define('AGREE_ERROR', '
  • You have to agree to the game rules and the general terms & conditions in order to register.
  • '); +define('LOGIN_USR_EMPTY', 'Enter name.'); +define('LOGIN_PASS_EMPTY', 'Enter password.'); +define('EMAIL_ERROR', 'Email does not match existing'); +define('PASS_MISMATCH', 'Passwords do not match'); +define('ALLI_OWNER', 'Please appoint an alliance owner before deleting'); +define('SIT_ERROR', 'Sitter already set or player not found'); +define('USR_NT_FOUND', 'Name does not exist.'); +define('LOGIN_PW_ERROR', 'The password is wrong.'); +define('WEL_TOPIC', 'Useful tips & information '); +define('ATAG_EMPTY', 'Tag empty'); +define('ANAME_EMPTY', 'Name empty'); +define('ATAG_EXIST', 'Tag taken'); +define('ANAME_EXIST', 'Name taken'); +define('ALREADY_ALLY_MEMBER', 'You're already in an alliance'); +define('ALLY_TOO_LOW', 'You must have a level 3 or greater embassy'); +define('USER_NOT_IN_YOUR_ALLY', 'This user is not in your alliance!'); +define('CANT_EDIT_YOUR_PERMISSIONS', 'You can't edit your own permissions!'); +define('CANT_EDIT_LEADER_PERMISSIONS', 'Alliance leader's permissions can't be edited!'); +define('NO_PERMISSION', 'You don't have enough permissions!'); +define('NAME_OR_DIPL_EMPTY', 'Name or diplomacy empty'); +define('ALLY_DOESNT_EXISTS', 'Alliance does not exist'); +define('CANNOT_INVITE_SAME_ALLY', 'You cannot invite your own alliance'); +define('WRONG_DIPLOMACY', 'Wrong choice made'); +define('INVITE_ALREADY_SENT', 'Either you have already sent a pact to this alliance, they sent it to yours or you already have a pact with them'); +define('INVITE_SENT', 'Invite sent'); +define('DECLARED_WAR_ON', 'declared war to'); +define('OFFERED_NON_AGGRESION_PACT_TO', 'offered non-aggression pact to'); +define('OFFERED_CONFED_TO', 'offered a confederation to'); +define('ALLY_TOO_MUCH_PACTS', 'Either You cannot offer more pacts of this kind or this alliance has reached the limit for this kind of patcs'); +define('ALLY_PERMISSIONS_UPDATED', 'Permissions updated'); +define('ALLY_FORUM_LINK_UPDATED', 'Forum link updated'); +define('NO_FORUMS_YET', 'There are no forums yet.'); +define('ALLY_USER_KICKED', ' has been kicked from the alliance'); +define('NOT_OPENED_YET', 'Server not started yet.'); +define('REGISTER_CLOSED', 'The register is closed. You can't register to this server.'); +define('NAME_EMPTY', 'Please insert name'); +define('NAME_NO_EXIST', 'There is no user with the name '); +define('ID_NO_EXIST', 'There is no user with the id '); +define('SAME_NAME', 'You can't invite yourself'); +define('ALREADY_INVITED', ' already invited'); +define('ALREADY_IN_ALLY', ' is already in this alliance'); +define('ALREADY_IN_AN_ALLY', ' is already in an alliance'); +define('NAME_OR_TAG_CHANGED', 'Name or Tag changed'); +define('VAC_MODE_WRONG_DAYS', 'You've inserted a wrong number of days'); //COPYRIGHT -define("TRAVIAN_COPYRIGHT","TravianZ 100% Open Source Travian Clone."); +define('TRAVIAN_COPYRIGHT', 'TravianZ 100% Open Source Travian Clone.'); //BUILD.TPL -define("CUR_PROD","Current production"); -define("NEXT_PROD","Production at level "); -define("CONSTRUCT_BUILD","Construct Building"); - -//BUILDINGS -define("B1","Woodcutter"); -define("B1_DESC","The Woodcutter cuts down trees in order to produce lumber. The further you extend the woodcutter the more lumber is produced by him."); -define("B2","Clay Pit"); -define("B2_DESC","Clay is produced here. By increasing its level you increase its clay production."); -define("B3","Iron Mine"); -define("B3_DESC","Here miners produce the precious resource iron. By increasing the mine`s level you increase its iron production."); -define("B4","Cropland"); -define("B4_DESC","Your population`s food is produced here. By increasing the farm`s level you increase its crop production."); +define('CUR_PROD', 'Current production'); +define('NEXT_PROD', 'Production at level '); +define('CONSTRUCT_BUILD', 'Construct Building'); //DORF1 -define("LUMBER","Lumber"); -define("CLAY","Clay"); -define("IRON","Iron"); -define("CROP","Crop"); -define("LEVEL","Level"); -define("CROP_COM",CROP." consumption"); -define("PER_HR","per hour"); -define("PROD_HEADER","Production"); -define("CAPITAL_LABEL","Capital"); -define("MULTI_V_HEADER","Villages"); -define("ANNOUNCEMENT","Announcement"); -define("GO2MY_VILLAGE","Go to my village"); -define("VILLAGE_CENTER","Village centre"); -define("FINISH_GOLD","Finish all construction and research orders in this village immediately for 2 Gold?"); -define("WAITING_LOOP","(waiting loop)"); -define("CROP_NEGATIVE","Your crop production is negative, you'll neaver reach the amount of requested resources."); -define("HRS","(hrs.)"); -define("DONE_AT","done at"); -define("CANCEL","cancel"); -define("LOYALTY","Loyalty"); -define("CALCULATED_IN","Calculated in"); -define("SEVER_TIME","Server time:"); -define("HI","HI"); -define("P_IN","in"); +define('LUMBER', 'Lumber'); +define('CLAY', 'Clay'); +define('IRON', 'Iron'); +define('CROP', 'Crop'); +define('LEVEL', 'Level'); +define('CROP_COM', CROP.' consumption'); +define('PER_HR', 'per hour'); +define('PRODUCTION', 'Production'); +define('CAPITAL1', 'Capital'); +define('VILLAGES', 'Villages'); +define('ANNOUNCEMENT', 'Announcement'); +define('GO2MY_VILLAGE', 'Go to my village'); +define('VILLAGE_CENTER', 'Village centre'); +define('FINISH_GOLD', 'Finish all construction and research orders in this village immediately for 2 Gold?'); +define('WAITING_LOOP', '(waiting loop)'); +define('CROP_NEGATIVE', 'Your crop production is negative, you'll neaver reach the amount of requested resources.'); +define('HR', 'h.'); +define('HRS', '(hrs.)'); +define('DONE_AT', 'done at'); +define('CANCEL', 'cancel'); +define('LOYALTY', 'Loyalty'); +define('CALCULATED_IN', 'Calculated in'); +define('HI', 'HI'); +define('P_IN', 'in'); +define('MS', 'ms'); +define('SERVER_TIME', 'Server time:'); +define('REMAINING_GOLD', 'Remaining gold'); + +// HEADER && MENU && Messages && Reports +define('REPORTS', 'Reports'); +define('MESSAGES', 'Messages'); +define('PLUS_MENU', 'Plus menu'); +define('LINKS', 'Links'); +define('CANCEL_PROCESS', 'Cancel process'); +define('ACCOUNT_DELETING', 'The account will be deleted in'); +define('INBOX', 'Inbox'); +define('WRITE', 'Write'); +define('SENT', 'Sent'); +define('SEND', 'Send'); +define('ARCHIVE', 'Archive'); +define('NOTES', 'Notes'); +define('SUBJECT', 'Subject'); +define('SENDER', 'Sender'); +define('RECIPIENT', 'Recipient'); +define('BACK', 'Back'); +define('NEW', 'new'); +define('UNREAD', 'unread'); +define('NO_MESS', 'There are no messages available'); +define('NO_MESS_IN_ARCHIVE', NO_MESS.' in the archive'); +define('NO_MESS_SENT', 'There are no sent messages available'); +define('MESS_FOR_SUP', 'Message for Support'); +define('MESS_FOR_MH', 'Message for Multihunter'); +define('SEND_AS_SUP', 'Send as Support'); +define('SEND_AS_MH', 'Send as Multihunter'); +define('SAVE', 'Save'); +define('ANSWER', 'Answer'); +define('REPLY', 'Reply'); +define('ADDRESSBOOK', 'Addressbook'); +define('CLOSE_ADDRESSBOOK', 'Close Addressbook'); +define('ONLINE_S1', 'Now online'); +define('ONLINE_S2', 'Offline'); +define('ONLINE_S3', 'Last 3 days'); +define('ONLINE_S4', 'Last 7 days'); +define('ONLINE_S5', 'Inactive'); +define('WAIT_FOR_CONFIRM', 'Wait for confirm'); +define('CONFIRM', 'Confirm'); +define('WRITE_MESS_WARN', 'Warning: you can't use the values [message] or [/message] in your message because it can cause problem with bbcode system'); +define('NO_REPORTS', 'There are no reports available'); +define('ATTACKER', 'Attacker'); +define('NATAR_COUNTERFORCE', 'Natar Counterforce'); +define('FROM_THE_VILL', 'from the village'); +define('CASUALTIES', 'Casualties'); +define('INFORMATION', 'Information'); +define('CARRY', 'carry'); +define('DEFENDER', 'Defender'); +define('VISITED', 'visited'); +define('HIS_TROOPS', ''s troops'); +define('WISHES_YOU', 'wishes you'); +define('X_MAS', 'Merry Christmas'); +define('NEW_YEAR', 'Happy New Year'); +define('EASTER', 'Happy Easter'); +define('PEACE', 'Peace'); + +define('GOLD', 'Gold'); +define('GOLD_IMG', '\"'.GOLD.'\"'); //QUEST -define("Q_CONTINUE","Continue with the next task."); -define("Q_REWARD","Your reward:"); -define("Q_BUTN","complete task"); -define("Q0","Welcome to "); -define("Q0_DESC","As I see you have been made chieftain of this little village. I will be your counselor for the first few days and never leave your (right hand) side."); -define("Q0_OPT1","To the first task."); -define("Q0_OPT2","Look around on your own."); -define("Q0_OPT3","Play no tasks."); +define('Q_CONTINUE', 'Continue with the next task.'); +define('Q_REWARD', 'Your reward:'); +define('Q_BUTN', 'complete task'); +define('Q0', 'Welcome to '); +define('Q0_DESC', 'As I see you have been made chieftain of this little village. I will be your counselor for the first few days and never leave your (right hand) side.'); +define('Q0_OPT1', 'To the first task.'); +define('Q0_OPT2', 'Look around on your own.'); +define('Q0_OPT3', 'Play no tasks.'); -define("Q1","Task 1: Woodcutter"); -define("Q1_DESC","There are four green forests around your village. Construct a woodcutter on one of them. Lumber is an important resource for our new settlement."); -define("Q1_ORDER","Order:<\/p>Construct a woodcutter."); -define("Q1_RESP","Yes, that way you gain more lumber.I helped a bit and completed the order instantly."); -define("Q1_REWARD","Woodcutter instantly completed."); +define('Q1', 'Task 1: Woodcutter'); +define('Q1_DESC', 'There are four green forests around your village. Construct a woodcutter on one of them. Lumber is an important resource for our new settlement.'); +define('Q1_ORDER', 'Order:

    Construct a woodcutter.'); +define('Q1_RESP', 'Yes, that way you gain more lumber.I helped a bit and completed the order instantly.'); +define('Q1_REWARD', 'Woodcutter instantly completed.'); -define("Q2","Task 2: Crop"); -define("Q2_DESC","Now your subjects are hungry from working all day. Extend a cropland to improve your subjects' supply. Come back here once the building is complete."); -define("Q2_ORDER","Order:<\/p>Extend one cropland."); -define("Q2_RESP","Very good. Now your subjects have enough to eat again..."); -define("Q2_REWARD","Your reward:<\/p>1 day Travian"); +define('Q2', 'Task 2: Crop'); +define('Q2_DESC', 'Now your subjects are hungry from working all day. Extend a cropland to improve your subjects' supply. Come back here once the building is complete.'); +define('Q2_ORDER', 'Order:

    Extend one cropland.'); +define('Q2_RESP', 'Very good. Now your subjects have enough to eat again...'); +define('Q2_REWARD', 'Your reward:

    1 day Travian'); -define("Q3","Task 3: Your Village's Name"); -define("Q3_DESC","Creative as you are you can grant your village the ultimate name.

    Click on 'profile' in the left hand menu and then select 'change profile'..."); -define("Q3_ORDER","Order:<\/p>Change your village's name to something nice."); -define("Q3_RESP","Wow, a great name for their village. It could have been the name of my village!..."); +define('Q3', 'Task 3: Your Village's Name'); +define('Q3_DESC', 'Creative as you are you can grant your village the ultimate name.

    Click on 'profile' in the left hand menu and then select 'change profile'...'); +define('Q3_ORDER', 'Order:

    Change your village's name to something nice.'); +define('Q3_RESP', 'Wow, a great name for their village. It could have been the name of my village!...'); -define("Q4","Task 4: Other Players"); -define("Q4_DESC","In ". SERVER_NAME ." you play along with billions of other players. Click 'statistics' in the top menu to look up your rank and enter it here."); -define("Q4_ORDER","Order:<\/p>Look for your rank in the statistics and enter it here."); -define("Q4_BUTN","complete task"); -define("Q4_RESP","Exactly! That's your rank."); +define('Q4', 'Task 4: Other Players'); +define('Q4_DESC', 'In '.SERVER_NAME.' you play along with billions of other players. Click 'statistics' in the top menu to look up your rank and enter it here.'); +define('Q4_ORDER', 'Order:

    Look for your rank in the statistics and enter it here.'); +define('Q4_BUTN', 'complete task'); +define('Q4_RESP', 'Exactly! That's your rank.'); -define("Q5","Task 5: Two Building Orders"); -define("Q5_DESC","Build an iron mine and a clay pit. Of iron and clay one can never have enough."); -define("Q5_ORDER","Order:<\/p>