supernova-ws / SuperNova

classes/Fleet/Fleet.php

Spacing +3 added lines, -3 removed lines

@@ -290,7 +290,7 @@ 
     $result = [];
 
     foreach ($this->getShipListArray() as $unit_id => $unit_amount) {
-      $shipsLost        = ceil($unit_amount * $multiplier);
+      $shipsLost = ceil($unit_amount * $multiplier);
       $result[$unit_id] += $shipsLost;
     }
 
@@ -436,8 +436,8 @@ 
   protected function getTravelData() {
     $travel_data = flt_travel_data(
       $this->getFleetOwnerRecord(),
-      ['galaxy' => $this->fleet_start_galaxy, 'system' => $this->fleet_start_system, 'planet' => $this->fleet_start_planet,],
-      ['galaxy' => $this->fleet_end_galaxy, 'system' => $this->fleet_end_system, 'planet' => $this->fleet_end_planet,],
+      ['galaxy' => $this->fleet_start_galaxy, 'system' => $this->fleet_start_system, 'planet' => $this->fleet_start_planet, ],
+      ['galaxy' => $this->fleet_end_galaxy, 'system' => $this->fleet_end_system, 'planet' => $this->fleet_end_planet, ],
       $this->getShipListArray(),
       $this->speedPercentTenth
     );

common.php

Spacing +7 added lines, -7 removed lines

@@ -14,24 +14,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(SN::$sys_user_logged_in) {
+} elseif (SN::$sys_user_logged_in) {
   sys_user_vacation($user);
 
   $planet_id = SetSelectedPlanet($user);
 
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
-  if($user['ally_id']) {
+  if ($user['ally_id']) {
     db_mysql::db_transaction_start();
     \Alliance\Alliance::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);
       SN::$auth->logout(false);
@@ -50,7 +50,7 @@ 
   db_mysql::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);
     SN::$auth->logout(false);
@@ -65,7 +65,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] : '';
   SnTemplate::renderHeader($page, $title, $template_result, false, $user, SN::$config, $lang, $planetrow);
 }

notes.php

Spacing +20 added lines, -20 removed lines

@@ -17,34 +17,34 @@ 
 $template = SnTemplate::gettemplate('notes', true);
 
 $result = array();
