supernova-ws / SuperNova

classes/Ube/Ube4_1/Ube4_1Calc.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         // Для не-симулятора - рандомизируем каждый раунд значения атаки и щитов
         $fleet_data[UBE_ATTACK_BASE][$unit_id] = floor($fleet_info[UBE_ATTACK][$unit_id] * ($isSimulatorStatic ? 1 : mt_rand(80, 120) / 100));
         $fleet_data[UBE_SHIELD_BASE][$unit_id] = floor($fleet_info[UBE_SHIELD][$unit_id] * ($isSimulatorStatic ? 1 : mt_rand(80, 120) / 100));
-        $fleet_data[UBE_ARMOR_BASE][$unit_id] = floor($fleet_info[UBE_ARMOR][$unit_id]);// * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
+        $fleet_data[UBE_ARMOR_BASE][$unit_id] = floor($fleet_info[UBE_ARMOR][$unit_id]); // * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
 
         $fleet_data[UBE_ATTACK][$unit_id] = $fleet_data[UBE_ATTACK_BASE][$unit_id] * $unit_count;
         $fleet_data[UBE_SHIELD][$unit_id] = $fleet_data[UBE_SHIELD_BASE][$unit_id] * $unit_count;

classes/Fleet/MissionExplore.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
    *
    * @var int[] $shipsToRemove
    */
-  protected $shipsToRemove = [SHIP_COLONIZER, SHIP_SPY,];
+  protected $shipsToRemove = [SHIP_COLONIZER, SHIP_SPY, ];
 
   // -------------------------------------------------------------------------------------------------------------------
   /**

admin/userlist.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 
   $template->assign_block_vars('user', array(
       'ID'              => $user_row['id'],
-      'NAME'            => $renderedNick = player_nick_render_to_html($user_row, ['player_rank' => true, 'vacancy' => true, 'birthday' => true, 'award' => true, NICK_RANK_NO_TEXT => true,]),
+      'NAME'            => $renderedNick = player_nick_render_to_html($user_row, ['player_rank' => true, 'vacancy' => true, 'birthday' => true, 'award' => true, NICK_RANK_NO_TEXT => true, ]),
       'NAME_HTML'       => htmlentities($user_row['username'], ENT_QUOTES, 'UTF-8'),
       'IP'              => $user_row['user_lastip'],
       'IP_MULTI'        => intval($multi_ip[$user_row['user_lastip']]),

language/ru/buildings.mo.php

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 $a_lang_array = array(
   'built' => 'Построено',

language/en/buildings.mo.php

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 
 $a_lang_array = array(

classes/debug.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 
     $result = array();
     $transaction_id = SN::db_transaction_check(false) ? SN::$transaction_id : SN::$transaction_id++;
-    $result[] = "tID {$transaction_id}";
+    $result[] = "tid {$transaction_id}";
     foreach($backtrace as $a_trace) {
       if(in_array($a_trace['function'], $exclude_functions)) {
         continue;

Spacing +39 added lines, -40 removed lines

@@ -25,7 +25,7 @@ 
  * que esperabas!!! soy newbie!!! D':<
 */
 
