From 56d07bb325062816b9f8e4558d98246c34475354 Mon Sep 17 00:00:00 2001 From: thekabal Date: Sun, 27 Aug 2017 20:08:10 -0600 Subject: [PATCH] Compliance with draft standard of extended coding standard - https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md --- admin.php | 4 ++-- attack.php | 18 +++++++++--------- beacon.php | 4 ++-- bounty.php | 24 ++++++++++++------------ check_mines.php | 2 +- classes/Db.php | 2 +- classes/Game.php | 4 ++-- classes/Ibank.php | 2 +- classes/Planet.php | 2 +- classes/PlanetCombat.php | 2 +- classes/Player.php | 8 ++++---- classes/Ship.php | 4 ++-- classes/Team.php | 4 ++-- classes/TraderouteBuildNew.php | 2 +- classes/TraderouteDie.php | 2 +- common.php | 2 +- copyright.php | 4 ++-- create_universe.php | 2 +- create_universe/0.php | 6 +++--- create_universe/10.php | 6 +++--- create_universe/20.php | 6 +++--- create_universe/30.php | 6 +++--- create_universe/40.php | 6 +++--- create_universe/50.php | 6 +++--- create_universe/60.php | 6 +++--- create_universe/70.php | 6 +++--- create_universe/80.php | 6 +++--- defence_report.php | 4 ++-- device.php | 4 ++-- dump.php | 6 +++--- emerwarp.php | 4 ++-- faq.php | 4 ++-- feedback.php | 4 ++-- galaxy.php | 4 ++-- genesis.php | 4 ++-- help.php | 4 ++-- ibank.php | 4 ++-- index.php | 4 ++-- kabal_control.php | 4 ++-- log.php | 4 ++-- login2.php | 10 +++++----- logout.php | 4 ++-- lrscan.php | 8 ++++---- mail.php | 4 ++-- mailto.php | 4 ++-- main.php | 6 +++--- mines.php | 6 +++--- modify_defences.php | 16 ++++++++-------- move.php | 4 ++-- navcomp.php | 6 +++--- new.php | 4 ++-- new2.php | 4 ++-- newplayerguide.php | 4 ++-- news.php | 4 ++-- option2.php | 4 ++-- options.php | 4 ++-- planet.php | 24 ++++++++++++------------ planet2.php | 6 +++--- planet3.php | 12 ++++++------ planet_report.php | 4 ++-- planet_report_ce.php | 6 +++--- port.php | 14 +++++++------- port2.php | 16 ++++++++-------- preset.php | 4 ++-- pwreset.php | 4 ++-- pwreset2.php | 4 ++-- ranking.php | 8 ++++---- readmail.php | 4 ++-- report.php | 4 ++-- rsmove.php | 4 ++-- scan.php | 6 +++--- scheduler.php | 6 +++--- scheduler/sched_thegovernor.php | 2 +- sector_fighters.php | 2 +- self_destruct.php | 8 ++++---- settings.php | 4 ++-- setup_info.php | 4 ++-- ship.php | 4 ++-- team.php | 4 ++-- team_planets.php | 6 +++--- teams.php | 4 ++-- traderoute.php | 6 +++--- warpedit.php | 12 ++++++------ warpedit2.php | 14 +++++++------- warpedit3.php | 12 ++++++------ zoneedit.php | 10 +++++----- zoneinfo.php | 4 ++-- 87 files changed, 257 insertions(+), 257 deletions(-) diff --git a/admin.php b/admin.php index 2809c8d30..5bb977ca7 100644 --- a/admin.php +++ b/admin.php @@ -98,12 +98,12 @@ 'footer', 'news', 'report', 'main', 'zoneedit', 'planet')); -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('admin.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/attack.php b/attack.php index 73914578e..630b14527 100644 --- a/attack.php +++ b/attack.php @@ -22,7 +22,7 @@ Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template); $title = $langvars['l_att_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -43,7 +43,7 @@ echo "You need to click on the ship first.

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -68,7 +68,7 @@ $playerscore = $playerscore * $playerscore; $targetscore = $targetscore * $targetscore; -$character_object = new \Tki\Character; +$character_object = new \Tki\Character(); // Check to ensure target is in the same sector as player if ($targetinfo['sector'] != $playerinfo['sector'] || $targetinfo['on_planet'] == 'Y') @@ -86,7 +86,7 @@ elseif ($_SESSION['in_combat'] !== null && $_SESSION['in_combat'] === true) { echo "
" . $langvars['l_team_already_combat'] . "
\n"; - $admin_log = new Tki\AdminLog; + $admin_log = new Tki\AdminLog(); $admin_log->writeLog($pdo_db, 13371337, "{$playerinfo['ship_id']}|{$targetinfo['ship_id']}|Detected multi attack."); } else @@ -627,7 +627,7 @@ Tki\Db::logDbErrors($pdo_db, $resx, __LINE__, __FILE__); Tki\PlayerLog::writeLog($pdo_db, $targetinfo['ship_id'], \Tki\LogEnums::ATTACK_LOSE, "$playerinfo[character_name]|Y"); Tki\Bounty::collect($pdo_db, $langvars, $playerinfo['ship_id'], $targetinfo['ship_id']); - $admin_log = new Tki\AdminLog; + $admin_log = new Tki\AdminLog(); $admin_log->writeLog($pdo_db, \Tki\LogEnums::ATTACK_DEBUG, "*|{$playerinfo['ship_id']}|{$targetinfo['ship_id']}|Just lost the Escape Pod."); } else @@ -635,7 +635,7 @@ Tki\PlayerLog::writeLog($pdo_db, $targetinfo['ship_id'], \Tki\LogEnums::ATTACK_LOSE, "$playerinfo[character_name]|N"); $character_object->kill($pdo_db, $targetinfo['ship_id'], $langvars, $tkireg, false); Tki\Bounty::collect($pdo_db, $langvars, $playerinfo['ship_id'], $targetinfo['ship_id']); - $admin_log = new Tki\AdminLog; + $admin_log = new Tki\AdminLog(); $admin_log->writeLog($pdo_db, \Tki\LogEnums::ATTACK_DEBUG, "*|{$playerinfo['ship_id']}|{$targetinfo['ship_id']}|Didn't have the Escape Pod."); } @@ -653,7 +653,7 @@ { $resx = $db->Execute("UPDATE {$db->prefix}kabal SET active= N WHERE kabal_id = ?;", array($targetinfo['email'])); Tki\Db::logDbErrors($pdo_db, $resx, __LINE__, __FILE__); - $admin_log = new Tki\AdminLog; + $admin_log = new Tki\AdminLog(); $admin_log->writeLog($pdo_db, \Tki\LogEnums::ATTACK_DEBUG, "*|{$playerinfo['ship_id']}|{$targetinfo['ship_id']}|Detected as AI."); if ($rating_change > 0) @@ -662,7 +662,7 @@ Tki\PlayerLog::writeLog($pdo_db, $targetinfo['ship_id'], \Tki\LogEnums::ATTACK_LOSE, "$playerinfo[character_name]|N"); Tki\Bounty::collect($pdo_db, $langvars, $playerinfo['ship_id'], $targetinfo['ship_id']); $character_object->kill($pdo_db, $targetinfo['ship_id'], $langvars, $tkireg, false); - $admin_log = new Tki\AdminLog; + $admin_log = new Tki\AdminLog(); $admin_log->writeLog($pdo_db, \Tki\LogEnums::ATTACK_DEBUG, "*|{$playerinfo['ship_id']}|{$targetinfo['ship_id']}|Hope fully we only killed off the AI."); } @@ -904,5 +904,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/beacon.php b/beacon.php index cc6c2e02f..ee5716f7b 100644 --- a/beacon.php +++ b/beacon.php @@ -25,7 +25,7 @@ 'footer', 'news')); $title = $langvars['l_beacon_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -151,5 +151,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/bounty.php b/bounty.php index b697bd659..362b12e9c 100644 --- a/bounty.php +++ b/bounty.php @@ -27,7 +27,7 @@ 'footer', 'news')); $title = $langvars['l_by_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Detect if this variable exists, and filter it. Returns false if anything wasn't right @@ -160,7 +160,7 @@ echo $langvars['l_by_noturn'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -172,7 +172,7 @@ echo $langvars['l_by_nobounty'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -183,7 +183,7 @@ echo $langvars['l_by_notyours'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -212,7 +212,7 @@ echo $langvars['l_by_notexists'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -223,7 +223,7 @@ echo $langvars['l_by_destroyed'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -233,7 +233,7 @@ echo $langvars['l_by_noturn'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -243,7 +243,7 @@ echo $langvars['l_by_zeroamount'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -253,7 +253,7 @@ echo $langvars['l_by_yourself'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -263,7 +263,7 @@ echo $langvars['l_by_notenough'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -289,7 +289,7 @@ echo $langvars['l_by_toomuch'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -399,5 +399,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/check_mines.php b/check_mines.php index bc43941b8..2a95df3ea 100644 --- a/check_mines.php +++ b/check_mines.php @@ -171,7 +171,7 @@ { // Or they lose! Tki\Bounty::cancel($pdo_db, $playerinfo['ship_id']); - $character_object = new Tki\Character; + $character_object = new Tki\Character(); $character_object->kill($pdo_db, $playerinfo['ship_id'], $langvars, $tkireg, false); } } diff --git a/classes/Db.php b/classes/Db.php index 174fb5da1..c4e6ddbca 100644 --- a/classes/Db.php +++ b/classes/Db.php @@ -173,7 +173,7 @@ public static function logDbErrors(\PDO $pdo_db, $query, int $served_line, strin { if ($db_log) { - $admin_log = new \Tki\AdminLog; + $admin_log = new \Tki\AdminLog(); $admin_log->writeLog($pdo_db, LogEnums::RAW, $text_error); } } diff --git a/classes/Game.php b/classes/Game.php index 5ea2c1e6b..28444f65f 100644 --- a/classes/Game.php +++ b/classes/Game.php @@ -33,12 +33,12 @@ public static function isGameClosed( { $title = $langvars['l_login_closed_message']; - $header = new \Tki\Header; + $header = new \Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo $langvars['l_login_closed_message']; - $footer = new \Tki\Footer; + $footer = new \Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } diff --git a/classes/Ibank.php b/classes/Ibank.php index eb72499a7..4121682f5 100644 --- a/classes/Ibank.php +++ b/classes/Ibank.php @@ -257,7 +257,7 @@ public static function ibankError(\PDO $pdo_db, array $langvars, string $errmsg, "" . ""; - $footer = new \Tki\Footer; + $footer = new \Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } diff --git a/classes/Planet.php b/classes/Planet.php index 8de26b03a..1320a26d2 100644 --- a/classes/Planet.php +++ b/classes/Planet.php @@ -60,7 +60,7 @@ public static function bombing( echo $langvars['l_cmb_atleastoneturn'] . "

"; \Tki\Text::gotoMain($pdo_db, $lang); - $footer = new \Tki\Footer; + $footer = new \Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); throw new \Exception(); } diff --git a/classes/PlanetCombat.php b/classes/PlanetCombat.php index 05a544ccb..5b53a71ac 100644 --- a/classes/PlanetCombat.php +++ b/classes/PlanetCombat.php @@ -28,7 +28,7 @@ public static function prime(\PDO $pdo_db, $db, string $lang, array $langvars, R echo $langvars['l_cmb_atleastoneturn'] . "

"; \Tki\Text::gotoMain($pdo_db, $lang); - $footer = new \Tki\Footer; + $footer = new \Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } diff --git a/classes/Player.php b/classes/Player.php index 95d0abca3..a311ba02a 100644 --- a/classes/Player.php +++ b/classes/Player.php @@ -86,12 +86,12 @@ public static function auth(\PDO $pdo_db, string $lang, array $langvars, Reg $tk $error_status .= str_replace('[here]', "" . $langvars['l_here'] . '', $langvars['l_global_needlogin']); $title = $langvars['l_error']; - $header = new \Tki\Header; + $header = new \Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo $error_status; - $footer = new \Tki\Footer; + $footer = new \Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -143,11 +143,11 @@ public static function ban(\PDO $pdo_db, string $lang, array $timestamp, Smarty $title = $langvars['l_error']; - $header = new \Tki\Header; + $header = new \Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo $error_status; - $footer = new \Tki\Footer; + $footer = new \Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } diff --git a/classes/Ship.php b/classes/Ship.php index 02cd439be..198260911 100644 --- a/classes/Ship.php +++ b/classes/Ship.php @@ -55,12 +55,12 @@ public static function isDestroyed(\PDO $pdo_db, string $lang, Reg $tkireg, arra $langvars['l_logout'] . '', $langvars['l_die_please']); $title = $langvars['l_error']; - $header = new \Tki\Header; + $header = new \Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo $error_status; - $footer = new \Tki\Footer; + $footer = new \Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } diff --git a/classes/Team.php b/classes/Team.php index 5a2dfb71c..604016c03 100644 --- a/classes/Team.php +++ b/classes/Team.php @@ -43,7 +43,7 @@ public static function isTeamMember(int $team, array $playerinfo) : bool // Check to see if the player is a member of $team['id'] if so return true, else return false. $returnvalue = ($playerinfo['team'] == $team['id']); - return (bool) $returnvalue; + return $returnvalue; } public static function isTeamOwner(int $team, array $playerinfo) : bool @@ -56,7 +56,7 @@ public static function isTeamOwner(int $team, array $playerinfo) : bool // Check to see if the player is the Owner of $team['creator'] if so return true, else return false. $returnvalue = ($playerinfo['ship_id'] == $team['creator']); - return (bool) $returnvalue; + return $returnvalue; } public static function validateTeam(\PDO $pdo_db, $name = null, $desc = null, $creator = null) : bool diff --git a/classes/TraderouteBuildNew.php b/classes/TraderouteBuildNew.php index b489a1e03..246993441 100644 --- a/classes/TraderouteBuildNew.php +++ b/classes/TraderouteBuildNew.php @@ -395,7 +395,7 @@ public static function new(\PDO $pdo_db, $db, string $lang, Reg $tkireg, Smarty \Tki\Text::gotoMain($pdo_db, $lang); echo "\n"; - $footer = new \Tki\Footer; + $footer = new \Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } diff --git a/classes/TraderouteDie.php b/classes/TraderouteDie.php index da6a35f40..aef91b661 100644 --- a/classes/TraderouteDie.php +++ b/classes/TraderouteDie.php @@ -34,7 +34,7 @@ public static function die( \Tki\Text::gotoMain($pdo_db, $lang); echo "\n"; - $footer = new \Tki\Footer; + $footer = new \Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } diff --git a/common.php b/common.php index a3e563ee8..049f6935c 100644 --- a/common.php +++ b/common.php @@ -85,7 +85,7 @@ if ($pdo_db !== null) { $tkireg = new Tki\Reg($pdo_db); // TKI Registry object - passing config variables via classes - $tkireg->tkitimer = new Tki\Timer; // Create a benchmark timer to get benchmarking data for everything + $tkireg->tkitimer = new Tki\Timer(); // Create a benchmark timer to get benchmarking data for everything $tkireg->tkitimer->start(); // Start benchmarking immediately } diff --git a/copyright.php b/copyright.php index 900f3e960..a96c08db3 100644 --- a/copyright.php +++ b/copyright.php @@ -39,12 +39,12 @@ // Temporarily set the template to the default template until we have a user option $variables['template'] = $tkireg->default_template; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('copyright.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/create_universe.php b/create_universe.php index bc1ecfb71..99b1ed8e4 100644 --- a/create_universe.php +++ b/create_universe.php @@ -55,7 +55,7 @@ $variables['goodpass'] = true; // Determine current step, next step, and number of steps - $step_finder = new Tki\BigBang; + $step_finder = new Tki\BigBang(); $create_universe_info = $step_finder->findStep(''); natsort($create_universe_info['files']); $loader_file = $create_universe_info['files'][$step]; diff --git a/create_universe/0.php b/create_universe/0.php index 8796d7ad0..3d643e8e3 100644 --- a/create_universe/0.php +++ b/create_universe/0.php @@ -17,7 +17,7 @@ // File: create_universe/0.php // Determine current step, next step, and number of steps -$step_finder = new Tki\BigBang; +$step_finder = new Tki\BigBang(); $create_universe_info = $step_finder->findStep(__FILE__); // Set variables @@ -82,11 +82,11 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('common', 'regional', 'footer', 'global_includes', 'create_universe', 'options', 'news')); -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('templates/classic/create_universe/0.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/create_universe/10.php b/create_universe/10.php index 5b60bb276..083caf580 100644 --- a/create_universe/10.php +++ b/create_universe/10.php @@ -17,7 +17,7 @@ // File: create_universe/10.php // Determine current step, next step, and number of steps -$step_finder = new Tki\BigBang; +$step_finder = new Tki\BigBang(); $create_universe_info = $step_finder->findStep(__FILE__); // Pull in the set config variables so we can get the correct sector max @@ -44,11 +44,11 @@ // Database driven language entries $langvars = Tki\Translate::load($pdo_db, $lang, array('common', 'regional', 'footer', 'global_includes', 'create_universe', 'news')); -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('templates/classic/create_universe/10.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/create_universe/20.php b/create_universe/20.php index b67558596..b214579b3 100644 --- a/create_universe/20.php +++ b/create_universe/20.php @@ -17,7 +17,7 @@ // File: create_universe/20.php // Determine current step, next step, and number of steps -$step_finder = new Tki\BigBang; +$step_finder = new Tki\BigBang(); $create_universe_info = $step_finder->findStep(__FILE__); // Set variables @@ -45,11 +45,11 @@ // Database driven language entries $langvars = Tki\Translate::load($pdo_db, $lang, array('common', 'regional', 'footer', 'global_includes', 'create_universe', 'news')); -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('templates/classic/create_universe/20.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/create_universe/30.php b/create_universe/30.php index 71633d537..2aeceb371 100644 --- a/create_universe/30.php +++ b/create_universe/30.php @@ -17,7 +17,7 @@ // File: create_universe/30.php // Determine current step, next step, and number of steps -$step_finder = new Tki\BigBang; +$step_finder = new Tki\BigBang(); $create_universe_info = $step_finder->findStep(__FILE__); // Set variables @@ -72,11 +72,11 @@ // Database driven language entries $langvars = Tki\Translate::load($pdo_db, $lang, array('common', 'regional', 'footer', 'global_includes', 'create_universe', 'news')); -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('templates/classic/create_universe/30.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/create_universe/40.php b/create_universe/40.php index fbea69b04..f5986b66a 100644 --- a/create_universe/40.php +++ b/create_universe/40.php @@ -17,7 +17,7 @@ // File: create_universe/40.php // Determine current step, next step, and number of steps -$step_finder = new Tki\BigBang; +$step_finder = new Tki\BigBang(); $create_universe_info = $step_finder->findStep(__FILE__); // Set variables @@ -67,11 +67,11 @@ // Database driven language entries $langvars = Tki\Translate::load($pdo_db, $lang, array('common', 'regional', 'footer', 'global_includes', 'create_universe', 'news')); -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('templates/classic/create_universe/40.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/create_universe/50.php b/create_universe/50.php index a14c0f888..d6b8b7e55 100644 --- a/create_universe/50.php +++ b/create_universe/50.php @@ -17,7 +17,7 @@ // File: create_universe/50.php // Determine current step, next step, and number of steps -$step_finder = new Tki\BigBang; +$step_finder = new Tki\BigBang(); $create_universe_info = $step_finder->findStep(__FILE__); // Set variables @@ -108,11 +108,11 @@ $lang = $tkireg->default_lang; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('templates/classic/create_universe/50.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/create_universe/60.php b/create_universe/60.php index aab7f4e30..fecb3635e 100644 --- a/create_universe/60.php +++ b/create_universe/60.php @@ -17,7 +17,7 @@ // File: create_universe/60.php // Determine current step, next step, and number of steps -$step_finder = new Tki\BigBang; +$step_finder = new Tki\BigBang(); $create_universe_info = $step_finder->findStep(__FILE__); // Set variables @@ -535,11 +535,11 @@ } } -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('templates/classic/create_universe/60.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/create_universe/70.php b/create_universe/70.php index 52068b395..92426cc4b 100644 --- a/create_universe/70.php +++ b/create_universe/70.php @@ -17,7 +17,7 @@ // File: create_universe/70.php // Determine current step, next step, and number of steps -$step_finder = new Tki\BigBang; +$step_finder = new Tki\BigBang(); $create_universe_info = $step_finder->findStep(__FILE__); // Set variables @@ -309,11 +309,11 @@ } } -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('templates/classic/create_universe/70.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/create_universe/80.php b/create_universe/80.php index 100a434f3..934a6f651 100644 --- a/create_universe/80.php +++ b/create_universe/80.php @@ -17,7 +17,7 @@ // File: create_universe/80.php // Determine current step, next step, and number of steps -$step_finder = new Tki\BigBang; +$step_finder = new Tki\BigBang(); $create_universe_info = $step_finder->findStep(__FILE__); // Set variables @@ -299,11 +299,11 @@ $local_table_timer->stop(); $variables['admin_zone_results']['elapsed'] = $local_table_timer->elapsed(); -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('templates/classic/create_universe/80.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/defence_report.php b/defence_report.php index 9ba304542..4c2a0350a 100644 --- a/defence_report.php +++ b/defence_report.php @@ -25,7 +25,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('defense_report', 'planet_report', 'main', 'device', 'port', 'modify_defenses', 'common', 'global_includes', 'global_funcs', 'combat', 'footer', 'news', 'regional')); $title = $langvars['l_sdf_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -125,5 +125,5 @@ echo "

"; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/device.php b/device.php index b65885916..0e6129a6a 100644 --- a/device.php +++ b/device.php @@ -26,7 +26,7 @@ $title = $langvars['l_device_title']; $body_class = 'device'; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title, $body_class); echo "
"; @@ -77,5 +77,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/dump.php b/dump.php index a623e3eeb..45483de97 100644 --- a/dump.php +++ b/dump.php @@ -23,7 +23,7 @@ $title = $langvars['l_dump_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -49,7 +49,7 @@ echo $langvars['l_dump_turn'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -73,5 +73,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/emerwarp.php b/emerwarp.php index 84caa4577..9022fd2c5 100644 --- a/emerwarp.php +++ b/emerwarp.php @@ -54,7 +54,7 @@ $variables['title'] = $langvars['l_ewd_title']; $variables['linkback'] = array("fulltext" => $langvars['l_global_mmenu'], "link" => "main.php"); -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); @@ -62,5 +62,5 @@ $template->display('emerwarp.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/faq.php b/faq.php index 7496186ab..f5aa01b92 100644 --- a/faq.php +++ b/faq.php @@ -40,7 +40,7 @@ $variables['linkback'] = array("fulltext" => $langvars['l_global_mmenu'], "link" => "index.php"); } -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); @@ -48,5 +48,5 @@ $template->display('faq.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/feedback.php b/feedback.php index c4ec29e05..e9d87de60 100644 --- a/feedback.php +++ b/feedback.php @@ -26,7 +26,7 @@ $title = $langvars['l_feedback_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -76,5 +76,5 @@ Tki\Text::gotoMain($pdo_db, $lang); } -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/galaxy.php b/galaxy.php index 17bdc3d07..5a61fa8ed 100644 --- a/galaxy.php +++ b/galaxy.php @@ -25,7 +25,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('main', 'port', 'galaxy', 'common', 'global_includes', 'global_funcs', 'footer')); $title = $langvars['l_map_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -120,5 +120,5 @@ echo "

"; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/genesis.php b/genesis.php index 18b6667ac..6d5773c9c 100644 --- a/genesis.php +++ b/genesis.php @@ -30,7 +30,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('genesis', 'common', 'global_includes', 'global_funcs', 'footer', 'news')); $title = $langvars['l_gns_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Get playerinfo from database @@ -158,5 +158,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/help.php b/help.php index 91d17b925..b5fcf843d 100644 --- a/help.php +++ b/help.php @@ -23,7 +23,7 @@ $title = $langvars['l_help']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -188,5 +188,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/ibank.php b/ibank.php index d561e87f6..712f0eb28 100644 --- a/ibank.php +++ b/ibank.php @@ -26,7 +26,7 @@ $title = $langvars['l_ibank_title']; $body_class = 'ibank'; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title, $body_class); $stmt = $pdo_db->prepare("SELECT * FROM ::prefix::ships WHERE email=:email"); @@ -196,5 +196,5 @@ echo ''; -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/index.php b/index.php index 22e012fad..d3a213f7f 100644 --- a/index.php +++ b/index.php @@ -45,12 +45,12 @@ // Temporarily set the template to the default template until we have a user option $variables['template'] = $tkireg->default_template; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('index.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/kabal_control.php b/kabal_control.php index 9da6fb8c4..5e6249972 100644 --- a/kabal_control.php +++ b/kabal_control.php @@ -22,7 +22,7 @@ $title = $langvars['l_ai_control']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -651,5 +651,5 @@ } } -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/log.php b/log.php index fd9c2dcd2..0220ca4f2 100644 --- a/log.php +++ b/log.php @@ -37,7 +37,7 @@ $title = $langvars['l_log_titlet']; $body_class = 'log'; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title, $body_class); // Get playerinfo from database @@ -385,5 +385,5 @@ echo ""; -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/login2.php b/login2.php index 49be0804d..1c1031f8c 100644 --- a/login2.php +++ b/login2.php @@ -87,12 +87,12 @@ { $title = $langvars['l_login_sclosed']; - $header = new Tki\Header; + $header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $langvars['l_login_closed_message'] . "

\n"; echo str_replace("[here]", "" . $langvars['l_here'] . "", $langvars['l_global_mlogin']); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -112,7 +112,7 @@ } } -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -244,7 +244,7 @@ // password is incorrect echo $langvars['l_login_4gotpw1a'] . "

" . $langvars['l_login_4gotpw1b'] . " " . $langvars['l_clickme'] . " " . $langvars['l_login_4gotpw2a'] . "

" . $langvars['l_login_4gotpw2b'] . " " . $langvars['l_clickme'] . " " . $langvars['l_login_4gotpw3'] . " " . $request->server->get('REMOTE_ADDR') . "..."; Tki\PlayerLog::writeLog($pdo_db, $playerinfo['ship_id'], \Tki\LogEnums::BADLOGIN, $request->server->get('REMOTE_ADDR')); - $admin_log = new Tki\AdminLog; + $admin_log = new Tki\AdminLog(); $admin_log->writeLog($pdo_db, (1000 + \Tki\LogEnums::BADLOGIN), "{$request->server->get('REMOTE_ADDR')}|{$email}|{$filtered_post_password}"); } } @@ -255,5 +255,5 @@ echo "" . $langvars['l_login_noone'] . "
"; } -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/logout.php b/logout.php index ed5202d05..4e0357fe9 100644 --- a/logout.php +++ b/logout.php @@ -69,12 +69,12 @@ $variables['linkback'] = array("fulltext" => $langvars['l_global_mlogin'], "link" => "index.php"); $variables['title'] = $langvars['l_logout_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('logout.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/lrscan.php b/lrscan.php index 5f794df57..030145c6a 100644 --- a/lrscan.php +++ b/lrscan.php @@ -25,7 +25,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('main', 'lrscan', 'common', 'global_includes', 'global_funcs', 'combat', 'footer', 'news', 'regional')); $title = $langvars['l_lrs_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -61,7 +61,7 @@ echo $langvars['l_lrs_nofull'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -72,7 +72,7 @@ echo $langvars['l_lrs_noturns'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -476,5 +476,5 @@ echo "

"; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/mail.php b/mail.php index ccc942434..a9d5da70a 100644 --- a/mail.php +++ b/mail.php @@ -21,7 +21,7 @@ $title = $langvars['l_mail_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -102,5 +102,5 @@ } } -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/mailto.php b/mailto.php index 04c99d6c2..519248aaf 100644 --- a/mailto.php +++ b/mailto.php @@ -27,7 +27,7 @@ // Database driven language entries $langvars = Tki\Translate::load($pdo_db, $lang, array('mailto', 'common', 'global_includes', 'global_funcs', 'footer', 'planet_report')); $title = $langvars['l_sendm_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title, $body_class, $include_ckeditor); // Filter to the FILTER_SANITIZE_STRING ruleset, because we need to allow spaces for names & subject (FILTER_SANITIZE_URL doesn't allow spaces) @@ -197,5 +197,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/main.php b/main.php index 7b7852369..829036eac 100644 --- a/main.php +++ b/main.php @@ -25,7 +25,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('combat', 'common', 'main', 'modify_defenses', 'admin', 'footer', 'global_includes', 'regional')); $title = $langvars['l_main_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); $stylefontsize = "12pt"; @@ -155,7 +155,7 @@ $planettypes[3] = "largeplanet.png"; $planettypes[4] = "hugeplanet.png"; -$insignia = new Tki\Character; +$insignia = new Tki\Character(); $signame = $insignia->getInsignia($pdo_db, $_SESSION['username'], $langvars); echo "
\n"; echo "{$signame} {$playerinfo['character_name']}{$langvars['l_aboard']} {$playerinfo['ship_name']}\n"; @@ -940,5 +940,5 @@ "; -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/mines.php b/mines.php index 6f63f5c0a..f4a8f6639 100644 --- a/mines.php +++ b/mines.php @@ -26,7 +26,7 @@ $title = $langvars['l_mines_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $hader->display($pdo_db, $lang, $template, $title); $op = null; @@ -131,7 +131,7 @@ echo $langvars['l_mines_noturn'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -311,5 +311,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/modify_defences.php b/modify_defences.php index 37f488be2..6e41ddf8e 100644 --- a/modify_defences.php +++ b/modify_defences.php @@ -22,7 +22,7 @@ Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template); $title = $langvars['l_md_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -33,7 +33,7 @@ echo $langvars['l_md_invalid'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -64,7 +64,7 @@ echo $langvars['l_md_noturn'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -87,7 +87,7 @@ echo $langvars['l_md_nothere'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -126,7 +126,7 @@ echo $langvars['l_md_yours'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -176,7 +176,7 @@ echo $langvars['l_md_notyours'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -240,7 +240,7 @@ echo $langvars['l_md_notyours'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -312,5 +312,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/move.php b/move.php index 335bc529f..68849aefb 100644 --- a/move.php +++ b/move.php @@ -23,7 +23,7 @@ $title = $langvars['l_move_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); $sector = (int) filter_input(INPUT_GET, 'sector', FILTER_SANITIZE_NUMBER_INT); @@ -46,7 +46,7 @@ echo $langvars['l_move_turn'] . '

'; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } diff --git a/navcomp.php b/navcomp.php index c59e963b7..6ee05a616 100644 --- a/navcomp.php +++ b/navcomp.php @@ -25,7 +25,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('navcomp', 'common', 'global_includes', 'global_funcs', 'footer')); $title = $langvars['l_nav_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -35,7 +35,7 @@ echo $langvars['l_nav_nocomp'] . '

'; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -200,5 +200,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/new.php b/new.php index cc0b85d88..f7278cd45 100644 --- a/new.php +++ b/new.php @@ -32,11 +32,11 @@ $variables['title'] = $langvars['l_new_title']; $variables['template'] = $tkireg->default_template; // Temporarily set the template to the default template until we have a user option -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('new.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/new2.php b/new2.php index 5db8690c8..f4016e24c 100644 --- a/new2.php +++ b/new2.php @@ -21,7 +21,7 @@ $title = $langvars['l_new_title2']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -210,5 +210,5 @@ echo $langvars['l_new_err']; } -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/newplayerguide.php b/newplayerguide.php index 8d706c19f..6e359edf5 100644 --- a/newplayerguide.php +++ b/newplayerguide.php @@ -36,12 +36,12 @@ $variables['linkback'] = array("fulltext" => $langvars['l_global_mlogin'], "link" => "index.php"); $variables['title'] = $langvars['l_npg_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('newplayerguide.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/news.php b/news.php index a6401a285..ff508afb8 100644 --- a/news.php +++ b/news.php @@ -26,7 +26,7 @@ 'global_funcs', 'combat', 'footer', 'news')); $title = $langvars['l_news_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Default to today's date in case it isn't supplied @@ -97,5 +97,5 @@ echo str_replace('[here]', "" . $langvars['l_here'] . '', $langvars['l_global_mmenu']); } -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/option2.php b/option2.php index 9cc0472ac..724f14b48 100644 --- a/option2.php +++ b/option2.php @@ -59,7 +59,7 @@ $title = $langvars['l_opt2_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -147,5 +147,5 @@ echo "
"; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/options.php b/options.php index 53b4a4333..a093dffd6 100644 --- a/options.php +++ b/options.php @@ -27,7 +27,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('options', 'common', 'global_includes', 'global_funcs', 'footer')); $title = $langvars['l_opt_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title, $body_class); $players_gateway = new \Tki\Players\PlayersGateway($pdo_db); // Build a player gateway object to handle the SQL calls @@ -82,5 +82,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/planet.php b/planet.php index 82db8f8dc..67516dd1c 100644 --- a/planet.php +++ b/planet.php @@ -23,7 +23,7 @@ $title = $langvars['l_planet_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -71,7 +71,7 @@ echo 'Invalid Planet

'; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -95,7 +95,7 @@ die(); } -$admin_log = new Tki\AdminLog; +$admin_log = new Tki\AdminLog(); if ($planetinfo) // If there is a planet in the sector show appropriate menu { @@ -110,7 +110,7 @@ echo $langvars['l_planet_none'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -128,7 +128,7 @@ echo "
"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -428,7 +428,7 @@ echo "You need to Click on the planet first.

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -554,7 +554,7 @@ echo "You need to Click on the planet first.

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -602,7 +602,7 @@ echo "You need to Click on the planet first.

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -663,7 +663,7 @@ echo "You need to Click on the planet first.

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -675,7 +675,7 @@ echo $langvars['l_plant_scn_turn'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -700,7 +700,7 @@ Tki\Text::gotoMain($pdo_db, $lang); Tki\PlayerLog::writeLog($pdo_db, $ownerinfo['ship_id'], \Tki\LogEnums::PLANET_SCAN_FAIL, "$planetinfo[name]|$playerinfo[sector]|$playerinfo[character_name]"); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -961,5 +961,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/planet2.php b/planet2.php index 33378caf4..112ff3b8f 100644 --- a/planet2.php +++ b/planet2.php @@ -22,7 +22,7 @@ Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template); $title = $langvars['l_planet2_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -157,7 +157,7 @@ echo "Invalid Planet

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -668,5 +668,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/planet3.php b/planet3.php index 3aae9ccf7..3bbc85b1d 100644 --- a/planet3.php +++ b/planet3.php @@ -23,7 +23,7 @@ $title = $langvars['l_planet3_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -61,7 +61,7 @@ echo "Invalid Planet

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -92,7 +92,7 @@ echo $langvars['l_trade_turnneed'] . '

'; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -102,7 +102,7 @@ echo $langvars['l_planet2_sector'] . '

'; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -112,7 +112,7 @@ echo $langvars['l_planet_none'] . "
"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -203,5 +203,5 @@ Tki\Score::updateScore($pdo_db, $playerinfo['ship_id'], $tkireg, $playerinfo); Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/planet_report.php b/planet_report.php index c79b286c7..9bb0e42b3 100644 --- a/planet_report.php +++ b/planet_report.php @@ -25,7 +25,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('main', 'planet', 'port', 'common', 'global_includes', 'global_funcs', 'footer', 'planet_report', 'regional')); $title = $langvars['l_pr_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); $preptype = null; @@ -76,5 +76,5 @@ echo "

"; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/planet_report_ce.php b/planet_report_ce.php index d354a801a..b321b4ff1 100644 --- a/planet_report_ce.php +++ b/planet_report_ce.php @@ -23,7 +23,7 @@ $title = $langvars['l_pr_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -48,7 +48,7 @@ } elseif ($buildp !== null && $builds !== null) { - $build_bases = new Tki\Bases; + $build_bases = new Tki\Bases(); $build_bases->buildBase($pdo_db, $langvars, $buildp, $builds, $tkireg); } else @@ -59,5 +59,5 @@ echo '

'; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/port.php b/port.php index 59f0e45b1..81cc8661b 100644 --- a/port.php +++ b/port.php @@ -26,7 +26,7 @@ $title = $langvars['l_title_port']; $body_class = 'port'; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title, $body_class); echo "
"; @@ -116,7 +116,7 @@ echo $langvars['l_war_info'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -128,7 +128,7 @@ echo $langvars['l_no_trade_info'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -151,7 +151,7 @@ echo "Trading at this port is not allowed for outsiders

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -165,7 +165,7 @@ echo $langvars['l_no_trade_out'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -318,7 +318,7 @@ echo "" . $langvars['l_ibank_term'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -1021,5 +1021,5 @@ Tki\Text::gotoMain($pdo_db, $lang); echo "\n"; -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/port2.php b/port2.php index e90ce53a7..a4760a08f 100644 --- a/port2.php +++ b/port2.php @@ -23,7 +23,7 @@ $title = $langvars['l_title_port']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -56,7 +56,7 @@ echo $langvars['l_no_trade_info'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -77,7 +77,7 @@ echo $langvars['l_no_trade_out'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -91,7 +91,7 @@ echo $langvars['l_no_trade_out'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -105,7 +105,7 @@ $trade_deficit = $langvars['l_cost'] . " : "; $trade_benefit = $langvars['l_profit'] . " : "; -$admin_log = new Tki\AdminLog; +$admin_log = new Tki\AdminLog(); if ($playerinfo['turns'] < 1) { echo $langvars['l_trade_turnneed'] . "

"; @@ -125,7 +125,7 @@ Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -137,7 +137,7 @@ echo "" . $langvars['l_ibank_term'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -707,5 +707,5 @@ echo "

Click here to return to the supply depot."; } -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/preset.php b/preset.php index b19af19e9..ec0cff797 100644 --- a/preset.php +++ b/preset.php @@ -25,7 +25,7 @@ $title = $langvars['l_pre_title']; $body_class = 'tki'; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title, $body_class); // Database driven language entries @@ -115,5 +115,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/pwreset.php b/pwreset.php index fb506264a..ca12e3f0b 100644 --- a/pwreset.php +++ b/pwreset.php @@ -24,7 +24,7 @@ $title = $langvars['l_pwr_title']; $body_class = 'options'; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title, $body_class); echo "

" . $title . "

\n"; @@ -106,5 +106,5 @@ /// Log user in (like login does) /// Redirect to game (like login does) -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/pwreset2.php b/pwreset2.php index 6f9cdf954..1002471ef 100644 --- a/pwreset2.php +++ b/pwreset2.php @@ -22,7 +22,7 @@ $title = $langvars['l_pwr_title']; $body_class = 'options'; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title, $body_class); // Database driven language entries @@ -141,5 +141,5 @@ // Admin log this attempt to use an invalid code } -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/ranking.php b/ranking.php index 0177ae320..f3a61845f 100644 --- a/ranking.php +++ b/ranking.php @@ -87,7 +87,7 @@ $stmt->bindParam(':limit', $tkireg->max_ranks, PDO::PARAM_INT); $stmt->execute(); $rankings = $stmt->fetchAll(PDO::FETCH_ASSOC); -$variables['num_players'] = (int) count($rankings); +$variables['num_players'] = count($rankings); $player_list = array(); $xx = 1; @@ -125,7 +125,7 @@ } // Set the characters Insignia. - $insignia = new Tki\Character; + $insignia = new Tki\Character(); $row['insignia'] = $insignia->getInsignia($pdo_db, $row['email'], $langvars); // This is just to show that we can set the type of player. @@ -171,7 +171,7 @@ $variables['linkback'] = array('caption' => $langvars['l_global_mmenu'], 'link' => 'main.php'); } -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('variables', $variables); @@ -188,5 +188,5 @@ // Now we tell Smarty to output the page $template->display('ranking.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/readmail.php b/readmail.php index 730516529..ed8bba530 100644 --- a/readmail.php +++ b/readmail.php @@ -25,7 +25,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('readmail', 'common', 'global_includes', 'global_funcs', 'footer', 'planet_report')); $title = $langvars['l_readm_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -211,5 +211,5 @@ display($pdo_db, $lang, $tkireg, $template); diff --git a/report.php b/report.php index ac30504b8..bd7f64e05 100644 --- a/report.php +++ b/report.php @@ -119,12 +119,12 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('main', 'report', 'device', 'common', 'global_includes', 'global_funcs', 'footer', 'regional', 'news')); -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('report.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/rsmove.php b/rsmove.php index 5a075e048..8f56cd26c 100644 --- a/rsmove.php +++ b/rsmove.php @@ -27,7 +27,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('rsmove', 'common', 'global_funcs', 'global_includes', 'combat', 'footer', 'news', 'regional')); $title = $langvars['l_rs_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Get playerinfo from database @@ -208,5 +208,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/scan.php b/scan.php index 89d723a0f..e0de04495 100644 --- a/scan.php +++ b/scan.php @@ -23,7 +23,7 @@ $title = $langvars['l_scan_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -65,7 +65,7 @@ echo "You need to Click on the ship first.

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -475,5 +475,5 @@ echo "

"; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/scheduler.php b/scheduler.php index 9939c44ab..c18976942 100644 --- a/scheduler.php +++ b/scheduler.php @@ -66,7 +66,7 @@ $title = $langvars['l_sys_update']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -173,7 +173,7 @@ if (abs($schedDiff) > ($tkireg->sched_ticks * 60)) { // Hmmm, seems that we have missed at least 1 update, so log it to the admin. - $admin_log = new Tki\AdminLog; + $admin_log = new Tki\AdminLog(); $admin_log->writeLog($pdo_db, 2468, "Detected Scheduler Issue|{$lastRun}|". time() . "|" . (time() - ($tkireg->sched_ticks * 60)) . "|{$schedDiff}|" . serialize($lastrunList)); } @@ -190,5 +190,5 @@ echo "
"; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/scheduler/sched_thegovernor.php b/scheduler/sched_thegovernor.php index b55f6e5eb..0eb69fddd 100644 --- a/scheduler/sched_thegovernor.php +++ b/scheduler/sched_thegovernor.php @@ -32,7 +32,7 @@ $detected = (bool) false; -$admin_log = new Tki\AdminLog; +$admin_log = new Tki\AdminLog(); while (!$tdres->EOF) { $playerinfo = $tdres->fields; diff --git a/sector_fighters.php b/sector_fighters.php index 1079048a4..35954f869 100644 --- a/sector_fighters.php +++ b/sector_fighters.php @@ -204,7 +204,7 @@ else { Tki\Bounty::cancel($pdo_db, $playerinfo['ship_id']); - $character_object = new Tki\Character; + $character_object = new Tki\Character(); $character_object->kill($pdo_db, $playerinfo['ship_id'], $langvars, $tkireg, false); $ok = 0; Tki\Text::gotoMain($pdo_db, $lang); diff --git a/self_destruct.php b/self_destruct.php index 351a0ddd4..754e58ae8 100644 --- a/self_destruct.php +++ b/self_destruct.php @@ -25,7 +25,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('self_destruct', 'ranking', 'common', 'global_includes', 'global_funcs', 'news', 'footer')); $title = $langvars['l_die_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -62,11 +62,11 @@ echo $langvars['l_die_vapor'] . "

"; $langvars['l_die_please'] = str_replace("[logout]", "" . $langvars['l_logout'] . "", $langvars['l_die_please']); echo $langvars['l_die_please'] . "
"; - $character_object = new Tki\Character; + $character_object = new Tki\Character(); $character_object->kill($pdo_db, $playerinfo['ship_id'], $langvars, $tkireg, true); Tki\Bounty::cancel($pdo_db, $playerinfo['ship_id']); - $admin_log = new Tki\AdminLog; + $admin_log = new Tki\AdminLog(); $admin_log->writeLog($pdo_db, \Tki\LogEnums::ADMIN_HARAKIRI, "$playerinfo[character_name]|" . $request->server->get('REMOTE_ADDR') . ""); Tki\PlayerLog::writeLog($pdo_db, $playerinfo['ship_id'], \Tki\LogEnums::HARAKIRI, $request->server->get('REMOTE_ADDR')); echo "Due to nobody looking after your Planets, all your Planets have reduced into dust and ruble. Your Planets are no more.
\n"; @@ -78,5 +78,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/settings.php b/settings.php index fd3ab5305..3d358dab7 100644 --- a/settings.php +++ b/settings.php @@ -103,7 +103,7 @@ $variables['linkback'] = array('caption' => $langvars['l_global_mmenu'], 'link' => 'main.php'); } -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); @@ -111,5 +111,5 @@ $template->display('settings.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/setup_info.php b/setup_info.php index 75be208eb..cbf95f205 100644 --- a/setup_info.php +++ b/setup_info.php @@ -179,12 +179,12 @@ $variables['db_addr'] = $db_host; } -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $variables['title'], $variables['body_class']); $template->addVariables('langvars', $langvars); $template->addVariables('variables', $variables); $template->display('templates/classic/setup_info.tpl'); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/ship.php b/ship.php index 5abbc8f37..89e5f83c7 100644 --- a/ship.php +++ b/ship.php @@ -22,7 +22,7 @@ Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template); $title = $langvars['l_ship_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -67,5 +67,5 @@ echo "
"; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/team.php b/team.php index 3522b9519..81aad915f 100644 --- a/team.php +++ b/team.php @@ -22,7 +22,7 @@ Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template); $title = $langvars['l_teamm_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -90,5 +90,5 @@ Tki\Text::gotoMain($pdo_db, $lang); } -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/team_planets.php b/team_planets.php index 7e5d575ea..ea4166d3e 100644 --- a/team_planets.php +++ b/team_planets.php @@ -23,7 +23,7 @@ $title = $langvars['l_teamplanet_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -42,7 +42,7 @@ echo "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); return; } @@ -201,5 +201,5 @@ echo "

"; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/teams.php b/teams.php index 437fa36a7..4f212468b 100644 --- a/teams.php +++ b/teams.php @@ -28,7 +28,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('teams', 'common', 'global_includes', 'global_funcs', 'main', 'footer')); $title = $langvars['l_team_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -617,5 +617,5 @@ echo "

"; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/traderoute.php b/traderoute.php index ba77e373e..6ea930a28 100644 --- a/traderoute.php +++ b/traderoute.php @@ -24,7 +24,7 @@ $langvars = Tki\Translate::load($pdo_db, $lang, array('traderoutes', 'common', 'global_includes', 'global_funcs', 'footer', 'bounty', 'regional')); $title = $langvars['l_tdr_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); echo "

" . $title . "

\n"; @@ -56,7 +56,7 @@ $freeholds = Tki\CalcLevels::abstractLevels($playerinfo['hull'], $tkireg) - $playerinfo['ship_ore'] - $playerinfo['ship_organics'] - $playerinfo['ship_goods'] - $playerinfo['ship_colonists']; $maxholds = Tki\CalcLevels::abstractLevels($playerinfo['hull'], $tkireg); $maxenergy = Tki\CalcLevels::energy($playerinfo['power'], $tkireg); -$admin_log = new Tki\AdminLog; +$admin_log = new Tki\AdminLog(); if ($playerinfo['ship_colonists'] < 0 || $playerinfo['ship_ore'] < 0 || $playerinfo['ship_organics'] < 0 || $playerinfo['ship_goods'] < 0 || $playerinfo['ship_energy'] < 0 || $freeholds < 0) { if ($playerinfo['ship_colonists'] < 0 || $playerinfo['ship_colonists'] > $maxholds) @@ -508,5 +508,5 @@ Tki\Text::gotoMain($pdo_db, $lang); echo "
\n"; -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/warpedit.php b/warpedit.php index 3105ee9c1..9b04fe4e5 100644 --- a/warpedit.php +++ b/warpedit.php @@ -23,7 +23,7 @@ $title = $langvars['l_warp_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -49,7 +49,7 @@ echo $langvars['l_warp_turn'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -59,7 +59,7 @@ echo $langvars['l_warp_none'] . ".

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -76,7 +76,7 @@ echo $langvars['l_warp_forbid'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -104,7 +104,7 @@ echo $langvars['l_warp_forbid'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -149,5 +149,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/warpedit2.php b/warpedit2.php index 4b0772b2f..4f4b7db5d 100644 --- a/warpedit2.php +++ b/warpedit2.php @@ -23,7 +23,7 @@ $title = $langvars['l_warp_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -58,7 +58,7 @@ echo $langvars['l_warp_turn'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -68,7 +68,7 @@ echo $langvars['l_warp_none'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -93,7 +93,7 @@ echo $langvars['l_warp_forbid'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -130,7 +130,7 @@ echo $langvars['l_warp_twoerror'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -148,7 +148,7 @@ echo $langvars['l_warp_sectex'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -232,5 +232,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/warpedit3.php b/warpedit3.php index 209867d3a..9c49d2a77 100644 --- a/warpedit3.php +++ b/warpedit3.php @@ -23,7 +23,7 @@ $title = $langvars['l_warp_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -58,7 +58,7 @@ echo $langvars['l_warp_turn'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -68,7 +68,7 @@ echo $langvars['l_warp_none'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -92,7 +92,7 @@ echo $langvars['l_warp_forbid'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -116,7 +116,7 @@ echo $langvars['l_warp_forbidtwo'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -190,5 +190,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/zoneedit.php b/zoneedit.php index 4fca28ccf..35f148916 100644 --- a/zoneedit.php +++ b/zoneedit.php @@ -23,7 +23,7 @@ $title = $langvars['l_ze_title']; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title); // Database driven language entries @@ -113,7 +113,7 @@ echo "

" . $langvars['l_zi_nexist'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -143,7 +143,7 @@ echo "

" . $langvars['l_ze_notowner'] . "

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -169,7 +169,7 @@ echo "" . $langvars['l_clickme'] . " " . $langvars['l_ze_return'] . ".

"; Tki\Text::gotoMain($pdo_db, $lang); - $footer = new Tki\Footer; + $footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); die(); } @@ -295,5 +295,5 @@ echo "" . $langvars['l_clickme'] . " " . $langvars['l_ze_return'] . ".

"; Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template); diff --git a/zoneinfo.php b/zoneinfo.php index 833b399f2..ab06759bd 100644 --- a/zoneinfo.php +++ b/zoneinfo.php @@ -26,7 +26,7 @@ $title = $langvars['l_zi_title']; $body_class = 'zoneinfo'; -$header = new Tki\Header; +$header = new Tki\Header(); $header->display($pdo_db, $lang, $template, $title, $body_class); echo "

" . $title . "

\n"; @@ -205,5 +205,5 @@ Tki\Text::gotoMain($pdo_db, $lang); -$footer = new Tki\Footer; +$footer = new Tki\Footer(); $footer->display($pdo_db, $lang, $tkireg, $template);