supernova-ws / SuperNova

classes/debug.php

Spacing +8 added lines, -12 removed lines

@@ -156,7 +156,7 @@ 
       $filtered = array_slice($filtered, -$onlyLastX);
     }
 
-    return [$raw, $filtered,];
+    return [$raw, $filtered, ];
   }
 
   /**
@@ -235,8 +235,7 @@ 
       foreach ($error_backtrace['cSN_data'] as &$location) {
         foreach ($location as $location_id => &$location_data) //          $location_data = $location_id;
         {
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
       }
     }
@@ -405,16 +404,16 @@ 
     $dumper = mt_rand(10, 99) . '|' . $varname;
   }
 
-  $type   = gettype($value);
+  $type = gettype($value);
   $dumper .= $type;
 
   if ($type == 'string') {
     $dumper .= '(' . strlen($value) . ')';
-    $value  = dump($value, '', -1);
+    $value = dump($value, '', -1);
   } elseif ($type == 'boolean') {
     $value = ($value ? 'true' : 'false');
   } elseif ($type == 'object') {
-    $props  = get_class_vars(get_class($value));
+    $props = get_class_vars(get_class($value));
     $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
     foreach ($props as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
@@ -524,12 +523,9 @@ 
     foreach (func_get_args() ?: [] as $var) {
       print "<pre>";
       print_r(
-        $var === null ? 'null' :
-          (($type = gettype($var)) == 'object' || $type == 'array'
-            ? $var :
-            ($type === 'string'
-              ? $type . '(' . strlen($var) . ') `' . $var . '`' :
-              ($type == 'boolean'
+        $var === null ? 'null' : (($type = gettype($var)) == 'object' || $type == 'array'
+            ? $var : ($type === 'string'
+              ? $type . '(' . strlen($var) . ') `' . $var . '`' : ($type == 'boolean'
                 ? ($var ? 'true' : 'false')
                 : $type . ' ' . print_r($var, true)
               )

Braces +3 added lines, -1 removed lines

@@ -233,11 +233,13 @@
     if ($deadlock && ($q = SN::$db->mysql_get_innodb_status())) {
       $error_backtrace['deadlock'] = explode("\n", $q['Status']);
       foreach ($error_backtrace['cSN_data'] as &$location) {
-        foreach ($location as $location_id => &$location_data) //          $location_data = $location_id;
+        foreach ($location as $location_id => &$location_data) {
+          //          $location_data = $location_id;
         {
           $location_data = isset($location_data['username']) ? $location_data['username'] :
             (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
+        }
       }
     }
 

classes/Player/PlayerStatic.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 
     if (!empty($TheUser['ally_id'])) {
       /** @noinspection SqlResolve */
