supernova-ws / SuperNova

flying_fleets.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('viewreport', true);
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);

classes/Common/IndexedObjectStorage.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
    * @throws \Exception
    */
   protected function indexDuplicated($object, $data) {
-    throw new \Exception('Duplicate index [' . $data . '] in ' . __CLASS__);
+    throw new \Exception('Duplicate index ['.$data.'] in '.__CLASS__);
   }
 
   /**
@@ -119,7 +119,7 @@ 
     if ($this->contains($object)) {
       $this->indexUnset($object);
     }
-    if($this->indexSet($object, $data)) {
+    if ($this->indexSet($object, $data)) {
       // Attaches object only if index sets successfully
       parent::attach($object, $data);
     }

classes/Common/GlobalContainer.php

Spacing +14 added lines, -14 removed lines

@@ -43,62 +43,62 @@
     $gc = $this;
 
     // Default db
-    $gc->db = function ($c) {
+    $gc->db = function($c) {
       classSupernova::$db = $db = new \db_mysql($c);
 
       return $db;
     };
 
-    $gc->debug = function ($c) {
+    $gc->debug = function($c) {
       return new \debug();
     };
 
-    $gc->types = function ($c) {
+    $gc->types = function($c) {
       return new \Common\Types();
     };
 
-    $gc->cache = function ($c) {
+    $gc->cache = function($c) {
       return new \classCache(classSupernova::$cache_prefix);
     };
 
-    $gc->config = function ($c) {
+    $gc->config = function($c) {
       return new \classConfig(classSupernova::$cache_prefix);
     };
 
-    $gc->localePlayer = function (GlobalContainer $c) {
+    $gc->localePlayer = function(GlobalContainer $c) {
       return new \classLocale($c->config->server_locale_log_usage);
     };
 
-    $gc->dbGlobalRowOperator = function (GlobalContainer $c) {
+    $gc->dbGlobalRowOperator = function(GlobalContainer $c) {
       return new \DbRowDirectOperator($c->db);
     };
 
-    $gc->query = $gc->factory(function (GlobalContainer $c) {
+    $gc->query = $gc->factory(function(GlobalContainer $c) {
       return new \DbQueryConstructor($c->db);
     });
 
-    $gc->cacheOperator = function (GlobalContainer $gc) {
+    $gc->cacheOperator = function(GlobalContainer $gc) {
       return new \SnDbCachedOperator($gc);
     };
 
     $gc->snCacheClass = 'SnCache';
-    $gc->snCache = function (GlobalContainer $gc) {
+    $gc->snCache = function(GlobalContainer $gc) {
       return $gc->db->snCache;
     };
 
     $gc->buddyClass = 'Buddy\BuddyModel';
-    $gc->buddyModel = function (GlobalContainer $c) {
+    $gc->buddyModel = function(GlobalContainer $c) {
       return new $c->buddyClass($c);
     };
 
-    $gc->unitModel = function (GlobalContainer $c) {
+    $gc->unitModel = function(GlobalContainer $c) {
       return new \V2Unit\V2UnitModel($c);
     };
-    $gc->unitList = $this->factory(function (GlobalContainer $c) {
+    $gc->unitList = $this->factory(function(GlobalContainer $c) {
       return new \V2Unit\V2UnitList($c);
     });
 
-    $gc->fleetModel = function (GlobalContainer $c) {
+    $gc->fleetModel = function(GlobalContainer $c) {
       return new V2FleetModel($c);
     };
   }

classes/Common/ObjectCollection.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
    * @since 5.0.0
    */
   public function offsetUnset($offset) {
-    if($this->offsetExists($offset)) {
+    if ($this->offsetExists($offset)) {
       parent::offsetUnset($this->offsetGet($offset));
     }
   }

classes/V2Fleet/V2FleetModel.php

Spacing +5 added lines, -5 removed lines

@@ -80,7 +80,7 @@ 
 
     $this->extendProperties($this->newProperties);
 
-    $this->accessors->set('location', P_CONTAINER_GET, function (V2FleetContainer $that) {
+    $this->accessors->set('location', P_CONTAINER_GET, function(V2FleetContainer $that) {
       if (is_null($location = $that->getDirect('location'))) {
         $location = new V2Location(LOC_FLEET);
         $that->setDirect('location', $location);
@@ -89,12 +89,12 @@ 
       return $location;
     });
 
-    $this->accessors->set('dbId', P_CONTAINER_SET, function (V2FleetContainer $that, $value) {
+    $this->accessors->set('dbId', P_CONTAINER_SET, function(V2FleetContainer $that, $value) {
       $that->setDirect('dbId', $value);
       $that->location->setLocationId($value);
     });
 
-    $this->accessors->set('ownerId', P_CONTAINER_SET, function (V2FleetContainer $that, $value) {
+    $this->accessors->set('ownerId', P_CONTAINER_SET, function(V2FleetContainer $that, $value) {
       $that->setDirect('ownerId', $value);
       $that->location->setLocationPlayerId($value);
     });
@@ -105,7 +105,7 @@ 
     $this->accessors->set('vectorArrive', P_CONTAINER_EXPORT, array($this, 'exportVector'));
 
 
-    $this->accessors->set('units', P_CONTAINER_GET, function (V2FleetContainer $that) {
+    $this->accessors->set('units', P_CONTAINER_GET, function(V2FleetContainer $that) {
       if (is_null($units = $that->getDirect('units'))) {
         $units = \classSupernova::$gc->unitList;
         $that->setDirect('units', $units);
@@ -114,7 +114,7 @@ 
       return $units;
     });
 
-    $this->accessors->set('isReturning', P_CONTAINER_GET, function (V2FleetContainer $that) {
+    $this->accessors->set('isReturning', P_CONTAINER_GET, function(V2FleetContainer $that) {
       return $that->status == FLEET_FLAG_RETURNING;
     });
 

classes/Common/Invoker.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
   }
 
   public static function build($callable) {
-    if(is_array($callable) && count($callable) == 2 && is_object($callable[0])) {
+    if (is_array($callable) && count($callable) == 2 && is_object($callable[0])) {
       return new static($callable);
     } else {
       return false;

classes/Common/Accessors.php

Spacing +10 added lines, -10 removed lines

@@ -40,7 +40,7 @@ 
    * @return bool
    */
   public function exists($varName, $accessor) {
-    return isset($this->accessors[$varName . $accessor]);
+    return isset($this->accessors[$varName.$accessor]);
   }
 
   /**
@@ -58,7 +58,7 @@ 
     if (empty($callable)) {
       return;
     } elseif (!is_callable($callable)) {
-      throw new \Exception('Error assigning callable in ' . get_called_class() . '::set()! Callable typed [' . $accessor . '] is not a callable or not accessible in the scope');
+      throw new \Exception('Error assigning callable in '.get_called_class().'::set()! Callable typed ['.$accessor.'] is not a callable or not accessible in the scope');
     }
 
     // Converting method array-callable to closure
@@ -68,13 +68,13 @@ 
 //      $callable = $method->getClosure($callable[0]);
 //    }
 
-    if($invoker = Invoker::build($callable)) {
+    if ($invoker = Invoker::build($callable)) {
       $callable = $invoker;
     }
 
-    $this->accessors[$varName . $accessor] = $callable;
-    if($shared) {
-      $this->shared[$varName . $accessor] = true;
+    $this->accessors[$varName.$accessor] = $callable;
+    if ($shared) {
+      $this->shared[$varName.$accessor] = true;
     }
   }
 
@@ -100,13 +100,13 @@ 
    */
   public function execute($varName, $accessor, $params) {
     if (!$this->exists($varName, $accessor)) {
-      throw new \Exception("No [{$accessor}] accessor found for variable [{$varName}] on " . get_called_class() . "::" . __METHOD__);
+      throw new \Exception("No [{$accessor}] accessor found for variable [{$varName}] on ".get_called_class()."::".__METHOD__);
     }
 
-    $functionName = $varName . $accessor;
+    $functionName = $varName.$accessor;
 
-    if(isset($this->shared[$functionName])) {
-      if(!array_key_exists($functionName, $this->executed)) {
+    if (isset($this->shared[$functionName])) {
+      if (!array_key_exists($functionName, $this->executed)) {
         $this->executed[$functionName] = call_user_func_array($this->accessors[$functionName], $params);
       }
       return $this->executed[$functionName];

includes/includes/flt_mission_transport.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
   $source_planet = &$mission_data->src_planet;
   $destination_planet = &$mission_data->dst_planet;
 
-  if(empty($destination_planet['id_owner'])) {
+  if (empty($destination_planet['id_owner'])) {
     $objFleet->markReturnedAndSave();
 
     return $result;
@@ -33,7 +33,7 @@ 
     $fleet_resources[RES_DEUTERIUM], classLocale::$lang['Deuterium']);
   DBStaticMessages::msg_send_simple_message($objFleet->target_owner_id, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, classLocale::$lang['sys_mess_tower'], classLocale::$lang['sys_mess_transport'], $Message);
 
-  if($objFleet->target_owner_id <> $objFleet->playerOwnerId) {
+  if ($objFleet->target_owner_id <> $objFleet->playerOwnerId) {
     DBStaticMessages::msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, classLocale::$lang['sys_mess_tower'], classLocale::$lang['sys_mess_transport'], $Message);
   }
 

includes/includes/flt_flying_fleet_handler2.php

Spacing +8 added lines, -12 removed lines

@@ -23,15 +23,11 @@ 
 // ------------------------------------------------------------------
 function flt_flyingFleetsSort($a, $b) {
   // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
-    // Если время - одинаковое, сравниваем события флотов
+  return $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 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -49,13 +45,13 @@ 
     $handler = fopen('event.log', 'a+');
   }
 
-  fwrite($handler, date(FMT_DATE_TIME_SQL, time()) . ' ' . $msg . "\r\n");
+  fwrite($handler, date(FMT_DATE_TIME_SQL, time()).' '.$msg."\r\n");
 }
 
 // ------------------------------------------------------------------
 function flt_flying_fleet_handler($skip_fleet_update = false) {
   if (true) {
-    if(!defined('IN_AJAX')) {
+    if (!defined('IN_AJAX')) {
       print('<div style="color: red; font-size: 300%">Fleet handler is disabled</div>');
       pdump('Fleet handler is disabled');
     }
@@ -181,7 +177,7 @@ 
     MT_EXPLORE   => 'flt_mission_explore',
   );
   foreach ($missions_used as $mission_id => $cork) {
-    require_once(SN_ROOT_PHYSICAL . "includes/includes/{$mission_files[$mission_id]}" . DOT_PHP_EX);
+    require_once(SN_ROOT_PHYSICAL."includes/includes/{$mission_files[$mission_id]}".DOT_PHP_EX);
   }
 
 //log_file('Обработка миссий');
@@ -248,7 +244,7 @@ 
     $objMission->fleet_event = $fleet_event['fleet_event'];
 
     // Fleet that have planet destination is returned
-    if($mission_data['dst_planet'] && empty($objMission->dst_planet['id_owner'])) {
+    if ($mission_data['dst_planet'] && empty($objMission->dst_planet['id_owner'])) {
       $objFleet->markReturnedAndSave();
       sn_db_transaction_commit();
       continue;