From bcbb3a354514fec3678c66ecbdb4f2838a06e3f8 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 13 Mar 2017 21:14:53 -0600 Subject: [PATCH] PSR2 compliance suggested via slevomat - PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket --- admin.php | 2 +- admin/bans_editor.php | 4 ++-- admin/user_editor.php | 2 +- classes/KabalTo.php | 2 +- classes/PlanetProduction.php | 2 +- classes/PlanetReport.php | 2 +- classes/PlanetReportCE.php | 2 +- classes/Realspace.php | 2 +- classes/Team.php | 2 +- classes/TraderouteBuild.php | 4 ++-- classes/TraderouteDelete.php | 2 +- classes/TraderouteSettings.php | 6 +++--- faq.php | 2 +- feedback.php | 2 +- footer_t.php | 2 +- kabal_control.php | 2 +- log.php | 2 +- logout.php | 2 +- lrscan.php | 2 +- mailto.php | 2 +- main.php | 4 ++-- mines.php | 4 ++-- news.php | 2 +- planet.php | 2 +- planet3.php | 2 +- ranking.php | 2 +- settings.php | 2 +- team_planets.php | 2 +- traderoute.php | 2 +- 29 files changed, 35 insertions(+), 35 deletions(-) diff --git a/admin.php b/admin.php index b64c0a864..42bdc939b 100644 --- a/admin.php +++ b/admin.php @@ -34,7 +34,7 @@ $button_main = false; // Clear variables array before use, and set array with all variables in page -unset ($variables); +unset($variables); $variables = array(); $variables['is_admin'] = false; diff --git a/admin/bans_editor.php b/admin/bans_editor.php index 9d5139514..5f3621a11 100644 --- a/admin/bans_editor.php +++ b/admin/bans_editor.php @@ -35,7 +35,7 @@ $res->MoveNext(); } - if (empty ($bans)) + if (empty($bans)) { echo "" . $langvars['l_admin_no_bans'] . ""; } @@ -331,7 +331,7 @@ } echo "

" . $langvars['l_admin_affected_players'] . " :

