supernova-ws / SuperNova

includes/includes/flt_page4.inc

Spacing +19 added lines, -19 removed lines

@@ -2,28 +2,28 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   classSupernova::$debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
 $fleetid = sys_get_param_id('fleetid');
 
-if(!is_numeric($fleetid) || empty($fleetid)) {
+if (!is_numeric($fleetid) || empty($fleetid)) {
   header("Location: fleet.php");
   exit();
 }
 
 $objFleet = new Fleet();
 $objFleet->dbLoad($fleetid);
-if(!$objFleet->dbId) {
+if (!$objFleet->dbId) {
   message(classLocale::$lang['fl_fleet_not_exists'], classLocale::$lang['fl_error']);
 }
 
-if($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
+if ($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
   message(classLocale::$lang['fl_isback'], classLocale::$lang['fl_error']);
 }
 
-if($objFleet->playerOwnerId != $user['id']) {
+if ($objFleet->playerOwnerId != $user['id']) {
   classSupernova::$debug->warning(classLocale::$lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301);
   message(classLocale::$lang['fl_aks_hack_wrong_fleet'], classLocale::$lang['fl_error']);
 }
@@ -34,19 +34,19 @@ 
 
 !$aks && !$userToAdd_unsafe ? $userToAdd_unsafe = $user['username'] : false;
 
-if($userToAdd_unsafe) {
+if ($userToAdd_unsafe) {
   $userToAdd = db_escape($userToAdd_unsafe);
   $userToAddID = DBStaticUser::db_user_by_username($userToAdd_unsafe, false, 'id', true, true);
   $userToAddID = $userToAddID['id'];
 
-  if($objFleet->target_owner_id == $userToAddID) {
+  if ($objFleet->target_owner_id == $userToAddID) {
     message(classLocale::$lang['flt_aks_player_same'], classLocale::$lang['fl_error']);
   }
 
-  if($userToAddID) {
-    if(!$aks) {
+  if ($userToAddID) {
+    if (!$aks) {
       // No AСS exists - making one
-      if(!$objFleet->group_id) {
+      if (!$objFleet->group_id) {
         DBStaticFleetACS::db_acs_insert($fleetid, $user['id'], $objFleet);
 
         $aks = DBStaticFleetACS::db_acs_get_by_fleet($fleetid);
@@ -61,24 +61,24 @@ 
 
     $isUserExists = false;
     $invited_ar = explode(",", $aks['eingeladen']);
-    foreach($invited_ar as $inv) {
-      if($userToAddID == $inv) {
+    foreach ($invited_ar as $inv) {
+      if ($userToAddID == $inv) {
         $isUserExists = true;
       }
     }
 
-    if(count($invited_ar) >= 5) {
+    if (count($invited_ar) >= 5) {
       message(classLocale::$lang['flt_aks_error_too_much_players'], classLocale::$lang['fl_error']);
     }
 
-    if($isUserExists) {
+    if ($isUserExists) {
       $userToAdd_unsafe != $user['username'] ? $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited_already'], $userToAdd) : false;
     } else {
       $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited'], $userToAdd);
-      if(!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
+      if (!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
         die(sprintf(classLocale::$lang['fl_aks_adding_error'], classSupernova::$db->db_error()));
       }
-      $aks['eingeladen'] .= ',' . $userToAddID;
+      $aks['eingeladen'] .= ','.$userToAddID;
     }
     DBStaticMessages::msg_send_simple_message($userToAddID, $user['id'], SN_TIME_NOW, MSG_TYPE_COMBAT, $user['username'], classLocale::$lang['fl_aks_invite_message_header'], sprintf(classLocale::$lang['fl_aks_invite_message'], $user['username']));
   } else {
@@ -94,8 +94,8 @@ 
   'MISSION_NAME' => classLocale::$lang['type_mission'][MT_ACS],
 ));
 
-if($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
-  foreach($members as $row) {
+if ($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
+  foreach ($members as $row) {
     $template->assign_block_vars('invited', array(
       'NAME' => $row['username'],
     ));
@@ -120,7 +120,7 @@ 
 $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);
 }
 

includes/db.php

Doc Comments +3 added lines, -1 removed lines

@@ -16,7 +16,6 @@ 
  * @param       $user
  * @param       $planet
  * @param array $unit_list
- * @param null  $query
  */
 function db_change_resources(&$user, &$planet, $unit_list) {
   $group = sn_get_groups('resources_loot');
@@ -56,6 +55,9 @@ 
 
 }
 
+/**
+ * @param boolean $transaction_should_be_started
+ */
 function sn_db_transaction_check($transaction_should_be_started = null) {
   return classSupernova::$gc->db->getTransaction()->check($transaction_should_be_started);
 }

Spacing +4 added lines, -4 removed lines

@@ -24,22 +24,22 @@
   $locationType = sys_get_unit_location($user, $planet, key($unit_list));
 
   $resourcesChange = array();
-  foreach($unit_list as $unit_id => $unit_amount) {
-    if(!in_array($unit_id, $group)) {
+  foreach ($unit_list as $unit_id => $unit_amount) {
+    if (!in_array($unit_id, $group)) {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: db_change_resources() вызван для не-ресурсов!</h1>');
       pdump(debug_backtrace());
       die('db_change_resources() вызван для не-ресурсов!');
     }
 
-    if(empty($unit_amount)) {
+    if (empty($unit_amount)) {
       continue;
     }
 
     $resourcesChange[pname_resource_name($unit_id)] += $unit_amount;
   }
 
-  if($locationType == LOC_USER) {
+  if ($locationType == LOC_USER) {
     $locationId = $user['id'];
   } else {
     $locationId = $planet['id'];

resources.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
  *
  **/
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 /**
  * @param          $resource_id
@@ -36,7 +36,7 @@ 
   $storage_fill = $caps_real['total_storage'][$resource_id] ? floor(mrc_get_level($user, $planetrow, $resource_id) / $caps_real['total_storage'][$resource_id] * 100) : 0;
 
   $template->assign_block_vars('resources', array(
-    'NAME' => classLocale::$lang["sys_" . pname_resource_name($resource_id)],
+    'NAME' => classLocale::$lang["sys_".pname_resource_name($resource_id)],
 
     'HOURLY'  => pretty_number($totalProduction, true, true),
     'WEEKLY'  => pretty_number($totalProduction * 24 * 7, true, true),
@@ -76,12 +76,12 @@ 
       $planetrow[$field_name] = $percent;
       $SubQry[$field_name] = $percent;
     } else {
-      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID' . $prod_id, 'Resource Page', 301);
+      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID'.$prod_id, 'Resource Page', 301);
       continue;
     }
   }
 
-  if(!empty($SubQry)) {
+  if (!empty($SubQry)) {
     DBStaticPlanet::db_planet_update_set_by_id(
       $planetrow['id'],
       $SubQry

phalanx.php

Spacing +10 added lines, -10 removed lines

@@ -11,24 +11,24 @@ 
  * @copyright 2008 by Pada for XNova.project.es
  */
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 lng_include('overview');
 lng_include('universe');
 
 $sensorLevel = mrc_get_level($user, $planetrow, STRUC_MOON_PHALANX);
 if (!intval($sensorLevel)) {
-  message (classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 if ($planetrow['planet_type'] != PT_MOON) {
-  message (classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $scan_galaxy  = sys_get_param_int('galaxy');
 $scan_system  = sys_get_param_int('system');
 $scan_planet  = sys_get_param_int('planet');
-$scan_planet_type  = 1; // sys_get_param_int('planettype');
+$scan_planet_type = 1; // sys_get_param_int('planettype');
 $id = sys_get_param_id('id');
 
 $source_galaxy = $planetrow['galaxy'];
@@ -38,9 +38,9 @@ 
 $sensorRange = GetPhalanxRange($sensorLevel);
 
 $system_distance = abs($source_system - $scan_system);
-if($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
+if ($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
 {
-  message (classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $cost = $sensorLevel * 1000;
@@ -51,20 +51,20 @@ 
 }
 
 $planet_scanned = DBStaticPlanet::db_planet_by_gspt($scan_galaxy, $scan_system, $scan_planet, $scan_planet_type);
-if(!$planet_scanned['id'])
+if (!$planet_scanned['id'])
 {
   message(classLocale::$lang['phalanx_planet_not_exists'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
-if($planet_scanned['destruyed'])
+if ($planet_scanned['destruyed'])
 {
-  message (classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 DBStaticPlanet::db_planet_update_adjust_by_id(
   $user['current_planet'],
   array(
-    'deuterium' => - $cost,
+    'deuterium' => -$cost,
   )
 );
 

overview.php

Spacing +38 added lines, -38 removed lines

@@ -30,7 +30,7 @@ 
 
 //define('SN_RENDER_NAVBAR_PLANET', false);
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 //$ccc = 0;
 //foreach(DBStaticUser::db_user_list_non_bots() as $ip) {
@@ -49,7 +49,7 @@ 
 
 $result = array();
 
-switch($mode = sys_get_param_str('mode')) {
+switch ($mode = sys_get_param_str('mode')) {
   case 'manage':
     sn_sys_sector_buy('overview.php?mode=manage');
 
@@ -59,7 +59,7 @@ 
     $template  = gettemplate('planet_manage', true);
     $planet_id = sys_get_param_id('planet_id');
 
-    if(sys_get_param_str('rename') && ($new_name_unsafe = sys_get_param_str_unsafe('new_name'))) {
+    if (sys_get_param_str('rename') && ($new_name_unsafe = sys_get_param_str_unsafe('new_name'))) {
       $planetrow['name'] = $new_name_unsafe;
       DBStaticPlanet::db_planet_update_set_by_id(
         $planetrow['id'],
@@ -67,21 +67,21 @@ 
           'name' => $new_name_unsafe,
         )
       );
-    } elseif(sys_get_param_str('action') == 'make_capital') {
+    } elseif (sys_get_param_str('action') == 'make_capital') {
       try {
         sn_db_transaction_start();
         $user = DBStaticUser::db_user_by_id($user['id'], true, '*');
         $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true, '*');
 
-        if($planetrow['planet_type'] != PT_PLANET) {
+        if ($planetrow['planet_type'] != PT_PLANET) {
           throw new exception(classLocale::$lang['ov_capital_err_not_a_planet'], ERR_ERROR);
         }
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           throw new exception(classLocale::$lang['ov_capital_err_capital_already'], ERR_ERROR);
         }
 
-        if($user_dark_matter < classSupernova::$config->planet_capital_cost) {
+        if ($user_dark_matter < classSupernova::$config->planet_capital_cost) {
           throw new exception(classLocale::$lang['ov_capital_err_no_dark_matter'], ERR_ERROR);
         }
 
@@ -106,16 +106,16 @@ 
         );
         sn_db_transaction_commit();
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_teleport') {
+    } elseif (sys_get_param_str('action') == 'planet_teleport') {
       try {
-        if(!uni_coordinates_valid($new_coordinates = array(
+        if (!uni_coordinates_valid($new_coordinates = array(
           'galaxy' => sys_get_param_int('new_galaxy'),
           'system' => sys_get_param_int('new_system'),
           'planet' => sys_get_param_int('new_planet')))
@@ -132,7 +132,7 @@ 
 //        $planetrow = $global_data['planet'];
 
         $can_teleport = uni_planet_teleport_check($user, $planetrow, $new_coordinates);
-        if($can_teleport['result'] != ERR_NONE) {
+        if ($can_teleport['result'] != ERR_NONE) {
           throw new exception($can_teleport['message'], $can_teleport['result']);
         }
 
@@ -151,7 +151,7 @@ 
           array()
         );
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           DBStaticUser::db_user_set_by_id(
             $user['id'],
             array(
@@ -171,17 +171,17 @@ 
           'MESSAGE' => classLocale::$lang['ov_teleport_err_none'],
         );
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_abandon') {
+    } elseif (sys_get_param_str('action') == 'planet_abandon') {
       // if(sec_password_check($user['id'], sys_get_param('abandon_confirm'))) {
-      if(classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
-        if($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
+      if (classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
+        if ($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
           $destroyed = SN_TIME_NOW + 60 * 60 * 24;
           DBStaticPlanet::db_planet_update_set_by_id(
             $user['current_planet'],
@@ -207,9 +207,9 @@ 
           message(classLocale::$lang['ov_delete_wrong_planet'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
         }
       } else {
-        message(classLocale::$lang['ov_delete_wrong_pass'] , classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
+        message(classLocale::$lang['ov_delete_wrong_pass'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
       }
-    } elseif(
+    } elseif (
       ($hire = sys_get_param_int('hire')) && in_array($hire, sn_get_groups('governors'))
       && (
         !get_unit_param($hire, P_MAX_STACK) ||
@@ -224,8 +224,8 @@ 
       $user = DBStaticUser::db_user_by_id($user['id'], true);
       $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
       $build_data = eco_get_build_data($user, $planetrow, $hire, $planetrow['PLANET_GOVERNOR_ID'] == $hire ? $planetrow['PLANET_GOVERNOR_LEVEL'] : 0);
-      if($build_data['CAN'][BUILD_CREATE]) {
-        if($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
+      if ($build_data['CAN'][BUILD_CREATE]) {
+        if ($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
           $planetrow['PLANET_GOVERNOR_LEVEL']++;
         } else {
           $planetrow['PLANET_GOVERNOR_LEVEL'] = 1;
@@ -257,8 +257,8 @@ 
 
     lng_include('mrc_mercenary');
     int_planet_pretemplate($planetrow, $template);
-    foreach(sn_get_groups('governors') as $governor_id) {
-      if($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
+    foreach (sn_get_groups('governors') as $governor_id) {
+      if ($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
         continue;
       }
 
@@ -310,7 +310,7 @@ 
       'PAGE_HINT'   => classLocale::$lang['ov_manage_page_hint'],
     ));
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 
@@ -320,7 +320,7 @@ 
   default:
     sn_sys_sector_buy();
 
-    if(sys_get_param_str('rename') && $new_name_unsafe = sys_get_param_str_unsafe('new_name')) {
+    if (sys_get_param_str('rename') && $new_name_unsafe = sys_get_param_str_unsafe('new_name')) {
       $planetrow['name'] = $new_name_unsafe;
       DBStaticPlanet::db_planet_update_set_by_id(
         $planetrow['id'],
@@ -355,7 +355,7 @@ 
 
     $planet_count = 0;
     $planets_query = DBStaticPlanet::db_planet_list_sorted($user, false, '*');
-    foreach($planets_query as $an_id => $UserPlanet) {
+    foreach ($planets_query as $an_id => $UserPlanet) {
       sn_db_transaction_start();
       $UserPlanet = sys_o_get_updated($user, $UserPlanet['id'], SN_TIME_NOW, false, true);
       sn_db_transaction_commit();
@@ -366,16 +366,16 @@ 
 
       $planet_fleet_id = 0;
       $fleet_list = $template_planet['fleet_list'];
-      if($fleet_list['own']['count']) {
+      if ($fleet_list['own']['count']) {
         $planet_fleet_id = "p{$UserPlanet['id']}";
         $fleets_to_planet[$UserPlanet['id']] = tpl_parse_fleet_sn($fleet_list['own']['total'], $planet_fleet_id);
 //        $fleet_id++;tpl_parse_fleet_sn
       }
-      if($UserPlanet['planet_type'] == PT_MOON) {
+      if ($UserPlanet['planet_type'] == PT_MOON) {
         continue;
       }
       $moon = DBStaticPlanet::db_planet_by_parent($UserPlanet['id']);
-      if($moon) {
+      if ($moon) {
         $moon_fill = min(100, floor($moon['field_current'] / eco_planet_fields_max($moon) * 100));
       } else {
         $moon_fill = 0;
@@ -415,7 +415,7 @@ 
     tpl_assign_fleet($template, $fleets);
 
     $lune = $planetrow['planet_type'] == PT_PLANET ? DBStaticPlanet::db_planet_by_parent($planetrow['id']) : DBStaticPlanet::db_planet_by_id($planetrow['parent_planet']);
-    if($lune) {
+    if ($lune) {
       $template->assign_vars(array(
         'MOON_ID' => $lune['id'],
         'MOON_IMG' => $lune['image'],
@@ -427,15 +427,15 @@ 
     $planet_fill = $planet_fill > 100 ? 100 : $planet_fill;
 
     $planet_recyclers_orbiting = 0;
-    foreach(Fleet::$snGroupRecyclers as $recycler_id) {
+    foreach (Fleet::$snGroupRecyclers as $recycler_id) {
       $planet_recyclers_orbiting += mrc_get_level($user, $planetrow, $recycler_id);
     }
 
     int_planet_pretemplate($planetrow, $template);
 
     $sn_group_ques = sn_get_groups('ques');
-    if(!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
-      foreach(array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
+    if (!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
+      foreach (array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
         $this_que = $que['ques'][$que_id][$user['id']][$planetrow['id']];
         $template->assign_block_vars('ques', array(
           'ID'     => $que_id,
@@ -443,8 +443,8 @@ 
           'LENGTH' => empty($this_que) ? 0 : count($this_que),
         ));
 
-        if(!empty($this_que)) {
-          foreach($this_que as $que_item) {
+        if (!empty($this_que)) {
+          foreach ($this_que as $que_item) {
             $template->assign_block_vars('que', que_tpl_parse_element($que_item));
           }
         }
@@ -458,7 +458,7 @@ 
       'LENGTH' => $que_hangar_length,
     ));
 
-    if(!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
+    if (!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
       $que_hangar_length = tpl_assign_hangar($template, $planetrow, SUBQUE_DEFENSE);
       $template->assign_block_vars('ques', array(
         'ID'     => SUBQUE_DEFENSE,
@@ -470,12 +470,12 @@ 
     $overview_planet_rows = $user['opt_int_overview_planet_rows'];
     $overview_planet_columns = $user['opt_int_overview_planet_columns'];
 
-    if($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
       $overview_planet_rows = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_rows'];
       $overview_planet_columns = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_columns'];
     }
 
-    if($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
       $overview_planet_columns = ceil($planet_count / $overview_planet_rows);
     }
 
@@ -532,7 +532,7 @@ 
     ));
     tpl_set_resource_info($template, $planetrow, $fleets_to_planet, 2);
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 

admin/planet_edit.php

Spacing +11 added lines, -11 removed lines

@@ -4,16 +4,16 @@ 
 define('INSTALL', false);
 define('IN_ADMIN', true);
 
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 // if($user['authlevel'] < 2)
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 AdminMessage('Временно не работает');
 
-require("includes/admin_planet_edit.inc" . DOT_PHP_EX);
+require("includes/admin_planet_edit.inc".DOT_PHP_EX);
 
 $template = gettemplate('admin/admin_planet_edit', true);
 
@@ -21,30 +21,30 @@ 
 $planet_id = sys_get_param_id('planet_id');
 
 $unit_list = sys_get_param('unit_list');
-if(sys_get_param('change_data') && !empty($unit_list))
+if (sys_get_param('change_data') && !empty($unit_list))
 {
   $query_string = array();
-  foreach($unit_list as $unit_id => $unit_amount)
+  foreach ($unit_list as $unit_id => $unit_amount)
   {
-    if($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
+    if ($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
     {
       $query_string[] = $unit_query_string;
     }
   }
 
-  if(!empty($query_string))
+  if (!empty($query_string))
   {
-    classSupernova::$db->doUpdateReallyComplex("UPDATE {{" . TABLE_PLANETS . "}} SET " . implode(', ', $query_string) . " WHERE `id` = {$planet_id}");
+    classSupernova::$db->doUpdateReallyComplex("UPDATE {{".TABLE_PLANETS."}} SET ".implode(', ', $query_string)." WHERE `id` = {$planet_id}");
   }
 }
 
-if($planet_id)
+if ($planet_id)
 {
   $edit_planet_row = DBStaticPlanet::db_planet_by_id($planet_id);
   admin_planet_edit_template($template, $edit_planet_row, $mode);
 }
 
-foreach($admin_planet_edit_mode_list as $page_mode => $mode_locale)
+foreach ($admin_planet_edit_mode_list as $page_mode => $mode_locale)
 {
   $template->assign_block_vars('page_menu', array(
     'ID' => $page_mode,
@@ -55,7 +55,7 @@ 
 $template->assign_vars(array(
   'MODE' => $mode,
   'PLANET_ID' => $planet_id,
-  'PLANET_NAME' => empty($edit_planet_row) ? '' : classLocale::$lang['sys_planet_type'][$edit_planet_row['planet_type']] . ' ' . uni_render_planet($edit_planet_row),
+  'PLANET_NAME' => empty($edit_planet_row) ? '' : classLocale::$lang['sys_planet_type'][$edit_planet_row['planet_type']].' '.uni_render_planet($edit_planet_row),
   'PAGE_HINT' => classLocale::$lang['adm_planet_edit_hint'],
 ));
 

includes/alliance/ali_internal_admin.inc

Spacing +20 added lines, -20 removed lines

@@ -1,10 +1,10 @@ 
 <?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);
 }
 
-if(!$user_admin) {
+if (!$user_admin) {
   message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
 }
 
@@ -20,11 +20,11 @@ 
 $allyTextID = ($allyTextID < 1 || $allyTextID > 3) ? 1 : $allyTextID;
 
 
-if(sys_get_param_str('isSaveOptions')) {
+if (sys_get_param_str('isSaveOptions')) {
   require_once('includes/includes/sys_avatar.php');
 
   $fieldChange = array();
-  if(($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) != $ally['ally_tag']) {
+  if (($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) != $ally['ally_tag']) {
     $fieldChange['ally_tag'] = $new_tag;
     DBStaticUser::db_user_set_by_id(
       $ally['ally_user_id'],
@@ -33,19 +33,19 @@ 
       )
     );
   }
-  if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) != $ally['ally_name']) {
+  if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) != $ally['ally_name']) {
     $fieldChange['ally_name'] = $new_name;
   }
 
-  if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) != $ally['ally_owner_range']) {
+  if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) != $ally['ally_owner_range']) {
     $fieldChange['ally_owner_range'] = $new_owner_rank;
   }
 
-  if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) != $ally['ally_web']) {
+  if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) != $ally['ally_web']) {
     $fieldChange['ally_web'] = $new_web;
   }
 
-  if(($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) != $ally['ally_request_notallow']) {
+  if (($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) != $ally['ally_request_notallow']) {
     $fieldChange['ally_request_notallow'] = sys_get_param_int('request_notallow', $ally['ally_request_notallow']);
   }
 
@@ -55,11 +55,11 @@ 
     'AVATAR_UPLOAD_STATUS'  => $avatar_upload_result['STATUS'],
     'AVATAR_UPLOAD_MESSAGE' => $avatar_upload_result['MESSAGE'],
   ));
-  if($new_image != $ally['ally_image']) {
+  if ($new_image != $ally['ally_image']) {
     $fieldChange['ally_image'] = $new_image;
   }
 
-  if(!empty($fieldChange)) {
+  if (!empty($fieldChange)) {
     classSupernova::$db->doUpdateRowSet(
       TABLE_ALLIANCE,
       $fieldChange,
@@ -70,17 +70,17 @@ 
 
     sys_redirect('alliance.php?mode=admin&edit=ally');
   }
-} elseif(sys_get_param_str('isSaveText')) {
+} elseif (sys_get_param_str('isSaveText')) {
   $text_unsafe = sys_get_param_str_unsafe('text');
   DBStaticAlly::db_ally_update_texts($text_unsafe, $ally['id'], $text_list[$allyTextID]['db_field']);
   $ally[$text_list[$allyTextID]['db_field']] = db_escape($text_unsafe);
-} elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
-  if(!$isAllyOwner) {
+} elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
+  if (!$isAllyOwner) {
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
   }
 
   $newLeader = DBStaticUser::db_user_by_id($idNewLeader, false, `ally_id`);
-  if($newLeader['ally_id'] == $user['ally_id']) {
+  if ($newLeader['ally_id'] == $user['ally_id']) {
     sn_db_transaction_start();
     DBStaticUser::db_user_set_by_id(
       $user['id'],
@@ -99,8 +99,8 @@ 
     sn_db_transaction_commit();
     sys_redirect('alliance.php');
   }
-} elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
-  if(!$isAllyOwner) {
+} elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
+  if (!$isAllyOwner) {
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
   }
   sn_db_transaction_start();
@@ -123,7 +123,7 @@ 
 $request = DBStaticAlly::db_ally_request_count_by_id($ally);
 
 $template->assign_vars(array(
-  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'] . ': ' . intval($request['request_count']) . '. ' . classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
+  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'].': '.intval($request['request_count']).'. '.classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
   'text'                    => $ally[$text_list[$allyTextID]['db_field']],
   'request_type'            => classLocale::$lang[$text_list[$allyTextID]['text_type']],
   't'                       => $allyTextID,
@@ -156,7 +156,7 @@ 
   $userAllyAdmins = DBStaticUser::db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
   unset($tmp);
   // while ($userAllyAdmin = db_fetch($userAllyAdmins))
-  foreach($userAllyAdmins as $userAllyAdmin) {
+  foreach ($userAllyAdmins as $userAllyAdmin) {
 // pdump($userAllyAdmin);
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
   }
@@ -164,8 +164,8 @@ 
   $template->assign_var('adminMembers', $tmp);
 }
 
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
-  if(!$sn_ali_admin_action_locale['title']) {
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
+  if (!$sn_ali_admin_action_locale['title']) {
     continue;
   }
   $template->assign_block_vars('admin_actions', array(

includes/alliance/ali_external_create_ally.inc

Spacing +5 added lines, -5 removed lines

@@ -2,7 +2,7 @@ 
 // Pretty Safe
 // TODO: Add ally_tag to usertable
 
-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);
 }
 
@@ -11,13 +11,13 @@ 
 $ally_name_unsafe = sys_get_param_str_unsafe('name');
 $ally_name = db_escape($ally_name_unsafe);
 
-if($ally_tag) {
-  if(!$ally_name_unsafe || !$ally_tag_unsafe) {
+if ($ally_tag) {
+  if (!$ally_name_unsafe || !$ally_tag_unsafe) {
     message(classLocale::$lang['have_not_name'], classLocale::$lang['make_alliance']);
   }
 
   $query = DBStaticAlly::db_ally_get_by_name_or_tag($ally_tag, $ally_name);
-  if($query) {
+  if ($query) {
     message(str_replace('%s', $query['ally_tag'] == $ally_tag_unsafe ? $ally_tag_unsafe : $ally_name_unsafe, classLocale::$lang['always_exist']), classLocale::$lang['make_alliance']);
   }
 
@@ -35,7 +35,7 @@ 
 
 
   $ally_user = classSupernova::$gc->cacheOperator->db_ins_record(LOC_USER, array(
-    'username'      => "[" . $ally_tag_unsafe . "]",
+    'username'      => "[".$ally_tag_unsafe."]",
     'register_time' => SN_TIME_NOW,
     'user_as_ally'  => $ally_id,
   ));

includes/alliance/ali_internal_admin_request.inc

Spacing +3 added lines, -3 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);
 }
 
@@ -8,13 +8,13 @@ 
   message(classLocale::$lang['Denied_access'], classLocale::$lang['requests_admin']);
 }
 
-if($d = sys_get_param_id('d')) {
+if ($d = sys_get_param_id('d')) {
   DBStaticAlly::db_ally_request_deny($d);
 }
 
 $id_user = sys_get_param_id('id_user');
 
-if($id_user) {
+if ($id_user) {
   DBStaticUser::db_user_set_by_id(
     $id_user,
     array(