supernova-ws / SuperNova

includes/functions/lng_language.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 // ----------------------------------------------------------------------------------------------------------------
 function lng_try_filepath($path, $file_path_relative)
 {
-  $file_path = SN_ROOT_PHYSICAL . ($path && file_exists(SN_ROOT_PHYSICAL . $path . $file_path_relative) ? $path : '') . $file_path_relative;
+  $file_path = SN_ROOT_PHYSICAL.($path && file_exists(SN_ROOT_PHYSICAL.$path.$file_path_relative) ? $path : '').$file_path_relative;
   return file_exists($file_path) ? $file_path : false;
 }
 

includes/functions/sys_maintenance.php

Spacing +11 added lines, -11 removed lines

@@ -22,10 +22,10 @@ 
     ),
   );
 
-  foreach($queries as &$query) {
-    if(!empty($query['query'])) {
+  foreach ($queries as &$query) {
+    if (!empty($query['query'])) {
       $query['result'] = doquery($query['query']);
-    } elseif(!empty($query['callable']) && is_callable($query['callable'])) {
+    } elseif (!empty($query['callable']) && is_callable($query['callable'])) {
       call_user_func($query['callable']);
     }
     $query['error'] = classSupernova::$db->db_error();
@@ -69,7 +69,7 @@ 
   $today_array = array($today_array['seconds'], $today_array['minutes'], $today_array['hours'], $today_array['mday'], $today_array['mon'], $today_array['year']);
 //  pdump($prev_run_array);
   $scheduleList = explode(',', $scheduleList);
-  array_walk($scheduleList, function (&$schedule) use ($prev_run_array, $today_array, $date_part_names_reverse, &$possible_schedules) {
+  array_walk($scheduleList, function(&$schedule) use ($prev_run_array, $today_array, $date_part_names_reverse, &$possible_schedules) {
     // pdump($schedule);
     $schedule = array('schedule_array' => array_reverse(explode(':', trim($schedule))));
 
@@ -81,21 +81,21 @@ 
     */
     // pdump($schedule);
 
-    foreach($prev_run_array as $index => $date_part) {
+    foreach ($prev_run_array as $index => $date_part) {
       $schedule['array']['recorded'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $date_part;
       $schedule['array']['now'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $today_array[$index];
     }
-    if($schedule['array']['recorded'] == $schedule['array']['now']) {
+    if ($schedule['array']['recorded'] == $schedule['array']['now']) {
       unset($schedule['array']['now']);
     }
 
-    foreach($schedule['array'] as $name => $array) {
+    foreach ($schedule['array'] as $name => $array) {
       $schedule['string'][$name] = "{$array[5]}-{$array[4]}-{$array[3]} {$array[2]}:{$array[1]}:{$array[0]}";
-      $schedule['string'][$name . '_next'] = $schedule['string'][$name] . ' +1 ' . $interval;
-      $schedule['string'][$name . '_prev'] = $schedule['string'][$name] . ' -1 ' . $interval;
+      $schedule['string'][$name.'_next'] = $schedule['string'][$name].' +1 '.$interval;
+      $schedule['string'][$name.'_prev'] = $schedule['string'][$name].' -1 '.$interval;
     }
 
-    foreach($schedule['string'] as $string) {
+    foreach ($schedule['string'] as $string) {
       $timestamp = strtotime($string);
       $schedule['timestamp'][$timestamp] = $possible_schedules[$timestamp] = date(FMT_DATE_TIME_SQL, strtotime($string));
     }
@@ -127,7 +127,7 @@ 
 
   $prev_run = 0;
   $next_run = 0;
-  foreach($possible_schedules as $timestamp => $string_date) {
+  foreach ($possible_schedules as $timestamp => $string_date) {
     $prev_run = SN_TIME_NOW >= $timestamp ? $timestamp : $prev_run;
     $next_run = SN_TIME_NOW < $timestamp && !$next_run ? $timestamp : $next_run;
 //    pdump($schedule, '$schedule ' . date(FMT_DATE_TIME_SQL, $schedule));

includes/functions/sys_bbcode.php

Spacing +7 added lines, -7 removed lines

@@ -107,23 +107,23 @@
 
   !empty(classSupernova::$config->url_faq) ? $msg = str_replace('faq://', classSupernova::$config->url_faq, $msg) : false;
 
-  foreach($supernova->design['bbcodes'] as $auth_level => $replaces) {
-    if($auth_level > $author_auth) {
+  foreach ($supernova->design['bbcodes'] as $auth_level => $replaces) {
+    if ($auth_level > $author_auth) {
       continue;
     }
 
-    foreach($replaces as $key => $html) {
+    foreach ($replaces as $key => $html) {
       $msg = preg_replace(''.$key.'', $html, $msg);
     }
   }
 
-  foreach($supernova->design['smiles'] as $auth_level => $replaces) {
-    if($auth_level > $author_auth) {
+  foreach ($supernova->design['smiles'] as $auth_level => $replaces) {
+    if ($auth_level > $author_auth) {
       continue;
     }
 
-    foreach($replaces as $key => $imgName) {
-      $msg = preg_replace("#" . addcslashes($key, '()[]{}') . "#isU","<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">",$msg);
+    foreach ($replaces as $key => $imgName) {
+      $msg = preg_replace("#".addcslashes($key, '()[]{}')."#isU", "<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">", $msg);
     }
   }
 

includes/functions/scheduler_process.php

Spacing +10 added lines, -10 removed lines

@@ -9,19 +9,19 @@ 
   $ts_var_stat_update = strtotime(classSupernova::$config->db_loadItem('var_stat_update'));
   $ts_scheduled_update = sys_schedule_get_prev_run(classSupernova::$config->db_loadItem('stats_schedule'), classSupernova::$config->var_stat_update);
 
-  if(sys_get_param_int('admin_update')) {
+  if (sys_get_param_int('admin_update')) {
     define('USER_LEVEL', isset($user['authlevel']) ? $user['authlevel'] : -1);
-    if(USER_LEVEL > 0) {
+    if (USER_LEVEL > 0) {
       $is_admin_request = true;
       $ts_scheduled_update = SN_TIME_NOW;
     }
   }
 
-  if($ts_scheduled_update > $ts_var_stat_update) {
+  if ($ts_scheduled_update > $ts_var_stat_update) {
     lng_include('admin');
     sn_db_transaction_start();
     $ts_var_stat_update_end = strtotime(classSupernova::$config->db_loadItem('var_stat_update_end'));
-    if(SN_TIME_NOW > $ts_var_stat_update_end) {
+    if (SN_TIME_NOW > $ts_var_stat_update_end) {
       $old_server_status = classSupernova::$config->db_loadItem('game_disable');
       classSupernova::$config->db_saveItem('game_disable', GAME_DISABLE_STAT);
 
@@ -31,14 +31,14 @@ 
 
       $msg = $is_admin_request ? 'admin request' : 'scheduler';
       $next_run = date(FMT_DATE_TIME_SQL, sys_schedule_get_prev_run(classSupernova::$config->stats_schedule, classSupernova::$config->var_stat_update, true));
-      $msg = "Running stat updates: {$msg}. Config->var_stat_update = " . classSupernova::$config->var_stat_update .
-        ', $ts_scheduled_update = ' . date(FMT_DATE_TIME_SQL, $ts_scheduled_update) .
-        ', next_stat_update = ' . $next_run;
+      $msg = "Running stat updates: {$msg}. Config->var_stat_update = ".classSupernova::$config->var_stat_update.
+        ', $ts_scheduled_update = '.date(FMT_DATE_TIME_SQL, $ts_scheduled_update).
+        ', next_stat_update = '.$next_run;
       classSupernova::$debug->warning($msg, 'Stat update', LOG_INFO_STAT_PROCESS);
       $total_time = microtime(true);
 
       // require_once('../includes/sys_stat.php');
-      require_once(SN_ROOT_PHYSICAL . 'includes/includes/sys_stat.php');
+      require_once(SN_ROOT_PHYSICAL.'includes/includes/sys_stat.php');
       sys_stat_calculate();
 
       $total_time = microtime(true) - $total_time;
@@ -57,13 +57,13 @@ 
       classSupernova::$config->db_saveItem('var_stat_update_end', SN_TIME_SQL);
 
       classSupernova::$config->db_saveItem('game_disable', $old_server_status);
-    } elseif($ts_scheduled_update > $ts_var_stat_update) {
+    } elseif ($ts_scheduled_update > $ts_var_stat_update) {
       $timeout = strtotime(classSupernova::$config->db_loadItem('var_stat_update_end')) - SN_TIME_NOW;
       $msg = classSupernova::$config->db_loadItem('var_stat_update_msg');
       $msg = "{$msg} ETA {$timeout} seconds. Please wait...";
     }
     sn_db_transaction_rollback();
-  } elseif($is_admin_request) {
+  } elseif ($is_admin_request) {
     $msg = 'Stat is up to date';
   }
 

includes/classes/UBE/UBEDebris.php

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
    */
   public function debris_add_resource($resource_id, $resource_amount) {
     // В обломках может быть только металл или кристалл
-    if($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
+    if ($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
       return;
     }
     $this->debris[$resource_id] += $resource_amount;
@@ -41,7 +41,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_wrecks(array $wreckage, $is_simulator) {
-    foreach($wreckage as $resource_id => $resource_amount) {
+    foreach ($wreckage as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_SHIP_WRECKS_TO_DEBRIS_AVG
@@ -57,7 +57,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_cargo_drop(array $dropped_resources, $is_simulator) {
-    foreach($dropped_resources as $resource_id => $resource_amount) {
+    foreach ($dropped_resources as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_CARGO_DROPPED_TO_DEBRIS_AVG
@@ -96,7 +96,7 @@ 
    * @param $moon_debris_left_part
    */
   public function debris_adjust_proportional($moon_debris_left_part) {
-    foreach($this->debris as $resource_id => &$resource_amount) {
+    foreach ($this->debris as $resource_id => &$resource_amount) {
       $resource_amount = floor($resource_amount * $moon_debris_left_part);
     }
   }
@@ -117,9 +117,9 @@ 
    */
   public function report_generate_sql() {
     return "
-      `ube_report_debris_metal` = " . (float)$this->debris_get_resource(RES_METAL) . ",
-      `ube_report_debris_crystal` = " . (float)$this->debris_get_resource(RES_CRYSTAL) . ",
-      `ube_report_debris_total_in_metal` = " . (float)$this->debris_in_metal() . ", ";
+      `ube_report_debris_metal` = " . (float) $this->debris_get_resource(RES_METAL).",
+      `ube_report_debris_crystal` = " . (float) $this->debris_get_resource(RES_CRYSTAL).",
+      `ube_report_debris_total_in_metal` = " . (float) $this->debris_in_metal().", ";
   }
 
   /**

includes/classes/UBE/UBEDebug.php

Spacing +12 added lines, -12 removed lines

@@ -11,7 +11,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_header() {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -48,7 +48,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump(UBEUnit $unit, $desc = '', UBEUnit $before = null) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -75,7 +75,7 @@ 
 //  print("<td>" . $this->units_lost . "</td>");
 //  print("<td>" . $this->units_restored . "</td>");
 //  print("<td>" . $this->capacity . "</td>");
-    print("<td>" . round($unit->share_of_side_armor, 4) . "</td>");
+    print("<td>".round($unit->share_of_side_armor, 4)."</td>");
     print('</tr>');
   }
 
@@ -86,7 +86,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_footer() {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -101,16 +101,16 @@ 
    * @return UBEUnit
    */
   public static function unit_dump_defender(UBEUnit $attacking_unit_pool, UBEUnit $defending_unit_pool, $defending_fleet_id) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return null;
     }
 
     $classLocale = classLocale::$lang;
 
-    print("[{$attacking_unit_pool->unitId}]{$classLocale['tech'][$attacking_unit_pool->unitId]}" .
-      ' attacks ' .
-      $defending_fleet_id . '@' . "[{$defending_unit_pool->unitId}]{$classLocale['tech'][$defending_unit_pool->unitId]}" .
-      ' with ' . pretty_number($defending_unit_pool->attack_income) .
+    print("[{$attacking_unit_pool->unitId}]{$classLocale['tech'][$attacking_unit_pool->unitId]}".
+      ' attacks '.
+      $defending_fleet_id.'@'."[{$defending_unit_pool->unitId}]{$classLocale['tech'][$defending_unit_pool->unitId]}".
+      ' with '.pretty_number($defending_unit_pool->attack_income).
       '<br>'
     );
     $before = clone $defending_unit_pool;
@@ -127,7 +127,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_delta(UBEUnit $unit, $field, UBEUnit $before = null) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -136,8 +136,8 @@ 
     print(pretty_number($unit->$field));
     print("</td>");
     print("<td>");
-    if(!empty($before)) {
-      print('' . pretty_number($unit->$field - $before->$field) . '');
+    if (!empty($before)) {
+      print(''.pretty_number($unit->$field - $before->$field).'');
     }
     print("</td>");
   }

includes/classes/UnitList.php

Spacing +7 added lines, -7 removed lines

@@ -89,7 +89,7 @@ 
    */
   public function offsetSet($offset, $value) {
     if (isset($this->mapUnitIdToDb[$value->unitId])) {
-      classSupernova::$debug->error('UnitList::offsetSet: Unit with UnitId ' . $value->unitId . ' already exists');
+      classSupernova::$debug->error('UnitList::offsetSet: Unit with UnitId '.$value->unitId.' already exists');
     }
     $this->mapUnitIdToDb[$value->unitId] = $value;
     parent::offsetSet($offset, $value);
@@ -202,7 +202,7 @@ 
 
   public function unitGetCount($unit_id) {
     if (empty($this->mapUnitIdToDb[$unit_id])) {
-      throw new Exception('Unit [' . $unit_id . '] is not exists in UnitList');
+      throw new Exception('Unit ['.$unit_id.'] is not exists in UnitList');
     }
 
     return $this->mapUnitIdToDb[$unit_id]->count;
@@ -321,7 +321,7 @@ 
      */
     $objFleet = $this->getLocatedAt();
     if (empty($objFleet)) {
-      throw new Exception('No fleet owner on UnitList::unitsRender() in ' . __FILE__ . '@' . __LINE__);
+      throw new Exception('No fleet owner on UnitList::unitsRender() in '.__FILE__.'@'.__LINE__);
     }
 
     $tplShips = array();
@@ -464,8 +464,8 @@ 
 
   // TODO - DEBUG - REMOVE =============================================================================================
   public function _dump() {
-    print(__FILE__ . ':' . __LINE__ . "<br />");
-    print("Located at " . $this->getLocationDbId() . " type " . $this->getLocationType() . "<br />");
+    print(__FILE__.':'.__LINE__."<br />");
+    print("Located at ".$this->getLocationDbId()." type ".$this->getLocationType()."<br />");
 
     print('<table border="1">');
     print('<tr>');
@@ -521,11 +521,11 @@ 
 
       print('<td>');
       $type = $unit->getType();
-      print("[{$type}] " . classLocale::$lang['tech'][$type]);
+      print("[{$type}] ".classLocale::$lang['tech'][$type]);
       print('</td>');
 
       print('<td>');
-      print("[{$unit->unitId}] " . classLocale::$lang['tech'][$unit->unitId]);
+      print("[{$unit->unitId}] ".classLocale::$lang['tech'][$unit->unitId]);
       print('</td>');
 
       print('<td>');

includes/classes/RequestInfo.php

Spacing +12 added lines, -12 removed lines

@@ -89,15 +89,15 @@ 
     // Инфа об устройстве и браузере - общая для всех
     sn_db_transaction_start();
     $this->device_cypher = $_COOKIE[SN_COOKIE_D];
-    if($this->device_cypher) {
+    if ($this->device_cypher) {
       $cypher_safe = db_escape($this->device_cypher);
       $device_id = doquery("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE", true);
-      if(!empty($device_id['device_id'])) {
+      if (!empty($device_id['device_id'])) {
         $this->device_id = $device_id['device_id'];
       }
     }
 
-    if($this->device_id <= 0) {
+    if ($this->device_id <= 0) {
       do {
         $cypher_safe = db_escape($this->device_cypher = sys_random_string());
         $row = doquery("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE", true);
@@ -118,10 +118,10 @@ 
     $this->page_address_id = db_get_set_unique_id_value($this->page_address, 'url_id', 'security_url', 'url_string');
     sn_db_transaction_commit();
 
-    if($this->write_full_url) {
+    if ($this->write_full_url) {
       sn_db_transaction_start();
       $this->page_url = substr($_SERVER['REQUEST_URI'], strlen(SN_ROOT_RELATIVE));
-      if(strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
+      if (strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
         $this->page_url = '/simulator.php';
       }
       $this->page_url_id = db_get_set_unique_id_value($this->page_url, 'url_id', 'security_url', 'url_string');
@@ -144,7 +144,7 @@ 
    */
   public function db_security_entry_insert($user_id_unsafe) {
     // TODO $user_id = !empty(self::$user['id']) ? self::$user['id'] : 'NULL';
-    if(empty($user_id_unsafe)) {
+    if (empty($user_id_unsafe)) {
       // self::flog('Нет ИД пользователя');
       return true;
     }
@@ -154,8 +154,8 @@ 
     // self::flog('Вставляем запись системы безопасности');
     return doquery(
       "INSERT IGNORE INTO {{security_player_entry}} (`player_id`, `device_id`, `browser_id`, `user_ip`, `user_proxy`)
-        VALUES ({$user_id_safe}," . $this->device_id . "," . $this->browser_id . "," .
-      $this->ip_v4_int . ", '" . db_escape($this->ip_v4_proxy_chain) . "');"
+        VALUES ({$user_id_safe},".$this->device_id.",".$this->browser_id.",".
+      $this->ip_v4_int.", '".db_escape($this->ip_v4_proxy_chain)."');"
     );
   }
 
@@ -167,7 +167,7 @@ 
   public function db_counter_insert($user_id_unsafe) {
     global $sys_stop_log_hit;
 
-    if($sys_stop_log_hit || !classSupernova::$config->game_counter) {
+    if ($sys_stop_log_hit || !classSupernova::$config->game_counter) {
       return;
     }
 
@@ -177,14 +177,14 @@ 
     classSupernova::$db->isWatching = true;
     doquery(
       "INSERT INTO {{counter}} SET
-        `visit_time` = '" . SN_TIME_SQL. "',
+        `visit_time` = '" . SN_TIME_SQL."',
         `user_id` = {$user_id_safe},
         `device_id` = {$this->device_id},
         `browser_id` = {$this->browser_id},
         `user_ip` = {$this->ip_v4_int},
         `user_proxy` = '{$proxy_safe}',
-        `page_url_id` = {$this->page_address_id}" .
-        ($this->write_full_url ? ", `plain_url_id` = {$this->page_url_id}" : '' ).
+        `page_url_id` = {$this->page_address_id}".
+        ($this->write_full_url ? ", `plain_url_id` = {$this->page_url_id}" : '').
       ";");
 
     classSupernova::$db->isWatching = false;

includes/classes/UnitResourceLoot.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
   public static function _init($group_name = '') {
     parent::_init($group_name);
 
-    foreach(static::$_group_unit_id_list as $resource_id) {
+    foreach (static::$_group_unit_id_list as $resource_id) {
       static::$_group_pnames[$resource_id] = pname_resource_name($resource_id);
     }
 
@@ -48,13 +48,13 @@ 
 
     !is_array($resource_array) ? $resource_array = array() : false;
 
-    foreach($resource_array as $resource_id => $resource_actual_delta) {
-      if(!$resource_actual_delta) {
+    foreach ($resource_array as $resource_id => $resource_actual_delta) {
+      if (!$resource_actual_delta) {
         // No delta - no changes
         continue;
       }
 
-      $result[$prefix . static::$_group_pnames[$resource_id]] = $resource_actual_delta;
+      $result[$prefix.static::$_group_pnames[$resource_id]] = $resource_actual_delta;
     }
 
     return $result;