"; - if (empty ($players)) + if (empty($players)) { echo " - " . $langvars['l_none'] . "
"; } diff --git a/admin/user_editor.php b/admin/user_editor.php index 695c6f038..58ad229d5 100644 --- a/admin/user_editor.php +++ b/admin/user_editor.php @@ -24,7 +24,7 @@ $_POST['operation'] = null; } -if (empty ($_POST['user'])) +if (empty($_POST['user'])) { $res = $db->Execute("SELECT ship_id, character_name FROM {$db->prefix}ships ORDER BY character_name"); Tki\Db::LogDbErrors($pdo_db, $res, __LINE__, __FILE__); diff --git a/classes/KabalTo.php b/classes/KabalTo.php index 7c5a7b416..afb686258 100644 --- a/classes/KabalTo.php +++ b/classes/KabalTo.php @@ -710,7 +710,7 @@ public static function ship(\PDO $pdo_db, $db, int $ship_id, Reg $tkireg, array } $ship_value = $tkireg->upgrade_cost * (round(pow($tkireg->upgrade_factor, $targetinfo['hull'])) + round(pow($tkireg->upgrade_factor, $targetinfo['engines'])) + round(pow($tkireg->upgrade_factor, $targetinfo['power'])) + round(pow($tkireg->upgrade_factor, $targetinfo['computer'])) + round(pow($tkireg->upgrade_factor, $targetinfo['sensors'])) + round(pow($tkireg->upgrade_factor, $targetinfo['beams'])) + round(pow($tkireg->upgrade_factor, $targetinfo['torp_launchers'])) + round(pow($tkireg->upgrade_factor, $targetinfo['shields'])) + round(pow($tkireg->upgrade_factor, $targetinfo['armor'])) + round(pow($tkireg->upgrade_factor, $targetinfo['cloak']))); - $ship_salvage_rate = random_int (10, 20); + $ship_salvage_rate = random_int(10, 20); $ship_salvage = $ship_value * $ship_salvage_rate / 100; \Tki\PlayerLog::writeLog($pdo_db, $playerinfo['ship_id'], LOG_RAW, "Attack successful, $targetinfo[character_name] was defeated and salvaged for $ship_salvage credits."); $resd = $db->Execute("UPDATE {$db->prefix}ships SET ship_ore = ship_ore + ?, ship_organics = ship_organics + ?, ship_goods = ship_goods + ?, credits = credits + ? WHERE ship_id = ?;", array($salv_ore, $salv_organics, $salv_goods, $ship_salvage, $playerinfo['ship_id'])); diff --git a/classes/PlanetProduction.php b/classes/PlanetProduction.php index edc415f69..4a65cffd2 100644 --- a/classes/PlanetProduction.php +++ b/classes/PlanetProduction.php @@ -161,7 +161,7 @@ public static function productionChange(\PDO $pdo_db, $db, array $langvars, arra foreach ($planets as $planet) { - if (empty ($planet['name'])) + if (empty($planet['name'])) { $planet['name'] = $langvars['l_unnamed']; } diff --git a/classes/PlanetReport.php b/classes/PlanetReport.php index 3dfcc94b0..37eb9ed6e 100644 --- a/classes/PlanetReport.php +++ b/classes/PlanetReport.php @@ -207,7 +207,7 @@ public static function standardReport(\PDO $pdo_db, array $langvars, array $play $total_selling++; } - if (empty ($planet[$i]['name'])) + if (empty($planet[$i]['name'])) { $planet[$i]['name'] = $langvars['l_unnamed']; } diff --git a/classes/PlanetReportCE.php b/classes/PlanetReportCE.php index f1aa64370..bf8117e67 100644 --- a/classes/PlanetReportCE.php +++ b/classes/PlanetReportCE.php @@ -111,7 +111,7 @@ public static function takeCredits(\PDO $pdo_db, $db, array $langvars, int $plan $planetinfo = $res->fields; // Set the name for unamed planets to be "unnamed" - if (empty ($planetinfo['name'])) + if (empty($planetinfo['name'])) { $planetinfo['name'] = $langvars['l_unnamed']; } diff --git a/classes/Realspace.php b/classes/Realspace.php index 0f7cfb1d0..54e6c7cc6 100644 --- a/classes/Realspace.php +++ b/classes/Realspace.php @@ -81,7 +81,7 @@ public static function realSpaceMove(\PDO $pdo_db, array $langvars, int $destina } // Make sure energyscooped is not null - if (!isset ($energyscooped)) + if (!isset($energyscooped)) { $energyscooped = 0; } diff --git a/classes/Team.php b/classes/Team.php index 6a9b864a9..144cc7d32 100644 --- a/classes/Team.php +++ b/classes/Team.php @@ -65,7 +65,7 @@ public static function validateTeam(\PDO $pdo_db, $name = null, $desc = null, $c $desc = trim($desc); $creator = (int) $creator; - if ($name === null || empty ($name) || $desc === null || empty ($desc) || $creator === null || empty ($creator)) + if ($name === null || empty($name) || $desc === null || empty($desc) || $creator === null || empty($creator)) { return (bool) false; } diff --git a/classes/TraderouteBuild.php b/classes/TraderouteBuild.php index 744d36479..055e18c16 100644 --- a/classes/TraderouteBuild.php +++ b/classes/TraderouteBuild.php @@ -410,7 +410,7 @@ public static function create(\PDO $pdo_db, $db, string $lang, Reg $tkireg, Smar $src_type = null; $dest_type = null; - if ($num_traderoutes >= $tkireg->max_traderoutes_player && empty ($editing)) + if ($num_traderoutes >= $tkireg->max_traderoutes_player && empty($editing)) { // Dont let them exceed max traderoutes \Tki\TraderouteDie::die($pdo_db, $lang, $tkireg, $template, $langvars['l_tdr_maxtdr']); } @@ -615,7 +615,7 @@ public static function create(\PDO $pdo_db, $db, string $lang, Reg $tkireg, Smar $mtype = 'W'; } - if (empty ($editing)) + if (empty($editing)) { $query = $db->Execute("INSERT INTO {$db->prefix}traderoutes VALUES(NULL, ?, ?, ?, ?, ?, ?, ?);", array($src_id, $dest_id, $src_type, $dest_type, $mtype, $playerinfo['ship_id'], $circuit_type)); \Tki\Db::logDbErrors($pdo_db, $query, __LINE__, __FILE__); diff --git a/classes/TraderouteDelete.php b/classes/TraderouteDelete.php index 44e443461..27c4c65b0 100644 --- a/classes/TraderouteDelete.php +++ b/classes/TraderouteDelete.php @@ -38,7 +38,7 @@ public static function prime(\PDO $pdo_db, $db, string $lang, array $langvars, R \Tki\TraderouteDie::die($pdo_db, $lang, $tkireg, $template, $langvars['l_tdr_notowntdr']); } - if (!empty ($confirm)) + if (!empty($confirm)) { $query = $db->Execute("DELETE FROM {$db->prefix}traderoutes WHERE traderoute_id = ?;", array($traderoute_id)); \Tki\Db::logDbErrors($pdo_db, $query, __LINE__, __FILE__); diff --git a/classes/TraderouteSettings.php b/classes/TraderouteSettings.php index 439e5541f..f63212ea7 100644 --- a/classes/TraderouteSettings.php +++ b/classes/TraderouteSettings.php @@ -91,9 +91,9 @@ public static function after(\PDO $pdo_db, $db, string $lang, Reg $tkireg, Smart { $langvars = \Tki\Translate::load($pdo_db, $lang, array('traderoutes', 'common', 'global_includes', 'global_funcs', 'footer', 'regional')); - empty ($colonists) ? $colonists = 'N' : $colonists = 'Y'; - empty ($fighters) ? $fighters = 'N' : $fighters = 'Y'; - empty ($torps) ? $torps = 'N' : $torps = 'Y'; + empty($colonists) ? $colonists = 'N' : $colonists = 'Y'; + empty($fighters) ? $fighters = 'N' : $fighters = 'Y'; + empty($torps) ? $torps = 'N' : $torps = 'Y'; $resa = $db->Execute("UPDATE {$db->prefix}ships SET trade_colonists = ?, trade_fighters = ?, trade_torps = ?, trade_energy = ? WHERE ship_id = ?;", array($colonists, $fighters, $torps, $energy, $playerinfo['ship_id'])); \Tki\Db::logDbErrors($pdo_db, $resa, __LINE__, __FILE__); diff --git a/faq.php b/faq.php index 360d305d1..0402a636c 100644 --- a/faq.php +++ b/faq.php @@ -31,7 +31,7 @@ $variables['body_class'] = 'faq'; $variables['title'] = $langvars['l_faq_title']; -if (empty ($_SESSION['username'])) +if (empty($_SESSION['username'])) { $variables['linkback'] = array("fulltext" => $langvars['l_global_mlogin'], "link" => "index.php"); } diff --git a/feedback.php b/feedback.php index 88a939497..bb7bb0634 100644 --- a/feedback.php +++ b/feedback.php @@ -65,7 +65,7 @@ } echo "
\n"; -if (empty ($_SESSION['username'])) +if (empty($_SESSION['username'])) { echo str_replace("[here]", "" . $langvars['l_here'] . "", $langvars['l_global_mlogin']); } diff --git a/footer_t.php b/footer_t.php index b3a99e1f9..92ddbb315 100644 --- a/footer_t.php +++ b/footer_t.php @@ -121,7 +121,7 @@ $slash_position = mb_strrpos($request->server->get('SCRIPT_NAME'), '/') + 1; $current_page = mb_substr($request->server->get('SCRIPT_NAME'), $slash_position); -unset ($variables); +unset($variables); $variables = array(); if (in_array($current_page, $public_pages)) diff --git a/kabal_control.php b/kabal_control.php index 23f77c4f4..0fc838c69 100644 --- a/kabal_control.php +++ b/kabal_control.php @@ -144,7 +144,7 @@ { echo "kabal Editor
"; echo "

"; - if (empty ($user)) + if (empty($user)) { echo "