-if(($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
+if (($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
   $result[] = array('STATUS' => sys_get_param_int('STATUS'), 'MESSAGE' => $lang[$result_message]);
 }
 
 $note_id_edit = sys_get_param_id('note_id_edit');
-if(sys_get_param('note_delete')) {
+if (sys_get_param('note_delete')) {
   try {
     $not = '';
     $query_where = '';
-    switch(sys_get_param_str('note_delete_range')) {
+    switch (sys_get_param_str('note_delete_range')) {
       case 'all':
       break;
 
       case 'marked_not':
         $not = 'NOT';
       case 'marked':
-        if(!is_array($notes_marked = sys_get_param('note'))) {
+        if (!is_array($notes_marked = sys_get_param('note'))) {
           throw new exception('note_err_none_selected', ERR_WARNING);
         }
 
         $notes_marked_filtered = array();
-        foreach($notes_marked as $note_id => $note_select) {
-          if($note_select == 'on' && $note_id = idval($note_id)) {
+        foreach ($notes_marked as $note_id => $note_select) {
+          if ($note_select == 'on' && $note_id = idval($note_id)) {
             $notes_marked_filtered[] = $note_id;
           }
         }
 
-        if(empty($notes_marked_filtered)) {
+        if (empty($notes_marked_filtered)) {
           throw new exception('note_err_none_selected', ERR_WARNING);
         }
 
@@ -61,7 +61,7 @@ 
     doquery("DELETE FROM {{notes}} WHERE `owner` = {$user['id']} {$query_where};");
     db_mysql::db_transaction_commit();
     throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
-  } catch(exception $e) {
+  } catch (exception $e) {
     $note_id_edit = 0;
     db_mysql::db_transaction_rollback();
     $result[] = array(
@@ -69,7 +69,7 @@ 
       'MESSAGE' => $lang[$e->getMessage()],
     );
   }
-} elseif(($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
+} elseif (($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
   $note_title == SN::$db->db_escape($lang['note_new_title']) ? $note_title = '' : false;
   ($note_text = sys_get_param_str('note_text')) == SN::$db->db_escape($lang['note_new_text']) ? $note_text = '' : false;
 
@@ -78,7 +78,7 @@ 
     $note_system = max(0, min(sys_get_param_id('note_system'), SN::$config->game_maxSystem));
     $note_planet = max(0, min(sys_get_param_id('note_planet'), SN::$config->game_maxPlanet + 1));
 
-    if(!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
+    if (!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
       throw new exception('note_err_note_empty', ERR_WARNING);
     }
 
@@ -87,15 +87,15 @@ 
     $note_sticky = intval(sys_get_param_id('note_sticky')) ? 1 : 0;
 
     db_mysql::db_transaction_start();
-    if($note_id_edit) {
+    if ($note_id_edit) {
       $check_note_id = doquery("SELECT `id`, `owner` FROM {{notes}} WHERE `id` = {$note_id_edit} LIMIT 1 FOR UPDATE", true);
-      if(!$check_note_id) {
+      if (!$check_note_id) {
         throw new exception('note_err_note_not_found', ERR_ERROR);
       }
     }
 
-    if($note_id_edit) {
-      if($check_note_id['owner'] != $user['id']) {
+    if ($note_id_edit) {
+      if ($check_note_id['owner'] != $user['id']) {
         throw new exception('note_err_owner_wrong', ERR_ERROR);
       }
 
@@ -110,7 +110,7 @@ 
     db_mysql::db_transaction_commit();
     sys_redirect('notes.php?STATUS=' . ERR_NONE . '&MESSAGE=' . ($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
 //    throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
-  } catch(exception $e) {
+  } catch (exception $e) {
     $note_id_edit = 0;
     db_mysql::db_transaction_rollback();
     $result[] = array(
@@ -120,7 +120,7 @@ 
   }
 }
 
-if(!$note_id_edit) {
+if (!$note_id_edit) {
   \Note\Note::note_assign($template, array(
     'id' => 0,
     'time' => SN_TIME_NOW,
@@ -133,13 +133,13 @@ 
 
 $note_exist = false;
 $notes_query = doquery("SELECT * FROM {{notes}} WHERE owner={$user['id']} ORDER BY priority DESC, galaxy ASC, system ASC, planet ASC, planet_type ASC, `time` DESC");
-while($note_row = db_fetch($notes_query)) {
+while ($note_row = db_fetch($notes_query)) {
   \Note\Note::note_assign($template, $note_row);
   $note_exist = $note_exist || $note_row['id'] == $note_id_edit;
 }
 $note_id_edit = $note_exist ? $note_id_edit : 0;
 
-foreach($note_priority_classes as $note_priority_id => $note_priority_class) {
+foreach ($note_priority_classes as $note_priority_id => $note_priority_class) {
   $template->assign_block_vars('note_priority', array(
     'ID' => $note_priority_id,
     'CLASS' => $note_priority_classes[$note_priority_id],
@@ -147,14 +147,14 @@ 
   ));
 }
 
-foreach($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
+foreach ($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
   $template->assign_block_vars('planet_type', array(
     'ID' => $planet_type_id,
     'TEXT' => $planet_type_string,
   ));
 }
 
-foreach($result as $result_data) {
+foreach ($result as $result_data) {
   $template->assign_block_vars('result', $result_data);
 }
 

classes/Fleet/MissionExploreResult.php

Spacing +11 added lines, -11 removed lines

@@ -73,29 +73,29 @@ 
       Constants::K_OUTCOME           => Constants::EXPEDITION_OUTCOME_FOUND_FLEET,
       Constants::K_OUTCOME_TYPE      => Constants::OUTCOME_TYPE_GOOD,
       P_CHANCE                       => 200,
-      'percent'                      => [0 => 0.1, 1 => 0.02, 2 => 0.01,],
+      'percent'                      => [0 => 0.1, 1 => 0.02, 2 => 0.01, ],
       Constants::K_OUTCOME_SECONDARY => [
-        [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2,],
-        [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1,],
-        [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0,],
+        [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2, ],
+        [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1, ],
+        [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0, ],
       ],
     ],
     Constants::EXPEDITION_OUTCOME_FOUND_RESOURCES => [
       Constants::K_OUTCOME           => Constants::EXPEDITION_OUTCOME_FOUND_RESOURCES,
       Constants::K_OUTCOME_TYPE      => Constants::OUTCOME_TYPE_GOOD,
       P_CHANCE                       => 300,
-      'percent'                      => [0 => 0.1, 1 => 0.050, 2 => 0.025,],
+      'percent'                      => [0 => 0.1, 1 => 0.050, 2 => 0.025, ],
       Constants::K_OUTCOME_SECONDARY => [
-        [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2,],
-        [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1,],
-        [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0,],
+        [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2, ],
+        [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1, ],
+        [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0, ],
       ],
     ],
     Constants::EXPEDITION_OUTCOME_FOUND_DM        => [
       Constants::K_OUTCOME           => Constants::EXPEDITION_OUTCOME_FOUND_DM,
       Constants::K_OUTCOME_TYPE      => Constants::OUTCOME_TYPE_GOOD,
       P_CHANCE                       => 100,
-      'percent'                      => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010,],
+      'percent'                      => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010, ],
       Constants::K_OUTCOME_SECONDARY => [
         [P_CHANCE => 90, P_MULTIPLIER => 0.0010, /*P_MESSAGE_ID => 2,*/],
         [P_CHANCE => 9, P_MULTIPLIER => 0.0040, /*P_MESSAGE_ID => 1,*/],
@@ -154,7 +154,7 @@ 
       if (!$config[P_CHANCE]) {
         continue;
       }
-      $this->outcome        = $key1;
+      $this->outcome = $key1;
       if ($this->valueRolled <= $config [self::K_ROLL_VALUE]) {
         break;
       }
@@ -624,7 +624,7 @@ 
       if ($found_ship_cost > $found_in_metal) {
         unset($can_be_found[$found_ship_id]);
       } else {
-        $found_ship_count                 = mt_rand(1, floor($found_in_metal / $found_ship_cost));
+        $found_ship_count = mt_rand(1, floor($found_in_metal / $found_ship_cost));
         $this->shipsFound[$found_ship_id] += $found_ship_count;
         $found_in_metal                   -= $found_ship_count * $found_ship_cost;
       }

classes/Fleet/FleetDispatchEvent.php

Spacing +30 added lines, -35 removed lines

@@ -46,17 +46,17 @@ 
   public static $processedIPR = -1;
 
   public static $MISSIONS = [
-    MT_ATTACK    => [self::IS_TRANSPORT => false, self::IS_ATTACK => true,],
-    MT_AKS       => [self::IS_TRANSPORT => false, self::IS_ATTACK => true,],
-    MT_DESTROY   => [self::IS_TRANSPORT => false, self::IS_ATTACK => true,],
-    MT_HOLD      => [self::IS_TRANSPORT => false,],
-    MT_SPY       => [self::IS_TRANSPORT => false, self::IS_LOCK_SOURCE => true, 'AJAX' => true,],
-    MT_TRANSPORT => [self::IS_TRANSPORT => true, self::IS_LOCK_SOURCE => true,],
-    MT_RELOCATE  => [self::IS_TRANSPORT => true, self::IS_LOCK_SOURCE => true,],
-    MT_RECYCLE   => [self::IS_TRANSPORT => false, 'AJAX' => true,],
-    MT_EXPLORE   => [self::IS_TRANSPORT => false,],
-    MT_COLONIZE  => [self::IS_TRANSPORT => true,],
-    MT_MISSILE   => [self::IS_TRANSPORT => false, 'AJAX' => true,],
+    MT_ATTACK    => [self::IS_TRANSPORT => false, self::IS_ATTACK => true, ],
+    MT_AKS       => [self::IS_TRANSPORT => false, self::IS_ATTACK => true, ],
+    MT_DESTROY   => [self::IS_TRANSPORT => false, self::IS_ATTACK => true, ],
+    MT_HOLD      => [self::IS_TRANSPORT => false, ],
+    MT_SPY       => [self::IS_TRANSPORT => false, self::IS_LOCK_SOURCE => true, 'AJAX' => true, ],
+    MT_TRANSPORT => [self::IS_TRANSPORT => true, self::IS_LOCK_SOURCE => true, ],
+    MT_RELOCATE  => [self::IS_TRANSPORT => true, self::IS_LOCK_SOURCE => true, ],
+    MT_RECYCLE   => [self::IS_TRANSPORT => false, 'AJAX' => true, ],
+    MT_EXPLORE   => [self::IS_TRANSPORT => false, ],
+    MT_COLONIZE  => [self::IS_TRANSPORT => true, ],
+    MT_MISSILE   => [self::IS_TRANSPORT => false, 'AJAX' => true, ],
   ];
 
   public function __construct($fleetRow, $eventType) {
@@ -71,19 +71,18 @@ 
 
     $this->fleetOwnerId = $fleetRow[self::F_FLEET_OWNER_ID];
 
-    $this->missionId      = (int)$this->fleet[FleetDispatcher::F_FLEET_MISSION];
+    $this->missionId      = (int) $this->fleet[FleetDispatcher::F_FLEET_MISSION];
     $this->missionInfoNew = self::$MISSIONS[$this->missionId];
 
-    $this->eventTimeStamp = (int)$this->fleet[$this->event === EVENT_FLT_ARRIVE ? 'fleet_start_time' :
-      ($this->event === EVENT_FLT_ACCOMPLISH ? 'fleet_end_stay' : /* EVENT_FLT_RETURN */
+    $this->eventTimeStamp = (int) $this->fleet[$this->event === EVENT_FLT_ARRIVE ? 'fleet_start_time' : ($this->event === EVENT_FLT_ACCOMPLISH ? 'fleet_end_stay' : /* EVENT_FLT_RETURN */
         'fleet_end_time')];
 
     /** @var Fleet $fleetObject */
-    $fleetObject = (object)$this->fleet;
+    $fleetObject = (object) $this->fleet;
 
     // Always locking flying fleet and fleet owner
-    $this->userIdsToLock   = [(int)$fleetObject->fleet_owner ?: 0 => true,];
-    $this->fleetIdsToLock  = [(int)$fleetObject->fleet_id => true,];
+    $this->userIdsToLock   = [(int) $fleetObject->fleet_owner ?: 0 => true, ];
+    $this->fleetIdsToLock  = [(int) $fleetObject->fleet_id => true, ];
     $this->planetIdsToLock = [];
 
     // Some locks make sense only on specific event types
@@ -103,10 +102,10 @@ 
       // If the fleet is a part of existing fleet group - locking also fleets in group and their respected owners
       // Only doing it for EVENT_FLT_ARRIVE - currently no other event types does trigger fleet group actions
       if (!empty($fleetObject->fleet_group) && $this->event === EVENT_FLT_ARRIVE) {
-        $fleetGroupId = (int)$fleetObject->fleet_group;
+        $fleetGroupId = (int) $fleetObject->fleet_group;
         foreach (DbFleetStatic::db_fleet_list("`fleet_group` = {$fleetGroupId}") as $fleetInGroup) {
-          $this->userIdsToLock[(int)$fleetInGroup[self::F_FLEET_OWNER_ID] ?: 0] = true;
-          $this->fleetIdsToLock[(int)$fleetInGroup[self::F_FLEET_ID] ?: 0]      = true;
+          $this->userIdsToLock[(int) $fleetInGroup[self::F_FLEET_OWNER_ID] ?: 0] = true;
+          $this->fleetIdsToLock[(int) $fleetInGroup[self::F_FLEET_ID] ?: 0]      = true;
         }
       }
 
@@ -129,8 +128,8 @@ 
         $this->eventTimeStamp
       );
       foreach ($fleetsOnHold as $aFleet) {
-        $this->userIdsToLock[(int)$aFleet[self::F_FLEET_OWNER_ID] ?: 0] = true;
-        $this->fleetIdsToLock[(int)$aFleet[self::F_FLEET_ID] ?: 0]      = true;
+        $this->userIdsToLock[(int) $aFleet[self::F_FLEET_OWNER_ID] ?: 0] = true;
+        $this->fleetIdsToLock[(int) $aFleet[self::F_FLEET_ID] ?: 0]      = true;
       }
     }
 
@@ -164,18 +163,14 @@ 
   }
 
   public static function sortEvents(&$eventList) {
-    uasort($eventList, function (FleetDispatchEvent $a, FleetDispatchEvent $b) {
+    uasort($eventList, function(FleetDispatchEvent $a, FleetDispatchEvent $b) {
       return
         // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-          $a->eventTimeStamp > $b->eventTimeStamp ? 1 : ($a->eventTimeStamp < $b->eventTimeStamp ? -1 :
-          // Если время - одинаковое, сравниваем события флотов
+          $a->eventTimeStamp > $b->eventTimeStamp ? 1 : ($a->eventTimeStamp < $b->eventTimeStamp ? -1 : // Если время - одинаковое, сравниваем события флотов
           // Если события - одинаковые, то флоты равны
-          ($a->event == $b->event ? 0 :
-            // Если события разные - первыми считаем прибывающие флоты
-            ($a->event == EVENT_FLT_ARRIVE ? 1 : ($b->event == EVENT_FLT_ARRIVE ? -1 :
-              // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-              ($a->event == EVENT_FLT_ACCOMPLISH ? 1 : ($b->event == EVENT_FLT_ACCOMPLISH ? -1 :
-                // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+          ($a->event == $b->event ? 0 : // Если события разные - первыми считаем прибывающие флоты
+            ($a->event == EVENT_FLT_ARRIVE ? 1 : ($b->event == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+              ($a->event == EVENT_FLT_ACCOMPLISH ? 1 : ($b->event == EVENT_FLT_ACCOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
                 // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
                 (
                 0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -228,10 +223,10 @@ 
 //    $this->srcPlanetRow = is_array($srcPlanetRow) ? $srcPlanetRow : DBStaticPlanet::db_planet_by_vector($this->fleet, 'fleet_start_');
     $this->srcPlanetRow = $srcPlanetRow;
 
-    $this->srcPlanetId = !empty($this->srcPlanetRow[self::F_PLANET_ID]) ? (int)$this->srcPlanetRow[self::F_PLANET_ID] : 0;
+    $this->srcPlanetId = !empty($this->srcPlanetRow[self::F_PLANET_ID]) ? (int) $this->srcPlanetRow[self::F_PLANET_ID] : 0;
     // Starting planet can change owner while fleet mission - and even change planet ID
     // It can happen due to teleport shenanigans or because of planet capturing (in certain game modes)
-    $this->fleetOwnerId = !empty($this->srcPlanetRow[self::F_PLANET_OWNER_ID]) ? (int)$this->srcPlanetRow[self::F_PLANET_OWNER_ID] : $this->fleetOwnerId;
+    $this->fleetOwnerId = !empty($this->srcPlanetRow[self::F_PLANET_OWNER_ID]) ? (int) $this->srcPlanetRow[self::F_PLANET_OWNER_ID] : $this->fleetOwnerId;
 
     return $this->srcPlanetRow;
   }
@@ -253,9 +248,9 @@ 
   public function updateDstPlanetRow($dstPlanetRow = null) {
     $this->dstPlanetRow = $dstPlanetRow;
 
-    $this->dstPlanetId = !empty($this->dstPlanetRow[self::F_PLANET_ID]) ? (int)$this->dstPlanetRow[self::F_PLANET_ID] : 0;
+    $this->dstPlanetId = !empty($this->dstPlanetRow[self::F_PLANET_ID]) ? (int) $this->dstPlanetRow[self::F_PLANET_ID] : 0;
     // Retrieving destination owner ID
-    $this->dstPlanetOwnerId = !empty($this->dstPlanetRow[self::F_PLANET_OWNER_ID]) ? (int)$this->dstPlanetRow[self::F_PLANET_OWNER_ID] : 0;
+    $this->dstPlanetOwnerId = !empty($this->dstPlanetRow[self::F_PLANET_OWNER_ID]) ? (int) $this->dstPlanetRow[self::F_PLANET_OWNER_ID] : 0;
 
     return $this->dstPlanetRow;
   }

classes/DBAL/db_mysql.php

Spacing +2 added lines, -2 removed lines

@@ -299,7 +299,7 @@ 
 
     $result = [];
     while ($row = $this->db_fetch($queryResult)) {
-      $result[] = $asArray ? $row : (object)$row;
+      $result[] = $asArray ? $row : (object) $row;
     }
 
     return $result;
@@ -782,7 +782,7 @@ 
         // Detecting primary key name
         $idFieldName = !empty(static::TABLE_ID_FIELD[$tableName]) ? static::TABLE_ID_FIELD[$tableName] : 'id';
         // Making ID mysql-safe
-        array_walk($lockedIds, function (&$id) { $id = idval($id); });
+        array_walk($lockedIds, function(&$id) { $id = idval($id); });
         /** @noinspection SqlResolve */
         $queries[] = "(SELECT 1 FROM `{{{$tableName}}}` WHERE `{$idFieldName}` IN (" . implode(',', $lockedIds) . ") FOR UPDATE)";
       }

includes/includes/flt_page3.inc

Spacing +37 added lines, -38 removed lines

@@ -9,7 +9,7 @@ 
 use Planet\DBStaticPlanet;
 use Unit\DBStaticUnit;
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   SN::$debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
@@ -29,7 +29,7 @@ 
     $errorlist .= $lang['fl_limit_galaxy'];
   if (!$system || $system > $config->game_maxSystem || $system < 1)
     $errorlist .= $lang['fl_limit_system'];
-  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE ))
+  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE))
     $errorlist .= $lang['fl_limit_planet'];
   if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type)
     $errorlist .= $lang['fl_ownpl_err'];
@@ -52,12 +52,12 @@ 
 
   // Preparing to lock both source and target users and planets
   $recordsToLock = [
-    'users'   => [$user['id'],] + (!empty($TargetPlanet['id_owner']) ? [1 => $TargetPlanet['id_owner'],] : []),
-    'planets' => [$planetrow['id'],] + (!empty($TargetPlanet['id']) ? [1 => $TargetPlanet['id'],] : []),
+    'users'   => [$user['id'], ] + (!empty($TargetPlanet['id_owner']) ? [1 => $TargetPlanet['id_owner'], ] : []),
+    'planets' => [$planetrow['id'], ] + (!empty($TargetPlanet['id']) ? [1 => $TargetPlanet['id'], ] : []),
   ];
   // Adding incoming aggressive fleets from current user to this planet - to lock those fleets. They will be needed later in bashing check
   if (!empty($TargetPlanet) && !empty($fleetsBashing = DbFleetStatic::fleet_list_bashing($user['id'], $TargetPlanet))) {
-    foreach($fleetsBashing as $bashingFleet) {
+    foreach ($fleetsBashing as $bashingFleet) {
       $recordsToLock['fleets'][] = $bashingFleet['fleet_id'];
     }
   }
@@ -71,35 +71,35 @@ 
   $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
 
   if ($target_mission == MT_EXPLORE) {
-    if ($MaxExpeditions == 0 ) {
+    if ($MaxExpeditions == 0) {
       $errorlist .= $lang['fl_expe_notech'];
-    } elseif ($FlyingExpeditions >= $MaxExpeditions ) {
+    } elseif ($FlyingExpeditions >= $MaxExpeditions) {
       $errorlist .= $lang['fl_expe_max'];
     }
   } else {
-    if ($TargetPlanet['id_owner']){
+    if ($TargetPlanet['id_owner']) {
       if ($target_mission == MT_COLONIZE)
         $errorlist .= $lang['fl_colonized'];
 
-      if ($TargetPlanet['id_owner'] == $planetrow['id_owner']){
+      if ($TargetPlanet['id_owner'] == $planetrow['id_owner']) {
         if ($target_mission == MT_ATTACK)
           $errorlist .= $lang['fl_no_self_attack'];
 
         if ($target_mission == MT_SPY)
           $errorlist .= $lang['fl_no_self_spy'];
-      }else{
+      } else {
         if ($target_mission == MT_RELOCATE)
           $errorlist .= $lang['fl_only_stay_at_home'];
       }
-    }else{
-      if ($target_mission < MT_COLONIZE){
+    } else {
+      if ($target_mission < MT_COLONIZE) {
         $errorlist .= $lang['fl_unknow_target'];
-      }else{
+      } else {
         if ($target_mission == MT_DESTROY)
           $errorlist .= $lang['fl_nomoon'];
 
-        if ($target_mission == MT_RECYCLE){
-          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
+        if ($target_mission == MT_RECYCLE) {
+          if ($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
             $errorlist .= $lang['fl_nodebris'];
         }
       }
@@ -107,13 +107,13 @@ 
   }
 
 
-  if(is_object($captainModule = moduleCaptain()) && $captain_id = sys_get_param_id('captain_id')) {
+  if (is_object($captainModule = moduleCaptain()) && $captain_id = sys_get_param_id('captain_id')) {
     $captain = $captainModule->unit_captain_get($planetrow['id']);
 //      mrc_get_level($user, $planetrow, UNIT_CAPTAIN, true);
-    if(!$captain) {
+    if (!$captain) {
       $errorlist .= $lang['module_unit_captain_error_no_captain'];
-    } elseif($captain['unit_location_type'] == LOC_PLANET) {
-      if($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
+    } elseif ($captain['unit_location_type'] == LOC_PLANET) {
+      if ($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
         $errorlist .= $lang['module_unit_captain_error_captain_already_bound'];
       }
     } else {
@@ -137,13 +137,13 @@ 
   $fleet_group = max(0, intval($_POST['fleet_group']));
   //But is it acs??
   //Well all acs fleets must have a fleet code.
-  if($fleet_group) {
+  if ($fleet_group) {
     //Also it must be mission type 2
     $target_mission = MT_AKS;
 
     //The co-ords must be the same as where the acs fleet is going.
     $target = "g{$galaxy}s{$system}p{$planet}t{$planet_type}";
-    if($_POST['acs_target_mr'] == $target) {
+    if ($_POST['acs_target_mr'] == $target) {
       //ACS attack must exist (if acs fleet has arrived this will also return false (2 checks in 1!!!)
       $aks = DbFleetStatic::dbAcsGetById($fleet_group);
       if (!$aks) {
@@ -159,7 +159,7 @@ 
     }
   }
   //Check that a failed acs attack isn't being sent, if it is, make it an attack fleet.
-  if(!$fleet_group && $target_mission == MT_AKS) {
+  if (!$fleet_group && $target_mission == MT_AKS) {
     $target_mission = MT_ATTACK;
   }
 
@@ -169,7 +169,7 @@ 
   $options = [P_FLEET_ATTACK_SPEED_PERCENT_TENTH => $speed_percent, P_FLEET_ATTACK_FLEET_GROUP => $fleet_group, P_FLEET_ATTACK_RESOURCES_SUM => $StorageNeeded];
   $cant_attack = flt_can_attack($planetrow, $TargetPlanet, $fleetarray, $target_mission, $options);
 
-  if($cant_attack !== ATTACK_ALLOWED) {
+  if ($cant_attack !== ATTACK_ALLOWED) {
     SnTemplate::messageBox("<span class='error'><b>{$lang['fl_attack_error'][$cant_attack]}</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 99);
   }
 
@@ -180,11 +180,10 @@ 
 
   $fleet['start_time'] = $duration + SN_TIME_NOW;
 
-  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) :
-    ($target_mission == MT_HOLD ? 12 : 0);
-  if($max_duration) {
+  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) : ($target_mission == MT_HOLD ? 12 : 0);
+  if ($max_duration) {
     $StayDuration = sys_get_param_id('missiontime');
-    if($StayDuration > $max_duration || $StayDuration < 1) {
+    if ($StayDuration > $max_duration || $StayDuration < 1) {
       SN::$debug->warning('Supplying wrong mission time', 'Hack attempt', 302, array('base_dump' => true));
       die();
     }
@@ -194,10 +193,10 @@ 
     $StayDuration = 0;
     $StayTime     = 0;
   }
-  $fleet['end_time']   = $StayDuration + (2 * $duration) + SN_TIME_NOW;
+  $fleet['end_time'] = $StayDuration + (2 * $duration) + SN_TIME_NOW;
 
-  if($aks && $target_mission == MT_AKS) {
-    if ($fleet['start_time']>$aks['ankunft']) {
+  if ($aks && $target_mission == MT_AKS) {
+    if ($fleet['start_time'] > $aks['ankunft']) {
       SnTemplate::messageBox($lang['fl_aks_too_slow'] . 'Fleet arrival: ' . date(FMT_DATE_TIME, $fleet['start_time']) . " AKS arrival: " . date(FMT_DATE_TIME, $aks['ankunft']), $lang['fl_error']);
     }
     $fleet['start_time'] = $aks['ankunft'];
@@ -208,14 +207,14 @@ 
   $FleetShipCount      = 0;
   $db_changeset = array();
   foreach ($fleetarray as $Ship => $Count) {
-    $FleetStorage    += get_unit_param($Ship, P_CAPACITY) * $Count;
+    $FleetStorage += get_unit_param($Ship, P_CAPACITY) * $Count;
     $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($Ship, -$Count, $user, $planetrow['id']);
   }
   $fleet_array = sys_unit_arr2str($fleetarray);
-  $FleetShipCount  += array_sum($fleetarray);
-  $FleetStorage        -= $consumption;
+  $FleetShipCount += array_sum($fleetarray);
+  $FleetStorage -= $consumption;
 
-  if ( $StorageNeeded > $FleetStorage) {
+  if ($StorageNeeded > $FleetStorage) {
     SnTemplate::messageBox("<span class='error'><b>" . $lang['fl_nostoragespa'] . HelperString::numberFloorAndFormat($StorageNeeded - $FleetStorage) . "</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
   if ($planetrow['deuterium'] < $TransDeuterium + $consumption) {
@@ -264,7 +263,7 @@ 
 //    ));
 //  }
 
-  if(is_array($captain)) {
+  if (is_array($captain)) {
     DBStaticUnit::db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = " . LOC_FLEET . ", `unit_location_id` = {$fleet_id}");
   }
 
@@ -277,7 +276,7 @@ 
     'START_LEFT'         => floor($fleet['end_time'] + 1 - SN_TIME_NOW),
   );
 
-  if(!empty($TargetPlanet)) {
+  if (!empty($TargetPlanet)) {
     $template_route += array(
       'END_TYPE_TEXT_SH' => $lang['sys_planet_type_sh'][$TargetPlanet['planet_type']],
       'END_COORDS'       => uni_render_coordinates($TargetPlanet),
@@ -290,8 +289,8 @@ 
   $template->assign_block_vars('fleets', $template_route);
 
   $sn_groups_fleet = sn_get_groups('fleet');
-  foreach($fleetarray as $ship_id => $ship_count) {
-    if(in_array($ship_id, $sn_groups_fleet) && $ship_count) {
+  foreach ($fleetarray as $ship_id => $ship_count) {
+    if (in_array($ship_id, $sn_groups_fleet) && $ship_count) {
 //      $ship_base_data = get_ship_data($ship_id, $user);
       $template->assign_block_vars('fleets.ships', array(
         'ID'          => $ship_id,

Braces +41 added lines, -30 removed lines

@@ -25,18 +25,24 @@ 
   $errorlist .= !is_array($fleetarray) ? $lang['fl_no_fleetarray'] : '';
 
   $errorlist = '';
-  if (!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1)
-    $errorlist .= $lang['fl_limit_galaxy'];
-  if (!$system || $system > $config->game_maxSystem || $system < 1)
-    $errorlist .= $lang['fl_limit_system'];
-  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE ))
-    $errorlist .= $lang['fl_limit_planet'];
-  if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type)
-    $errorlist .= $lang['fl_ownpl_err'];
-  if (!$planet_type)
-    $errorlist .= $lang['fl_no_planettype'];
-  if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON)
-    $errorlist .= $lang['fl_fleet_err_pl'];
+  if (!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1) {
+      $errorlist .= $lang['fl_limit_galaxy'];
+  }
+  if (!$system || $system > $config->game_maxSystem || $system < 1) {
+      $errorlist .= $lang['fl_limit_system'];
+  }
+  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE )) {
+      $errorlist .= $lang['fl_limit_planet'];
+  }
+  if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type) {
+      $errorlist .= $lang['fl_ownpl_err'];
+  }
+  if (!$planet_type) {
+      $errorlist .= $lang['fl_no_planettype'];
+  }
+  if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON) {
+      $errorlist .= $lang['fl_fleet_err_pl'];
+  }
   if (empty($missiontype[$target_mission])) {
     $errorlist .= $lang['fl_bad_mission'];
   }
@@ -78,29 +84,35 @@ 
     }
   } else {
     if ($TargetPlanet['id_owner']){
-      if ($target_mission == MT_COLONIZE)
-        $errorlist .= $lang['fl_colonized'];
+      if ($target_mission == MT_COLONIZE) {
+              $errorlist .= $lang['fl_colonized'];
+      }
 
       if ($TargetPlanet['id_owner'] == $planetrow['id_owner']){
-        if ($target_mission == MT_ATTACK)
-          $errorlist .= $lang['fl_no_self_attack'];
-
-        if ($target_mission == MT_SPY)
-          $errorlist .= $lang['fl_no_self_spy'];
-      }else{
-        if ($target_mission == MT_RELOCATE)
-          $errorlist .= $lang['fl_only_stay_at_home'];
+        if ($target_mission == MT_ATTACK) {
+                  $errorlist .= $lang['fl_no_self_attack'];
+        }
+
+        if ($target_mission == MT_SPY) {
+                  $errorlist .= $lang['fl_no_self_spy'];
+        }
+      } else{
+        if ($target_mission == MT_RELOCATE) {
+                  $errorlist .= $lang['fl_only_stay_at_home'];
+        }
       }
-    }else{
+    } else{
       if ($target_mission < MT_COLONIZE){
         $errorlist .= $lang['fl_unknow_target'];
-      }else{
-        if ($target_mission == MT_DESTROY)
-          $errorlist .= $lang['fl_nomoon'];
+      } else{
+        if ($target_mission == MT_DESTROY) {
+                  $errorlist .= $lang['fl_nomoon'];
+        }
 
         if ($target_mission == MT_RECYCLE){
-          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
-            $errorlist .= $lang['fl_nodebris'];
+          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0) {
+                      $errorlist .= $lang['fl_nodebris'];
+          }
         }
       }
     }
@@ -148,8 +160,7 @@ 
       $aks = DbFleetStatic::dbAcsGetById($fleet_group);
       if (!$aks) {
         $fleet_group = 0;
-      }
-      else
+      } else
       {
         $galaxy = $aks['galaxy'];
         $system = $aks['system'];

language/de/tech.mo.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 * NICHT ÄNDERN
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 
 $a_lang_array = (array(

flotenajax.php

Spacing +3 added lines, -3 removed lines

@@ -58,8 +58,8 @@ 
 db_mysql::db_transaction_start();
 // Locking all necessary user/planet records
 SN::$gc->db->lockRecords([
-  'users'   => [$user['id'],] + (!empty($enemy['id']) ? [1 => $enemy['id'],] : []),
-  'planets' => [$user['current_planet'],] + (!empty($target_row['id']) ? [1 => $target_row['id'],] : []),
+  'users'   => [$user['id'], ] + (!empty($enemy['id']) ? [1 => $enemy['id'], ] : []),
+  'planets' => [$user['current_planet'], ] + (!empty($target_row['id']) ? [1 => $target_row['id'], ] : []),
 ]);
 
 $user      = db_user_by_id($user['id'], true);
@@ -177,7 +177,7 @@ 
 //$ships_sent_js = array();
 $ships_sent_js = 0;
 foreach ($fleet_array as $unit_id => $unit_count) {
-  $ships_sent[]  = "{$unit_count} {$lang['tech'][$unit_id]}";
+  $ships_sent[] = "{$unit_count} {$lang['tech'][$unit_id]}";
   $ships_sent_js += mrc_get_level($user, $planetrow, $unit_id, false, true);
 }
 $ships_sent = implode(', ', $ships_sent);