supernova-ws / SuperNova

flying_fleets.php

Spacing +7 added lines, -7 removed lines

@@ -4,9 +4,9 @@ 
 
 global $debug, $lang, $user, $planetrow;
 
-if(!empty($_POST['return']) && is_array($_POST['return'])) {
-  foreach($_POST['return'] as $fleet_id) {
-    if($fleet_id = idval($fleet_id)) {
+if (!empty($_POST['return']) && is_array($_POST['return'])) {
+  foreach ($_POST['return'] as $fleet_id) {
+    if ($fleet_id = idval($fleet_id)) {
       sn_db_transaction_start();
       $objFleet = new Fleet();
       $objFleet->dbLoad($fleet_id);
@@ -30,7 +30,7 @@ 
 lng_include('overview');
 lng_include('fleet');
 
-if(!$planetrow) {
+if (!$planetrow) {
   message($lang['fl_noplanetrow'], $lang['fl_error']);
 }
 
@@ -38,14 +38,14 @@ 
 
 $i = 0;
 $objFleetList = FleetList::dbGetFleetListByOwnerId($user['id']);
-if(!empty($objFleetList)) {
-  foreach($objFleetList->_container as $fleet_id => $objFleet) {
+if (!empty($objFleetList)) {
+  foreach ($objFleetList->_container as $fleet_id => $objFleet) {
     $i++;
     $fleet_data = tplParseFleetObject($objFleet, $i, $user);
 
     $template->assign_block_vars('fleets', $fleet_data['fleet']);
 
-    foreach($fleet_data['ships'] as $ship_data) {
+    foreach ($fleet_data['ships'] as $ship_data) {
       $template->assign_block_vars('fleets.ships', $ship_data);
     }
   }

admin/adm_message_list.php

Spacing +10 added lines, -10 removed lines

@@ -14,7 +14,7 @@ 
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage($lang['adm_err_denied']);
 }
 
@@ -28,8 +28,8 @@ 
   ),
 );
 $template->assign_block_vars('int_type_selected', $allowed_types[-1]);
-foreach($sn_message_class_list as $key => $value) {
-  if($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
+foreach ($sn_message_class_list as $key => $value) {
+  if ($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
     continue;
   }
 
@@ -41,17 +41,17 @@ 
 
 
 $message_delete = sys_get_param_id('msg_del');
-if(sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
+if (sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
   $message_delete = implode(', ', $message_delete);
 }
 
-if($message_delete) {
+if ($message_delete) {
   db_message_list_delete_set($message_delete);
   $template->assign_block_vars('result', array('MESSAGE' => sprintf($lang['mlst_messages_deleted'], $message_delete)));
 }
 
 
-if(sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year'))) {
+if (sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year'))) {
   $delete_date = "{$year}-{$month}-{$day}";
   db_message_list_delete_by_date($delete_date, $int_type_selected);
   $template->assign_block_vars('result', array('MESSAGE' => sprintf($lang['mlst_messages_deleted_date'], $allowed_types[$int_type_selected]['TEXT'], $delete_date)));
@@ -63,13 +63,13 @@ 
 
 $int_page_current = min(sys_get_param_id('int_page_current', 1), $page_max);
 
-if(sys_get_param('page_prev') && $int_page_current > 1) {
+if (sys_get_param('page_prev') && $int_page_current > 1) {
   $int_page_current--;
-} elseif(sys_get_param('page_next') && $int_page_current < $page_max) {
+} elseif (sys_get_param('page_next') && $int_page_current < $page_max) {
   $int_page_current++;
 }
 
-for($i = 1; $i <= $page_max; $i++) {
+for ($i = 1; $i <= $page_max; $i++) {
   $template->assign_block_vars('page', array('NUMBER' => $i));
 }
 
@@ -77,7 +77,7 @@ 
 $StartRec = ($int_page_current - 1) * 25;
 
 $Messages = db_message_list_admin_by_type($int_type_selected, $StartRec);
-while($row = db_fetch($Messages)) {
+while ($row = db_fetch($Messages)) {
   $row['FROM'] = htmlentities($row['FROM'], ENT_COMPAT, 'UTF-8');
   $row['OWNER_NAME'] = htmlentities($row['OWNER_NAME'], ENT_COMPAT, 'UTF-8');
   $row['TEXT'] = nl2br($row['TEXT']);

admin/adm_flying_fleets.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
 // if ($user['authlevel'] < 2)
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage($lang['adm_err_denied']);
 }
 
@@ -22,7 +22,7 @@ 
 //while($CurrentFleet = db_fetch($FlyingFleets))
 
 $all_flying_fleets = FleetList::dbGetFleetList();
-foreach($all_flying_fleets->_container as $fleet_id => $objFleet) {
+foreach ($all_flying_fleets->_container as $fleet_id => $objFleet) {
   $FleetOwner = db_user_by_id($objFleet->playerOwnerId);
   $TargetOwner = db_user_by_id($objFleet->target_owner_id);
 
@@ -33,7 +33,7 @@ 
   $fleet_data['fleet']['STAY_TIME_INT'] = $objFleet->time_mission_job_complete;
 
   $template->assign_block_vars('fleets', $fleet_data['fleet']);
-  foreach($fleet_data['ships'] as $ship_data) {
+  foreach ($fleet_data['ships'] as $ship_data) {
     $template->assign_block_vars('fleets.ships', $ship_data);
   }
 }

admin/adm_log_main.php

Spacing +9 added lines, -9 removed lines

@@ -14,25 +14,25 @@ 
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage($lang['adm_err_denied']);
 }
 
-if($delete = sys_get_param_id('delete')) {
+if ($delete = sys_get_param_id('delete')) {
   db_log_delete_by_id($delete);
-} elseif(sys_get_param_str('delete_update_info')) {
+} elseif (sys_get_param_str('delete_update_info')) {
   db_log_delete_update_and_stat_calc();
-} elseif(sys_get_param_str('deleteall') == 'yes') {
+} elseif (sys_get_param_str('deleteall') == 'yes') {
 //  doquery("TRUNCATE TABLE `{{logs}}`");
 }
 
-if($detail = sys_get_param_id('detail')) {
+if ($detail = sys_get_param_id('detail')) {
   $template = gettemplate('admin/adm_log_main_detail', true);
 
   $errorInfo = db_log_get_by_id($detail);
   $error_dump = unserialize($errorInfo['log_dump']);
-  if(is_array($error_dump)) {
-    foreach($error_dump as $key => $value) {
+  if (is_array($error_dump)) {
+    foreach ($error_dump as $key => $value) {
       $v = array(
         'VAR_NAME'  => $key,
         'VAR_VALUE' => $key == 'query_log' ? $value : dump($value, $key)
@@ -47,10 +47,10 @@ 
 
   $i = 0;
   $query = db_log_list_get_last_100();
-  while($u = db_fetch($query)) {
+  while ($u = db_fetch($query)) {
     $i++;
     $v = array();
-    foreach($u as $key => $value) {
+    foreach ($u as $key => $value) {
       $v[strtoupper($key)] = $value;
     }
     $template->assign_block_vars('error', $v);

admin/ajax_maintenance.php

Spacing +10 added lines, -10 removed lines

@@ -4,7 +4,7 @@ 
 
 require('../includes/init.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   message($lang['sys_noalloaw'], $lang['sys_noaccess']);
   die();
@@ -20,9 +20,9 @@ 
 // [#] info_best_battles 1b0
 $best_reports = array();
 
-if(defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
+if (defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
   $query = db_ube_report_get_best_battles();
-  while($row = db_fetch($query)) {
+  while ($row = db_fetch($query)) {
     $best_reports[] = $row['ube_report_id'];
   }
 }
@@ -186,16 +186,16 @@ 
 
 function sn_maintenance_pack_user_list($user_list) {
   $user_list = explode(',', $user_list);
-  foreach($user_list as $key => $user_id) {
-    if(!ceil(floatval($user_id))) {
+  foreach ($user_list as $key => $user_id) {
+    if (!ceil(floatval($user_id))) {
       unset($user_list[$key]);
     }
   }
 
   $result = array();
-  if(!empty($user_list)) {
+  if (!empty($user_list)) {
     $query = db_user_list_get_by_id_array($user_list);
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[] = $row['id'];
     }
   }
@@ -210,13 +210,13 @@ 
 $old_server_status == GAME_DISABLE_NONE ? $config->db_saveItem('game_disable', GAME_DISABLE_MAINTENANCE) : false;
 sn_db_transaction_commit();
 
-foreach($ques as $que_transaction) {
+foreach ($ques as $que_transaction) {
   sn_db_transaction_start();
 
   !is_array($que_transaction) ? $que_transaction = array($que_transaction) : false;
-  foreach($que_transaction as $que) {
+  foreach ($que_transaction as $que) {
     set_time_limit(120);
-    if(is_callable($que)) {
+    if (is_callable($que)) {
       $QryResult = call_user_func($que);
     } else {
       $QryResult = doquery($que);

admin/tools.php

Spacing +6 added lines, -6 removed lines

@@ -12,19 +12,19 @@ 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
 // if($user['authlevel'] < 1)
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage($lang['adm_err_denied']);
 }
 
 $mode = sys_get_param_int('mode');
 
-switch($mode) {
+switch ($mode) {
   case ADM_TOOL_CONFIG_RELOAD:
     $config->db_loadAll();
     sys_refresh_tablelist();
 
     $config->db_loadItem('game_watchlist');
-    if($config->game_watchlist) {
+    if ($config->game_watchlist) {
       $config->game_watchlist_array = explode(';', $config->game_watchlist);
     } else {
       unset($config->game_watchlist_array);
@@ -69,7 +69,7 @@ 
       $lang['adm_tool_sql_client_version'] => db_get_client_info(),
       $lang['adm_tool_sql_host_info']      => db_get_host_info(),
     );
-    foreach($status as $key => $value) {
+    foreach ($status as $key => $value) {
       $template->assign_block_vars('table.row', array(
         'VALUE_1' => $key,
         'VALUE_2' => $value,
@@ -78,7 +78,7 @@ 
 
     $template->assign_block_vars('table', $lang['adm_tool_sql_table']['status']);
     $status = explode('  ', db_server_stat());
-    foreach($status as $value) {
+    foreach ($status as $value) {
       $row = explode(': ', $value);
       $template->assign_block_vars('table.row', array(
         'VALUE_1' => $row[0],
@@ -89,7 +89,7 @@ 
 
     $template->assign_block_vars('table', $lang['adm_tool_sql_table']['params']);
     $result = db_core_show_status();
-    while($row = db_fetch($result)) {
+    while ($row = db_fetch($result)) {
       $template->assign_block_vars('table.row', array(
         'VALUE_1' => $row['Variable_name'],
         'VALUE_2' => $row['Value'],

admin/adm_payment.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage($lang['adm_err_denied']);
 }
 
@@ -25,7 +25,7 @@ 
 );
 
 $query = db_payment_list_payers();
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $payer_list[$row['payment_user_id']] = '[' . $row['payment_user_id'] . '] ' . $row['payment_user_name'];
 }
 tpl_assign_select($template, 'payer', $payer_list);
@@ -35,7 +35,7 @@ 
 );
 
 $query = db_payment_list_modules();
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $module_list[$row['payment_module_name']] = $row['payment_module_name'];
 }
 tpl_assign_select($template, 'module', $module_list);
@@ -50,9 +50,9 @@ 
 
 $query = db_payment_list_get($flt_payer, $flt_status, $flt_test, $flt_module);
 
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $row2 = array();
-  foreach($row as $key => $value) {
+  foreach ($row as $key => $value) {
     $row2[strtoupper($key)] = $value;
   }
   $template->assign_block_vars('payment', $row2);

flotenajax.php

Spacing +11 added lines, -11 removed lines

@@ -36,7 +36,7 @@ 
 
   $target_mission = sys_get_param_int('mission');
   $sn_group_missions = sn_get_groups('missions');
-  if(empty($sn_group_missions[$target_mission]['AJAX'])) {
+  if (empty($sn_group_missions[$target_mission]['AJAX'])) {
     die($lang['gs_c00']);
   }
 
@@ -51,7 +51,7 @@ 
   );
   // fleet_ajax now can send fleets only to existing planets/moons
   // TODO - sending colonization and expeditions in 1 click
-  if(!uni_coordinates_valid($target_coord)) {
+  if (!uni_coordinates_valid($target_coord)) {
     die($lang['gs_c02']);
   }
 
@@ -62,7 +62,7 @@ 
 
   // TODO - DEADLOCK CAN BE HERE!!!! We should lock SOURCE and TARGET owners in one query
   $target_row = db_planet_by_vector($target_coord);
-  if(empty($target_row)) {
+  if (empty($target_row)) {
     $target_row = $target_coord;
     $target_row['id_owner'] = 0;
     // If fleet destination is PT_DEBRIS - then it's actually destination is PT_PLANET // TODO - REMOVE! Debris should be valid DESTINATION planet_type!
@@ -73,15 +73,15 @@ 
   }
 
   $fleet_array = array();
-  switch($target_mission) {
+  switch ($target_mission) {
     case MT_SPY:
       $fleet_array[SHIP_SPY] = min(mrc_get_level($user, $planetrow, SHIP_SPY), abs(classSupernova::$user_options[PLAYER_OPTION_FLEET_SPY_DEFAULT]));
       $unit_group = 'flt_spies';
     break;
 
     case MT_RECYCLE:
-      foreach(sn_get_groups('flt_recyclers') as $unit_id) {
-        if($unit_count = mrc_get_level($user, $planetrow, $unit_id)) {
+      foreach (sn_get_groups('flt_recyclers') as $unit_id) {
+        if ($unit_count = mrc_get_level($user, $planetrow, $unit_id)) {
           $fleet_array[$unit_id] = $unit_count;
         }
       }
@@ -106,16 +106,16 @@ 
       'target_structure' => $target_structure = sys_get_param_int('structures'),
     )
   );
-  if($isAttackAllowed != ATTACK_ALLOWED) {
+  if ($isAttackAllowed != ATTACK_ALLOWED) {
     die($lang['fl_attack_error'][$isAttackAllowed]);
   }
 
   $db_changeset = array();
-  foreach($fleet_array as $unit_id => $unit_count) {
+  foreach ($fleet_array as $unit_id => $unit_count) {
     $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, -$unit_count, $user, $planetrow);
   }
 
-  if($target_mission == MT_MISSILE) {
+  if ($target_mission == MT_MISSILE) {
     $distance = abs($target_coord['system'] - $planetrow['system']);
     $duration = round((30 + (60 * $distance)) / flt_server_flight_speed_multiplier());
     $arrival = SN_TIME_NOW + $duration;
@@ -125,7 +125,7 @@ 
   } else {
     $travel_data = flt_travel_data($user, $planetrow, $target_coord, $fleet_array, 10);
 
-    if($planetrow['deuterium'] < $travel_data['consumption']) {
+    if ($planetrow['deuterium'] < $travel_data['consumption']) {
       die($lang['gs_c13']);
     }
 
@@ -146,7 +146,7 @@ 
 
   $ships_sent = array();
   $ships_sent_js = 0;
-  foreach($fleet_array as $unit_id => $unit_count) {
+  foreach ($fleet_array as $unit_id => $unit_count) {
     $ships_sent[] = "{$unit_count} {$lang['tech'][$unit_id]}";
     $ships_sent_js += mrc_get_level($user, $planetrow, $unit_id, false, true);
   }

includes/pages/chat.php

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * chat.php
- * Main chat window
- *
- * Changelog:
- * 4.0 copyright © 2009-2012 Gorlum for http://supernova.ws
- * [!] Another rewrite
- * [+] preMVC-compatible
- * 3.0 copyright © 2009-2011 Gorlum for http://supernova.ws
- * [!] Almost full rewrote
- * [+] Complies with PCG1
- * 2.0 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [+] Rewrote to remove unnecessary code dupes
- * 1.5 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [~] More DDoS-realted fixes
- * 1.4 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [~] DDoS-realted fixes
- * 1.3 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [~] Security checks for SQL-injection
- * 1.2 by Ihor
- * 1.0 Shoutbox copyright © 2008 by e-Zobar for XNova
- **/
+   * chat.php
+   * Main chat window
+   *
+   * Changelog:
+   * 4.0 copyright © 2009-2012 Gorlum for http://supernova.ws
+   * [!] Another rewrite
+   * [+] preMVC-compatible
+   * 3.0 copyright © 2009-2011 Gorlum for http://supernova.ws
+   * [!] Almost full rewrote
+   * [+] Complies with PCG1
+   * 2.0 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [+] Rewrote to remove unnecessary code dupes
+   * 1.5 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [~] More DDoS-realted fixes
+   * 1.4 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [~] DDoS-realted fixes
+   * 1.3 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [~] Security checks for SQL-injection
+   * 1.2 by Ihor
+   * 1.0 Shoutbox copyright © 2008 by e-Zobar for XNova
+   **/
 /*
 $sn_mvc['model']['chat'][] = 'sn_chat_model';
 $sn_mvc['model']['chat_add'][] = 'sn_chat_add_model';

Spacing +13 added lines, -13 removed lines

@@ -36,7 +36,7 @@ 
   $user_auth_level = isset($user['authlevel']) ? $user['authlevel'] : AUTH_LEVEL_ANONYMOUS;
 
   $mode = sys_get_param_int('mode');
-  switch($mode) {
+  switch ($mode) {
     case CHAT_MODE_ALLY:
       $template_result['ALLY'] = intval($user['ally_id']);
       $page_title = $lang['chat_ally'];
@@ -49,12 +49,12 @@ 
   }
 
   $template_result['.']['smiles'] = array();
-  foreach($supernova->design['smiles'] as $auth_level => $replaces) {
-    if($auth_level > $user_auth_level) {
+  foreach ($supernova->design['smiles'] as $auth_level => $replaces) {
+    if ($auth_level > $user_auth_level) {
       continue;
     }
 
-    foreach($replaces as $bbcode => $filename) {
+    foreach ($replaces as $bbcode => $filename) {
       $template_result['.']['smiles'][] = array(
         'BBCODE'   => $bbcode,
         'FILENAME' => $filename,
@@ -77,11 +77,11 @@ 
   define('IN_AJAX', true);
   $skip_fleet_update = true;
 
-  if($config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
+  if ($config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
     die();
   }
 
-  if(($message = sys_get_param_str('message')) && $user['username']) {
+  if (($message = sys_get_param_str('message')) && $user['username']) {
     $ally_id = sys_get_param('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
     $nick = db_escape(player_nick_compact(player_nick_render_current_to_array($user, array('color' => true, 'icons' => true, 'ally' => !$ally_id))));
 
@@ -102,7 +102,7 @@ 
   $skip_fleet_update = true;
 
   $history = sys_get_param_str('history');
-  if(!$history) {
+  if (!$history) {
     $config->array_set('users', $user['id'], 'chat_last_refresh', SN_TIME_MICRO);
   }
 
@@ -110,7 +110,7 @@ 
   $last_message = '';
   $alliance = 0;
   $template_result['.']['chat'] = array();
-  if(!$history && $config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
+  if (!$history && $config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
     $result['disable'] = true;
     $template_result['.']['chat'][] = array(
       'TIME'    => date(FMT_DATE_TIME, htmlentities(SN_CLIENT_TIME_LOCAL, ENT_QUOTES, 'utf-8')),
@@ -123,11 +123,11 @@ 
 
     $where_add = '';
     $last_message = 0;
-    if($history) {
+    if ($history) {
       $rows = db_chat_message_count_by_ally($alliance);
       $page_count = ceil($rows['CNT'] / $page_limit);
 
-      for($i = 0; $i < $page_count; $i++) {
+      for ($i = 0; $i < $page_count; $i++) {
         $template_result['.']['page'][] = array(
           'NUMBER' => $i
         );
@@ -141,12 +141,12 @@ 
 
     $start_row = $page * $page_limit;
     $query = db_chat_message_get_page($alliance, $where_add, $start_row, $page_limit);
-    while($chat_row = db_fetch($query)) {
+    while ($chat_row = db_fetch($query)) {
       // Little magik here - to retain HTML codes from DB and stripping HTML codes from nick
       $chat_row['user'] = player_nick_render_to_html($chat_row['user']);
       $nick_stripped = htmlentities(strip_tags($chat_row['user']), ENT_QUOTES, 'utf-8');
       $nick = str_replace(strip_tags($chat_row['user']), $nick_stripped, $chat_row['user']);
-      if(!$history) {
+      if (!$history) {
         $nick = "<span style=\"cursor: pointer;\" onclick=\"addSmiley('({$nick_stripped})');\">{$nick}</span>";
       }
 
@@ -171,7 +171,7 @@ 
   $template = gettemplate('chat_messages', $template);
   $template->assign_recursive($template_result);
 
-  if($history) {
+  if ($history) {
     display($template, "{$lang['chat_history']} - {$lang[$alliance ? 'chat_ally' : 'chat_common']}", true, '', false, true);
   } else {
     $result['last_message'] = $last_message;