supernova-ws / SuperNova

includes/includes/upd_helpers.php

Spacing +38 added lines, -38 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('IN_UPDATE')) {
+if (!defined('IN_UPDATE')) {
   die('Trying to call update helpers externally!');
 }
 
@@ -8,12 +8,12 @@ 
   global $update_tables;
 
   upd_add_more_time();
-  if(!$no_log) {
+  if (!$no_log) {
     upd_log_message("Performing query '{$query}'");
   }
 
-  if(strpos($query, '{{') !== false) {
-    foreach($update_tables as $tableName => $cork) {
+  if (strpos($query, '{{') !== false) {
+    foreach ($update_tables as $tableName => $cork) {
       $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix . $tableName, $query);
     }
   }
@@ -25,9 +25,9 @@ 
   global $config, $sys_log_disabled;
 
   $config->db_loadItem($key);
-  if($condition || !isset($config->$key)) {
+  if ($condition || !isset($config->$key)) {
     upd_add_more_time();
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       upd_log_message("Updating config key '{$key}' with value '{$default_value}'");
     }
     $config->db_saveItem($key, $default_value);
@@ -55,7 +55,7 @@ 
 function upd_log_message($message) {
   global $sys_log_disabled, $upd_log, $debug;
 
-  if($sys_log_disabled)
+  if ($sys_log_disabled)
   {
 //    print("{$message}<br />");
   } else {
@@ -67,15 +67,15 @@ 
 function upd_unset_table_info($table_name) {
   global $update_tables, $update_indexes, $update_foreigns;
 
-  if(isset($update_tables[$table_name])) {
+  if (isset($update_tables[$table_name])) {
     unset($update_tables[$table_name]);
   }
 
-  if(isset($update_indexes[$table_name])) {
+  if (isset($update_indexes[$table_name])) {
     unset($update_indexes[$table_name]);
   }
 
-  if(isset($update_foreigns[$table_name])) {
+  if (isset($update_foreigns[$table_name])) {
     unset($update_foreigns[$table_name]);
   }
 }
@@ -89,18 +89,18 @@ 
   upd_unset_table_info($tableName);
 
   $q1 = upd_do_query("SHOW FULL COLUMNS FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_tables[$tableName][$r1['Field']] = $r1;
   }
 
   $q1 = upd_do_query("SHOW INDEX FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_indexes[$tableName][$r1['Key_name']] .= "{$r1['Column_name']},";
     $update_indexes_full[$tableName][$r1['Key_name']][$r1['Column_name']] = $r1;
   }
 
-  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name). "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
-  while($r1 = db_fetch($q1)) {
+  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
+  while ($r1 = db_fetch($q1)) {
     $table_referenced = str_replace($config->db_prefix, '', $r1['REFERENCED_TABLE_NAME']);
 
     $update_foreigns[$tableName][$r1['CONSTRAINT_NAME']] .= "{$r1['COLUMN_NAME']},{$table_referenced},{$r1['REFERENCED_COLUMN_NAME']};";
@@ -110,7 +110,7 @@ 
 function upd_alter_table($table, $alters, $condition = true) {
   global $config, $update_tables;
 
-  if(!$condition) {
+  if (!$condition) {
     return;
   }
 
@@ -118,7 +118,7 @@ 
   $alters_print = is_array($alters) ? dump($alters) : $alters;
   upd_log_message("Altering table '{$table}' with alterations {$alters_print}");
 
-  if(!is_array($alters)) {
+  if (!is_array($alters)) {
     $alters = array($alters);
   }
 
@@ -128,7 +128,7 @@ 
 
   $result = upd_do_query($qry);
   $error = db_error();
-  if($error) {
+  if ($error) {
     die("Altering error for table `{$table}`: {$error}<br />{$alters_print}");
   }
 
@@ -155,19 +155,19 @@ 
 function upd_create_table($table_name, $declaration, $tableOptions = '') {
   global $config, $update_tables;
 
-  if(!$update_tables[$table_name]) {
+  if (!$update_tables[$table_name]) {
     upd_do_query('set foreign_key_checks = 0;', true);
     $declaration = trim($declaration);
-    if(substr($declaration, 0, 1) != '(') {
+    if (substr($declaration, 0, 1) != '(') {
       $declaration = "($declaration)";
     }
     $tableOptions = trim($tableOptions);
-    if(!empty($tableOptions)) {
+    if (!empty($tableOptions)) {
       $declaration .= $tableOptions;
     }
     $result = upd_do_query("CREATE TABLE IF NOT EXISTS `{$config->db_prefix}{$table_name}` {$declaration}");
     $error = db_error();
-    if($error) {
+    if ($error) {
       die("Creating error for table `{$table_name}`: {$error}<br />" . dump($declaration));
     }
     upd_do_query('set foreign_key_checks = 1;', true);
@@ -193,14 +193,14 @@ 
 
 
 function upd_db_unit_changeset_prepare($unit_id, $unit_value, $user, $planet_id = null) {
-  if(!is_array($user)) {
+  if (!is_array($user)) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: upd_db_unit_changeset_prepare() - USER is not ARRAY</h1>');
     pdump(debug_backtrace());
     die('USER is not ARRAY');
   }
 
-  if(!isset($user['id']) || !$user['id']) {
+  if (!isset($user['id']) || !$user['id']) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: upd_db_unit_changeset_prepare() - USER[id] пустой</h1>');
     pdump($user);
@@ -215,7 +215,7 @@ 
 
   $db_changeset = array();
   $temp = upd_db_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
-  if($temp['unit_id']) {
+  if ($temp['unit_id']) {
     // update
     $db_changeset = array(
       'action' => SQL_OP_UPDATE,
@@ -261,53 +261,53 @@ 
 
 
 function upd_db_changeset_apply($db_changeset) {
-  if(!is_array($db_changeset) || empty($db_changeset)) {
+  if (!is_array($db_changeset) || empty($db_changeset)) {
     return;
   }
 
-  foreach($db_changeset as $table_name => $table_data) {
-    foreach($table_data as $record_id => $conditions) {
+  foreach ($db_changeset as $table_name => $table_data) {
+    foreach ($table_data as $record_id => $conditions) {
       $where = '';
-      if(!empty($conditions['where'])) {
+      if (!empty($conditions['where'])) {
         $where = 'WHERE ' . implode(' AND ', $conditions['where']);
       }
 
       $fields = array();
-      if($conditions['fields']) {
-        foreach($conditions['fields'] as $field_name => $field_data) {
+      if ($conditions['fields']) {
+        foreach ($conditions['fields'] as $field_name => $field_data) {
           $condition = "`{$field_name}` = ";
           $value = '';
-          if($field_data['delta']) {
+          if ($field_data['delta']) {
             $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
-          } elseif($field_data['set']) {
-            $value = (is_string($field_data['set']) ? "'{$field_data['set']}'": $field_data['set']);
+          } elseif ($field_data['set']) {
+            $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
           }
-          if($value) {
+          if ($value) {
             $fields[] = $condition . $value;
           }
         }
       }
       $fields = implode(',', $fields);
 
-      switch($conditions['action']) {
+      switch ($conditions['action']) {
         case SQL_OP_DELETE:
           upd_do_query("DELETE FROM {{{$table_name}}} {$where}");
           break;
 
         case SQL_OP_UPDATE:
-          if($fields) {
+          if ($fields) {
             upd_do_query("UPDATE {{{$table_name}}} SET {$fields} {$where}");
           }
           break;
 
         case SQL_OP_INSERT:
-          if($fields) {
+          if ($fields) {
             upd_do_query("INSERT INTO {{{$table_name}}} SET {$fields}");
           }
           break;
 
         case SQL_OP_REPLACE:
-          if($fields) {
+          if ($fields) {
             upd_do_query("REPLACE INTO {{{$table_name}}} SET {$fields}");
           }
           break;

includes/includes/art_artifact.php

Spacing +15 added lines, -15 removed lines

@@ -4,7 +4,7 @@ 
 {
   global $lang;
 
-  if(!in_array($unit_id, sn_get_groups('artifacts')))
+  if (!in_array($unit_id, sn_get_groups('artifacts')))
   {
     return;
   }
@@ -13,24 +13,24 @@ 
   $user = db_user_by_id($user['id'], true);
 
   $unit_level = $artifact_level_old = mrc_get_level($user, array(), $unit_id, true);
-  if($unit_level > 0)
+  if ($unit_level > 0)
   {
     $db_changeset = array();
-    switch($unit_id)
+    switch ($unit_id)
     {
       case ART_LHC:
       case ART_HOOK_SMALL:
       case ART_HOOK_MEDIUM:
       case ART_HOOK_LARGE:
         $has_moon = DBStaticPlanet::db_planet_by_parent($planetrow['id'], true, '`id`');
-        if($planetrow['planet_type'] == PT_PLANET && !$has_moon['id'])
+        if ($planetrow['planet_type'] == PT_PLANET && !$has_moon['id'])
         {
           $unit_level--;
           $moon_chance = $unit_id == ART_LHC ? uni_calculate_moon_chance($planetrow['debris_metal'] + $planetrow['debris_crystal']) : (
             $unit_id == ART_HOOK_MEDIUM ? mt_rand(1100, 8999) : ($unit_id == ART_HOOK_SMALL ? 1100 : 8999)
           );
           $random = $unit_id == ART_LHC ? mt_rand(1, 100) : $moon_chance;
-          if($random <= $moon_chance)
+          if ($random <= $moon_chance)
           {
             $new_moon_row = uni_create_moon($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], $user['id'], $moon_chance);
             $message = sprintf($lang['art_moon_create'][$unit_id], $new_moon_row['name'], uni_render_coordinates($planetrow), pretty_number($moon_chance));
@@ -51,14 +51,14 @@ 
       case ART_RCD_MEDIUM:
       case ART_RCD_LARGE:
         $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
-        if($planetrow['planet_type'] != PT_PLANET)
+        if ($planetrow['planet_type'] != PT_PLANET)
         {
           $message = $lang['art_rcd_err_moon'];
           break;
         }
 
         $que = que_get($user['id'], $planetrow['id'], QUE_STRUCTURES, false);
-        if(!empty($que['items']))
+        if (!empty($que['items']))
         {
           $message = $lang['art_rcd_err_que'];
           break;
@@ -67,15 +67,15 @@ 
         $artifact_deploy = get_unit_param($unit_id, P_DEPLOY);
 
         $sectors_used = 0;
-        foreach($artifact_deploy as $deploy_unit_id => $deploy_unit_level)
+        foreach ($artifact_deploy as $deploy_unit_id => $deploy_unit_level)
         {
-          if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true))))
+          if (!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true))))
             continue;
           $sectors_used += $levels_deployed;
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($deploy_unit_id, $levels_deployed, $user, $planetrow['id']);
         }
 
-        if($sectors_used == 0)
+        if ($sectors_used == 0)
         {
           $message = $lang['art_rcd_err_no_sense'];
           break;
@@ -90,13 +90,13 @@ 
         $que_item = null;
         $que = que_get($user['id'], $planetrow['id'], QUE_RESEARCH, true);
         $current_que = &$que['ques'][QUE_RESEARCH][$user['id']][0];
-        if(!empty($current_que))
+        if (!empty($current_que))
         {
           reset($current_que);
           $que_item = &$que['ques'][QUE_RESEARCH][$user['id']][0][key($current_que)];
         }
 
-        if(!empty($que_item) && $que_item['que_time_left'] > 60)
+        if (!empty($que_item) && $que_item['que_time_left'] > 60)
         {
           $unit_level--;
           $old_time = $que_item['que_time_left'];
@@ -117,13 +117,13 @@ 
         $que = que_get($user['id'], $planetrow['id'], QUE_STRUCTURES, true);
         $current_que = &$que['ques'][QUE_STRUCTURES][$user['id']][$planetrow['id']];
         // $que_item = &$que['que'][QUE_STRUCTURES][0];
-        if(!empty($current_que))
+        if (!empty($current_que))
         {
           reset($current_que);
           $que_item = &$que['ques'][QUE_STRUCTURES][$user['id']][$planetrow['id']][key($current_que)];
         }
 
-        if(isset($que_item) && $que_item['que_time_left'] > 60)
+        if (isset($que_item) && $que_item['que_time_left'] > 60)
         {
           $unit_level--;
           $old_time = $que_item['que_time_left'];
@@ -141,7 +141,7 @@ 
       break;
 
     }
-    if($unit_level != $artifact_level_old)
+    if ($unit_level != $artifact_level_old)
     {
       $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_level - $artifact_level_old, $user);
       OldDbChangeSet::db_changeset_apply($db_changeset);

includes/includes/flt_functions.php

Spacing +79 added lines, -79 removed lines

@@ -8,11 +8,11 @@ 
   }
 
   $speeds = array();
-  if(!empty($fleet))
+  if (!empty($fleet))
   {
     foreach ($fleet as $ship_id => $amount)
     {
-      if($amount && in_array($ship_id, sn_get_groups(array('fleet', 'missile'))))
+      if ($amount && in_array($ship_id, sn_get_groups(array('fleet', 'missile'))))
       {
         $single_ship_data = get_ship_data($ship_id, $user);
         $speeds[] = $single_ship_data['speed'];
@@ -26,15 +26,15 @@ 
 function flt_travel_distance($from, $to) {
   global $config;
 
-  if($from['galaxy'] != $to['galaxy'])
+  if ($from['galaxy'] != $to['galaxy'])
   {
     $distance = abs($from['galaxy'] - $to['galaxy']) * $config->uni_galaxy_distance;
   }
-  elseif($from['system'] != $to['system'])
+  elseif ($from['system'] != $to['system'])
   {
     $distance = abs($from['system'] - $to['system']) * 5 * 19 + 2700;
   }
-  elseif($from['planet'] != $to['planet'])
+  elseif ($from['planet'] != $to['planet'])
   {
     $distance = abs($from['planet'] - $to['planet']) * 5 + 1000;
   }
@@ -65,14 +65,14 @@ 
 
   $game_fleet_speed = flt_server_flight_speed_multiplier();
   $fleet_speed = flt_fleet_speed($user_row, $fleet_array);
-  if(!empty($fleet_array) && $fleet_speed && $game_fleet_speed)
+  if (!empty($fleet_array) && $fleet_speed && $game_fleet_speed)
   {
     $speed_percent = $speed_percent ? max(min($speed_percent, 10), 1) : 10;
     $real_speed = $speed_percent * sqrt($fleet_speed);
 
     $duration = max(1, round((35000 / $speed_percent * sqrt($distance * 10 / $fleet_speed) + 10) / $game_fleet_speed));
 
-    foreach($fleet_array as $ship_id => $ship_count)
+    foreach ($fleet_array as $ship_id => $ship_count)
     {
       if (!$ship_id || !$ship_count)
       {
@@ -126,19 +126,19 @@ 
 
   $config_bashing_attacks = $config->fleet_bashing_attacks;
   $config_bashing_interval = $config->fleet_bashing_interval;
-  if(!$config_bashing_attacks) {
+  if (!$config_bashing_attacks) {
     // Bashing allowed - protection disabled
     return ATTACK_ALLOWED;
   }
 
   $bashing_result = ATTACK_BASHING;
-  if($user['ally_id'] && $enemy['ally_id']) {
+  if ($user['ally_id'] && $enemy['ally_id']) {
     $relations = ali_relations($user['ally_id'], $enemy['ally_id']);
-    if(!empty($relations)) {
+    if (!empty($relations)) {
       $relations = $relations[$enemy['ally_id']];
-      switch($relations['alliance_diplomacy_relation']) {
+      switch ($relations['alliance_diplomacy_relation']) {
         case ALLY_DIPLOMACY_WAR:
-          if(SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= $config->fleet_bashing_war_delay) {
+          if (SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= $config->fleet_bashing_war_delay) {
             $bashing_result = ATTACK_BASHING_WAR_DELAY;
           } else {
             return ATTACK_ALLOWED;
@@ -175,9 +175,9 @@ 
 //    }
 //  }
   $bashing_fleet_list = fleet_list_bashing($user['id'], $planet_dst);
-  foreach($bashing_fleet_list as $fleet_row) {
+  foreach ($bashing_fleet_list as $fleet_row) {
     // Checking for ACS - each ACS count only once
-    if($fleet_row['fleet_group']) {
+    if ($fleet_row['fleet_group']) {
       $bashing_list["{$user['id']}_{$fleet_row['fleet_group']}"] = $fleet_row['fleet_start_time'];
     } else {
       $bashing_list[] = $fleet_row['fleet_start_time'];
@@ -185,12 +185,12 @@ 
   }
 
   // Check for joining to ACS - if there are already fleets in ACS no checks should be done
-  if($mission == MT_AKS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
+  if ($mission == MT_AKS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
     return ATTACK_ALLOWED;
   }
 
   $query = doquery("SELECT bashing_time FROM {{bashing}} WHERE bashing_user_id = {$user['id']} AND bashing_planet_id = {$planet_dst['id']} AND bashing_time >= {$time_limit};");
-  while($bashing_row = db_fetch($query)) {
+  while ($bashing_row = db_fetch($query)) {
     $bashing_list[] = $bashing_row['bashing_time'];
   }
 
@@ -199,9 +199,9 @@ 
   $last_attack = 0;
   $wave = 0;
   $attack = 1;
-  foreach($bashing_list as &$bash_time) {
+  foreach ($bashing_list as &$bash_time) {
     $attack++;
-    if($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
+    if ($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
       $attack = 1;
       $wave++;
     }
@@ -212,21 +212,21 @@ 
   return ($wave > $config->fleet_bashing_waves ? $bashing_result : ATTACK_ALLOWED);
 }
 
-function flt_can_attack($planet_src, $planet_dst, $fleet = array(), $mission, $options = false){return sn_function_call('flt_can_attack', array($planet_src, $planet_dst, $fleet, $mission, $options, &$result));}
+function flt_can_attack($planet_src, $planet_dst, $fleet = array(), $mission, $options = false) {return sn_function_call('flt_can_attack', array($planet_src, $planet_dst, $fleet, $mission, $options, &$result)); }
 function sn_flt_can_attack($planet_src, $planet_dst, $fleet = array(), $mission, $options = false, &$result) {
   //TODO: try..catch
   global $config, $user;
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     return $result = ATTACK_OWN_VACATION;
   }
 
-  if(empty($fleet) || !is_array($fleet)) {
+  if (empty($fleet) || !is_array($fleet)) {
     return $result = ATTACK_NO_FLEET;
   }
 
   $sn_groups_mission = sn_get_groups('missions');
-  if(!isset($sn_groups_mission[$mission])) {
+  if (!isset($sn_groups_mission[$mission])) {
     return $result = ATTACK_MISSION_ABSENT;
   }
   $sn_data_mission = $sn_groups_mission[$mission];
@@ -245,32 +245,32 @@ 
   $resources = 0;
   $ship_ids = sn_get_groups('fleet');
   $resource_ids = sn_get_groups('resources_loot');
-  foreach($fleet as $ship_id => $ship_count) {
+  foreach ($fleet as $ship_id => $ship_count) {
     $is_ship = in_array($ship_id, $ship_ids);
     $is_resource = in_array($ship_id, $resource_ids);
-    if(!$is_ship && !$is_resource) {
+    if (!$is_ship && !$is_resource) {
       // TODO Спецобработчик для Капитана и модулей
 //      return ATTACK_WRONG_UNIT;
     }
 
-    if($ship_count < 0) {
+    if ($ship_count < 0) {
       return $result = $is_ship ? ATTACK_SHIP_COUNT_WRONG : ATTACK_RESOURCE_COUNT_WRONG;
     }
 
-    if($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
+    if ($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
       // TODO ATTACK_NO_MISSILE
       return $result = $is_ship ? ATTACK_NO_SHIPS : ATTACK_NO_RESOURCES;
     }
 
-    if($is_ship) {
+    if ($is_ship) {
       $single_ship_data = get_ship_data($ship_id, $user);
-      if($single_ship_data[P_SPEED] <= 0) {
+      if ($single_ship_data[P_SPEED] <= 0) {
         return $result = ATTACK_ZERO_SPEED;
       }
       $ships += $ship_count;
       $recyclers += in_array($ship_id, sn_get_groups('flt_recyclers')) ? $ship_count : 0;
       $spies += $ship_id == SHIP_SPY ? $ship_count : 0;
-    } elseif($is_resource) {
+    } elseif ($is_resource) {
       $resources += $ship_count;
     }
   }
@@ -281,7 +281,7 @@ 
   }
 */
 
-  if(isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
+  if (isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
     return $result = ATTACK_RESOURCE_FORBIDDEN;
   }
 
@@ -293,35 +293,35 @@ 
   */
 
   $speed = $options['fleet_speed_percent'];
-  if($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
+  if ($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
     return $result = ATTACK_WRONG_SPEED;
   }
 
   $travel_data = flt_travel_data($user, $planet_src, $planet_dst, $fleet, $options['fleet_speed_percent']);
 
 
-  if(mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
+  if (mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
     return $result = ATTACK_NO_FUEL;
   }
 
-  if($travel_data['consumption'] > $travel_data['capacity']) {
+  if ($travel_data['consumption'] > $travel_data['capacity']) {
     return $result = ATTACK_TOO_FAR;
   }
 
-  if($travel_data['hold'] < $resources) {
+  if ($travel_data['hold'] < $resources) {
     return $result = ATTACK_OVERLOADED;
   }
 
   $fleet_start_time = SN_TIME_NOW + $travel_data['duration'];
 
   $fleet_group = $options['fleet_group'];
-  if($fleet_group) {
-    if($mission != MT_AKS) {
+  if ($fleet_group) {
+    if ($mission != MT_AKS) {
       return $result = ATTACK_WRONG_MISSION;
     };
 
     $acs = doquery("SELECT * FROM {{aks}} WHERE id = '{$fleet_group}' LIMIT 1;", '', true);
-    if(!$acs['id']) {
+    if (!$acs['id']) {
       return $result = ATTACK_NO_ACS;
     }
 
@@ -329,70 +329,70 @@ 
       return $result = ATTACK_ACS_WRONG_TARGET;
     }
 
-    if ($fleet_start_time>$acs['ankunft']) {
+    if ($fleet_start_time > $acs['ankunft']) {
       return $result = ATTACK_ACS_TOO_LATE;
     }
   }
 
   $flying_fleets = $options['flying_fleets'];
-  if(!$flying_fleets) {
+  if (!$flying_fleets) {
 //    $flying_fleets = doquery("SELECT COUNT(fleet_id) AS `flying_fleets` FROM {{fleets}} WHERE `fleet_owner` = '{$user['id']}';", '', true);
 //    $flying_fleets = $flying_fleets['flying_fleets'];
     $flying_fleets = fleet_count_flying($user['id']);
   }
-  if(GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
+  if (GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
     return $result = ATTACK_NO_SLOTS;
   }
 
   // В одиночку шпионские зонды могут летать только в миссии Шпионаж, Передислокация и Транспорт
-  if($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
+  if ($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
     return $result = ATTACK_SPIES_LONLY;
   }
 
   // Checking for no planet
-  if(!$planet_dst['id_owner']) {
-    if($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
+  if (!$planet_dst['id_owner']) {
+    if ($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
       return $result = ATTACK_NO_COLONIZER;
     }
 
-    if($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
+    if ($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
       return $result = ATTACK_ALLOWED;
     }
     return $result = ATTACK_NO_TARGET;
   }
 
-  if($mission == MT_RECYCLE) {
-    if($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
+  if ($mission == MT_RECYCLE) {
+    if ($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
       return $result = ATTACK_NO_DEBRIS;
     }
-    if($recyclers <= 0) {
+    if ($recyclers <= 0) {
       return $result = ATTACK_NO_RECYCLERS;
     }
     return $result = ATTACK_ALLOWED;
   }
 
   // Got planet. Checking if it is ours
-  if($planet_dst['id_owner'] == $user['id']) {
-    if($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
+  if ($planet_dst['id_owner'] == $user['id']) {
+    if ($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
       return $result = ATTACK_ALLOWED;
     }
     return $planet_src['id'] == $planet_dst['id'] ? ATTACK_SAME : ATTACK_OWN;
   }
 
   // No, planet not ours. Cutting mission that can't be send to not-ours planet
-  if($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
+  if ($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
     return $result = ATTACK_WRONG_MISSION;
   }
 
   $enemy = db_user_by_id($planet_dst['id_owner']);
   // We cannot attack or send resource to users in VACATION mode
-  if($enemy['vacation'] && $mission != MT_RECYCLE) {
+  if ($enemy['vacation'] && $mission != MT_RECYCLE) {
     return $result = ATTACK_VACATION;
   }
 
   // Multi IP protection
   // TODO: Here we need a procedure to check proxies
-  if(sys_is_multiaccount($user, $enemy)) {
+  if (sys_is_multiaccount($user, $enemy)) {
     return $result = ATTACK_SAME_IP;
   }
 
@@ -400,8 +400,8 @@ 
   $enemy_points = $enemy['total_points'];
 
   // Is it transport? If yes - checking for buffing to prevent mega-alliance destroyer
-  if($mission == MT_TRANSPORT) {
-    if($user_points >= $enemy_points || $config->allow_buffing) {
+  if ($mission == MT_TRANSPORT) {
+    if ($user_points >= $enemy_points || $config->allow_buffing) {
       return $result = ATTACK_ALLOWED;
     } else {
       return $result = ATTACK_BUFFING;
@@ -411,65 +411,65 @@ 
   // Only aggresive missions passed to this point. HOLD counts as passive but aggresive
 
   // Is it admin with planet protection?
-  if($planet_dst['id_level'] > $user['authlevel']) {
+  if ($planet_dst['id_level'] > $user['authlevel']) {
     return $result = ATTACK_ADMIN;
   }
 
   // Okay. Now skipping protection checks for inactive longer then 1 week
-  if(!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60*60*24*7)) {
-    if(
+  if (!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60 * 60 * 24 * 7)) {
+    if (
       ($enemy_points <= $config->game_noob_points && $user_points > $config->game_noob_points)
       ||
       ($config->game_noob_factor && $user_points > $enemy_points * $config->game_noob_factor)
     ) {
-      if($mission != MT_HOLD) {
+      if ($mission != MT_HOLD) {
         return $result = ATTACK_NOOB;
       }
-      if($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && $config->ally_help_weak)) {
+      if ($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && $config->ally_help_weak)) {
         return $result = ATTACK_NOOB;
       }
     }
   }
 
   // Is it HOLD mission? If yes - there should be ally deposit
-  if($mission == MT_HOLD) {
-    if(mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
+  if ($mission == MT_HOLD) {
+    if (mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
       return $result = ATTACK_ALLOWED;
     }
     return $result = ATTACK_NO_ALLY_DEPOSIT;
   }
 
-  if($mission == MT_SPY) {
+  if ($mission == MT_SPY) {
     return $result = $spies >= 1 ? ATTACK_ALLOWED : ATTACK_NO_SPIES;
   }
 
   // Is it MISSILE mission?
-  if($mission == MT_MISSILE) {
+  if ($mission == MT_MISSILE) {
     $sn_data_mip = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
-    if(mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
+    if (mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
       return $result = ATTACK_NO_SILO;
     }
 
-    if(!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
+    if (!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
       return $result = ATTACK_NO_MISSILE;
     }
 
     $distance = abs($planet_dst['system'] - $planet_src['system']);
     $mip_range = flt_get_missile_range($user);
-    if($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
+    if ($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
       return $result = ATTACK_MISSILE_TOO_FAR;
     }
 
-    if(isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
+    if (isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
       return $result = ATTACK_WRONG_STRUCTURE;
     }
   }
 
-  if($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
+  if ($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
     return $result = ATTACK_WRONG_MISSION;
   }
 
-  if($mission == MT_ATTACK || $mission == MT_AKS || $mission == MT_DESTROY) {
+  if ($mission == MT_ATTACK || $mission == MT_AKS || $mission == MT_DESTROY) {
     return $result = flt_bashing_check($user, $enemy, $planet_dst, $mission, $travel_data['duration'], $fleet_group);
   }
 
@@ -495,18 +495,18 @@ 
   $from = $from['planet'];
 
   $can_attack = flt_can_attack($from, $to, $fleet, $mission, $options);
-  if($can_attack != ATTACK_ALLOWED) {
+  if ($can_attack != ATTACK_ALLOWED) {
     $internal_transaction ? sn_db_transaction_rollback() : false;
     return $can_attack;
   }
 
   $fleet_group = isset($options['fleet_group']) ? floatval($options['fleet_group']) : 0;
 
-  $travel_data  = flt_travel_data($user, $from, $to, $fleet, $options['fleet_speed_percent']);
+  $travel_data = flt_travel_data($user, $from, $to, $fleet, $options['fleet_speed_percent']);
 
   $fleet_start_time = SN_TIME_NOW + $travel_data['duration'];
 
-  if($mission == MT_EXPLORE || $mission == MT_HOLD) {
+  if ($mission == MT_EXPLORE || $mission == MT_HOLD) {
     $stay_duration = $options['stay_time'] * 3600;
     $stay_time     = $fleet_start_time + $stay_duration;
   } else {
@@ -519,20 +519,20 @@ 
   $fleet_string      = '';
   $db_changeset = array();
   $planet_fields = array();
-  foreach($fleet as $unit_id => $amount)
+  foreach ($fleet as $unit_id => $amount)
   {
-    if(!$amount || !$unit_id)
+    if (!$amount || !$unit_id)
     {
       continue;
     }
 
-    if(in_array($unit_id, sn_get_groups('fleet')))
+    if (in_array($unit_id, sn_get_groups('fleet')))
     {
       $fleet_ship_count += $amount;
       $fleet_string     .= "{$unit_id},{$amount};";
       $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, -$amount, $user, $from['id']);
     }
-    elseif(in_array($unit_id, sn_get_groups('resources_loot')))
+    elseif (in_array($unit_id, sn_get_groups('resources_loot')))
     {
       $planet_fields[pname_resource_name($unit_id)]['delta'] -= $amount;
     }
@@ -640,7 +640,7 @@ 
 
   $ship_data = array();
   $fleet_array = array();
-  foreach($ship_list as $transport_id => $cork)
+  foreach ($ship_list as $transport_id => $cork)
   {
     $ship_data[$transport_id] = flt_travel_data($user, $from, $to, array($transport_id => 1), 10);
   }
@@ -649,10 +649,10 @@ 
   $fleet_hold = 0;
   $fleet_capacity = 0;
   $fuel_total = $fuel_left = mrc_get_level($user, $from, RES_DEUTERIUM);
-  foreach($ship_data as $transport_id => &$ship_info)
+  foreach ($ship_data as $transport_id => &$ship_info)
   {
     $ship_loaded = min($ship_list[$transport_id], ceil($resource_amount / $ship_info['hold']), floor($fuel_left / $ship_info['consumption']));
-    if($ship_loaded)
+    if ($ship_loaded)
     {
       $fleet_array[$transport_id] = $ship_loaded;
       $resource_amount -= min($resource_amount, $ship_info['hold'] * $ship_loaded);

alliance.php

Spacing +15 added lines, -15 removed lines

@@ -2,7 +2,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(classSupernova::$config->game_mode == GAME_BLITZ) {
+if (classSupernova::$config->game_mode == GAME_BLITZ) {
   messageBox($lang['sys_blitz_page_disabled'], $lang['sys_error'], 'overview.php', 10);
   die();
 }
@@ -14,21 +14,21 @@ 
 
 $mode = sys_get_param_str('mode');
 
-if($mode == 'ainfo')
+if ($mode == 'ainfo')
 {
   include('includes/alliance/ali_info.inc');
 }
 
-if(!$user['ally_id'])
+if (!$user['ally_id'])
 {
   $user_request = doquery("SELECT * FROM {{alliance_requests}} WHERE `id_user` ='{$user['id']}' LIMIT 1;", '', true);
-  if($user_request['id_user'])
+  if ($user_request['id_user'])
   {
     require('includes/alliance/ali_external_request.inc');
   }
   else
   {
-    switch($mode)
+    switch ($mode)
     {
       case 'search':
         require('includes/alliance/ali_external_search.inc');
@@ -52,7 +52,7 @@ 
 
 sn_ali_fill_user_ally($user);
 //$ally = doquery("SELECT * FROM {{alliance}} WHERE `id` ='{$user['ally_id']}'", '', true);
-if(!isset($user['ally']))
+if (!isset($user['ally']))
 {
   db_user_set_by_id($user['id'], "`ally_id` = null, `ally_name` = null, `ally_register_time` = 0, `ally_rank_id` = 0");
   messageBox($lang['ali_sys_notFound'], $lang['your_alliance'], 'alliance.php');
@@ -81,13 +81,13 @@ 
 
 // This piece converting old ally data to new one
 //  unset($ally['ranklist']);
-if(!$ally['ranklist'] && $ally['ally_ranks'])
+if (!$ally['ranklist'] && $ally['ally_ranks'])
 {
   $ally_ranks = unserialize($ally['ally_ranks']);
   $i = 0;
-  foreach($ally_ranks as $rank_id => $rank)
+  foreach ($ally_ranks as $rank_id => $rank)
   {
-    foreach($ally_rights as $key => $value)
+    foreach ($ally_rights as $key => $value)
     {
       $ranks[$i][$value] = $rank[$rights_old[$key]];
     }
@@ -95,7 +95,7 @@ 
     $i++;
   }
 
-  if(!empty($ranks))
+  if (!empty($ranks))
   {
     ali_rank_list_save($ranks);
   }
@@ -114,18 +114,18 @@ 
 
 $edit = sys_get_param_str('edit');
 ally_pre_call();
-switch($mode)
+switch ($mode)
 {
   case 'admin':
-    if(!array_key_exists($edit , $sn_ali_admin_internal))
+    if (!array_key_exists($edit, $sn_ali_admin_internal))
     {
       $edit = 'default';
     }
-    if($sn_ali_admin_internal[$edit]['include'])
+    if ($sn_ali_admin_internal[$edit]['include'])
     {
       require("includes/{$sn_ali_admin_internal[$edit]['include']}");
     }
-    if(isset($sn_ali_admin_internal[$edit]['function']) && is_callable($sn_ali_admin_internal[$edit]['function']))
+    if (isset($sn_ali_admin_internal[$edit]['function']) && is_callable($sn_ali_admin_internal[$edit]['function']))
     {
       call_user_func($sn_ali_admin_internal[$edit]['function']);
     }
@@ -136,6 +136,6 @@ 
   default:             require('includes/alliance/ali_info.inc'); break;
 }
 
-function ally_pre_call(){$func_args = func_get_args();return sn_function_call('ally_pre_call', $func_args);}
+function ally_pre_call() {$func_args = func_get_args(); return sn_function_call('ally_pre_call', $func_args); }
 
 ?>

common.php

Spacing +7 added lines, -7 removed lines

@@ -12,24 +12,24 @@ 
 global $debug, $template_result, $user, $lang, $planetrow;
 
 // Напоминание для Администрации, что игра отключена
-if($template_result[F_GAME_DISABLE]) {
+if ($template_result[F_GAME_DISABLE]) {
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
 }
 unset($disable_reason);
 
 
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
   lng_include('admin');
-} elseif($sys_user_logged_in) {
+} elseif ($sys_user_logged_in) {
   sys_user_vacation($user);
 
   $planet_id = SetSelectedPlanet($user);
 
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
-  if($user['ally_id']) {
+  if ($user['ally_id']) {
     sn_db_transaction_start();
     sn_ali_fill_user_ally($user);
-    if(!$user['ally']['player']['id']) {
+    if (!$user['ally']['player']['id']) {
       // sn_sys_logout(false, true);
       // core_auth::logout(false);
       classSupernova::$auth->logout(false);
@@ -48,7 +48,7 @@ 
   sn_db_transaction_commit();
 
   $planetrow = $global_data['planet'];
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false);
     classSupernova::$auth->logout(false);
@@ -63,7 +63,7 @@ 
 sys_user_options_unpack($user);
 
 global $sn_page_name, $sn_mvc;
-if(!empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_EARLY_HEADER])) {
+if (!empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_EARLY_HEADER])) {
   $title = !empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_TITLE]) ? $sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_TITLE] : '';
   renderHeader($page, $title, $template_result, false, $user, classSupernova::$config, $lang, $planetrow);
 }

jumpgate.php

Spacing +17 added lines, -17 removed lines

@@ -14,39 +14,39 @@ 
 
 lng_include('fleet');
 
-if($TargetPlanet = sys_get_param_id('jmpto'))
+if ($TargetPlanet = sys_get_param_id('jmpto'))
 {
   sn_db_transaction_start();
   db_user_by_id($user['id'], true, 'id');
   $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
-  if(!($NextJumpTime = uni_get_time_to_jump($planetrow)))
+  if (!($NextJumpTime = uni_get_time_to_jump($planetrow)))
   {
     $TargetGate = DBStaticPlanet::db_planet_by_id($TargetPlanet, true, '`id`, `last_jump_time`');
-    if(mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
+    if (mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
     {
-      $NextDestTime = uni_get_time_to_jump ( $TargetGate );
-      if(!$NextDestTime)
+      $NextDestTime = uni_get_time_to_jump($TargetGate);
+      if (!$NextDestTime)
       {
         // $SubQueryOri = "";
         // $SubQueryDes = "";
         $ship_list = sys_get_param('ships');
         $db_changeset = array();
-        foreach($ship_list as $ship_id => $ship_count)
+        foreach ($ship_list as $ship_id => $ship_count)
         {
-          if(!in_array($ship_id, sn_get_groups('fleet')))
+          if (!in_array($ship_id, sn_get_groups('fleet')))
           {
             continue;
           }
 
           $ship_count = max(0, min(floor($ship_count), mrc_get_level($user, $planetrow, $ship_id)));
-          if($ship_count)
+          if ($ship_count)
           {
             $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($ship_id, -$ship_count, $user, $planetrow['id']);
             $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($ship_id, $ship_count, $user, $TargetGate['id']);
           }
         }
         // Dit monsieur, y avait quelque chose a envoyer ???
-        if(!empty($db_changeset))
+        if (!empty($db_changeset))
         {
           DBStaticPlanet::db_planet_set_by_id($TargetGate['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
           DBStaticPlanet::db_planet_set_by_id($planetrow['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
@@ -55,31 +55,31 @@ 
           db_user_set_by_id($user['id'], "`current_planet` = '{$TargetGate['id']}'");
 
           $planetrow['last_jump_time'] = SN_TIME_NOW;
-          $RetMessage = $lang['gate_jump_done'] ." - ". pretty_time(uni_get_time_to_jump($planetrow));
+          $RetMessage = $lang['gate_jump_done'] . " - " . pretty_time(uni_get_time_to_jump($planetrow));
         } else {
           $RetMessage = $lang['gate_wait_data'];
         }
       } else {
-        $RetMessage = $lang['gate_wait_dest'] ." - ". pretty_time($NextDestTime);
+        $RetMessage = $lang['gate_wait_dest'] . " - " . pretty_time($NextDestTime);
       }
     } else {
       $RetMessage = $lang['gate_no_dest_g'];
     }
   } else {
-    $RetMessage = $lang['gate_wait_star'] ." - ". pretty_time($NextJumpTime);
+    $RetMessage = $lang['gate_wait_star'] . " - " . pretty_time($NextJumpTime);
   }
   sn_db_transaction_commit();
   messageBox($RetMessage, $lang['tech'][STRUC_MOON_GATE], "jumpgate.php", 10);
 } else {
   $template = gettemplate('jumpgate', true);
-  if(mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
+  if (mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
   {
     $Combo = '';
     $MoonList = DBStaticPlanet::db_planet_list_moon_other($user['id'], $planetrow['id']);
     // while($CurMoon = db_fetch($MoonList))
-    foreach($MoonList as $CurMoon)
+    foreach ($MoonList as $CurMoon)
     {
-      if(mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
+      if (mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
       {
         $NextJumpTime = uni_get_time_to_jump($CurMoon);
         $template->assign_block_vars('moon', array(
@@ -93,9 +93,9 @@ 
       }
     }
 
-    foreach(sn_get_groups('fleet') as $Ship)
+    foreach (sn_get_groups('fleet') as $Ship)
     {
-      if(($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
+      if (($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
       {
         continue;
       }

messages.php

Spacing +26 added lines, -26 removed lines

@@ -42,7 +42,7 @@ 
 
 $mode = sys_get_param_str('msg_delete') ? 'delete' : sys_get_param_str('mode');
 $current_class = sys_get_param_int('message_class');
-if(!isset($sn_message_class_list[$current_class])) {
+if (!isset($sn_message_class_list[$current_class])) {
   $current_class = 0;
   $mode = '';
 }
@@ -53,48 +53,48 @@ 
     $template = gettemplate('msg_message_compose', true);
 
     $recipient_name = sys_get_param_str_unsafe('recipient_name');
-    if($recipient_name) {
+    if ($recipient_name) {
       $recipient_row = db_user_by_username($recipient_name);
     }
 
-    if(!$recipient_row) {
+    if (!$recipient_row) {
       $recipient_id = sys_get_param_id('id');
       $recipient_row = db_user_by_id($recipient_id);
-      if(!$recipient_row) {
+      if (!$recipient_row) {
         $recipient_id = 0;
       }
     }
 
-    if($recipient_row) {
+    if ($recipient_row) {
       $recipient_id = $recipient_row['id'];
       $recipient_name = $recipient_row['username'];
     }
 
-    if($recipient_id == $user['id']) {
+    if ($recipient_id == $user['id']) {
       $error_list[] = array('MESSAGE' => $lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
     }
 
     $re = 0;
     $subject = sys_get_param_str('subject');
-    while(strpos($subject, $lang['msg_answer_prefix']) !== false) {
+    while (strpos($subject, $lang['msg_answer_prefix']) !== false) {
       $subject = substr($subject, strlen($lang['msg_answer_prefix']));
       $re++;
     }
     $re ? $subject = $lang['msg_answer_prefix'] . $subject : false;
 
-    if(sys_get_param_str('msg_send')) {
+    if (sys_get_param_str('msg_send')) {
       $subject = $subject ? $subject : $lang['msg_subject_default'];
 
-      if(!$recipient_id) {
+      if (!$recipient_id) {
         $error_list[] = array('MESSAGE' => $lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
       }
 
       $text = sys_get_param_str('text');
-      if(!$text) {
+      if (!$text) {
         $error_list[] = array('MESSAGE' => $lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
       }
 
-      if(empty($error_list)) {
+      if (empty($error_list)) {
         $error_list[] = array('MESSAGE' => $lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
 
         $user_safe_name = db_escape($user['username']);
@@ -104,7 +104,7 @@ 
         //$recipient_id = 0;
         //$recipient_name = '';
         //$subject = '';
-        $text    = '';
+        $text = '';
 
         $msg_sent = true;
       } else {
@@ -123,7 +123,7 @@ 
       'TEXT'           => htmlspecialchars($text),
     ));
 
-    foreach($error_list as $error_message) {
+    foreach ($error_list as $error_message) {
       $template->assign_block_vars('result', $error_message);
     }
 
@@ -153,25 +153,25 @@ 
 
     $message_range = sys_get_param_str('message_range');
 
-    switch($message_range) {
+    switch ($message_range) {
       case 'unchecked':
       case 'checked':
         $marked_message_list = sys_get_param('mark', array());
-        if($message_range == 'checked' && empty($marked_message_list)) {
+        if ($message_range == 'checked' && empty($marked_message_list)) {
           break;
         }
 
         $query_add = implode(',', $marked_message_list);
-        if($query_add) {
+        if ($query_add) {
           $query_add = "IN ({$query_add})";
-          if($message_range == 'unchecked') {
+          if ($message_range == 'unchecked') {
             $query_add = "NOT {$query_add}";
           }
           $query_add = " AND `message_id` {$query_add}";
         }
 
       case 'class':
-        if($current_class != MSG_TYPE_OUTBOX && $current_class != MSG_TYPE_NEW) {
+        if ($current_class != MSG_TYPE_OUTBOX && $current_class != MSG_TYPE_NEW) {
           $query_add .= " AND `message_type` = {$current_class}";
         }
       case 'all':
@@ -179,19 +179,19 @@ 
       break;
     }
 
-    if($query_add) {
+    if ($query_add) {
       $query_add = $query_add === true ? '' : $query_add;
       doquery("DELETE FROM `{{messages}}` WHERE `message_owner` = '{$user['id']}'{$query_add};");
     }
 
   case 'show':
-    if($current_class == MSG_TYPE_OUTBOX) {
+    if ($current_class == MSG_TYPE_OUTBOX) {
       $message_query = db_message_list_outbox_by_user_id($user['id']);
     } else {
       if ($current_class == MSG_TYPE_NEW) {
         $SubUpdateQry = array();
-        foreach($sn_message_class_list as $message_class_id => $message_class) {
-          if($message_class_id != MSG_TYPE_OUTBOX) {
+        foreach ($sn_message_class_list as $message_class_id => $message_class) {
+          if ($message_class_id != MSG_TYPE_OUTBOX) {
             $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
             $user[$message_class['name']] = 0;
           }
@@ -210,7 +210,7 @@ 
       $message_query = doquery($message_query);
     }
 
-    if(sys_get_param_int('return')) {
+    if (sys_get_param_int('return')) {
       sys_redirect('messages.php');
     }
 
@@ -238,11 +238,11 @@ 
   break;
 }
 
-if(!$template) {
+if (!$template) {
   $template = gettemplate('msg_message_class', true);
 
   $query = doquery("SELECT message_owner, message_type, COUNT(message_owner) AS message_count FROM {{messages}} WHERE `message_owner` = {$user['id']} GROUP BY message_owner, message_type ORDER BY message_owner ASC, message_type;");
-  while($message_row = db_fetch($query)) {
+  while ($message_row = db_fetch($query)) {
     $messages_total[$message_row['message_type']]  = $message_row['message_count'];
     $messages_total[MSG_TYPE_NEW]                 += $message_row['message_count'];
   }
@@ -250,7 +250,7 @@ 
   $query = doquery("SELECT COUNT(message_sender) AS message_count FROM {{messages}} WHERE `message_sender` = '{$user['id']}' AND message_type = 1 GROUP BY message_sender;", '', true);
   $messages_total[MSG_TYPE_OUTBOX] = intval($query['message_count']);
 
-  foreach($sn_message_class_list as $message_class_id => $message_class) {
+  foreach ($sn_message_class_list as $message_class_id => $message_class) {
     $template->assign_block_vars('message_class', array(
       'ID'     => $message_class_id,
       'STYLE'  => $message_class['name'],

search.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(classSupernova::$config->game_mode == GAME_BLITZ) {
+if (classSupernova::$config->game_mode == GAME_BLITZ) {
   messageBox($lang['sys_blitz_page_disabled'], $lang['sys_error'], 'overview.php', 10);
   die();
 }
@@ -25,9 +25,9 @@ 
 
 $template = gettemplate('search', true);
 
-if($searchtext && $type)
+if ($searchtext && $type)
 {
-  switch($type)
+  switch ($type)
   {
     case "planetname":
       // $search = db_planet_list_search($searchtext);
@@ -43,9 +43,9 @@ 
     break;
   }
 
-  while($row = db_fetch($search))
+  while ($row = db_fetch($search))
   {
-    if($type=='playername' || $type=='planetname')
+    if ($type == 'playername' || $type == 'planetname')
     {
       $template->assign_block_vars('search_result', array(
         'PLAYER_ID' => $row['uid'],
@@ -62,7 +62,7 @@ 
         'ALLY_TAG' => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'),
       ));
     }
-    elseif($type=='ally')
+    elseif ($type == 'ally')
     {
       $template->assign_block_vars('search_result', array(
         'ALLY_NAME' => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'),
@@ -81,7 +81,7 @@ 
   'ally' => 'sys_alliance',
 );
 
-foreach($search_type as $type_id => $type_lang)
+foreach ($search_type as $type_id => $type_lang)
 {
   $template->assign_block_vars('type', array(
     'ID' => $type_id,

annonce.php

Spacing +20 added lines, -20 removed lines

@@ -18,25 +18,25 @@ 
 
 lng_include('announce');
 
-switch($action)
+switch ($action)
 {
   case 1://on veut poster une annonce
-    $page .='<HTML>
+    $page .= '<HTML>
     <center>
     <br>
     <table width="600">
-    <td class="c" colspan="10" align="center"><b><font color="white">'.$lang['Classifieds'].'</font></b></td></tr>
+    <td class="c" colspan="10" align="center"><b><font color="white">'.$lang['Classifieds'] . '</font></b></td></tr>
     <form action="annonce.php?action=2" method="post">
-    <td class="c" colspan="10" align="center"><b>'.$lang['Resources_to_be_sold'].'</font></b></td>
-    <tr><th colspan="5">'.$lang['metal'].'</th><th colspan="5"><input type="texte" value="0" name="metalvendre" /></th></tr>
-    <tr><th colspan="5">'.$lang['crystal'].'</th><th colspan="5"><input type="texte" value="0" name="cristalvendre" /></th></tr>
-    <tr><th colspan="5">'.$lang['deuterium'].'</th><th colspan="5"><input type="texte" value="0" name="deutvendre" /></th></tr>
+    <td class="c" colspan="10" align="center"><b>'.$lang['Resources_to_be_sold'] . '</font></b></td>
+    <tr><th colspan="5">'.$lang['metal'] . '</th><th colspan="5"><input type="texte" value="0" name="metalvendre" /></th></tr>
+    <tr><th colspan="5">'.$lang['crystal'] . '</th><th colspan="5"><input type="texte" value="0" name="cristalvendre" /></th></tr>
+    <tr><th colspan="5">'.$lang['deuterium'] . '</th><th colspan="5"><input type="texte" value="0" name="deutvendre" /></th></tr>
 
-    <td class="c" colspan="10" align="center"><b>'.$lang['Desired_resources'].'</font></b></td></tr>
-    <tr><th colspan="5">'.$lang['metal'].'</th><th colspan="5"><input type="texte" value="0" name="metalsouhait" /></th></tr>
-    <tr><th colspan="5">'.$lang['crystal'].'</th><th colspan="5"><input type="texte" value="0" name="cristalsouhait" /></th></tr>
-    <tr><th colspan="5">'.$lang['deuterium'].'</th><th colspan="5"><input type="texte" value="0" name="deutsouhait" /></th></tr>
-    <tr><th colspan="10"><input type="submit" value="'.$lang['send'].'" /></th></tr>
+    <td class="c" colspan="10" align="center"><b>'.$lang['Desired_resources'] . '</font></b></td></tr>
+    <tr><th colspan="5">'.$lang['metal'] . '</th><th colspan="5"><input type="texte" value="0" name="metalsouhait" /></th></tr>
+    <tr><th colspan="5">'.$lang['crystal'] . '</th><th colspan="5"><input type="texte" value="0" name="cristalsouhait" /></th></tr>
+    <tr><th colspan="5">'.$lang['deuterium'] . '</th><th colspan="5"><input type="texte" value="0" name="deutsouhait" /></th></tr>
+    <tr><th colspan="10"><input type="submit" value="'.$lang['send'] . '" /></th></tr>
 
     <form>
     </table>
@@ -53,20 +53,20 @@ 
     $deutvendre = sys_get_param_float('deutvendre');
     $deutsouhait = sys_get_param_float('deutsouhait');
 
-    if(($metalvendre!=0 && $metalsouhait==0) ||($cristalvendre!=0 && $cristalsouhait==0) || ($deutvendre!=0 && $deutsouhait==0))
+    if (($metalvendre != 0 && $metalsouhait == 0) || ($cristalvendre != 0 && $cristalsouhait == 0) || ($deutvendre != 0 && $deutsouhait == 0))
     {
       doquery("INSERT INTO {{annonce}} SET `user` ='{$users['username']}', `galaxie` ='{$users['galaxy']}', `systeme` ='{$users['system']}', `metala` ='{$metalvendre}', `cristala` ='{$cristalvendre}', `deuta` ='{$deutvendre}', `metals` ='{$metalsouhait}', `cristals` ='{$cristalsouhait}', `deuts` ='{$deutsouhait}'");
-      messageBox ($lang['Your_announce_was_recorded'], $lang['announce_status'],"annonce.php");
+      messageBox($lang['Your_announce_was_recorded'], $lang['announce_status'], "annonce.php");
     }
     else
     {
-      messageBox ($lang['Your_announce_not_recorded'], $lang['announce_status'],"annonce.php?action=1");
+      messageBox($lang['Your_announce_not_recorded'], $lang['announce_status'], "annonce.php?action=1");
     }
   break;
 
   case 3://Suppression d'annonce
     doquery("DELETE FROM {{annonce}} WHERE `id` = {$GET_id}");
-    messageBox ($lang['Your_announce_was_deleted'], $lang['announce_status'],"annonce.php");
+    messageBox($lang['Your_announce_was_deleted'], $lang['announce_status'], "annonce.php");
   break;
 
   default://Sinon on affiche la liste des annonces
@@ -81,15 +81,15 @@ 
     while ($b = db_fetch($annonce))
     {
       $page2 .= '<tr><th>';
-      foreach($b as $name => $value)
+      foreach ($b as $name => $value)
       {
-        if($name!='id')
+        if ($name != 'id')
         {
-          $page2 .= $value ;
+          $page2 .= $value;
           $page2 .= '</th><th>';
         }
       }
-      $page2 .= ($b['user']==$users['username'])?"<a href=\"annonce.php?action=3&id={$b[id]}\">X</a></th></tr>":"</th></tr>";
+      $page2 .= ($b['user'] == $users['username']) ? "<a href=\"annonce.php?action=3&id={$b[id]}\">X</a></th></tr>" : "</th></tr>";
     }
 
     $page2 .= "<tr><th colspan=\"10\" align=\"center\"><a href=\"annonce.php?action=1\">{$lang['add_announce']}</a></th></tr></td></table></HTML>";