supernova-ws / SuperNova

classes/Planet/DBStaticPlanet.php

Spacing +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
     $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0;
     $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0;
     $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0;
-    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) :
-      (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
+    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) : (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
     $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type;
 
     return DBStaticPlanet::db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update, $fields);

classes/Universe/Universe.php

Spacing +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
   const MOON_MIN_SIZE = 1100;
   const MOON_MAX_SIZE = 8999;
 
-  const MOON_DEBRIS_MIN = 1000000;    // Minimum amount of debris to span a moon
-  const MOON_CHANCE_MIN_PERCENT = 1;  // Minimum chance to span a moon
+  const MOON_DEBRIS_MIN = 1000000; // Minimum amount of debris to span a moon
+  const MOON_CHANCE_MIN_PERCENT = 1; // Minimum chance to span a moon
   const MOON_CHANCE_MAX_PERCENT = 30; // Maximum chance to span a moon
 
   /**

classes/Fleet/FleetDispatcher.php

Spacing +4 added lines, -8 removed lines

@@ -465,15 +465,11 @@
   protected function flt_flyingFleetsSort($a, $b) {
     return
       // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-      $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
-        // Если время - одинаковое, сравниваем события флотов
+      $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
         // Если события - одинаковые, то флоты равны
-        ($a['fleet_event'] == $b['fleet_event'] ? 0 :
-          // Если события разные - первыми считаем прибывающие флоты
-          ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
-            // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-            ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
-              // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+        ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
+          ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+            ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
               // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
               (
               0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий

classes/DBAL/OldDbChangeSet.php

Spacing +1 added lines, -3 removed lines

@@ -142,9 +142,7 @@
           // Простое условие - $field_id = $field_value
           if (is_string($field_id)) {
             $field_value =
-              $field_value === null ? 'NULL' :
-                (is_string($field_value) ? "'" . db_escape($field_value) . "'" :
-                  (is_bool($field_value) ? intval($field_value) : $field_value));
+              $field_value === null ? 'NULL' : (is_string($field_value) ? "'" . db_escape($field_value) . "'" : (is_bool($field_value) ? intval($field_value) : $field_value));
             $the_conditions[] = "`{$field_id}` = {$field_value}";
           } else {
             die('Неподдерживаемый тип условия');

includes/alliance/ali_internal_admin_request.inc

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 use Alliance\DBStaticAlly;
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
@@ -11,12 +11,12 @@ 
 }
 
 $d = sys_get_param_id('d');
-if($d) {
+if ($d) {
   doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '{$lang['ali_req_deny_reason']}' WHERE `id_user`= {$d} LIMIT 1;");
 }
 
 $id_user = sys_get_param_id('id_user');
-if($id_user) {
+if ($id_user) {
   $ally_name_safe = db_escape($ally['ally_name']);
   $ally_tag_safe = db_escape($ally['ally_tag']);
   db_user_set_by_id($id_user, "`ally_id` = '{$ally['id']}', `ally_name` = '{$ally_name_safe}', `ally_tag` = '{$ally_tag_safe}', `ally_register_time` = " . SN_TIME_NOW . ", `ally_rank_id` = 0");

includes/alliance/ali_internal_admin.inc

Spacing +25 added lines, -25 removed lines

@@ -2,26 +2,26 @@ 
 
 use Alliance\DBStaticAlly;
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
-if(!$user_admin) {
+if (!$user_admin) {
   messageBox($lang['Denied_access'], $lang['ally_admin']);
 }
 
 $template = gettemplate('ali_admin', $template);
 
 $text_list = array(
-  1 => array ('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'),
-  2 => array ('db_field' => 'ally_text', 'text_type' => 'Internal_text'),
-  3 => array ('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'),
+  1 => array('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'),
+  2 => array('db_field' => 'ally_text', 'text_type' => 'Internal_text'),
+  3 => array('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'),
 );
 
 $allyTextID = sys_get_param_int('t', 1);
-$allyTextID = ($allyTextID<1 || $allyTextID>3) ? 1 : $allyTextID;
+$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');
 
   $new_image = $ally['ally_image'];
@@ -33,32 +33,32 @@ 
 //  $template->assign_block_vars('result', $avatar_upload_result);
 
   $ally_changeset = array();
-  if(($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
+  if (($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
     $new_tag_unsafe = $new_tag;
     $new_tag = db_escape($new_tag);
     $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_tag($new_tag);
-    if(!empty($isTaggedAllyExists)) {
+    if (!empty($isTaggedAllyExists)) {
       messageBox(sprintf($lang['ally_message_tag_exists'], $new_tag_unsafe), '', 'alliance.php?mode=admin&edit=ally');
     }
     $ally_changeset[] = "`ally_tag`='{$new_tag}'";
     db_user_set_by_id($ally['ally_user_id'], "`username`='[{$new_tag}]'");
   }
 
-  if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
+  if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
     $new_name_unsafe = $new_name;
     $new_name = db_escape($new_name);
     $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_name($new_name);
-    if(!empty($isTaggedAllyExists)) {
+    if (!empty($isTaggedAllyExists)) {
       messageBox(sprintf($lang['ally_message_name_exists'], $new_name_unsafe), '', 'alliance.php?mode=admin&edit=ally');
     }
     $ally_changeset[] = "`ally_name`='{$new_name}'";
   }
 
-  if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
+  if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
     $new_owner_rank = db_escape($new_owner_rank);
     $ally_changeset[] = "`ally_owner_range` = '{$new_owner_rank}'";
   }
-  if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
+  if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
     $new_web = db_escape($new_web);
     $ally_changeset[] = "`ally_web` = '{$new_web}'";
   }
@@ -67,31 +67,31 @@ 
 //  if(($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) && $new_request != $ally['ally_request_notallow']) {
 //    $ally_changeset[] = "`ally_request_notallow` = '{$new_request}'";
 //  }
-  if($new_image != $ally['ally_image']) {
+  if ($new_image != $ally['ally_image']) {
     $new_image = intval($new_image);
     $ally_changeset[] = "`ally_image` = '{$new_image}'";
   }
 
-  if(!empty($ally_changeset)) {
+  if (!empty($ally_changeset)) {
     doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;");
     sys_redirect('alliance.php?mode=admin&edit=ally');
   }
 }
-elseif(sys_get_param_str('isSaveText'))
+elseif (sys_get_param_str('isSaveText'))
 {
   $text = sys_get_param_str_both('text');
   doquery("UPDATE {{alliance}} SET `{$text_list[$allyTextID]['db_field']}`='{$text['safe']}' WHERE `id`='{$ally['id']}';");
   $ally[$text_list[$allyTextID]['db_field']] = $text['unsafe'];
 }
-elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
+elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
 {
-  if(!$isAllyOwner)
+  if (!$isAllyOwner)
   {
     messageBox($lang['Denied_access'], $lang['ally_admin']);
   }
 
   $newLeader = 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();
     db_user_set_by_id($user['id'], "`ally_rank_id`='0'");
@@ -101,9 +101,9 @@ 
     sys_redirect('alliance.php');
   }
 }
-elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
+elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
 {
-  if(!$isAllyOwner)
+  if (!$isAllyOwner)
   {
     messageBox($lang['Denied_access'], $lang['ally_admin']);
   }
@@ -126,7 +126,7 @@ 
   'ally_name' => htmlspecialchars($ally['ally_name']),
   'ally_tag' => htmlspecialchars($ally['ally_tag']),
   'ally_web' => htmlspecialchars($ally['ally_web']),
-  'ally_request_notallow_0' => (( $ally['ally_request_notallow']) ? ' SELECTED' : ''),
+  'ally_request_notallow_0' => (($ally['ally_request_notallow']) ? ' SELECTED' : ''),
   'ally_request_notallow_1' => ((!$ally['ally_request_notallow']) ? ' SELECTED' : ''),
   'ally_owner_range' => htmlspecialchars($ally['ally_owner_range']),
   'hideNotOwner' => $ally['ally_owner'] != $user['id'] ? 'display: hide;' : '',
@@ -135,7 +135,7 @@ 
 {
   $userAllyAdmins = db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
   unset($tmp);
-  foreach($userAllyAdmins as $userAllyAdmin)
+  foreach ($userAllyAdmins as $userAllyAdmin)
   {
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
   }
@@ -143,9 +143,9 @@ 
   $template->assign_var('adminMembers', $tmp);
 }
 
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale)
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale)
 {
-  if(!$sn_ali_admin_action_locale['title'])
+  if (!$sn_ali_admin_action_locale['title'])
   {
     continue;
   }

includes/alliance/ali_internal_admin_diplomacy.inc

Spacing +19 added lines, -19 removed lines

@@ -3,7 +3,7 @@ 
 use Alliance\DBStaticAlly;
 use \DBAL\DbQuery;
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -18,28 +18,28 @@ 
 $ally_name_safe = db_escape($user['ally_name']);
 
 $autoAccept = false;
-if(sys_get_param_str('ali_dip_offer_make'))
+if (sys_get_param_str('ali_dip_offer_make'))
 {
   $alliance_negotiation_relation = sys_get_param_str('alliance_negotiation_relation');
-  if(!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
+  if (!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
   {
     messageBox($lang['ali_dip_err_wrong_offer'], $page_title);
   }
 
   $alliance_negotiation_contr_ally_id = sys_get_param_id('alliance_negotiation_contr_ally_id');
-  if($alliance_negotiation_contr_ally_id == $user['ally_id'])
+  if ($alliance_negotiation_contr_ally_id == $user['ally_id'])
   {
     messageBox($lang['ali_dip_err_same_ally'], $page_title);
   }
 
   $contr_ally_row = doquery("SELECT `ally_name` FROM {{alliance}} WHERE `id` = {$alliance_negotiation_contr_ally_id} LIMIT 1;", '', true);
-  if(!$contr_ally_row)
+  if (!$contr_ally_row)
   {
     messageBox($lang['ali_dip_err_no_ally'], $page_title);
   }
 
   $relation_current_id = ali_relation($user['ally_id'], $alliance_negotiation_contr_ally_id);
-  if($alliance_negotiation_relation == $relation_current_id)
+  if ($alliance_negotiation_relation == $relation_current_id)
   {
     messageBox(sprintf($lang['ali_dip_err_offer_same'], $lang['ali_dip_relations'][$alliance_negotiation_relation]), $page_title);
   }
@@ -51,7 +51,7 @@ 
 
   $relation_new = $sn_diplomacy_relation_list[$alliance_negotiation_relation];
   $relation_current = $sn_diplomacy_relation_list[$relation_current_id];
-  if($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
+  if ($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
   {
     DbQuery::build()
       ->setTable('alliance_negotiation')
@@ -85,39 +85,39 @@ 
 else
 {
   $offer_id = sys_get_param_id('offer_id');
-  if($offer_id)
+  if ($offer_id)
   {
     $offer_answer = sys_get_param_str('answer');
 
     $negotiation = doquery("SELECT * FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;", '', true);
-    if(!$negotiation)
+    if (!$negotiation)
     {
       messageBox($lang['ali_dip_err_offer_none'], $page_title);
     }
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
+    elseif ($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
     {
       // TODO: Add log of hack attempt
       messageBox($lang['ali_dip_err_offer_alien'], $page_title);
     }
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
+    elseif ($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
     {
-      if($offer_answer == 'accept')
+      if ($offer_answer == 'accept')
       {
         // TODO: Add log of hack attempt
         messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
       }
-      elseif($offer_answer == 'deny')
+      elseif ($offer_answer == 'deny')
       {
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
       }
     }
     else
     {
-      if($offer_answer == 'accept')
+      if ($offer_answer == 'accept')
       {
         $accept_offer = true;
       }
-      elseif($offer_answer == 'deny')
+      elseif ($offer_answer == 'deny')
       {
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
       }
@@ -125,7 +125,7 @@ 
   }
 }
 
-if($accept_offer)
+if ($accept_offer)
 {
   sn_db_transaction_start();
 
@@ -185,7 +185,7 @@ 
   sn_db_transaction_commit();
 }
 
-foreach($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
+foreach ($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
 {
   $template->assign_block_vars('relation', array(
     'ID'   => $diplomacy_relation_id,
@@ -194,7 +194,7 @@ 
 }
 
 $query = doquery("SELECT id, ally_name, ally_tag FROM {{alliance}} WHERE `id` != {$user['ally_id']} ORDER BY ally_name;");
-while($alliance = db_fetch($query))
+while ($alliance = db_fetch($query))
 {
   $template->assign_block_vars('alliance', array(
     'ID'   => $alliance['id'],
@@ -213,7 +213,7 @@ 
   WHERE
     alliance_negotiation_ally_id = {$user['ally_id']} OR alliance_negotiation_contr_ally_id = {$user['ally_id']};"
 );
-while($offer = db_fetch($query))
+while ($offer = db_fetch($query))
 {
   $template->assign_block_vars('offer', array(
     'ID'       => $offer['alliance_negotiation_id'],

includes/includes/market_fleeter.inc

Spacing +26 added lines, -26 removed lines

@@ -3,7 +3,7 @@ 
 use DBAL\OldDbChangeSet;
 use Planet\DBStaticPlanet;
 
-if(!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
 
@@ -15,8 +15,8 @@ 
   'rpg_cost' => $rpg_cost,
 ));
 
-if(is_array($shipList)) {
-  if(mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
+if (is_array($shipList)) {
+  if (mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
     $intError = MARKET_NO_DM;
   }
 
@@ -33,30 +33,30 @@ 
   $qry = array();
   $total = array();
   $db_changeset = array();
-  foreach($shipList as $shipID => &$shipCount) {
+  foreach ($shipList as $shipID => &$shipCount) {
     $shipCount = ceil(floatval($shipCount));
-    if(!$shipCount) {
+    if (!$shipCount) {
       continue;
     }
 
-    if($shipCount < 0) {
+    if ($shipCount < 0) {
       $debug->warning('User supplied negative ship count on Black Market page', 'Hack Attempt', 307);
       $intError = MARKET_NEGATIVE_SHIPS;
       break;
     }
 
-    if($mode == MARKET_SCRAPPER) {
+    if ($mode == MARKET_SCRAPPER) {
       $amount = mrc_get_level($user, $planetrow, $shipID, true, true); // $planetrow[get_unit_param($shipID, P_NAME)];
-    } elseif($mode == MARKET_STOCKMAN) {
+    } elseif ($mode == MARKET_STOCKMAN) {
       $amount = $stock[$shipID];
     }
 
-    if($amount < $shipCount) {
+    if ($amount < $shipCount) {
       $intError = $error_no_stock;
       break;
     }
 
-    if(!in_array($shipID, sn_get_groups('fleet'))) {
+    if (!in_array($shipID, sn_get_groups('fleet'))) {
       $debug->warning('Hack Attempt', 'User supplied non-ship unit ID on Black Market page', 306);
       $intError = MARKET_NOT_A_SHIP;
       break;
@@ -72,16 +72,16 @@ 
     $resTemp[RES_CRYSTAL] = floor($build_data[BUILD_CREATE][RES_CRYSTAL] * $shipCount * $config_rpg_scrape_crystal * (-$multiplier));
     $resTemp[RES_DEUTERIUM] = floor($build_data[BUILD_CREATE][RES_DEUTERIUM] * $shipCount * $config_rpg_scrape_deuterium * (-$multiplier));
 
-    foreach($resTemp as $resID => $resCount) {
+    foreach ($resTemp as $resID => $resCount) {
       $total[$resID] += $resCount;
     }
 
     $message .= "<li>{$lang['tech'][$shipID]}: " . HelperString::numberFloorAndFormat($shipCount);
   }
 
-  if($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
-    foreach($total as $resID => $resCount) {
-      if(mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
+  if ($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
+    foreach ($total as $resID => $resCount) {
+      if (mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
         $intError = MARKET_NO_RESOURCES;
         $debug->warning('Trying to use bug in s/h market', 'S/H Ship Market', 301);
         break;
@@ -91,10 +91,10 @@ 
 
   $intError = ($intError == MARKET_DEAL) && (array_sum($total) == 0) ? $error_zero_res : $intError;
 
-  if($intError == MARKET_DEAL) {
+  if ($intError == MARKET_DEAL) {
     $message .= '</ul>' . $lang["eco_mrk_{$submode}_res"] . '<ul>';
-    foreach($total as $resID => $resCount) {
-      if(!$resCount) {
+    foreach ($total as $resID => $resCount) {
+      if (!$resCount) {
         continue;
       }
 
@@ -128,38 +128,38 @@ 
       'MESSAGE' => $lang['eco_mrk_errors'][$intError],
     ));
 
-    foreach($shipList as $shipID => $shipCount) {
+    foreach ($shipList as $shipID => $shipCount) {
       $data['ships'][$shipID] = max(0, intval($shipCount));
     }
   }
 }
 $message = '';
 
-if(!$config->eco_stockman_fleet && $config->eco_stockman_fleet_populate) {
-  $config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item){return mt_rand(1, 1000);}, sn_get_groups('fleet'))));
+if (!$config->eco_stockman_fleet && $config->eco_stockman_fleet_populate) {
+  $config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item) {return mt_rand(1, 1000); }, sn_get_groups('fleet'))));
 }
 
 tpl_set_resource_info($template, $planetrow, array());
 
-if(!$array) {
+if (!$array) {
   $array = array();
 }
 
 $group_fleet = sn_get_groups('fleet');
-foreach($array as $key => $value) {
-  if($mode == MARKET_SCRAPPER) {
+foreach ($array as $key => $value) {
+  if ($mode == MARKET_SCRAPPER) {
     $shipID = $value;
     $amount = mrc_get_level($user, $planetrow, $shipID, false, true); // $planetrow[get_unit_param($shipID, P_NAME)];
-  } elseif($mode == MARKET_STOCKMAN) {
+  } elseif ($mode == MARKET_STOCKMAN) {
     $shipID = $key;
     $amount = $value;
   }
 
-  if(!in_array($shipID, $group_fleet)) {
+  if (!in_array($shipID, $group_fleet)) {
     continue;
   }
 
-  if($amount > 0) {
+  if ($amount > 0) {
     $build_data = eco_get_build_data($user, $planetrow, $shipID);
     $template->assign_block_vars('ships', array(
       'ID'        => $shipID,

admin/settings.php

Spacing +7 added lines, -7 removed lines

@@ -10,8 +10,8 @@ 
 
 use Unit\DBStaticUnit;
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
@@ -21,7 +21,7 @@ 
 
 $template = gettemplate('admin/settings', true);
 
-if(sys_get_param('save')) {
+if (sys_get_param('save')) {
   SN::$config->game_name               = sys_get_param_str_unsafe('game_name');
   SN::$config->game_mode               = sys_get_param_int('game_mode');
   SN::$config->game_speed              = sys_get_param_float('game_speed', 1);
@@ -31,7 +31,7 @@ 
   SN::$config->url_faq                 = sys_get_param_str_unsafe('url_faq');
   SN::$config->url_forum               = sys_get_param_str_unsafe('url_forum');
   SN::$config->url_rules               = sys_get_param_str_unsafe('url_rules');
-  SN::$config->url_purchase_metamatter         = sys_get_param_str_unsafe('url_purchase_metamatter');
+  SN::$config->url_purchase_metamatter = sys_get_param_str_unsafe('url_purchase_metamatter');
   SN::$config->game_disable            = sys_get_param_int('game_disable');
   SN::$config->game_disable_reason     = sys_get_param_str_unsafe('game_disable_reason');
   SN::$config->server_updater_check_auto = sys_get_param_int('server_updater_check_auto');
@@ -101,8 +101,8 @@ 
   SN::$config->stats_schedule          = sys_get_param_str('stats_schedule');
 
   SN::$config->empire_mercenary_base_period = sys_get_param_int('empire_mercenary_base_period');
-  if(SN::$config->empire_mercenary_temporary != sys_get_param_int('empire_mercenary_temporary')) {
-    if(SN::$config->empire_mercenary_temporary) {
+  if (SN::$config->empire_mercenary_temporary != sys_get_param_int('empire_mercenary_temporary')) {
+    if (SN::$config->empire_mercenary_temporary) {
       DBStaticUnit::db_unit_list_admin_delete_mercenaries_finished();
     } else {
       DBStaticUnit::db_unit_list_admin_set_mercenaries_expire_time(SN::$config->empire_mercenary_base_period);
@@ -152,7 +152,7 @@ 
 tpl_assign_select($template, 'ver_response', SN::$lang['adm_opt_ver_response'], 'ID', 'NAME');
 
 $lang_list = lng_get_list();
-foreach($lang_list as $lang_id => $lang_data) {
+foreach ($lang_list as $lang_id => $lang_data) {
   $template->assign_block_vars('game_languages', array(
     'ID'   => $lang_id,
     'NAME' => "{$lang_data['LANG_NAME_NATIVE']} ({$lang_data['LANG_NAME_ENGLISH']})",