supernova-ws / SuperNova

classes/Template/TemplateMeta.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 //    var_dump($fallBackPath);
 //    var_dump($template);
 
-    if(empty($fallBackPath)) {
+    if (empty($fallBackPath)) {
       if (!$this->parent || empty($fallbackName = $this->parent->getName()) || !$this->isTemplateExists()) {
         // If no parent template - then using default template as fallback one
         $fallbackName = SnTemplate::SN_TEMPLATE_NAME_DEFAULT;

classes/classPersistent.php

Spacing +13 added lines, -13 removed lines

@@ -40,7 +40,7 @@ 
     $this->sql_index_field = "{$table_name}_name";
     $this->sql_value_field = "{$table_name}_value";
 
-    if(!$this->_DB_LOADED) {
+    if (!$this->_DB_LOADED) {
       $this->db_loadAll();
     }
   }
@@ -60,10 +60,10 @@ 
    */
   public function db_loadItem($index) {
     $result = null;
-    if($index) {
+    if ($index) {
       $index_safe = SN::$db->db_escape($index);
       $queryResult = doquery("SELECT `{$this->sql_value_field}` FROM `{{{$this->table_name}}}` WHERE `{$this->sql_index_field}` = '{$index_safe}' FOR UPDATE", true);
-      if(is_array($queryResult) && !empty($queryResult)) {
+      if (is_array($queryResult) && !empty($queryResult)) {
         $this->$index = $result = $queryResult[$this->sql_value_field];
       }
     }
@@ -75,7 +75,7 @@ 
     $this->loadDefaults();
 
     $query = doquery("SELECT * FROM {{{$this->table_name}}} FOR UPDATE;");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $this[$row[$this->sql_index_field]] = $row[$this->sql_value_field];
     }
 
@@ -83,7 +83,7 @@ 
   }
 
   public function loadDefaults() {
-    foreach($this->defaults as $defName => $defValue) {
+    foreach ($this->defaults as $defName => $defValue) {
       $this->$defName = $defValue;
     }
   }
@@ -93,7 +93,7 @@ 
   }
 
   public function db_saveItem($item_list, $value = NULL) {
-    if(empty($item_list)) {
+    if (empty($item_list)) {
       return;
     }
 
@@ -101,8 +101,8 @@ 
 
     // Сначала записываем данные в базу - что бы поймать все блокировки
     $qry = array();
-    foreach($item_list as $item_name => $item_value) {
-      if($item_name) {
+    foreach ($item_list as $item_name => $item_value) {
+      if ($item_name) {
         $item_value = SN::$db->db_escape($item_value === NULL ? $this->$item_name : $item_value);
         $item_name = SN::$db->db_escape($item_name);
         $qry[] = "('{$item_name}', '{$item_value}')";
@@ -111,8 +111,8 @@ 
     doquery("REPLACE INTO `{{" . $this->table_name . "}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES " . implode(',', $qry) . ";");
 
     // И только после взятия блокировок - меняем значения в кэше
-    foreach($item_list as $item_name => $item_value) {
-      if($item_name && $item_value !== null) {
+    foreach ($item_list as $item_name => $item_value) {
+      if ($item_name && $item_value !== null) {
         $this->__set($item_name, $item_value);
       }
     }
@@ -140,14 +140,14 @@ 
   }
 
   public function __get($name) {
-    if($this->force) {
+    if ($this->force) {
       $this->force = false;
       $value = $this->db_loadItem($name);
     } else {
       $value = parent::__get($name);
     }
 
-    if(isset($this->notEmptyFields[$name]) && empty($value) && isset($this->defaults[$name])) {
+    if (isset($this->notEmptyFields[$name]) && empty($value) && isset($this->defaults[$name])) {
       $value = $this->defaults[$name];
     }
 
@@ -155,7 +155,7 @@ 
   }
 
   public function __set($name, $value) {
-    if($this->force) {
+    if ($this->force) {
       $this->force = false;
       $this->db_saveItem($name, $value);
     }

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

@@ -92,7 +92,7 @@ 
     $this->db_saveItem(array_combine(array_keys($this->defaults), array_fill(0, count($this->defaults), null)));
   }
 
-  public function db_saveItem($item_list, $value = NULL) {
+  public function db_saveItem($item_list, $value = null) {
     if(empty($item_list)) {
       return;
     }
@@ -103,7 +103,7 @@ 
     $qry = array();
     foreach($item_list as $item_name => $item_value) {
       if($item_name) {
-        $item_value = SN::$db->db_escape($item_value === NULL ? $this->$item_name : $item_value);
+        $item_value = SN::$db->db_escape($item_value === null ? $this->$item_name : $item_value);
         $item_name = SN::$db->db_escape($item_name);
         $qry[] = "('{$item_name}', '{$item_value}')";
       }

classes/DBAL/OldDbChangeSet.php

Spacing +1 added lines, -3 removed lines

@@ -142,9 +142,7 @@
           // Простое условие - $field_id = $field_value
           if (is_string($field_id)) {
             $field_value =
-              $field_value === null ? 'NULL' :
-                (is_string($field_value) ? "'" . SN::$db->db_escape($field_value) . "'" :
-                  (is_bool($field_value) ? intval($field_value) : $field_value));
+              $field_value === null ? 'NULL' : (is_string($field_value) ? "'" . SN::$db->db_escape($field_value) . "'" : (is_bool($field_value) ? intval($field_value) : $field_value));
             $the_conditions[] = "`{$field_id}` = {$field_value}";
           } else {
             die('Неподдерживаемый тип условия');

classes/DBAL/db_mysql.php

Spacing +2 added lines, -2 removed lines

@@ -224,7 +224,7 @@ 
 
     set_error_handler([$this, 'handlerQueryWarning']);
     $sqlquery = $this->db_sql_query($sql);
-    if(!$sqlquery) {
+    if (!$sqlquery) {
       $debug->error(SN::$db->db_error() . "<br />$sql<br />", 'SQL Error');
     }
     restore_error_handler();
@@ -396,7 +396,7 @@ 
     $q1 = $this->db_sql_query("SHOW INDEX FROM {$prefixedTableName_safe};");
     while ($r1 = db_fetch($q1)) {
       $indexName = $r1['Key_name'];
-      if(empty($result[$indexName])) {
+      if (empty($result[$indexName])) {
         $result[$indexName] = new DbIndexDescription();
       }
       $result[$indexName]->addField($r1);

classes/StatUpdateLauncher.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         $config->pass()->game_disable = GAME_DISABLE_STAT;
 
         $statMinimalInterval = intval($config->pass()->stats_minimal_interval);
-        $config->pass()->var_stat_update_end= date(FMT_DATE_TIME_SQL, SN_TIME_NOW + ($statMinimalInterval ? $statMinimalInterval : STATS_RUN_INTERVAL_MINIMUM));
+        $config->pass()->var_stat_update_end = date(FMT_DATE_TIME_SQL, SN_TIME_NOW + ($statMinimalInterval ? $statMinimalInterval : STATS_RUN_INTERVAL_MINIMUM));
         $config->pass()->var_stat_update_msg = 'Update started';
         SN::db_transaction_commit();
 

classes/SnTemplate.php

Spacing +5 added lines, -5 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;
 
@@ -648,7 +648,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']),
     ));
 
@@ -836,7 +836,7 @@ 
       }
 
       $fleet_listx = flt_get_fleets_to_planet($CurPlanet);
-      if($CurPlanet['planet_type'] == PT_MOON) {
+      if ($CurPlanet['planet_type'] == PT_MOON) {
         $parentPlanet = DBStaticPlanet::db_planet_by_id($CurPlanet['parent_planet']);
       } else {
         $parentPlanet = $CurPlanet;
@@ -881,7 +881,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']
@@ -1171,7 +1171,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();
 

galaxy.php

Spacing +4 added lines, -4 removed lines

@@ -65,8 +65,8 @@ 
   $planet = $planetrow['planet'];
 }
 
-$uni_galaxy = (int)$uni_galaxy;
-$uni_system = (int)$uni_system;
+$uni_galaxy = (int) $uni_galaxy;
+$uni_system = (int) $uni_system;
 
 $uni_galaxy = $uni_galaxy < 1 ? 1 : ($uni_galaxy > SN::$config->game_maxGalaxy ? SN::$config->game_maxGalaxy : $uni_galaxy);
 $uni_system = $uni_system < 1 ? 1 : ($uni_system > SN::$config->game_maxSystem ? SN::$config->game_maxSystem : $uni_system);
@@ -131,7 +131,7 @@ 
     ||
     (!empty($uni_galaxyRowPlanet['destruyed']) && CheckAbandonPlanetState($uni_galaxyRowPlanet))
   ) {
-    $template->assign_block_vars('galaxyrow', ['PLANET_NUM' => $Planet,]);
+    $template->assign_block_vars('galaxyrow', ['PLANET_NUM' => $Planet, ]);
     continue;
   }
 
@@ -249,7 +249,7 @@ 
     'IS_CAPITAL'      => $uni_galaxyRowUser['id_planet'] == $uni_galaxyRowPlanet['id'],
 
     'USER_ID'         => $uni_galaxyRowUser['id'],
-    'USER_NAME'       => $renderedNick = player_nick_render_to_html($uni_galaxyRowUser, ['icons' => true,]),
+    'USER_NAME'       => $renderedNick = player_nick_render_to_html($uni_galaxyRowUser, ['icons' => true, ]),
     'USER_NAME_JS'    => js_safe_string($renderedNick),
     'USER_RANK'       => in_array($uni_galaxyRowUser['id'], $user_skip_list) ? '-' : $uni_galaxyRowUser['total_rank'],
     'USER_BANNED'     => $uni_galaxyRowUser['banaday'],

includes/db/db_helpers.php

Spacing +7 added lines, -7 removed lines

@@ -29,19 +29,19 @@ 
  */
 function db_set_make_safe_string($set, $delta = false) {
   $set_safe = array();
-  foreach($set as $field => $value) {
-    if(empty($field)) {
+  foreach ($set as $field => $value) {
+    if (empty($field)) {
       continue;
     }
 
     $field = '`' . SN::$db->db_escape($field) . '`';
     $new_value = $value;
-    if($value === null) {
+    if ($value === null) {
       $new_value = 'NULL';
-    } elseif(is_string($value) && (string)($new_value = floatval($value)) != (string)$value) {
+    } elseif (is_string($value) && (string) ($new_value = floatval($value)) != (string) $value) {
       // non-float
       $new_value = '"' . SN::$db->db_escape($value) . '"';
-    } elseif($delta) {
+    } elseif ($delta) {
       // float and DELTA-set
       $new_value = "{$field} + ({$new_value})";
     }
@@ -61,8 +61,8 @@ 
  */
 function missile_list_convert_to_fleet(&$missile_db_list, &$fleet_db_list) {
   // Missile attack
-  foreach($missile_db_list as $irak) {
-    if($irak['fleet_end_time'] >= SN_TIME_NOW) {
+  foreach ($missile_db_list as $irak) {
+    if ($irak['fleet_end_time'] >= SN_TIME_NOW) {
       $irak['fleet_start_type'] = PT_PLANET;
       $planet_start = DBStaticPlanet::db_planet_by_vector($irak, 'fleet_start_', false, 'name');
       $irak['fleet_id'] = -$irak['id'];

includes/functions/sys_user.php

Spacing +8 added lines, -8 removed lines

@@ -12,7 +12,7 @@ 
 function sys_user_vacation($user) {
   global $config;
 
-  if(sys_get_param_str('vacation') == 'leave') {
+  if (sys_get_param_str('vacation') == 'leave') {
     if ($user['vacation'] < SN_TIME_NOW) {
       $user['vacation'] = 0;
       $user['vacation_next'] = SN_TIME_NOW + $config->player_vacation_timeout;
@@ -20,7 +20,7 @@ 
     }
   }
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false, true);
 
@@ -163,7 +163,7 @@ 
   \DBAL\DbQuery::build()->setTable('users')->setValues($field_set)->doInsert();
   $user_new = db_user_by_id(SN::$db->db_insert_id());
 
-  if(!($options['galaxy'] && $options['system'] && $options['planet'])) {
+  if (!($options['galaxy'] && $options['system'] && $options['planet'])) {
     $options['galaxy'] = SN::$config->LastSettedGalaxyPos;
     $options['system'] = SN::$config->LastSettedSystemPos;
     $segment_size = floor(SN::$config->game_maxPlanet / 3);
@@ -171,19 +171,19 @@ 
     $segment++;
     $options['planet'] = mt_rand(1 + $segment * $segment_size, ($segment + 1) * $segment_size);
 
-    while(true) {
-      if($options['planet'] > SN::$config->game_maxPlanet) {
+    while (true) {
+      if ($options['planet'] > SN::$config->game_maxPlanet) {
         $options['planet'] = mt_rand(0, $segment_size - 1) + 1;
         $options['system']++;
       }
-      if($options['system'] > SN::$config->game_maxSystem) {
+      if ($options['system'] > SN::$config->game_maxSystem) {
         $options['system'] = 1;
         $options['galaxy']++;
       }
       $options['galaxy'] > SN::$config->game_maxGalaxy ? $options['galaxy'] = 1 : false;
 
       $galaxy_row = DBStaticPlanet::db_planet_by_gspt($options['galaxy'], $options['system'], $options['planet'], PT_PLANET, true, 'id');
-      if(!$galaxy_row['id']) {
+      if (!$galaxy_row['id']) {
         SN::$config->db_saveItem(array(
           'LastSettedGalaxyPos' => $options['galaxy'],
           'LastSettedSystemPos' => $options['system'],
@@ -204,7 +204,7 @@ 
   $username_safe = SN::$db->db_escape($username_unsafe);
   doquery("REPLACE INTO `{{player_name_history}}` SET `player_id` = {$user_new['id']}, `player_name` = '{$username_safe}'");
 
-  if(!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
+  if (!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
     doquery("INSERT INTO `{{referrals}}` SET `id` = {$user_new['id']}, `id_partner` = {$options['partner_id']}");
   }