From 1d677e87186a50619c568f081aebca9e6832517d Mon Sep 17 00:00:00 2001 From: Catalin Novgorodschi <1140613+Shadowss@users.noreply.github.com> Date: Wed, 29 Apr 2026 15:20:55 +0300 Subject: [PATCH] Add notice and winner refactor Add notice and winner refactor --- a2b.php | 26 ++++--- celebration.php | 2 + dorf1.php | 7 +- dorf2.php | 8 +- dorf3.php | 7 +- index.php | 14 ++-- karte.php | 7 +- karte2.php | 9 ++- login.php | 7 +- logout.php | 7 +- manual.php | 7 +- massmessage.php | 7 +- nachrichten.php | 7 +- packages.php | 8 +- password.php | 7 +- plus.php | 7 +- rules.php | 9 ++- spieler.php | 8 +- spielregeln.php | 10 ++- statistiken.php | 7 +- support.php | 9 ++- sysmsg.php | 7 +- tutorial.php | 76 ++----------------- version.php | 7 +- warsim.php | 7 +- winner.php | 190 +++++++++++++++++++++++++++--------------------- 26 files changed, 252 insertions(+), 215 deletions(-) diff --git a/a2b.php b/a2b.php index f03e26a6..69205e9e 100644 --- a/a2b.php +++ b/a2b.php @@ -2,15 +2,23 @@ include_once ("GameEngine/Generator.php"); $start_timer = $generator->pageLoadTimeStart(); -// ################################################################################ -// # -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## -// # --------------------------------------------------------------------------- ## -// # Filename a2b.php ## -// # Developed by: Dzoki ## -// # License: TravianX Project ## -// # Copyright: TravianX (c) 2010-2011. All rights reserved. ## -// # ## -// ################################################################################ +################################################################################# +## ## +## -= YOU MUST NOT REMOVE OR CHANGE THIS NOTICE =- ## +## ## +## --------------------------------------------------------------------------- ## +## ## +## Project: TravianZ ## +## Version: 29.04.2026 ## +## Filename: a2b.php ## +## Developed by: Dzoki & Advocaite & Donnchadh ## +## Reworked by: Shadow ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2018. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## +## ## +################################################################################# use App\Utils\AccessLogger; diff --git a/celebration.php b/celebration.php index 54937a3b..11433d1b 100644 --- a/celebration.php +++ b/celebration.php @@ -1,4 +1,5 @@ pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename dorf1.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# use App\Utils\AccessLogger; diff --git a/dorf2.php b/dorf2.php index 15710557..ead0ead3 100644 --- a/dorf2.php +++ b/dorf2.php @@ -5,12 +5,16 @@ $start_timer = $generator->pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename dorf2.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# + use App\Utils\AccessLogger; include_once("GameEngine/Village.php"); diff --git a/dorf3.php b/dorf3.php index 0116e339..141af799 100644 --- a/dorf3.php +++ b/dorf3.php @@ -5,10 +5,13 @@ $start_timer = $generator->pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename dorf3.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/index.php b/index.php index 17392619..ca5af19d 100644 --- a/index.php +++ b/index.php @@ -7,15 +7,15 @@ use App\Utils\AccessLogger; ## ## ## --------------------------------------------------------------------------- ## ## ## -## Project: ZravianX ## -## Version: 2011.11.30 ## +## Project: TravianZ ## +## Version: 29.04.2026 ## ## Filename: index.php ## ## Developed by: Dzoki & Advocaite & Donnchadh ## ## Reworked by: ZZJHONS ## -## License: Creative Commons BY-NC-SA 3.0 ## -## Copyright: ZravianX (c) 2011 - All rights reserved ## -## URLs: http://zravianx.zzjhons.com ## -## Source code: http://www.github.com/ZZJHONS/ZravianX ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2018. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# @@ -90,7 +90,7 @@ AccessLogger::logRequest(); - + diff --git a/karte.php b/karte.php index 14151bca..d33fc7b0 100644 --- a/karte.php +++ b/karte.php @@ -5,10 +5,13 @@ $start_timer = $generator->pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename karte.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/karte2.php b/karte2.php index 0441daee..0122ca41 100644 --- a/karte2.php +++ b/karte2.php @@ -2,10 +2,13 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename karte2.php ## -## Developed by: Advocaite ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## Developed by: Dzoki ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# use App\Utils\AccessLogger; diff --git a/login.php b/login.php index 3c12625e..beb3d052 100644 --- a/login.php +++ b/login.php @@ -3,10 +3,13 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename login.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/logout.php b/logout.php index 71d365c6..360f36b8 100644 --- a/logout.php +++ b/logout.php @@ -5,10 +5,13 @@ $start_timer = $generator->pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename logout.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/manual.php b/manual.php index bf7e12e5..b3e5847d 100644 --- a/manual.php +++ b/manual.php @@ -4,10 +4,13 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename manual.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/massmessage.php b/massmessage.php index fbd663af..e437ec2a 100644 --- a/massmessage.php +++ b/massmessage.php @@ -3,10 +3,13 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename massmessage.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/nachrichten.php b/nachrichten.php index fcdaebb4..7c581a92 100644 --- a/nachrichten.php +++ b/nachrichten.php @@ -5,10 +5,13 @@ $start_timer = $generator->pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename nachrichten.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/packages.php b/packages.php index b450c7aa..05e3ce5e 100644 --- a/packages.php +++ b/packages.php @@ -5,9 +5,13 @@ $start_timer = $generator->pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename packages.php ## +## Project: TravianZ ## +## Filename packages.php ## ## Developed by: yi12345 ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/password.php b/password.php index fa6f7ba9..be33c276 100644 --- a/password.php +++ b/password.php @@ -3,10 +3,13 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename password.php ## ## Developed by: Dixie ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# use App\Utils\AccessLogger; diff --git a/plus.php b/plus.php index 72671d7e..b2d97a2f 100644 --- a/plus.php +++ b/plus.php @@ -5,10 +5,13 @@ $start_timer = $generator->pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename plus.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/rules.php b/rules.php index 54083154..1fe80e99 100644 --- a/rules.php +++ b/rules.php @@ -5,10 +5,13 @@ $start_timer = $generator->pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename rules.php ## -## Developed by: FurkicanLove ## -## License: TravianWorldZ Project ## -## Copyright: TravianWorldZ (c) 2011. All rights reserved. ## +## Developed by: FurkicanLove ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/spieler.php b/spieler.php index 32cd6389..fdc73042 100644 --- a/spieler.php +++ b/spieler.php @@ -5,12 +5,16 @@ $start_timer = $generator->pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename spieler.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# + use App\Utils\AccessLogger; ob_start(); diff --git a/spielregeln.php b/spielregeln.php index aba6d644..6e94bd89 100644 --- a/spielregeln.php +++ b/spielregeln.php @@ -1,11 +1,15 @@ pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename anmelden.php ## +## Project: TravianZ ## +## Filename support.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# use App\Utils\AccessLogger; diff --git a/sysmsg.php b/sysmsg.php index b77fbe5a..065bc7e5 100644 --- a/sysmsg.php +++ b/sysmsg.php @@ -2,10 +2,13 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename sysmsg.php ## ## Developed by: Dixie ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/tutorial.php b/tutorial.php index c0db5c8d..dbea550b 100644 --- a/tutorial.php +++ b/tutorial.php @@ -2,11 +2,13 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename anleitung.php ## +## Project: TravianZ ## +## Filename tutorial.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Fixed bt: Shadow ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# @@ -34,57 +36,25 @@ AccessLogger::logRequest();
-
- - - - - - -
- -
- - +