-if(!defined('INSIDE')) {
+if (!defined('INSIDE')) {
   die("attemp hacking");
 }
 
@@ -84,8 +84,8 @@ 
     $result = array();
     $transaction_id = SN::db_transaction_check(false) ? SN::$transaction_id : SN::$transaction_id++;
     $result[] = "tID {$transaction_id}";
-    foreach($backtrace as $a_trace) {
-      if(in_array($a_trace['function'], $exclude_functions)) {
+    foreach ($backtrace as $a_trace) {
+      if (in_array($a_trace['function'], $exclude_functions)) {
         continue;
       }
       $function =
@@ -102,7 +102,7 @@ 
       $line = !empty($a_trace['line']) ? $a_trace['line'] : '_UNDEFINED_';
       $result[] = "{$function} - '{$file}' Line {$line}";
 
-      if(!$long_comment) {
+      if (!$long_comment) {
         break;
       }
     }
@@ -111,26 +111,26 @@ 
   }
 
   function dump($dump = false, $force_base = false, $deadlock = false) {
-    if($dump === false) {
+    if ($dump === false) {
       return [];
     }
 
     $error_backtrace = array();
     $base_dump = false;
 
-    if($force_base === true) {
+    if ($force_base === true) {
       $base_dump = true;
     }
 
-    if($dump === true) {
+    if ($dump === true) {
       $base_dump = true;
     } else {
-      if(!is_array($dump)) {
+      if (!is_array($dump)) {
         $dump = array('var' => $dump);
       }
 
-      foreach($dump as $dump_var_name => $dump_var) {
-        if($dump_var_name == 'base_dump') {
+      foreach ($dump as $dump_var_name => $dump_var) {
+        if ($dump_var_name == 'base_dump') {
           $base_dump = $dump_var;
         } else {
           $error_backtrace[$dump_var_name] = $dump_var;
@@ -138,22 +138,21 @@ 
       }
     }
 
-    if($deadlock && ($q = SN::$db->mysql_get_innodb_status())) {
+    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 ($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);
         }
       }
     }
 
-    if($base_dump) {
-      if(!is_array($this->log_array) || empty($this->log_array)) {
+    if ($base_dump) {
+      if (!is_array($this->log_array) || empty($this->log_array)) {
         $this->log_array = [];
       } else {
-        foreach($this->log_array as $log) {
+        foreach ($this->log_array as $log) {
           $error_backtrace['queries'][] = $log;
         }
       }
@@ -165,17 +164,17 @@ 
       // Converting object instances to object names
 
       foreach ($error_backtrace['backtrace'] as &$backtrace) {
-        if(is_object($backtrace['object'])) {
+        if (is_object($backtrace['object'])) {
           $backtrace['object'] = get_class($backtrace['object']);
         }
 
-        if(empty($backtrace['args'])) {
+        if (empty($backtrace['args'])) {
           continue;
         }
 
         // Doing same conversion for backtrace params
-        foreach($backtrace['args'] as &$arg) {
-          if(is_object($arg)) {
+        foreach ($backtrace['args'] as &$arg) {
+          if (is_object($arg)) {
             $arg = 'object::' . get_class($arg);
           }
         }
@@ -204,14 +203,14 @@ 
   function error($message = 'There is a error on page', $title = 'Internal Error', $httpCode = 500, $dump = true) {
     global $config, $sys_stop_log_hit, $lang, $sys_log_disabled, $user;
 
-    if(empty(SN::$db->connected)) {
+    if (empty(SN::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     SN::db_transaction_rollback();
 
-    if(SN::$config->debug == 1) {
+    if (SN::$config->debug == 1) {
       /** @noinspection HtmlDeprecatedTag */
       /** @noinspection XmlDeprecatedElement */
       /** @noinspection HtmlDeprecatedAttribute */
@@ -224,7 +223,7 @@ 
     $error_text = SN::$db->db_escape($message);
     $error_backtrace = $this->dump($dump, true, strpos($message, 'Deadlock') !== false);
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $this->_writeLogMessage($httpCode, $user, $title, $message, $error_backtrace, $fatal_error);
 
       $message = "Пожалуйста, свяжитесь с админом, если ошибка повторится. Ошибка №: <b>" . SN::$db->db_insert_id() . "</b>";
@@ -237,7 +236,7 @@ 
       ob_start();
       print("<hr>User ID {$user['id']} raised error code {$httpCode} titled '{$title}' with text '{$error_text}' on page {$_SERVER['SCRIPT_NAME']}");
 
-      foreach($error_backtrace as $name => $value) {
+      foreach ($error_backtrace as $name => $value) {
         print('<hr>');
         pdump($value, $name);
       }
@@ -249,7 +248,7 @@ 
   function warning($message, $title = 'System Message', $httpCode = 300, $dump = false) {
     global $user, $lang, $sys_log_disabled;
 
-    if(empty(SN::$db->connected)) {
+    if (empty(SN::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
@@ -258,7 +257,7 @@ 
 
     $error_backtrace = $this->dump($dump, false);
 
-    if(empty($sys_log_disabled)) {
+    if (empty($sys_log_disabled)) {
       $this->_writeLogMessage($httpCode, $user, $title, $message, $error_backtrace, $fatal_error);
     } else {
 //        // TODO Здесь надо писать в файло
@@ -295,11 +294,11 @@ 
 // Dump variables nicer then var_dump()
 
 function dump($value, $varname = null, $level = 0, $dumper = '') {
-  if(isset($varname)) {
+  if (isset($varname)) {
     $varname .= " = ";
   }
 
-  if($level == -1) {
+  if ($level == -1) {
     $trans[' '] = '&there4;';
     $trans["\t"] = '&rArr;';
     $trans["\n"] = '&para;;';
@@ -308,7 +307,7 @@ 
 
     return strtr(htmlspecialchars($value), $trans);
   }
-  if($level == 0) {
+  if ($level == 0) {
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
     $dumper = mt_rand(10, 99) . '|' . $varname;
   }
@@ -316,22 +315,22 @@ 
   $type = gettype($value);
   $dumper .= $type;
 
-  if($type == 'string') {
+  if ($type == 'string') {
     $dumper .= '(' . strlen($value) . ')';
     $value = dump($value, '', -1);
-  } elseif($type == 'boolean') {
+  } elseif ($type == 'boolean') {
     $value = ($value ? 'true' : 'false');
-  } elseif($type == 'object') {
+  } elseif ($type == 'object') {
     $props = get_class_vars(get_class($value));
     $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
-    foreach($props as $key => $val) {
+    foreach ($props as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
       $dumper .= dump($value->$key, '', $level + 1);
     }
     $value = '';
-  } elseif($type == 'array') {
+  } elseif ($type == 'array') {
     $dumper .= '(' . count($value) . ')';
-    foreach($value as $key => $val) {
+    foreach ($value as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
       $dumper .= dump($val, '', $level + 1);
     }
@@ -351,7 +350,7 @@ 
 //  $backtrace = $backtrace[1];
 
   $caller = '';
-  if(defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
+  if (defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
     $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '') .
       (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '') .
       $backtrace[1]['function'] .
@@ -386,7 +385,7 @@ 
 }
 
 function pr($prePrint = false) {
-  if($prePrint) {
+  if ($prePrint) {
     print("<br>");
   }
   print(mt_rand() . "<br>");
@@ -396,7 +395,7 @@ 
   global $_PRINT_COUNT_VALUE;
   $_PRINT_COUNT_VALUE++;
 
-  if($prePrint) {
+  if ($prePrint) {
     print("<br>");
   }
   print($_PRINT_COUNT_VALUE . "<br>");

Braces +4 added lines, -3 removed lines

@@ -141,11 +141,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);
         }
+        }
       }
     }
 
@@ -276,8 +278,7 @@ 
    *
    * @return void
    */
-  function _writeLogMessage($httpCode, $user, $title, $message, array $error_backtrace, $fatal_error)
-  {
+  function _writeLogMessage($httpCode, $user, $title, $message, array $error_backtrace, $fatal_error) {
     /** @noinspection SqlResolve */
     $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . SN::$db->db_escape($httpCode) . "', " .

buildings.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
 $mode = sys_get_param_escaped('mode');
 $mode = (!$mode || $mode == 'buildings') ? QUE_STRUCTURES : ($mode == 'fleet' ? SUBQUE_FLEET : ($mode == 'defense' ? SUBQUE_DEFENSE : ($mode == 'research' ? QUE_RESEARCH : $mode)));
 
-if($building_sort = sys_get_param_id('sort_elements')) {
-  if(!empty($lang['player_option_building_sort'][$building_sort])) {
+if ($building_sort = sys_get_param_id('sort_elements')) {
+  if (!empty($lang['player_option_building_sort'][$building_sort])) {
     SN::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $mode)] = $building_sort;
     SN::$user_options[array(PLAYER_OPTION_BUILDING_SORT_INVERSE, $mode)] = sys_get_param_id('sort_elements_inverse', 0);
   }

includes/pages/options.php

Spacing +2 added lines, -2 removed lines

@@ -401,7 +401,7 @@ 
     unset($player_options[PLAYER_OPTION_TUTORIAL_CURRENT]);
   }
 
-  array_walk($player_options, function (&$value) {
+  array_walk($player_options, function(&$value) {
     // TODO - Когда будет больше параметров - сделать больше проверок
     $value = intval($value);
   });
@@ -450,7 +450,7 @@ 
           $user['id'],
           RPG_NAME_CHANGE,
           -$config->game_user_changename_cost,
-          vsprintf('Пользователь ID %1$d сменил имя с "%2$s" на "%3$s"', [$user['id'], $user['username'], $username,])
+          vsprintf('Пользователь ID %1$d сменил имя с "%2$s" на "%3$s"', [$user['id'], $user['username'], $username, ])
         );
 
       case SERVER_PLAYER_NAME_CHANGE_FREE:

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 && strrpos($classPrefix, 1) != '\\') {
+    if ($classPrefix && strrpos($classPrefix, 1) != '\\') {
       $classPrefix .= '\\';
     }