Eliminate static checklogin function call

photogabble · Sep 13, 2018 · c7b80a5 · c7b80a5
1 parent 044fbd1
commit c7b80a5
Show file tree

Hide file tree

Showing 46 changed files with 91 additions and 46 deletions.
diff --git a/attack.php b/attack.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_att_title'];
 $header = new Tki\Header();

diff --git a/beacon.php b/beacon.php
@@ -30,7 +30,8 @@
 
 echo "<h1>" . $title . "</h1>\n";
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Get playerinfo from database
 $players_gateway = new \Tki\Players\PlayersGateway($pdo_db); // Build a player gateway object to handle the SQL calls

diff --git a/bounty.php b/bounty.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('bounty', 'port', 'common',

diff --git a/classes/Login.php b/classes/Login.php
@@ -21,7 +21,7 @@
 
 class Login
 {
-    public static function checkLogin(\PDO $pdo_db, string $lang, Reg $tkireg, Smarty $template) : bool
+    public function checkLogin(\PDO $pdo_db, string $lang, Reg $tkireg, Smarty $template) : bool
     {
         // Database driven language entries
         $langvars = Translate::load(

diff --git a/defence_report.php b/defence_report.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $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'));

diff --git a/device.php b/device.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('device', 'common', 'global_includes', 'global_funcs', 'report', 'footer', 'regional'));

diff --git a/dump.php b/dump.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_dump_title'];
 

diff --git a/emerwarp.php b/emerwarp.php
@@ -20,7 +20,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Always make sure we are using empty vars before use.
 $variables = null;

diff --git a/feedback.php b/feedback.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('feedback', 'galaxy', 'common', 'global_includes', 'global_funcs', 'footer'));

diff --git a/galaxy.php b/galaxy.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('main', 'port', 'galaxy', 'common', 'global_includes', 'global_funcs', 'footer'));

diff --git a/genesis.php b/genesis.php
@@ -24,7 +24,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('genesis', 'common', 'global_includes', 'global_funcs', 'footer', 'news'));

diff --git a/help.php b/help.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_help'];
 

diff --git a/ibank.php b/ibank.php
@@ -18,7 +18,8 @@
 // File: ibank.php
 
 require_once './common.php';
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('ibank', 'common', 'global_includes', 'global_funcs', 'footer', 'news', 'regional'));

diff --git a/log.php b/log.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Hack for log bug issue - this really needs to be fixed
 $log_list = array(null,

diff --git a/lrscan.php b/lrscan.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('main', 'lrscan', 'common', 'global_includes', 'global_funcs', 'combat', 'footer', 'news', 'regional'));

diff --git a/mailto.php b/mailto.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $body_class = 'tki';
 $include_ckeditor = "include";

diff --git a/main.php b/main.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('combat', 'common', 'main', 'modify_defenses', 'admin', 'footer', 'global_includes', 'regional'));

diff --git a/mines.php b/mines.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('mines', 'common', 'global_includes', 'global_funcs', 'combat', 'footer', 'news', 'regional'));

diff --git a/modify_defences.php b/modify_defences.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_md_title'];
 $header = new Tki\Header();

diff --git a/move.php b/move.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_move_title'];
 

diff --git a/navcomp.php b/navcomp.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('navcomp', 'common', 'global_includes', 'global_funcs', 'footer'));

diff --git a/option2.php b/option2.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Set a flag that we have not changed the language
 $changed_language = false;

diff --git a/options.php b/options.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $body_class = 'options';
 

diff --git a/planet.php b/planet.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_planet_title'];
 

diff --git a/planet2.php b/planet2.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_planet2_title'];
 $header = new Tki\Header();

diff --git a/planet3.php b/planet3.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_planet3_title'];
 

diff --git a/planet_report.php b/planet_report.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('main', 'planet', 'port', 'common', 'global_includes', 'global_funcs', 'footer', 'planet_report', 'regional'));

diff --git a/planet_report_ce.php b/planet_report_ce.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_pr_title'];
 

diff --git a/port.php b/port.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('port', 'report', 'device', 'common', 'global_includes', 'global_funcs', 'combat', 'footer', 'news', 'bounty', 'regional'));

diff --git a/port2.php b/port2.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_title_port'];
 

diff --git a/preset.php b/preset.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $langvars = Tki\Translate::load($pdo_db, $lang, array('presets'));
 $title = $langvars['l_pre_title'];

diff --git a/readmail.php b/readmail.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('readmail', 'common', 'global_includes', 'global_funcs', 'footer', 'planet_report'));

diff --git a/report.php b/report.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('main', 'report', 'device', 'common', 'global_includes', 'global_funcs', 'footer', 'regional'));

diff --git a/rsmove.php b/rsmove.php
@@ -21,7 +21,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('rsmove', 'common', 'global_funcs', 'global_includes', 'combat', 'footer', 'news', 'regional'));

diff --git a/scan.php b/scan.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_scan_title'];
 

diff --git a/self_destruct.php b/self_destruct.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('self_destruct', 'ranking', 'common', 'global_includes', 'global_funcs', 'news', 'footer'));

diff --git a/ship.php b/ship.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_ship_title'];
 $header = new Tki\Header();

diff --git a/team.php b/team.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_teamm_title'];
 $header = new Tki\Header();

diff --git a/team_planets.php b/team_planets.php
@@ -19,7 +19,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 $title = $langvars['l_teamplanet_title'];
 

diff --git a/teams.php b/teams.php
@@ -22,7 +22,8 @@
 
 require_once './common.php';
 
-Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
+$login = new Tki\Login;
+$login->checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
 $langvars = Tki\Translate::load($pdo_db, $lang, array('teams', 'common', 'global_includes', 'global_funcs', 'main', 'footer'));