-      $TheAlly                 = doquery("SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true);
+      $TheAlly = doquery("SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true);
       $TheAlly['ally_members'] -= 1;
       /** @noinspection SqlResolve */
       doquery("UPDATE `{{alliance}}` SET `ally_members` = '" . $TheAlly['ally_members'] . "' WHERE `id` = '" . $TheAlly['id'] . "';");

classes/BanHammer.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
    * @return array[]|object[]
    */
   public static function getByIpV4($ipV4, $isExpired = self::EXPIRED_NOT) {
-    $ipV4 = !is_numeric($ipV4) ? ip2long($ipV4) : (integer)$ipV4;
+    $ipV4 = !is_numeric($ipV4) ? ip2long($ipV4) : (integer) $ipV4;
 
     $sqlArray = [
       "SELECT *, INET_NTOA(`ipv4_from`) as ipv4_from_string, INET_NTOA(`ipv4_to`) as ipv4_to_string

classes/SnTemplate.php

Spacing +9 added lines, -9 removed lines

@@ -128,7 +128,7 @@ 
         $insert_position = $is_positioned == '-' ? 0 : count($menu);
       }
 
-      $insert_position     += $is_positioned == '+' ? 1 : 0;
+      $insert_position += $is_positioned == '+' ? 1 : 0;
       $spliced             = array_splice($menu, $insert_position, count($menu) - $insert_position);
       $menu[$menu_item_id] = $menu_item;
 
@@ -436,12 +436,12 @@ 
       $cssOriginal = $css;
 
       // At first - removing minimization flag from file name
-      if(($rPos = strrpos($css, '.min.css')) !== false) {
+      if (($rPos = strrpos($css, '.min.css')) !== false) {
         // 4 - string length of substring to cut `.min`
         $css = substr_replace($css, '', $rPos, 4);
       }
       // Also we don't need `.css` extension
-      if(($rPos = strrpos($css, '.css')) !== false) {
+      if (($rPos = strrpos($css, '.css')) !== false) {
         // 4 - string length of substring to cut `.css`
         $css = substr_replace($css, '', $rPos, 4);
       }
@@ -450,7 +450,7 @@ 
       $cssWas = count($standard_css);
       // Trying to add newly found filename
       $standard_css = self::addFileName($css, $standard_css);
-      if(count($standard_css) > $cssWas) {
+      if (count($standard_css) > $cssWas) {
         // Removing file from extra CSS list only if everything went well and records was added to list of CSS to cache
         // Otherwise something went wrong - so we don't touch this
         unset($sn_mvc['css'][''][$cssOriginal]);
@@ -569,11 +569,11 @@ 
    * @return array
    */
   public static function addFileName($fileNames, $anArray, $ext = '.css') {
-    if(!is_array($fileNames)) {
+    if (!is_array($fileNames)) {
       $fileNames = [$fileNames];
     }
 
-    foreach($fileNames as $fileName) {
+    foreach ($fileNames as $fileName) {
       if (file_exists(SN_ROOT_PHYSICAL . $fileName . '.min' . $ext)) {
         $anArray[$fileName . '.min' . $ext] = '';
       } elseif (file_exists(SN_ROOT_PHYSICAL . $fileName . '.css' . $ext)) {
@@ -704,7 +704,7 @@ 
       'LANG'     => $language ? $language : '',
       'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
 
-      'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
+      'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
       'FILENAME'       => basename($_SERVER['PHP_SELF']),
     ));
 
@@ -937,7 +937,7 @@ 
       'QUE_ID'   => QUE_RESEARCH,
       'QUE_HTML' => 'topnav',
 
-      'RESEARCH_ONGOING' => (boolean)$user['que'],
+      'RESEARCH_ONGOING' => (boolean) $user['que'],
 
       'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], $lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
         $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -1231,7 +1231,7 @@ 
       SnTemplate::renderFooter($page, $template_result);
     }
 
-    $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
+    $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
 
     SN::$db->db_disconnect();
 

classes/SN.php

Braces +12 added lines, -4 removed lines

@@ -261,11 +261,13 @@ 
     $location_info = &static::$location_info[$location_type];
     $id_field      = $location_info[P_ID];
     $table_name    = $location_info[P_TABLE_NAME];
-    if ($result = self::$db->doquery("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}", false)) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if ($result = self::$db->doquery("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}", false)) {
+      // TODO Как-то вернуть может быть LIMIT 1 ?
     {
       if (static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
         DBStaticUnit::cache_clear();
+    }
       }
     }
 
@@ -295,9 +297,11 @@ 
     $set        = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if ($result = self::$db->doquery("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = SN::$db->db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -317,10 +321,12 @@ 
     $id_field      = $location_info[P_ID];
     $table_name    = $location_info[P_TABLE_NAME];
     if ($result = self::$db->doquery("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         DBStaticUnit::cache_clear();
       }
+      }
     }
 
     return $result;
@@ -334,11 +340,13 @@ 
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
     if ($result = self::$db->doquery("DELETE FROM `{{{$table_name}}}` WHERE {$condition}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         DBStaticUnit::cache_clear();
       }
+      }
     }
 
     return $result;

classes/Planet/DBStaticPlanet.php

Spacing +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
     $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0;
     $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0;
     $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0;
-    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) :
-      (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
+    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) : (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
     $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type;
 
     return DBStaticPlanet::db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type);

classes/Core/Autoloader.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
   protected static $autoloaderRegistered = false;
 
   protected static function _constructorStatic() {
-    if(!static::$autoloaderRegistered) {
+    if (!static::$autoloaderRegistered) {
       spl_autoload_register(array(__CLASS__, 'autoloader'));
       static::$autoloaderRegistered = true;
     }
@@ -36,17 +36,17 @@ 
   public static function autoloader($class) {
     static::_constructorStatic();
 
-    foreach(static::$folders as $data) {
+    foreach (static::$folders as $data) {
       $theClassFile = $class;
 
-      if($data[static::P_PREFIX] && strrpos($class, $data[static::P_PREFIX]) !== false) {
+      if ($data[static::P_PREFIX] && strrpos($class, $data[static::P_PREFIX]) !== false) {
         $theClassFile = substr($class, strlen($data[static::P_PREFIX]));
       }
 
       $classFullFileName = str_replace('\\', '/', $data[static::P_FOLDER] . $theClassFile) . DOT_PHP_EX;
-      if(file_exists($classFullFileName) && is_file($classFullFileName)) {
+      if (file_exists($classFullFileName) && is_file($classFullFileName)) {
         require_once($classFullFileName);
-        if(method_exists($class, '_constructorStatic')) {
+        if (method_exists($class, '_constructorStatic')) {
           $class::_constructorStatic();
         }
       }
@@ -62,13 +62,13 @@ 
 
     $absoluteClassRoot = str_replace('\\', '/', SN_ROOT_PHYSICAL . $absoluteClassRoot);
 
-    if(!($absoluteClassRoot = realpath($absoluteClassRoot))) {
+    if (!($absoluteClassRoot = realpath($absoluteClassRoot))) {
       // TODO - throw new \Exception("There is some error when installing autoloader for '{$absoluteClassRoot}' class prefix '{$classPrefix}'");
       return;
     }
     $absoluteClassRoot = str_replace('\\', '/', $absoluteClassRoot) . '/';
 
-    if($classPrefix && substr($classPrefix, -1) != '\\') {
+    if ($classPrefix && substr($classPrefix, -1) != '\\') {
       $classPrefix .= '\\';
     }
 

classes/Core/Updater.php

Spacing +3 added lines, -3 removed lines

@@ -206,7 +206,7 @@ 
    * @return bool|mysqli_result|null
    */
   public function indexDropIfExists($table, $index) {
-    return $this->upd_alter_table($table, ["DROP KEY `{$index}`",], $this->isIndexExists($table, $index));
+    return $this->upd_alter_table($table, ["DROP KEY `{$index}`", ], $this->isIndexExists($table, $index));
   }
 
   /**
@@ -216,7 +216,7 @@ 
    * @return bool|mysqli_result|null
    */
   public function constraintDropIfExists($table, $constraint) {
-    return $this->upd_alter_table($table, ["DROP FOREIGN KEY `{$constraint}`",], $this->isConstrainExists($table, $constraint));
+    return $this->upd_alter_table($table, ["DROP FOREIGN KEY `{$constraint}`", ], $this->isConstrainExists($table, $constraint));
   }
 
   /**
@@ -239,7 +239,7 @@ 
     }
 
     $this->indexDropIfExists($table, $index);
-    $queryFields = implode(',', array_map(function ($value) { return "`{$value}`"; }, $fields));
+    $queryFields = implode(',', array_map(function($value) { return "`{$value}`"; }, $fields));
     if ($queryFields) {
       $this->upd_alter_table(
         $table,

classes/Core/SnBootstrap.php

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 class SnBootstrap {
 
   public static function install_benchmark() {
-    register_shutdown_function(function () {
+    register_shutdown_function(function() {
       if (defined('IN_AJAX')) {
         return;
       }
@@ -103,9 +103,9 @@ 
     // Declaring PHP-constants from server config
     /** @see \classConfig::$DEBUG_SQL_FILE_LOG */
     foreach ([
-      'DEBUG_SQL_FILE_LOG'     => ['DEBUG_SQL_ERROR' => true, 'DEBUG_SQL_COMMENT_LONG' => true,],
-      'DEBUG_SQL_ERROR'        => ['DEBUG_SQL_COMMENT' => true,],
-      'DEBUG_SQL_COMMENT_LONG' => ['DEBUG_SQL_COMMENT' => true,],
+      'DEBUG_SQL_FILE_LOG'     => ['DEBUG_SQL_ERROR' => true, 'DEBUG_SQL_COMMENT_LONG' => true, ],
+      'DEBUG_SQL_ERROR'        => ['DEBUG_SQL_COMMENT' => true, ],
+      'DEBUG_SQL_COMMENT_LONG' => ['DEBUG_SQL_COMMENT' => true, ],
       'DEBUG_SQL_COMMENT'      => []
     ] as $constantName => $implications) {
       if (!empty(SN::$config->$constantName) && !defined($constantName)) {