Tutorial

- - - - - - - - - -
-
-
-
- - -
- - - - - - -
- Close -

Anleitung

- - -
-
-
-
- - -
- - - - diff --git a/version.php b/version.php index 4ce3b202..e392e01c 100644 --- a/version.php +++ b/version.php @@ -5,10 +5,13 @@ $start_timer = $generator->pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename version.php ## ## Developed by: Shadow ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/warsim.php b/warsim.php index 8186e7f9..8ea38839 100644 --- a/warsim.php +++ b/warsim.php @@ -5,10 +5,13 @@ $start_timer = $generator->pageLoadTimeStart(); ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## +## Project: TravianZ ## ## Filename warsim.php ## ## Developed by: Dzoki ## -## License: TravianX Project ## -## Copyright: TravianX (c) 2010-2011. All rights reserved. ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# diff --git a/winner.php b/winner.php index 241095f2..bdbf5857 100644 --- a/winner.php +++ b/winner.php @@ -3,21 +3,21 @@ include_once("GameEngine/Generator.php"); $start_timer = $generator->pageLoadTimeStart(); ################################################################################# -## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## +## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Project: TravianZ ## -## Version: 18.02.2014 ## -## Description: When the player builds Wonder of the World ## -## to level 100 the winner details are shown. ## -## tells the players the game is over ## -## Authors: aggenkeech - and a little help from Eyas95 ## -## Page: winner.php ## -## Fixed by: Shadow ## -## License: TravianZ Project ## -## Copyright: TravianZ (c) 2010-2013. All rights reserved. ## -## URLs: http://travian.shadowss.ro ## -## Source code: https://github.com/Shadowss/TravianZ/ ## -## ## +## Project: TravianZ ## +## Version: 18.02.2014 ## +## Description: When the player builds Wonder of the World ## +## to level 100 the winner details are shown. ## +## tells the players the game is over ## +## Authors: aggenkeech - and a little help from Eyas95 ## +## Page: winner.php ## +## Fixed by: Shadow ## +## License: TravianZ Project ## +## Copyright: TravianZ (c) 2010-2026. All rights reserved. ## +## URLs: http://travian.shadowss.ro ## +## Source code: https://github.com/Shadowss/TravianZ/ ## +## ## ################################################################################# use App\Utils\AccessLogger; @@ -39,31 +39,32 @@ if(isset($_GET['newdid'])) { exit; } - $sql = mysqli_query($database->dblink,"SELECT vref FROM ".TB_PREFIX."fdata WHERE f99 = '100' and f99t = '40'"); - $winner = mysqli_num_rows($sql); +/* +|-------------------------------------------------------------------------- +| CHECK WW WINNER EXISTS +|-------------------------------------------------------------------------- +*/ - if($winner > 0){ +$sql = mysqli_query($database->dblink,"SELECT 1 FROM " . TB_PREFIX . "fdata WHERE f99 = '100' AND f99t = '40' LIMIT 1"); +$winner = mysqli_fetch_row($sql); +if ($winner) { - ## Get Rankings for Ranking Section -## Top 3 Population - $q = " - SELECT ".TB_PREFIX."users.id userid, ".TB_PREFIX."users.username username,".TB_PREFIX."users.alliance alliance, ( - SELECT SUM( ".TB_PREFIX."vdata.pop ) - FROM ".TB_PREFIX."vdata - WHERE ".TB_PREFIX."vdata.owner = userid - )totalpop, ( - SELECT COUNT( " . TB_PREFIX . "vdata.wref ) - FROM " . TB_PREFIX . "vdata - WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99 - )totalvillages, ( - SELECT " . TB_PREFIX . "alidata.tag - FROM " . TB_PREFIX . "alidata, " . TB_PREFIX . "users - WHERE " . TB_PREFIX . "alidata.id = " . TB_PREFIX . "users.alliance - AND " . TB_PREFIX . "users.id = userid - )allitag - FROM " . TB_PREFIX . "users - WHERE " . TB_PREFIX . "users.access < ".(INCLUDE_ADMIN ? "10" : "8")." AND " . TB_PREFIX . "users.tribe <= 3 - ORDER BY totalpop DESC, totalvillages DESC, username ASC"; + /* + |-------------------------------------------------------------------------- + | TOP POPULATION + |-------------------------------------------------------------------------- + */ + + $q = "SELECT + u.id AS userid, + u.username, + u.alliance, + (SELECT SUM(v.pop) FROM " . TB_PREFIX . "vdata v WHERE v.owner = u.id) AS totalpop, + (SELECT COUNT(v.wref) FROM " . TB_PREFIX . "vdata v WHERE v.owner = u.id AND v.type != 99) AS totalvillages, + (SELECT a.tag FROM " . TB_PREFIX . "alidata a WHERE a.id = u.alliance) AS allitag + FROM " . TB_PREFIX . "users u + WHERE u.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND u.tribe <= 3 + ORDER BY totalpop DESC, totalvillages DESC, u.username ASC"; $result = (mysqli_query($database->dblink,$q)); while($row = mysqli_fetch_assoc($result)) $datas[] = $row; @@ -75,21 +76,23 @@ if(isset($_GET['newdid'])) { $value['aname'] = $result['allitag']; $value['totalpop'] = $result['totalpop']; $value['totalvillage'] = $result['totalvillages']; - } - ## Top Attacker - $q = " - SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.apall, ( - SELECT COUNT( " . TB_PREFIX . "vdata.wref ) - FROM " . TB_PREFIX . "vdata - WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99 - )totalvillages, ( - SELECT SUM( " . TB_PREFIX . "vdata.pop ) - FROM " . TB_PREFIX . "vdata - WHERE " . TB_PREFIX . "vdata.owner = userid - )pop - FROM " . TB_PREFIX . "users - WHERE " . TB_PREFIX . "users.apall >= 0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND " . TB_PREFIX . "users.tribe <= 3 - ORDER BY " . TB_PREFIX . "users.apall DESC, pop DESC, username ASC"; + } + + /* + |-------------------------------------------------------------------------- + | TOP ATTACKER + |-------------------------------------------------------------------------- + */ + + $q = "SELECT + u.id AS userid, + u.username, + u.apall, + (SELECT COUNT(v.wref) FROM " . TB_PREFIX . "vdata v WHERE v.owner = u.id AND v.type != 99) AS totalvillages, + (SELECT SUM(v.pop) FROM " . TB_PREFIX . "vdata v WHERE v.owner = u.id) AS pop + FROM " . TB_PREFIX . "users u + WHERE u.apall >= 0 AND u.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND u.tribe <= 3 + ORDER BY u.apall DESC, pop DESC, u.username ASC"; $result = mysqli_query($database->dblink,$q); while($row = mysqli_fetch_assoc($result)) $attacker[] = $row; @@ -101,20 +104,23 @@ if(isset($_GET['newdid'])) { $value['totalpop'] = $row['pop']; $value['apall'] = $row['apall']; } - ## Top Defender - $q = " - SELECT ".TB_PREFIX."users.id userid, ".TB_PREFIX."users.username username, ".TB_PREFIX."users.dpall, ( - SELECT COUNT(".TB_PREFIX."vdata.wref) - FROM ".TB_PREFIX."vdata - WHERE ".TB_PREFIX."vdata.owner = userid AND type != 99 - )totalvillages, ( - SELECT SUM(".TB_PREFIX."vdata.pop) - FROM ". TB_PREFIX . "vdata - WHERE ". TB_PREFIX . "vdata.owner = userid - )pop - FROM ".TB_PREFIX."users - WHERE ". TB_PREFIX."users.dpall >= 0 AND ".TB_PREFIX."users.access < ".(INCLUDE_ADMIN ? "10" : "8")." AND ".TB_PREFIX."users.tribe <= 3 - ORDER BY ".TB_PREFIX."users.dpall DESC, pop DESC, username ASC"; + + /* + |-------------------------------------------------------------------------- + | TOP DEFENDER + |-------------------------------------------------------------------------- + */ + + $q = "SELECT + u.id AS userid, + u.username, + u.dpall, + (SELECT COUNT(v.wref) FROM " . TB_PREFIX . "vdata v WHERE v.owner = u.id AND v.type != 99) AS totalvillages, + (SELECT SUM(v.pop) FROM " . TB_PREFIX . "vdata v WHERE v.owner = u.id) AS pop + FROM " . TB_PREFIX . "users u + WHERE u.dpall >= 0 AND u.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND u.tribe <= 3 + ORDER BY u.dpall DESC, pop DESC, u.username ASC"; + $result = mysqli_query($database->dblink,$q); while($row = mysqli_fetch_assoc($result)) $defender[] = $row; @@ -126,27 +132,43 @@ if(isset($_GET['newdid'])) { $value['dpall'] = $row['dpall']; } - ## Get WW Winner Details - $sql = mysqli_query($database->dblink,"SELECT vref FROM ".TB_PREFIX."fdata WHERE f99 = '100' and f99t = '40'"); - $vref = mysqli_result($sql, 0); + /* + |-------------------------------------------------------------------------- + | WW WINNER DETAILS + |-------------------------------------------------------------------------- + */ - $winningvillagename = $database->getVillage($vref)['name']; - $owner = $database->getVillage($vref)['owner']; + $q = "SELECT + f.vref, + f.ww_lastupdate, + v.name AS village_name, + v.owner AS owner_id, + u.username, + a.id AS alliance_id, + a.name AS alliance_name, + a.tag AS alliance_tag + FROM " . TB_PREFIX . "fdata f + LEFT JOIN " . TB_PREFIX . "vdata v ON v.wref = f.vref + LEFT JOIN " . TB_PREFIX . "users u ON u.id = v.owner + LEFT JOIN " . TB_PREFIX . "alidata a ON a.id = u.alliance + WHERE f.f99 = '100' AND f.f99t = '40' + LIMIT 1"; - $sql = mysqli_query($database->dblink,"SELECT username FROM ".TB_PREFIX."users WHERE id = '$owner'"); - $username = mysqli_result($sql, 0); + $result = mysqli_query($database->dblink, $q); + $row = mysqli_fetch_assoc($result); - $sql = mysqli_query($database->dblink,"SELECT alliance FROM ".TB_PREFIX."users WHERE id = '$owner'"); - $allianceid = mysqli_result($sql, 0); - - $sql = mysqli_query($database->dblink,"SELECT name, tag FROM ".TB_PREFIX."alidata WHERE id = '$allianceid'"); - $winningalliance = mysqli_result($sql, 0); - - $sql = mysqli_query($database->dblink,"SELECT tag FROM ".TB_PREFIX."alidata WHERE id = '$allianceid'"); - $winningalliancetag = mysqli_result($sql, 0); - - $sql = mysqli_query($database->dblink,"SELECT ww_lastupdate FROM ".TB_PREFIX."fdata WHERE vref = '$vref'"); - $finishconstruction = mysqli_result($sql, 0); + if ($row) { + $vref = $row['vref']; + $winningvillagename = $row['village_name']; + $owner = $row['owner_id']; + $username = $row['username']; + $allianceid = $row['alliance_id']; + $winningalliance = $row['alliance_name']; + $winningalliancetag = $row['alliance_tag']; + $finishconstruction = $row['ww_lastupdate']; + } else { + $vref = 0; + } ?>