supernova-ws / SuperNova

language/en/login.mo.php

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
   'log_lost_send_mail' => 'Send confirmation code',
   'log_lost_description2' => 'If you have a confirmation code, please enter it below and click "Reset password". An e-mail will be sent an email with a new password<br /><br />
     If you already asking for confirmation code but can not find email from us in your main folder - check your SPAM folder. Some mail servers can mark our letters as "SPAM"<br /><br />
-    If you absolutly sure that did not receive email from us - just write a email to Administration address <span class="ok">' . classSupernova::$config->server_email . '</span>',
+    If you absolutly sure that did not receive email from us - just write a email to Administration address <span class="ok">' . classSupernova::$config->server_email.'</span>',
   'log_lost_reset_pass' => 'Reset password',
   'log_lost_sent_code' => 'Email sent to this email with further instructions on resetting your password',
   'log_lost_sent_pass' => 'Just sent to your email message with the new password',

time_probe.php

Spacing +7 added lines, -7 removed lines

@@ -5,7 +5,7 @@ 
 global $skip_fleet_update;
 $skip_fleet_update = true;
 
-require_once('common.' . substr(strrchr(__FILE__, '.'), 1));
+require_once('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 /*
 $time_local  = $time_server + $time_diff
@@ -13,13 +13,13 @@ 
 $time_server = $time_local  - $time_diff
 */
 
-if($font_size = sys_get_param_str('font_size')) {
-  if(strpos($font_size, '%') !== false) {
+if ($font_size = sys_get_param_str('font_size')) {
+  if (strpos($font_size, '%') !== false) {
     // Размер шрифта в процентах
-    $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
-  } elseif(strpos($font_size, 'px') !== false) {
+    $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX).'%';
+  } elseif (strpos($font_size, 'px') !== false) {
     // Размер шрифта в пикселях
-    $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
+    $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX).'px';
   } else {
     // Не мышонка, не лягушка...
     $font_size = FONT_SIZE_PERCENT_DEFAULT_STRING;
@@ -29,7 +29,7 @@ 
   classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE] = $font_size;
 } else {
   $user_time_diff = playerTimeDiff::user_time_diff_get();
-  if($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
+  if ($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
     $time_diff = intval($user_time_diff[PLAYER_OPTION_TIME_DIFF]);
   } else {
     $user_time_diff = playerTimeDiff::user_time_diff_probe();

includes/pages/imperium.php

Spacing +19 added lines, -19 removed lines

@@ -22,17 +22,17 @@ 
   $sn_group_factories = sn_get_groups('factories');
   $planet_density = sn_get_groups('planet_density');
 
-  if(sys_get_param('save_production')) {
+  if (sys_get_param('save_production')) {
     $production = sys_get_param('percent');
-    if(is_array($production) && !empty($production)) {
+    if (is_array($production) && !empty($production)) {
       // sn_db_transaction_start();
       $query = array();
       $planet_row_list = db_planet_list_sorted($user, false, '*');
       // while($planet = db_fetch($planet_row_list))
-      foreach($planet_row_list as $planet) {
-        foreach($sn_group_factories as $factory_unit_id) {
+      foreach ($planet_row_list as $planet) {
+        foreach ($sn_group_factories as $factory_unit_id) {
           $unit_db_name_porcent = pname_factory_production_field_name($factory_unit_id);
-          if(
+          if (
             get_unit_param($factory_unit_id, P_MINING_IS_MANAGED)
             && isset($production[$factory_unit_id][$planet['id']])
             && ($actual_porcent = intval($production[$factory_unit_id][$planet['id']] / 10)) >= 0
@@ -43,7 +43,7 @@ 
           }
         }
       }
-      foreach($query as $planet_id => $query_data) {
+      foreach ($query as $planet_id => $query_data) {
         db_planet_set_by_id($planet_id, implode(',', $query_data));
       }
       // sn_db_transaction_commit();
@@ -52,7 +52,7 @@ 
 
   $planet_row_list = db_planet_list_sorted($user);
   // while ($planet = db_fetch($planet_row_list))
-  foreach($planet_row_list as $planet) {
+  foreach ($planet_row_list as $planet) {
     sn_db_transaction_start();
     $global_data = sys_o_get_updated($user, $planet['id'], SN_TIME_NOW, false, true);
     $planets[$planet['id']] = $global_data['planet'];
@@ -64,7 +64,7 @@ 
   $template = gettemplate('imperium', $template);
   $template->assign_var('amount', count($planets) + 2);
 
-  for($i = 100; $i >= 0; $i -= 10) {
+  for ($i = 100; $i >= 0; $i -= 10) {
     $template->assign_block_vars('percent', array('PERCENT' => $i));
   }
 
@@ -74,13 +74,13 @@ 
   $total['temp_min'] = 1000;
   $total['temp_max'] = -999;
 
-  foreach($planets as $planet_index => &$planet) {
+  foreach ($planets as $planet_index => &$planet) {
     $list_planet_que = $ques[$planet_index];
     $planet_template = tpl_parse_planet($planet);
 
     $planet_fleet_id = 0;
-    $fleet_list = $planet_template['fleet_list'];//flt_get_fleets_to_planet($planet);
-    if($fleet_list['own']['count']) {
+    $fleet_list = $planet_template['fleet_list']; //flt_get_fleets_to_planet($planet);
+    if ($fleet_list['own']['count']) {
       $planet_fleet_id = "p{$fleet_id}";
       $fleets[] = tpl_parse_fleet_sn($fleet_list['own']['total'], $planet_fleet_id);
       $fleet_id++;
@@ -141,17 +141,17 @@ 
     UNIT_DEFENCE            => 'defense',
   );
 
-  foreach($show_groups as $unit_group_id => $mode) {
+  foreach ($show_groups as $unit_group_id => $mode) {
     $template->assign_block_vars('prods', array(
       'NAME' => classLocale::$lang['tech'][$unit_group_id],
     ));
     $unit_group = get_unit_param('techtree', $unit_group_id);
-    foreach($unit_group as $unit_id) {
+    foreach ($unit_group as $unit_id) {
       $unit_count = $unit_count_abs = 0;
       $block_vars = array();
       $unit_is_factory = in_array($unit_id, $sn_group_factories) && get_unit_param($unit_id, P_MINING_IS_MANAGED);
       // $unit_db_name = pname_resource_name($unit_id);
-      foreach($planets as $planet) {
+      foreach ($planets as $planet) {
         $unit_level_plain = mrc_get_level($user, $planet, $unit_id, false, true);
 
         $level_plus['FACTORY'] = $unit_is_factory;
@@ -159,7 +159,7 @@ 
         $level_plus['LEVEL_PLUS_GREEN'] = 0;
 
         $level_plus['PERCENT'] = $unit_is_factory ? ($unit_level_plain ? $planet[pname_factory_production_field_name($unit_id)] * 10 : -1) : -1;
-        switch($mode) {
+        switch ($mode) {
           /*
           case 'structures':
             $level_plus_build = $ques[$planet['id']]['in_que'][que_get_unit_que($unit_id)][$user['id']][$planet['id']][$unit_id];
@@ -179,7 +179,7 @@ 
           case 'structures':
           case 'defense':
             $level_plus_build = $ques[$planet['id']]['in_que'][que_get_unit_que($unit_id)][$user['id']][$planet['id']][$unit_id];
-            if($level_plus_build) {
+            if ($level_plus_build) {
               $level_plus['LEVEL_PLUS_GREEN'] = $level_plus_build < 0 ? $level_plus_build : "+{$level_plus_build}";
               // $level_plus['LEVEL_PLUS_GREEN'] = "+{$level_plus_build}";
               $total['units'][$unit_id]['LEVEL_PLUS_GREEN'] += $level_plus['LEVEL_PLUS_GREEN'];
@@ -199,15 +199,15 @@ 
         $unit_count_abs += $unit_level_plain + abs($level_plus['LEVEL_PLUS_YELLOW']) + abs($level_plus['LEVEL_PLUS_GREEN']);
       }
 
-      if($unit_count_abs) {
+      if ($unit_count_abs) {
         $template->assign_block_vars('prods', array(
           'ID'    => $unit_id,
-          'FIELD' => 'unit_' . $unit_id, // pname_resource_name($unit_id), // TODO Делать это прямо в темплейте
+          'FIELD' => 'unit_'.$unit_id, // pname_resource_name($unit_id), // TODO Делать это прямо в темплейте
           'NAME'  => classLocale::$lang['tech'][$unit_id],
           'MODE'  => $mode,
         ));
 
-        foreach($block_vars as $block_var) {
+        foreach ($block_vars as $block_var) {
           $template->assign_block_vars('prods.planet', $block_var);
         }
         $unit_green = $total['units'][$unit_id]['LEVEL_PLUS_GREEN'];

includes/functions/eco_planet_update.php

Spacing +13 added lines, -13 removed lines

@@ -14,13 +14,13 @@ 
 
   $no_data = array('user' => false, 'planet' => false, 'que' => false);
 
-  if(!$planet) {
+  if (!$planet) {
     return $no_data;
   }
 
-  if(!$no_user_update) {
+  if (!$no_user_update) {
     $user = intval(is_array($user) && $user['id'] ? $user['id'] : $user);
-    if(!$user) {
+    if (!$user) {
       // TODO - Убрать позже
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sys_o_get_updated() - USER пустой!</h1>');
       $backtrace = debug_backtrace();
@@ -32,17 +32,17 @@ 
     $user = db_user_by_id($user, !$simulation, '*', true);
   }
 
-  if(empty($user['id'])) {
+  if (empty($user['id'])) {
     return $no_data;
   }
 
-  if(is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
+  if (is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
     $planet = db_planet_by_vector($planet, '', !$simulation);
   } else {
     $planet = intval(is_array($planet) && isset($planet['id']) ? $planet['id'] : $planet);
     $planet = db_planet_by_id($planet, !$simulation);
   }
-  if(!is_array($planet) || !isset($planet['id'])) {
+  if (!is_array($planet) || !isset($planet['id'])) {
     return $no_data;
   }
 
@@ -65,19 +65,19 @@ 
     RES_DEUTERIUM => 0,
   );
 
-  switch($planet['planet_type']) {
+  switch ($planet['planet_type']) {
     case PT_PLANET:
-      foreach($resources_increase as $resource_id => &$increment) {
+      foreach ($resources_increase as $resource_id => &$increment) {
         $resource_name = pname_resource_name($resource_id);
         $increment = $caps_real['total'][$resource_id] * $ProductionTime / 3600;
         $store_free = $caps_real['total_storage'][$resource_id] - $planet[$resource_name];
         $increment = min($increment, max(0, $store_free));
 
-        if($planet[$resource_name] + $increment < 0 && !$simulation) {
+        if ($planet[$resource_name] + $increment < 0 && !$simulation) {
           classSupernova::$debug->warning("Player ID {$user['id']} have negative resources on ID {$planet['id']}.{$planet['planet_type']} [{$planet['galaxy']}:{$planet['system']}:{$planet['planet']}]. Difference {$planet[$resource_name]} of {$resource_name}", 'Negative Resources', 501);
         }
         $planet[$resource_name] += $increment;
-        $planet[$resource_name . '_perhour'] = $caps_real['total'][$resource_id];
+        $planet[$resource_name.'_perhour'] = $caps_real['total'][$resource_id];
       }
     break;
 
@@ -94,13 +94,13 @@ 
   // TODO пересчитывать размер планеты только при постройке чего-нибудь и при покупке сектора
   $planet['field_current'] = 0;
   $sn_group_build_allow = sn_get_groups('build_allow');
-  if(is_array($sn_group_build_allow[$planet['planet_type']])) {
-    foreach($sn_group_build_allow[$planet['planet_type']] as $building_id) {
+  if (is_array($sn_group_build_allow[$planet['planet_type']])) {
+    foreach ($sn_group_build_allow[$planet['planet_type']] as $building_id) {
       $planet['field_current'] += mrc_get_level($user, $planet, $building_id, !$simulation, true);
     }
   }
 
-  if($simulation) {
+  if ($simulation) {
     return array('user' => $user, 'planet' => $planet, 'que' => $que);
   }
 

Doc Comments +3 added lines

@@ -9,6 +9,9 @@
  *     [+] Full rewrote and optimization
  *
  */
+/**
+ * @param integer $UpdateTime
+ */
 function sys_o_get_updated($user, $planet, $UpdateTime, $simulation = false, $no_user_update = false) {
   sn_db_transaction_check(true);
 

includes/functions/ali_alliances.php

Spacing +4 added lines, -4 removed lines

@@ -3,10 +3,10 @@ 
 function ali_rank_list_save($ranks) {
   global $user;
 
-  if(!empty($ranks)) {
-    foreach($ranks as $rank => $rights) {
+  if (!empty($ranks)) {
+    foreach ($ranks as $rank => $rights) {
       $rights = implode(',', $rights);
-      $ranklist .= $rights . ';';
+      $ranklist .= $rights.';';
     }
   }
 
@@ -22,7 +22,7 @@ 
   $temp_array = array();
   $query = db_ally_diplomacy_get_relations($ally_from, $ally_to);
 
-  while($record = db_fetch($query)) {
+  while ($record = db_fetch($query)) {
     $temp_array[$record['alliance_diplomacy_contr_ally_id']] = $record;
   }
 

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/alliance/ali_info.inc

Spacing +14 added lines, -14 removed lines

@@ -1,37 +1,37 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
 $template = gettemplate('ali_info', true);
 
-if($mode == 'exit') {
-  if($ally['ally_owner'] == $user['id']) {
+if ($mode == 'exit') {
+  if ($ally['ally_owner'] == $user['id']) {
     message(classLocale::$lang['Owner_cant_go_out'], classLocale::$lang['Alliance']);
   }
 
-  if(sys_get_param_int('ali_info_leave_confirm')) {
+  if (sys_get_param_int('ali_info_leave_confirm')) {
     sn_db_transaction_start();
     db_user_set_by_id($user['id'], "`ally_id` = null, `ally_name` = null, `ally_tag` = null, `ally_register_time` = 0, `ally_rank_id` = 0");
     db_ally_list_recalc_counts();
     sn_db_transaction_commit();
     message(sprintf(classLocale::$lang['ali_info_leave_success'], $ally['ally_name']), classLocale::$lang['sys_alliance']);
   }
-} elseif($mode == 'ainfo') {
+} elseif ($mode == 'ainfo') {
   $tag = sys_get_param_str('tag');
   $id_ally = sys_get_param_id('a');
-  if($tag) {
+  if ($tag) {
     $ally = db_ally_get_by_tag($tag);
-  } elseif($id_ally) {
+  } elseif ($id_ally) {
     $ally = db_ally_get_by_id($id_ally);
   }
 
-  if(!$ally) {
+  if (!$ally) {
     message(classLocale::$lang['ali_sys_notFound'], classLocale::$lang['Ally_info_1']);
   }
 
-  if(!$ally['ally_description']) {
+  if (!$ally['ally_description']) {
     $ally['ally_description'] = classLocale::$lang['Ally_nodescription'];
   }
 
@@ -43,9 +43,9 @@ 
 } else {
   $page_header = classLocale::$lang['your_alliance'];
 
-  if($ally['ally_owner'] == $user['id']) {
+  if ($ally['ally_owner'] == $user['id']) {
     $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : classLocale::$lang['Founder'];
-  } elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) {
+  } elseif ($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) {
     $range = $ranks[$user['ally_rank_id']]['name'];
   } else {
     $range = classLocale::$lang['member'];
@@ -86,8 +86,8 @@ 
 ));
 
 $relations = ali_relations($ally['id']);
-foreach($relations as $relation) {
-  if($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) {
+foreach ($relations as $relation) {
+  if ($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) {
     $template->assign_block_vars('relation', array(
       'NAME'     => $relation['alliance_diplomacy_contr_ally_name'],
       'RELATION' => classLocale::$lang['ali_dip_relations'][$relation['alliance_diplomacy_relation']],
@@ -106,4 +106,4 @@ 
 
 ali_render();
 
-display($template, classLocale::$lang['your_alliance'] . ' [' . $ally['ally_name'] . ']');
+display($template, classLocale::$lang['your_alliance'].' ['.$ally['ally_name'].']');

includes/alliance/ali_internal_admin_rights.inc

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -14,7 +14,7 @@ 
 $new_rank_name = sys_get_param_str('newRankName');
 if ($new_rank_name)
 {
-  foreach($ally_rights as $fieldName)
+  foreach ($ally_rights as $fieldName)
   {
     $newRank[$fieldName] = 0;
   }
@@ -28,9 +28,9 @@ 
 {
   unset($ranks);
 
-  foreach($rankListInput as $rankID => $rank)
+  foreach ($rankListInput as $rankID => $rank)
   {
-    foreach($ally_rights as $rightName)
+    foreach ($ally_rights as $rightName)
     {
       $ranks[$rankID][$rightName] = $rank[$rightName] ? 1 : 0;
     }
@@ -41,7 +41,7 @@ 
 $d = sys_get_param_int('d');
 if ($d && isset($ranks[$d]))
 {
-  if(count($ranks) == 1)
+  if (count($ranks) == 1)
   {
     message(classLocale::$lang['ali_adm_lastRank'], classLocale::$lang['ali_adm_rights_title']);
   }
@@ -53,17 +53,17 @@ 
 
 if (count($ranks))
 {
-  foreach($ranks as $rankID => $rank)
+  foreach ($ranks as $rankID => $rank)
   {
     $rank_data = array(
       'ID'   => $rankID,
       'NAME' => $rank['name'],
     );
 
-    for($i = 1; $i < count($rank); $i++)
+    for ($i = 1; $i < count($rank); $i++)
     {
-      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '') ;
-      $rank_data['N' . $i] = $ally_rights[$i];
+      $rank_data['R'.$i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '');
+      $rank_data['N'.$i] = $ally_rights[$i];
     }
 
     $template->assign_block_vars('rank', $rank_data);