Merge branch 'Shadowss:master' into ita

This commit is contained in:
Mario Garavello
2025-09-03 11:22:18 +02:00
committed by GitHub
218 changed files with 4870 additions and 3492 deletions
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename 404.tpl ## ## Filename 404.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename 404.tpl ## ## Filename index.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -5,8 +5,8 @@
## Filename newmessage.tpl ## ## Filename newmessage.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## Reworked: aggenkeech ## ## Reworked: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename 404.tpl ## ## Filename index.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+6 -6
View File
@@ -81,13 +81,13 @@ Submitting this form will create new Users<br>(and their home Villages) on your
$tribe = RANDOM; $tribe = RANDOM;
break; break;
case '1': case '1':
$tribe = ROMANS; $tribe = TRIBE1; // Romans
break; break;
case '2': case '2':
$tribe = TEUTONS; $tribe = TRIBE2; // Teutons
break; break;
case '3': case '3':
$tribe = GAULS; $tribe = TRIBE3; // Gauls
break; break;
default: default:
// Should never reach here // Should never reach here
@@ -157,9 +157,9 @@ Beginners Protection &nbsp;&nbsp;<input type ="checkbox" name="users_protection"
<br><br> <br><br>
Tribe:<br> Tribe:<br>
<label><input type="radio" name="tribe" value="0" checked> &nbsp;<?php echo RANDOM; ?></label><br> <label><input type="radio" name="tribe" value="0" checked> &nbsp;<?php echo RANDOM; ?></label><br>
<label><input type="radio" name="tribe" value="1"> &nbsp;<?php echo ROMANS; ?></label><br> <label><input type="radio" name="tribe" value="1"> &nbsp;<?php echo TRIBE1; /* Romans */ ?></label><br>
<label><input type="radio" name="tribe" value="2"> &nbsp;<?php echo TEUTONS; ?></label><br> <label><input type="radio" name="tribe" value="2"> &nbsp;<?php echo TRIBE2; /* Teutons */ ?></label><br>
<label><input type="radio" name="tribe" value="3"> &nbsp;<?php echo GAULS; ?></label><br> <label><input type="radio" name="tribe" value="3"> &nbsp;<?php echo TRIBE3; /* Gauls */ ?></label><br>
<br><br> <br><br>
<input type="submit" value="Create Users"> <input type="submit" value="Create Users">
</form> </form>
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename add_village.tpl ## ## Filename add_village.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -5,8 +5,8 @@
## Filename alliance.tpl ## ## Filename alliance.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## Reworked: aggenkeech ## ## Reworked: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+1 -1
View File
@@ -28,7 +28,7 @@ $artifactInfo = Artifacts::getArtifactInfo($artifact);
if(empty($artifact)){ if(empty($artifact)){
?> ?>
<tr> <tr>
<td colspan="8"><div style="text-align: center"><?php echo NO_ARTIFACTS; ?></div></td> <td colspan="8"><div style="text-align: center"><?php echo NO_ARTEFACTS; ?></div></td>
</tr> </tr>
<?php }else{ ?> <?php }else{ ?>
<tr> <tr>
+2 -2
View File
@@ -5,8 +5,8 @@
## Filename ban.tpl ## ## Filename ban.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## Reworked: aggenkeech ## ## Reworked: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+1 -1
View File
@@ -4,7 +4,7 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename ban_msq.tpl ## ## Filename ban_msq.tpl ##
## Developed by: yi12345 ## ## Developed by: yi12345 ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
$time = time(); $time = time();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename oasis.tpl ## ## Filename cleanban.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+1 -1
View File
@@ -6,7 +6,7 @@
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## Rework by: ronix ## ## Rework by: ronix ##
## License: TravianZ Project ## ## License: TravianZ Project ##
## Copyright: TravianZ (c) 2010-2014. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if(!isset($_SESSION)) session_start(); if(!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold.php ## ## Filename delallymedal.php ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## Improved: aggenkeech ## ## Improved: aggenkeech ##
################################################################################# #################################################################################
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename deletion.tpl ## ## Filename deletion.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
include_once("../GameEngine/Ranking.php"); include_once("../GameEngine/Ranking.php");
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold.php ## ## Filename gold.php ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## Improved: aggenkeech ## ## Improved: aggenkeech ##
################################################################################# #################################################################################
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold.tpl ## ## Filename editAccess.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+1 -1
View File
@@ -2,7 +2,7 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename playerheroinfo.tpl ## ## Filename editHero.tpl ##
## Developed by: ronix ## ## Developed by: ronix ##
## License: TravianZ Project ## ## License: TravianZ Project ##
## Copyright: TravianZ (c) 2010-2014. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2014. All rights reserved. ##
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editOverall.tpl ## ## Filename editOverall.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editPlus.tpl ## ## Filename editPlus.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editPlus.tpl ## ## Filename editProtection.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editVillage.tpl ## ## Filename editResources.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editPlus.tpl ## ## Filename editSitter.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+2 -2
View File
@@ -5,8 +5,8 @@
## Filename editUser.tpl ## ## Filename editUser.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## Reworked: aggenkeech ## ## Reworked: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editVillage.tpl ## ## Filename editVillage.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editOverall.tpl ## ## Filename editWeek.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold.tpl ## ## Filename givePlus.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold.tpl ## ## Filename givePlusRes.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold.tpl ## ## Filename gold.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+2 -2
View File
@@ -5,8 +5,8 @@
## Filename home.tpl ## ## Filename home.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## Reworked: aggenekech ## ## Reworked: aggenekech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename 404.tpl ## ## Filename index.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -5,8 +5,8 @@
## Filename login.tpl ## ## Filename login.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## Reworked: aggenkeech ## ## Reworked: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename maintenance.tpl ## ## Filename maintenance.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename MaintenenceResetGold.tpl ## ## Filename MaintenenceResetGold.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename MaintenenceResetPlus.tpl ## ## Filename MaintenenceResetPlus.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename MaintenenceResetPlusBonus.tpl ## ## Filename MaintenenceResetPlusBonus.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+335
View File
@@ -0,0 +1,335 @@
<h1 class="left">Check &#38; Edit Map Tile</h1>
<?php
#################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ##
## Filename map_tile.tpl ##
## Developed by: Taras ##
## License: TravianZ Project ##
## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ##
#################################################################################
function get_map_tile_info($coord_x, $coord_y){ // todo mv to queries file
$q = 'SELECT map_data.`id` AS village_id, map_data.`fieldtype`, map_data.`oasistype`, map_data.`occupied`, map_data.`image`, '.
'oasis_data.`type`, '.
'CASE '.
'WHEN oasis_data.`owner` IS NOT NULL AND oasis_data.`owner` != 2 '.
'THEN oasis_data.`owner` '.
'ELSE village_data.`owner` '.
'END AS owner_id, '.
'u.`username` '.
'FROM (SELECT * FROM `s1_wdata` WHERE `x` = '.$coord_x.' AND `y` = '.$coord_y.') AS map_data '.
'LEFT JOIN `s1_odata` AS oasis_data ON map_data.`id` = oasis_data.`wref` '.
'LEFT JOIN `s1_vdata` AS village_data ON village_data.`wref` = map_data.`id` '.
'LEFT JOIN s1_users AS u ON u.`id` = COALESCE(oasis_data.`owner`, village_data.`owner`, 0);'; // todo check this db tables fields -- del doublings like oasistype = '2' and image = 'o2'
$result = mysqli_query($GLOBALS['link'], $q);
return mysqli_fetch_assoc($result);
}
function upd_oasis_to_oasis($village_id, $new_oasis_type){ // $village_id aka wref
mysqli_begin_transaction($GLOBALS['link']);
$q = 'UPDATE `'.TB_PREFIX.'odata` SET `type` = '.$new_oasis_type.' WHERE `wref` = '.$village_id;
mysqli_query($GLOBALS['link'], $q);
$q2 = 'UPDATE `'.TB_PREFIX.'wdata` SET `oasistype` = '.$new_oasis_type.', `image` = "o'.$new_oasis_type.'" WHERE `id` = '.$village_id;
mysqli_query($GLOBALS['link'], $q2);
mysqli_commit($GLOBALS['link']);
}
function upd_village_to_village($village_id, $new_village_type){ // $village_id aka wref
//mysqli_begin_transaction($GLOBALS['link']);
//$q = '';
//mysqli_query($GLOBALS['link'], $q);
$q2 = 'UPDATE `'.TB_PREFIX.'wdata` SET `fieldtype` = '.$new_village_type.', `image` = "t'.$new_village_type.'" WHERE `id` = '.$village_id;
mysqli_query($GLOBALS['link'], $q2);
//mysqli_commit($GLOBALS['link']);
}
function upd_village_to_oasis($village_id, $new_oasis_type){ // $village_id aka wref
mysqli_begin_transaction($GLOBALS['link']);
//$q = 'INSERT INTO `'.TB_PREFIX.'odata` (`wref`, `type`, `conqured`, `wood`, `iron`, `clay`, `maxstore`, `crop`, `maxcrop`, `lastupdated`, `lastupdated2`, `loyalty`, `owner`, `name`, `high`) VALUES ('.$village_id.', '.$new_oasis_type.', 0, 800, 800, 800, 800, 800, 800, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 100, 2, "Unoccupied Oasis", '.rand(0, 2).')'; // todo fix maxstore + maxcrop
$q = 'INSERT INTO `'.TB_PREFIX.'odata` (`wref`, `type`, `conqured`, `wood`, `iron`, `clay`, `maxstore`, `crop`, `maxcrop`, `loyalty`, `owner`, `name`, `high`) VALUES ('.$village_id.', '.$new_oasis_type.', 0, 800, 800, 800, 800, 800, 800, 100, 2, "Unoccupied Oasis", '.rand(0, 2).')'; // todo fix maxstore + maxcrop
mysqli_query($GLOBALS['link'], $q);
$q2 = 'UPDATE `'.TB_PREFIX.'wdata` SET `fieldtype` = 0, `oasistype` = '.$new_oasis_type.', `image` = "o'.$new_oasis_type.'" WHERE `id` = '.$village_id;
mysqli_query($GLOBALS['link'], $q2);
mysqli_commit($GLOBALS['link']);
}
function upd_oasis_to_village($village_id, $new_village_type){ // $village_id aka wref
mysqli_begin_transaction($GLOBALS['link']);
$q = 'DELETE FROM `'.TB_PREFIX.'odata` WHERE `wref` = '.$village_id;
mysqli_query($GLOBALS['link'], $q);
$q2 = 'UPDATE `'.TB_PREFIX.'wdata` SET `fieldtype` = '.$new_village_type.', `oasistype` = 0, `image` = "t'.rand(0, 8).'" WHERE `id` = '.$village_id;
mysqli_query($GLOBALS['link'], $q2);
mysqli_commit($GLOBALS['link']);
}
$msg = '';
$coord_x = 0;
$coord_y = 0;
$search_result = '';
$edit_form = '';
//print_r($_GET);
//print_r($_POST);
// todo mv to other file with functions
function oasis_type_by_id($oasis_type_id){
if($oasis_type_id == 1){
return '+25% Lumber';
}else if($oasis_type_id == 2){
return '+25% Lumber'; // todo think maybe add +50% instead the same +25% ?
}else if($oasis_type_id == 3){
return '+25% Lumber +25% Crop';
}else if($oasis_type_id == 4){
return '+25% Clay';
}else if($oasis_type_id == 5){
return '+25% Clay';
}else if($oasis_type_id == 6){
return '+25% Clay +25% Crop';
}else if($oasis_type_id == 7){
return '+25% Iron';
}else if($oasis_type_id == 8){
return '+25% Iron';
}else if($oasis_type_id == 9){
return '+25% Iron +25% Crop';
}else if($oasis_type_id == 10){
return '+25% Crop';
}else if($oasis_type_id == 11){
return '+25% Crop';
}else if($oasis_type_id == 12){
return '+50% Crop';
}else{
return 'undefined';
}
}
// fieldtype =
// 0 = oasis ?
// 1+ = village - valley ?
function village_type_by_fieldtype_id($village_fieldtype_id){ // fieldtype (and image aka t0, t1, .. - can be any?)
// 1 = 3-3-3-9
// 2 = 3-4-5-6
// 3 = 4-4-4-6
// 4 = 4-5-3-6
// 5 = 5-3-4-6
// 6 = 1-1-1-15 // todo add 0-0-0-18 (with few resources for 0 fields)
// 7 = 4-4-3-7
// 8 = 3-4-4-7
// 9 = 4-3-4-7
// 10 = 3-5-4-6
// 11 = 4-3-5-6
// 12 = 5-4-3-6
if($village_fieldtype_id == 1){
return '3-3-3-9';
}else if($village_fieldtype_id == 2){
return '3-4-5-6'; // todo think maybe add +50% instead the same +25% ?
}else if($village_fieldtype_id == 3){
return '4-4-4-6';
}else if($village_fieldtype_id == 4){
return '4-5-3-6';
}else if($village_fieldtype_id == 5){
return '5-3-4-6';
}else if($village_fieldtype_id == 6){
return '1-1-1-15'; // todo add 0-0-0-18 (with few resources for 0 fields)
}else if($village_fieldtype_id == 7){
return '4-4-3-7';
}else if($village_fieldtype_id == 8){
return '3-4-4-7';
}else if($village_fieldtype_id == 9){
return '4-3-4-7';
}else if($village_fieldtype_id == 10){
return '3-5-4-6';
}else if($village_fieldtype_id == 11){
return '4-3-5-6';
}else if($village_fieldtype_id == 12){
return '5-4-3-6';
}else{
return 'undefined';
}
}
function gen_map_tiles_select_list_form($is_ocuppied, $is_oasis_tile_type, $oasis_type, $fieldtype, $coord_x, $coord_y){
// if ocuppied village --can change only to other $fieldtype (cannot change to oasis)
// if ocuppied oasis -- can change only to other $oasis_type (cannot change to village field - valley)
// unoccypied can change to oasis, to village field, and back
$not_ocuppied = (!($is_ocuppied));
$result = '<br><hr><br>'.
'<b>New Map Tile Type</b>:<br>'.
'<form name="new_tile_type" method="post" action="?p=map_tile&do_save" style="padding-top:10px">'.
'<select name="new_field_type">';
if($is_oasis_tile_type){
for($i = 1; $i < 13; $i++){
$oasis_txt = oasis_type_by_id($i);
$selected = ($i == $oasis_type) ? ' selected' : '';
$result .= '<option value="'.$i.'_0"'.$selected.'>['.$i.'] Oasis '.$oasis_txt.'</option>'; // value "x_0" -- 0 for oasis
}
if($not_ocuppied){
for($i = 1; $i < 13; $i++){
$village_field_type_txt = village_type_by_fieldtype_id($i);
$result .= '<option value="'.$i.'_1">['.$i.'] Valley ' .$village_field_type_txt.'</option>'; // value "x_1" -- 1 for village - valley filed type
}
}
}else{ // village fieldtype
if($not_ocuppied){
for($i = 1; $i < 13; $i++){
$oasis_txt = oasis_type_by_id($i);
$result .= '<option value="'.$i.'_0">['.$i.'] Oasis '.$oasis_txt.'</option>'; // value "x_0" -- 0 for oasis
}
}
for($i = 1; $i < 13; $i++){
$village_field_type_txt = village_type_by_fieldtype_id($i);
$selected = ($i == $fieldtype) ? ' selected' : '';
$result .= '<option value="'.$i.'_1"'.$selected.'>['.$i.'] Valley '.$village_field_type_txt.'</option>'; // value "x_1" -- 1 for village - valley filed type
}
}
$result .= '</select>'.
'<input type="image" id="btn_save" class="dynamic_img" value="save" name="save" src="/img/x.gif" alt="Save">'.
'<input type="hidden" name="x" value="'.$coord_x.'">'.
'<input type="hidden" name="y" value="'.$coord_y.'">'.
'</form>';
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!<br>'; // 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!<br>';
}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!<br>'; }
}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 = '<b>type:</b> ['.$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 = '<b>owner:</b> <a href="?p=player&uid='.$row['owner_id'].'" target="_blank">'.$row['username'].' [id: '.$row['owner_id'].']</a><br>';
//$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 = '<b>bonus:</b> ['.$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 = '<b>owner:</b> <a href="?p=player&uid='.$row['owner_id'].'" target="_blank">'.$row['username'].' [id: '.$row['owner_id'].']</a><br>'; // 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 = '<b>owner:</b> <a href="?p=player&uid='.$row['owner_id'].'" target="_blank">'.$row['username'].' [id: '.$row['owner_id'].']</a><br>';
//$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 = '<link href="/css/compact.css" rel="stylesheet">'.
'<p>'.
'<b>x:</b> '.$coord_x.'<br>'.
'<b>y:</b> '.$coord_y.'<br>'.
'<b>type:</b> '.$place_type.'<br>'.
$bonus_or_type.'<br>'.$owner.
'</p>'.
'<div class="map">'.
'<div id="map">'.
'<div id="map_content">'.
'<div class="'.$row['image'].'"></div>'.
'</div>'.
'</div>'.
'</div>';
//}else{ // show begin search map tile form
}
echo $search_result;
?>
<link href="/css/admin_map_tile.css" rel="stylesheet">
<div id="map_coords">
<!--<form name="map_coords" method="post" action="./Mods/edit_map_tile.php" style="padding-top:10px">-->
<form name="map_coords" method="post" action="?p=map_tile&do_get" style="padding-top:10px">
<span><b>x</b> </span><input id="x" class="text fm" name="x" style="width:30px" value="<?php echo $coord_x; ?>" maxlength="4">
<span><b>y</b> </span><input id="y" class="text fm" name="y" style="width:30px" value="<?php echo $coord_y; ?>" maxlength="4">
<!-- <input type="hidden" name="do_get"> -->
<input type="image" id="btn_ok" class="dynamic_img" value="ok" name="btn" src="/img/x.gif" alt="OK"><br><br>
<?php
echo $msg;
?>
</form>
<?php
echo $edit_form;
?>
</div>
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename message.tpl ## ## Filename message.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename msg.tpl ## ## Filename msg.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
include_once("../GameEngine/Generator.php"); include_once("../GameEngine/Generator.php");
+1 -1
View File
@@ -66,7 +66,7 @@ $deletedArtifacts = $database->getDeletedArtifacts();
if(empty($deletedArtifacts)){ if(empty($deletedArtifacts)){
?> ?>
<tr> <tr>
<td colspan="8"><div style="text-align: center"><?php echo NO_ARTIFACTS; ?></div></td> <td colspan="8"><div style="text-align: center"><?php echo NO_ARTEFACTS; ?></div></td>
</tr> </tr>
<?php }else{ <?php }else{
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename online.tpl ## ## Filename online.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -5,8 +5,8 @@
## Filename player.tpl ## ## Filename player.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## Reworked: aggenkeech ## ## Reworked: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
$id = $_GET['uid']; $id = $_GET['uid'];
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename punish.tpl ## ## Filename punish.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+2 -2
View File
@@ -4,9 +4,9 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename renameVillage.tpl ## ## Filename renameVillage.tpl ##
## Developed by: Dzoki & Advocatie ## ## Developed by: Dzoki & Advocatie ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Thanks to: Dzoki & itay2277(Edit troops) ## ## 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!"); if($_SESSION['access'] < ADMIN) die("Access Denied: You are not Admin!");
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename report.tpl ## ## Filename report.tpl ##
## Developed by: Armando ## ## Developed by: Armando ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2014. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
include_once("../GameEngine/Generator.php"); include_once("../GameEngine/Generator.php");
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold.tpl ## ## Filename resetPlus.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold.tpl ## ## Filename resetPlusBonus.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename results_alliances.tpl ## ## Filename results_alliances.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename resutls_email.tpl ## ## Filename resutls_email.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename results_ip.tpl ## ## Filename results_ip.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename results_player.tpl ## ## Filename results_player.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -5,8 +5,8 @@
## Filename results_villages.tpl ## ## Filename results_villages.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## Reworked: aggenkeech ## ## Reworked: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+2 -2
View File
@@ -5,8 +5,8 @@
## Filename search.tpl ## ## Filename search.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## Reworked: aggenkeech ## ## Reworked: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+45 -47
View File
@@ -4,23 +4,23 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename server_info.tpl ## ## Filename server_info.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## Enhanced: aggenkeech ## ## Enhanced: aggenkeech ##
## Improoved by: Shadow ##
################################################################################# #################################################################################
$tribe1 = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE tribe = 1"); $tribe1 = mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE tribe = 1");
$tribe2 = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE tribe = 2"); $tribe2 = mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE tribe = 2");
$tribe3 = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE tribe = 3"); $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)); $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"));
?> ?>
<br /><br /><br /><br /><br />
<br /><br />
<table id="profile"> <table id="profile">
<thead> <thead>
<tr> <tr>
<th colspan="2">Player Information</th> <th colspan="2">World Information</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -30,12 +30,12 @@ $users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM
</tr> </tr>
<tr> <tr>
<td>Active players</td> <td>Active players</td>
<td><?php $result = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."active"); $num_rows = mysqli_num_rows($result); echo $num_rows; ?></td> <td><?php $result = mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."active"); $num_rows = mysqli_num_rows($result); echo $num_rows; ?></td>
</tr> </tr>
<tr> <tr>
<td>Players online</td> <td>Players online</td>
<td><?php $t =time(); <td><?php $t =time();
$result = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE timestamp > ".($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); $num_rows = mysqli_num_rows($result);
echo $num_rows;?> echo $num_rows;?>
</td> </td>
@@ -43,7 +43,7 @@ $users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM
<tr> <tr>
<td>Players Banned</td> <td>Players Banned</td>
<td><?php <td><?php
$result = mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM ".TB_PREFIX."users WHERE access = 0"); $result = mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE access = 0");
$num_rows = mysqli_num_rows($result); $num_rows = mysqli_num_rows($result);
echo $num_rows; ?> echo $num_rows; ?>
</td> </td>
@@ -57,6 +57,10 @@ $users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM
?> ?>
</td> </td>
</tr> </tr>
<tr>
<td>Total Population</td>
<td><?php $pop = mysqli_query($database->dblink,"SELECT SUM(pop) AS sumofpop FROM ".TB_PREFIX."vdata"); $getpop = mysqli_fetch_assoc($pop); echo $getpop['sumofpop']; ?></td>
</tr>
</tbody> </tbody>
</table> </table>
@@ -114,68 +118,62 @@ $users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM
<th colspan="10">Troops on the Server</th> <th colspan="10">Troops on the Server</th>
</tr> </tr>
<?php <?php
for($i=1; $i<11; $i++) $cells = ['SUM(hero) as hero'];
{
for($i=1; $i<51; $i++) {
array_push($cells, 'SUM(u'.$i.') AS u'.$i);
}
$units_villages = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT ".implode(',', $cells)." FROM ".TB_PREFIX."units"));
$units_enforcements = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT ".implode(',', $cells)." FROM ".TB_PREFIX."enforcement"));
for($i=1; $i<11; $i++) {
echo '<td class="on"><img src="../'.GP_LOCATE.'img/u/'.$i.'.gif"></td>'; echo '<td class="on"><img src="../'.GP_LOCATE.'img/u/'.$i.'.gif"></td>';
} }
echo '</thead><tbody>'; echo '</thead><tbody>';
for($i=1; $i<11; $i++) for($i=1; $i<11; $i++) {
{ echo '<td class="on">'.($units_villages['u'.$i] + $units_enforcements['u'.$i]).'</td>';
$t = mysqli_query($GLOBALS["link"], "SELECT SUM(u".$i.") AS sumof FROM ".TB_PREFIX."units");
$troop = mysqli_fetch_assoc($t);
echo '<td class="on">'.$troop['sumof'].'</td>';
} }
echo "</tr>"; echo "</tr>";
for($i=11; $i<21; $i++) for($i=11; $i<21; $i++) {
{
echo '<td class="on"><img src="../'.GP_LOCATE.'img/u/'.$i.'.gif"></td>'; echo '<td class="on"><img src="../'.GP_LOCATE.'img/u/'.$i.'.gif"></td>';
} }
echo '</thead><tbody>'; echo '</thead><tbody>';
for($i=11; $i<21; $i++) for($i=11; $i<21; $i++) {
{ echo '<td class="on">'.($units_villages['u'.$i] + $units_enforcements['u'.$i]).'</td>';
$t = mysqli_query($GLOBALS["link"], "SELECT SUM(u".$i.") AS sumof FROM ".TB_PREFIX."units");
$troop = mysqli_fetch_assoc($t);
echo '<td class="on">'.$troop['sumof'].'</td>';
} }
echo "</tr>"; echo "</tr>";
for($i=21; $i<31; $i++) for($i=21; $i<31; $i++) {
{
echo '<td class="on"><img src="../'.GP_LOCATE.'img/u/'.$i.'.gif"></td>'; echo '<td class="on"><img src="../'.GP_LOCATE.'img/u/'.$i.'.gif"></td>';
} }
echo '</thead><tbody>'; echo '</thead><tbody>';
for($i=21; $i<31; $i++) for($i=21; $i<31; $i++) {
{ echo '<td class="on">'.($units_villages['u'.$i] + $units_enforcements['u'.$i]).'</td>';
$t = mysqli_query($GLOBALS["link"], "SELECT SUM(u".$i.") AS sumof FROM ".TB_PREFIX."units");
$troop = mysqli_fetch_assoc($t);
echo '<td class="on">'.$troop['sumof'].'</td>';
} }
echo "</tr>"; echo "</tr>";
for($i=31; $i<41; $i++) for($i=31; $i<41; $i++) {
{
echo '<td class="on"><img src="../'.GP_LOCATE.'img/u/'.$i.'.gif"></td>'; echo '<td class="on"><img src="../'.GP_LOCATE.'img/u/'.$i.'.gif"></td>';
} }
echo '</thead><tbody>'; echo '</thead><tbody>';
for($i=31; $i<41; $i++) for($i=31; $i<41; $i++) {
{ echo '<td class="on">'.($units_villages['u'.$i] + $units_enforcements['u'.$i]).'</td>';
$t = mysqli_query($GLOBALS["link"], "SELECT SUM(u".$i.") AS sumof FROM ".TB_PREFIX."units");
$troop = mysqli_fetch_assoc($t);
echo '<td class="on">'.$troop['sumof'].'</td>';
} }
echo "</tr>"; echo "</tr>";
for($i=41; $i<51; $i++) for($i=41; $i<51; $i++) {
{
echo '<td class="on"><img src="../'.GP_LOCATE.'img/u/'.$i.'.gif"></td>'; echo '<td class="on"><img src="../'.GP_LOCATE.'img/u/'.$i.'.gif"></td>';
} }
echo '</thead><tbody>'; echo '</thead><tbody>';
for($i=41; $i<51; $i++) for($i=41; $i<51; $i++) {
{ echo '<td class="on">'.($units_villages['u'.$i] + $units_enforcements['u'.$i]).'</td>';
$t = mysqli_query($GLOBALS["link"], "SELECT SUM(u".$i.") AS sumof FROM ".TB_PREFIX."units");
$troop = mysqli_fetch_assoc($t);
echo '<td class="on">'.$troop['sumof'].'</td>';
} }
?> ?>
</tbody> </tbody>
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold.tpl ## ## Filename usergold.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+1 -1
View File
@@ -7,7 +7,7 @@
## License: TravianX Project ## ## License: TravianX Project ##
## Thanks to: Dzoki & itay2277(Edit some additions) ## ## Thanks to: Dzoki & itay2277(Edit some additions) ##
## Fix by: ronix (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 ## ## Improved: aggenkeech ##
################################################################################# #################################################################################
include_once("../GameEngine/Generator.php"); include_once("../GameEngine/Generator.php");
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename villages.tpl ## ## Filename villages.tpl ##
## Developed by: Dzoki ## ## Developed by: Dzoki ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+14 -1
View File
@@ -12,7 +12,7 @@
## Edited by: Shadow and ronix ## ## Edited by: Shadow and ronix ##
## License: Creative Commons BY-NC-SA 3.0 ## ## License: Creative Commons BY-NC-SA 3.0 ##
## Copyright: TravianZ (c) 2014 - All rights reserved ## ## Copyright: TravianZ (c) 2014 - All rights reserved ##
## URLs: http://travian.shadowss/ro ## ## URLs: http://travian.shadowss.ro ##
## Source code: https://github.com/Shadowss/TravianZ ## ## Source code: https://github.com/Shadowss/TravianZ ##
## ## ## ##
################################################################################# #################################################################################
@@ -30,6 +30,7 @@ include('Templates/update_latest.tpl');
$up_avl = $latest - $ver ; $up_avl = $latest - $ver ;
$subpage = 'Login'; $subpage = 'Login';
$not_include_mootools_js = false;
if (!empty($_GET['p'])) { if (!empty($_GET['p'])) {
switch ($_GET['p']) { switch ($_GET['p']) {
@@ -61,6 +62,11 @@ if (!empty($_GET['p'])) {
$subpage = 'Map'; $subpage = 'Map';
break; break;
case 'map_tile':
$subpage = 'Map Tile';
$not_include_mootools_js = true;
break;
case 'natars': case 'natars':
$subpage = 'Natars Management'; $subpage = 'Natars Management';
break; break;
@@ -353,9 +359,15 @@ if (!empty($_GET['p'])) {
<link rel="stylesheet" type="text/css" href="../img/img.css"> <link rel="stylesheet" type="text/css" href="../img/img.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script type="text/javascript" src="jquery.cookie.js"></script> <script type="text/javascript" src="jquery.cookie.js"></script>
<?php
if($not_include_mootools_js){}else{
?>
<script type="text/javascript" src="/mt-full.js?423cb"></script> <script type="text/javascript" src="/mt-full.js?423cb"></script>
<script type="text/javascript" src="ajax.js"></script> <script type="text/javascript" src="ajax.js"></script>
<script type="text/javascript" src="../new.js?0faab"></script> <script type="text/javascript" src="../new.js?0faab"></script>
<?php
}
?>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="imagetoolbar" content="no"> <meta http-equiv="imagetoolbar" content="no">
</head> </head>
@@ -506,6 +518,7 @@ if (!empty($_GET['p'])) {
<li><a href="?p=report">Players Report</a></li> <li><a href="?p=report">Players Report</a></li>
<li><a href="?p=msg">Players Message</a></li> <li><a href="?p=msg">Players Message</a></li>
<li><a href="?p=map">Map</a></li> <li><a href="?p=map">Map</a></li>
<li><a href="?p=map_tile">Map Tile</a></li>
<li><a href="?p=natars">Natars Management</a></li> <li><a href="?p=natars">Natars Management</a></li>
</ul> </ul>
</li> </li>
+1 -1
View File
@@ -6,7 +6,7 @@
## Developed by: Dzoki & Advocatie ## ## Developed by: Dzoki & Advocatie ##
## License: TravianZ Project ## ## License: TravianZ Project ##
## Reworks by: ronix ## ## Reworks by: ronix ##
## Copyright: TravianZ (c) 2010-2014. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
+11 -8
View File
@@ -1,12 +1,15 @@
<?php <?php
######################################################### #################################################################################
## Filename addUsers.php ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## Created by: KFCSpike ## ## --------------------------------------------------------------------------- ##
## Contributors: KFCSpike ## ## Filename addUsers.php ##
## Improve by: ronix ## ## Created by KFCSpike ##
## License: TravianZ Project ## ## Improve by ronix ##
## Copyright: TravianZ (c) 2014. All rights reserved. ## ## Developed by: Shadow ##
######################################################### ## License: TravianZ Project ##
## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ##
#################################################################################
use App\Entity\User; use App\Entity\User;
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename cp.php ## ## Filename cp.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
include_once("../../config.php"); include_once("../../config.php");
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename cp.php ## ## Filename cp.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename delallymedal.php ## ## Filename delallymedal.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename deletemedalsbyuser.php ## ## Filename deletemedalsbyuser.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename deletemedalsbyweek.php ## ## Filename deletemedalsbyweek.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -4,10 +4,10 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename deletemedalsbyweek.php ## ## Filename deletemedalsbyweek.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# ##################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
if($_SESSION['access'] < 9) die("Access Denied: You are not Admin!"); if($_SESSION['access'] < 9) die("Access Denied: You are not Admin!");
include_once("../../config.php"); include_once("../../config.php");
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editUser.php ## ## Filename editUser.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editUser.php ## ## Filename editOverall.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editUser.php ## ## Filename editPassword.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editUser.php ## ## Filename editPlus.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editUser.php ## ## Filename editProtection ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editResources.php ## ## Filename editResources.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editUser.php ## ## Filename editSitter.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editUser.php ## ## Filename editUser.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename deletemedalsbyuser.php ## ## Filename editUsername.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editUser.php ## ## Filename editVillageOwner.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editUser.php ## ## Filename editWeek.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename mainteneceBan.php ## ## Filename givePlus.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename mainteneceBan.php ## ## Filename givePlusRes.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold_1.php ## ## Filename giveResBonus.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold.php ## ## Filename gold.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename gold_1.php ## ## Filename gold_1.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename 404.tpl ## ## Filename index.tpl ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename mainteneceBan.php ## ## Filename mainteneceBan.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename mainteneceCleanBanData.php ## ## Filename mainteneceCleanBanData.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename mainteneceResetGold.php ## ## Filename mainteneceResetGold.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename mainteneceResetPlus.php ## ## Filename mainteneceResetPlus.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename mainteneceResetPlusBonus.php ## ## Filename mainteneceResetPlusBonus.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename mainteneceUnban.php ## ## Filename mainteneceUnban.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+3 -2
View File
@@ -5,8 +5,9 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename medals.php ## ## Filename medals.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
if($_SESSION['access'] < 9) die("Access Denied: You are not Admin!"); if($_SESSION['access'] < 9) die("Access Denied: You are not Admin!");
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename editBuildings.php ## ## Filename editBuildings.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename renameVillage.php ## ## Filename renameVillage.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+2 -2
View File
@@ -4,8 +4,8 @@
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename sendMessage.php ## ## Filename sendMessage.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2025. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
if (!isset($_SESSION)) session_start(); if (!isset($_SESSION)) session_start();
+1 -1
View File
@@ -12,7 +12,7 @@
## Edited by: Shadow and ronix ## ## Edited by: Shadow and ronix ##
## License: Creative Commons BY-NC-SA 3.0 ## ## License: Creative Commons BY-NC-SA 3.0 ##
## Copyright: TravianZ (c) 2014 - All rights reserved ## ## Copyright: TravianZ (c) 2014 - All rights reserved ##
## URLs: http://travian.shadowss/ro ## ## URLs: http://travian.shadowss.ro ##
## Source code: https://github.com/Shadowss/TravianZ ## ## Source code: https://github.com/Shadowss/TravianZ ##
## ## ## ##
################################################################################# #################################################################################
+2 -1
View File
@@ -12,7 +12,7 @@
## Edited by: Shadow and ronix ## ## Edited by: Shadow and ronix ##
## License: Creative Commons BY-NC-SA 3.0 ## ## License: Creative Commons BY-NC-SA 3.0 ##
## Copyright: TravianZ (c) 2014 - All rights reserved ## ## Copyright: TravianZ (c) 2014 - All rights reserved ##
## URLs: http://travian.shadowss/ro ## ## URLs: http://travian.shadowss.ro ##
## Source code: https://github.com/Shadowss/TravianZ ## ## Source code: https://github.com/Shadowss/TravianZ ##
## ## ## ##
################################################################################# #################################################################################
@@ -82,6 +82,7 @@ class adm_DB {
$bcrypted = false; $bcrypted = false;
} }
$username = htmlspecialchars($username);
if($pwOk) { if($pwOk) {
// update password to bcrypt, if correct // update password to bcrypt, if correct
if (!$dbarray['is_bcrypt'] && !$bcrypted) { if (!$dbarray['is_bcrypt'] && !$bcrypted) {
+17 -17
View File
@@ -1,22 +1,22 @@
<?php <?php
// ################################################################################ #################################################################################
// # ## ## ##
// # -= YOU MUST NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MUST NOT REMOVE OR CHANGE THIS NOTICE =- ##
// # ## ## ##
// # --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
// # ## ## ##
// # Project: TravianZ ## ## Project: TravianZ ##
// # Version: 05.03.2014 ## ## Version: 05.03.2014 ##
// # Filename: Admin/function.php ## ## Filename: GameEngine/Admin/function.php ##
// # Developed by: Dzoki ## ## Developed by: Dzoki ##
// # Edited by: Shadow and ronix ## ## Edited by: Shadow and ronix ##
// # License: Creative Commons BY-NC-SA 3.0 ## ## License: Creative Commons BY-NC-SA 3.0 ##
// # Copyright: TravianZ (c) 2014 - All rights reserved ## ## Copyright: TravianZ (c) 2014 - All rights reserved ##
// # URLs: http://travian.shadowss/ro ## ## URLs: http://travian.shadowss.ro ##
// # Source code: https://github.com/Shadowss/TravianZ ## ## Source code: https://github.com/Shadowss/TravianZ ##
// # ## ## ##
// ################################################################################ #################################################################################
include_once(__DIR__ . "/../Artifacts.php"); include_once(__DIR__ . "/../Artifacts.php");
include_once(__DIR__ . "/../Units.php"); include_once(__DIR__ . "/../Units.php");
include_once(__DIR__ . "/../Generator.php"); include_once(__DIR__ . "/../Generator.php");
+3 -3
View File
@@ -2,10 +2,10 @@
################################################################################# #################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Filename 404.tpl ## ## Filename GameEngine\Admin\index.php ##
## Developed by: aggenkeech ## ## Developed by: aggenkeech ##
## License: TravianX Project ## ## License: TravianZ Project ##
## Copyright: TravianX (c) 2010-2012. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2012. All rights reserved. ##
## ## ## ##
################################################################################# #################################################################################
?> ?>
+2 -2
View File
@@ -1,9 +1,9 @@
Hello %USER%, Hello %USER%,
Thank you for registering on our server. 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 <b>protected by beginner\'s protection for %PROTECTION% hours</b>. 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 <b>protected by beginner&#39;s protection for %PROTECTION% hours</b>.
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&#39;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.
<ul style="margin-top:0;margin-bottom:0;"><li>You have to heed the <a href="rules.php">game rules</a></li><li>Information concerning troops and buildings can be found in the <a href="#" onClick="return Popup(0,0);">instructions</a></li><li>Problems? Check the <a href="http://t3.answers.travian.com" target="_blank">Travian Answers</a> first!</li><li>No solution? Try asking in the <a href="http://forum.travian.com/">Forum</a></li><li>Tried everything to no avail? Write an answer to this message to contact the Support</li></ul> <ul style="margin-top:0;margin-bottom:0;"><li>You have to heed the <a href="rules.php">game rules</a></li><li>Information concerning troops and buildings can be found in the <a href="#" onClick="return Popup(0,0);">instructions</a></li><li>Problems? Check the <a href="http://t3.answers.travian.com" target="_blank">Travian Answers</a> first!</li><li>No solution? Try asking in the <a href="http://forum.travian.com/">Forum</a></li><li>Tried everything to no avail? Write an answer to this message to contact the Support</li></ul>
+19 -17
View File
@@ -4,36 +4,38 @@
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ## ## --------------------------------------------------------------------------- ##
## Project: TravianZ ## ## Project: TravianZ ##
## Version: 22.06.2015 ## ## Version: 22.06.2015 ##
## Filename Automation.php ## ## Filename Automation.php ##
## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix ## ## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix ##
## Fixed by: Shadow - STARVATION , HERO FIXED COMPL. ## ## Fixed by: Shadow - STARVATION , HERO FIXED COMPL. ##
## Fixed by: InCube - double troops ## ## Fixed by: InCube - double troops ##
## License: TravianZ Project ## ## License: TravianZ Project ##
## Copyright: TravianZ (c) 2010-2018. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2018. All rights reserved. ##
## URLs: http://travian.shadowss.ro ## ## URLs: http://travian.shadowss.ro ##
## Source code: https://github.com/Shadowss/TravianZ ## ## Source code: https://github.com/Shadowss/TravianZ ##
## ## ## ##
################################################################################# #################################################################################
// make sure we only run the automation script once and wait until it's done, // 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 // so concurrent AJAX calls from many different users won't overload the server
if ( !defined('AUTOMATION_MANUAL_RUN') ) { if ( !defined('AUTOMATION_MANUAL_RUN') ) {
if ( file_exists( AUTOMATION_LOCK_FILE_NAME ) ) { if(defined('AUTOMATION_LOCK_FILE_NAME')){
// check that the file is not too old, in which case our PHP script hung if ( file_exists( AUTOMATION_LOCK_FILE_NAME ) ) {
// and we need to remove the lock and run automation again // check that the file is not too old, in which case our PHP script hung
$fileTime = filemtime( AUTOMATION_LOCK_FILE_NAME ); // 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 // allow for 60 seconds of old automation script processing time, which is still way too plenty
if ( ! $fileTime || time() - $fileTime > 60 ) { if ( ! $fileTime || time() - $fileTime > 60 ) {
@unlink( AUTOMATION_LOCK_FILE_NAME ); @unlink( AUTOMATION_LOCK_FILE_NAME );
} else {
// automation file exists and is valid, don't run another automation
exit;
}
} else { } else {
// automation file exists and is valid, don't run another automation // create automation lock file
exit; file_put_contents( AUTOMATION_LOCK_FILE_NAME, '' );
} }
} else {
// create automation lock file
file_put_contents( AUTOMATION_LOCK_FILE_NAME, '' );
} }
} }
+8 -8
View File
@@ -149,14 +149,14 @@ $replace[50] = "<img class='unit u48' src='img/x.gif' title='".U48."' alt='".U48
$replace[51] = "<img class='unit u49' src='img/x.gif' title='".U49."' alt='".U49."'>"; $replace[51] = "<img class='unit u49' src='img/x.gif' title='".U49."' alt='".U49."'>";
$replace[52] = "<img class='unit u50' src='img/x.gif' title='".U50."' alt='".U50."'>"; $replace[52] = "<img class='unit u50' src='img/x.gif' title='".U50."' alt='".U50."'>";
$replace[53] = "<img class='unit uhero' src='img/x.gif' title='".U0."' alt='".U0."'>"; $replace[53] = "<img class='unit uhero' src='img/x.gif' title='".U0."' alt='".U0."'>";
$replace[54] = "<img src='img/x.gif' class='r1' title='".R1."' alt='".R1."'>"; $replace[54] = "<img src='img/x.gif' class='r1' title='".LUMBER."' alt='".LUMBER."'>";
$replace[55] = "<img src='img/x.gif' class='r2' title='".R2."' alt='".R2."'>"; $replace[55] = "<img src='img/x.gif' class='r2' title='".CLAY."' alt='".CLAY."'>";
$replace[56] = "<img src='img/x.gif' class='r3' title='".R3."' alt='".R3."'>"; $replace[56] = "<img src='img/x.gif' class='r3' title='".IRON."' alt='".IRON."'>";
$replace[57] = "<img src='img/x.gif' class='r4' title='".R4."' alt='".R4."'>"; $replace[57] = "<img src='img/x.gif' class='r4' title='".CROP."' alt='".CROP."'>";
$replace[54] = "<img src='img/x.gif' class='r1' title='Lumber' alt='Lumber'>"; $replace[54] = "<img src='img/x.gif' class='r1' title='".LUMBER."' alt='".LUMBER."'>";
$replace[55] = "<img src='img/x.gif' class='r2' title='Clay' alt='Clay'>"; $replace[55] = "<img src='img/x.gif' class='r2' title='".CLAY."' alt='".CLAY."'>";
$replace[56] = "<img src='img/x.gif' class='r3' title='Iron' alt='Iron'>"; $replace[56] = "<img src='img/x.gif' class='r3' title='".IRON."' alt='".IRON."'>";
$replace[57] = "<img src='img/x.gif' class='r4' title='Crop' alt='Crop'>"; $replace[57] = "<img src='img/x.gif' class='r4' title='".CROP."' alt='".CROP."'>";
$replace[58] = "<img class='smiley aha' src='img/x.gif' alt='*aha*' title='*aha*'>"; $replace[58] = "<img class='smiley aha' src='img/x.gif' alt='*aha*' title='*aha*'>";
$replace[59] = "<img class='smiley angry' src='img/x.gif' alt='*angry*' title='*angry*'>"; $replace[59] = "<img class='smiley angry' src='img/x.gif' alt='*angry*' title='*angry*'>";
$replace[60] = "<img class='smiley cool' src='img/x.gif' alt='*cool*' title='*cool*'>"; $replace[60] = "<img class='smiley cool' src='img/x.gif' alt='*cool*' title='*cool*'>";
+1 -1
View File
@@ -40,7 +40,7 @@ class Battle {
global $form; global $form;
// receive form and process // 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']; $_POST['mytribe'] = $post['a1_v'];
$target = []; $target = [];

Some files were not shown because too many files have changed in this diff Show More