supernova-ws / SuperNova

includes/classes/UBE/UBERoundList.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
    */
   public function report_render_rounds(&$template_result, UBE $ube) {
     $round_count = $this->count();
-    for($round = 1; $round <= $round_count - 1; $round++) {
+    for ($round = 1; $round <= $round_count - 1; $round++) {
       $template_result['.']['round'][] = array(
         'NUMBER' => $round,
         '.'      => array(
@@ -48,7 +48,7 @@ 
    */
   public function sql_generate_unit_array(array &$sql_perform_ube_report_unit, $ube_report_id, UBEFleetList $UBEFleetList) {
     $unit_sort_order = 1;
-    foreach($this->_container as $round_number => $UBERound) {
+    foreach ($this->_container as $round_number => $UBERound) {
       $outer_prefix = array(
         $ube_report_id,
         $round_number,
@@ -66,9 +66,9 @@ 
    */
   public function db_load_round_list_from_report_row($report_row, UBE $ube) {
     $query = doquery("SELECT * FROM {{ube_report_unit}} WHERE `ube_report_id` = {$report_row['ube_report_id']} ORDER BY `ube_report_unit_id`");
-    while($report_unit_row = db_fetch($query)) {
+    while ($report_unit_row = db_fetch($query)) {
       $round_number = $report_unit_row['ube_report_unit_round'];
-      if(!isset($this[$round_number])) {
+      if (!isset($this[$round_number])) {
         $this[$round_number] = new UBERound();
         $this[$round_number]->init_round_from_report_unit_row($report_unit_row);
       }

includes/classes/UBE/UBERound.php

Spacing +7 added lines, -7 removed lines

@@ -36,8 +36,8 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function make_snapshot(UBEFleetList $UBEFleetList) {
-    foreach($UBEFleetList->_container as $fleet_id => $UBEFleet) {
-      foreach($UBEFleet->unit_list->_container as $UBEUnit) {
+    foreach ($UBEFleetList->_container as $fleet_id => $UBEFleet) {
+      foreach ($UBEFleet->unit_list->_container as $UBEUnit) {
         $this->snapshot[$fleet_id][$UBEUnit->unitId] = new UBESnapshotUnit();
         $this->snapshot[$fleet_id][$UBEUnit->unitId]->init_from_UBEUnit($UBEUnit);
       }
@@ -53,12 +53,12 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function sql_generate_unit_array(array &$sql_perform_ube_report_unit, &$unit_sort_order, UBEFleetList $UBEFleetList, array $outer_prefix) {
-    foreach($this->snapshot as $fleet_id => $fleet_snapshot) {
+    foreach ($this->snapshot as $fleet_id => $fleet_snapshot) {
       $inner_prefix = array(
         $UBEFleetList[$fleet_id]->owner_id,
         $fleet_id,
       );
-      foreach($fleet_snapshot as $unit_id => $unit_snapshot) {
+      foreach ($fleet_snapshot as $unit_id => $unit_snapshot) {
         $sql_perform_ube_report_unit[] = array_merge(
           $outer_prefix,
           $inner_prefix,
@@ -101,7 +101,7 @@ 
       UBE_PLAYER_IS_DEFENDER => array(),
     );
 
-    foreach($this->snapshot as $fleet_id => $fleet_snapshot) {
+    foreach ($this->snapshot as $fleet_id => $fleet_snapshot) {
       $fleet_owner_id = $ube->fleet_list[$fleet_id]->owner_id;
       $planet_ube_row = $ube->fleet_list[$fleet_id]->UBE_PLANET;
 
@@ -111,13 +111,13 @@ 
         'PLAYER_NAME' => htmlentities($ube->players[$fleet_owner_id]->name, ENT_COMPAT, 'UTF-8'),
       );
 
-      if(is_array($planet_ube_row)) {
+      if (is_array($planet_ube_row)) {
         $template_fleet += $planet_ube_row;
         $template_fleet[PLANET_NAME] = $template_fleet[PLANET_NAME] ? htmlentities($template_fleet[PLANET_NAME], ENT_COMPAT, 'UTF-8') : '';
         $template_fleet['PLANET_TYPE_TEXT'] = $lang['sys_planet_type_sh'][$template_fleet['PLANET_TYPE']];
       }
 
-      foreach($fleet_snapshot as $unit_id => $unit_snapshot) {
+      foreach ($fleet_snapshot as $unit_id => $unit_snapshot) {
         $template_fleet['.']['ship'][] = $unit_snapshot->report_render_unit($prevSnapshot[$fleet_id][$unit_id]);
       }
 

includes/classes/PlayerList.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
    * @version 41a6.16
    */
   protected function db_load_player_by_id($player_id) {
-    if(isset($this[$player_id])) {
+    if (isset($this[$player_id])) {
       return;
     }
 

includes/classes/Unit.php

Spacing +5 added lines, -5 removed lines

@@ -154,15 +154,15 @@ 
    * @param string $group_name
    */
   public static function _init($group_name = '') {
-    if(static::$_is_static_init) {
+    if (static::$_is_static_init) {
       return;
     }
 
-    if($group_name) {
+    if ($group_name) {
       static::$_sn_group_name = $group_name;
     }
 
-    if(static::$_sn_group_name) {
+    if (static::$_sn_group_name) {
       static::$_group_unit_id_list = sn_get_groups(static::$_sn_group_name);
       empty(static::$_group_unit_id_list) ? static::$_group_unit_id_list = array() : false;
     }
@@ -187,7 +187,7 @@ 
     // TODO - Reset combat stats??
     $this->_unitId = $unitId;
 
-    if($this->_unitId) {
+    if ($this->_unitId) {
       $this->info = get_unit_param($this->_unitId);
       $this->_type = $this->info[P_UNIT_TYPE];
     } else {
@@ -198,7 +198,7 @@ 
 
   protected function setCount($value) {
     // TODO - Reset combat stats??
-    if($value < 0) {
+    if ($value < 0) {
       classSupernova::$debug->error('Can not set Unit::$count to negative value');
     }
     $this->_count = $value;

includes/classes/UBE/UBEFleet.php

Doc Comments +11 added lines, -4 removed lines

@@ -150,7 +150,7 @@ 
   }
 
   /**
-   * @param $ube_report_id
+   * @param integer $ube_report_id
    *
    * @return array
    *
@@ -288,7 +288,7 @@ 
 
 
   /**
-   * @param $ube_report_id
+   * @param integer $ube_report_id
    *
    * @return array
    */
@@ -336,7 +336,7 @@ 
   // Рендерит таблицу общего результата боя
   /**
    * @param $array
-   * @param $lang_header_index
+   * @param string $lang_header_index
    *
    * @return array
    */
@@ -362,6 +362,9 @@ 
   }
 
 
+  /**
+   * @param integer $ube_report_id
+   */
   public function sql_generate_outcome_unit_array(&$sql_perform_report_unit, $ube_report_id) {
     $fleet_id = $this->db_id;
 
@@ -468,6 +471,10 @@ 
     $this->fleet_capacity -= $fleet_total_resources;
   }
 
+  /**
+   * @param integer $is_small_fleet_recce
+   * @param integer $reapers_status
+   */
   public function db_save_combat_result_fleet($is_small_fleet_recce, $reapers_status) {
     $ship_count_initial = $this->unit_list->unitsCount();
     $ship_count_lost = $this->unit_list->unitCountLost();
@@ -535,7 +542,7 @@ 
 
   /**
    * @param UBEFleetList $fleet_list
-   * @param              $is_simulator
+   * @param              boolean $is_simulator
    *
    * @version 2016-02-25 23:42:45 41a4.68
    */

Spacing +64 added lines, -64 removed lines

@@ -162,20 +162,20 @@ 
       $this->owner_id,
       $this->db_id,
 
-      (float)$this->UBE_PLANET[PLANET_ID],
-      "'" . db_escape($this->UBE_PLANET[PLANET_NAME]) . "'",
-      (int)$this->UBE_PLANET[PLANET_GALAXY],
-      (int)$this->UBE_PLANET[PLANET_SYSTEM],
-      (int)$this->UBE_PLANET[PLANET_PLANET],
-      (int)$this->UBE_PLANET[PLANET_TYPE],
-
-      (float)$this->resource_list[RES_METAL],
-      (float)$this->resource_list[RES_CRYSTAL],
-      (float)$this->resource_list[RES_DEUTERIUM],
-
-      (float)$this->fleet_bonus->calcBonus(P_ATTACK),
-      (float)$this->fleet_bonus->calcBonus(P_SHIELD),
-      (float)$this->fleet_bonus->calcBonus(P_ARMOR),
+      (float) $this->UBE_PLANET[PLANET_ID],
+      "'".db_escape($this->UBE_PLANET[PLANET_NAME])."'",
+      (int) $this->UBE_PLANET[PLANET_GALAXY],
+      (int) $this->UBE_PLANET[PLANET_SYSTEM],
+      (int) $this->UBE_PLANET[PLANET_PLANET],
+      (int) $this->UBE_PLANET[PLANET_TYPE],
+
+      (float) $this->resource_list[RES_METAL],
+      (float) $this->resource_list[RES_CRYSTAL],
+      (float) $this->resource_list[RES_DEUTERIUM],
+
+      (float) $this->fleet_bonus->calcBonus(P_ATTACK),
+      (float) $this->fleet_bonus->calcBonus(P_SHIELD),
+      (float) $this->fleet_bonus->calcBonus(P_ARMOR),
     );
   }
 
@@ -189,13 +189,13 @@ 
     $this->owner_id = $objFleet->playerOwnerId;
     $this->group_id = $objFleet->group_id;
 
-    foreach($objFleet->shipsIterator() as $unit_id => $unit) {
-      if(!$unit->count) {
+    foreach ($objFleet->shipsIterator() as $unit_id => $unit) {
+      if (!$unit->count) {
         continue;
       }
 
       $unit_type = get_unit_param($unit_id, P_UNIT_TYPE);
-      if($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
+      if ($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
         $this->unit_list->unitAdjustCount($unit_id, $unit->count);
       }
     }
@@ -231,13 +231,13 @@ 
 //      }
 //    }
 
-    foreach($sn_group_combat as $unit_id) {
-      if($unit_count = mrc_get_level($player_db_row, $planet_row, $unit_id)) {
+    foreach ($sn_group_combat as $unit_id) {
+      if ($unit_count = mrc_get_level($player_db_row, $planet_row, $unit_id)) {
         $this->unit_list->unitAdjustCount($unit_id, $unit_count);
       }
     }
 
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
       $this->resource_list[$resource_id] = floor(mrc_get_level($player_db_row, $planet_row, $resource_id));
     }
 
@@ -296,27 +296,27 @@ 
       $ube_report_id,
       $this->db_id,
 
-      (float)$this->resources_lost_on_units[RES_METAL],
-      (float)$this->resources_lost_on_units[RES_CRYSTAL],
-      (float)$this->resources_lost_on_units[RES_DEUTERIUM],
-      (float)$this->cargo_dropped[RES_METAL],
-      (float)$this->cargo_dropped[RES_CRYSTAL],
-      (float)$this->cargo_dropped[RES_DEUTERIUM],
-      (float)$this->resources_looted[RES_METAL],
-      (float)$this->resources_looted[RES_CRYSTAL],
-      (float)$this->resources_looted[RES_DEUTERIUM],
-      (float)$this->resources_lost_in_metal[RES_METAL],
+      (float) $this->resources_lost_on_units[RES_METAL],
+      (float) $this->resources_lost_on_units[RES_CRYSTAL],
+      (float) $this->resources_lost_on_units[RES_DEUTERIUM],
+      (float) $this->cargo_dropped[RES_METAL],
+      (float) $this->cargo_dropped[RES_CRYSTAL],
+      (float) $this->cargo_dropped[RES_DEUTERIUM],
+      (float) $this->resources_looted[RES_METAL],
+      (float) $this->resources_looted[RES_CRYSTAL],
+      (float) $this->resources_looted[RES_DEUTERIUM],
+      (float) $this->resources_lost_in_metal[RES_METAL],
     );
   }
 
   public function report_render_outcome_side_fleet() {
     $UBE_DEFENCE_RESTORE = array();
     $UBE_UNITS_LOST = array();
-    foreach($this->unit_list->_container as $UBEUnit) {
-      if($UBEUnit->units_restored) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
+      if ($UBEUnit->units_restored) {
         $UBE_DEFENCE_RESTORE[$UBEUnit->unitId] = $UBEUnit->units_restored;
       }
-      if($UBEUnit->units_lost) {
+      if ($UBEUnit->units_lost) {
         $UBE_UNITS_LOST[$UBEUnit->unitId] = $UBEUnit->units_lost;
       }
     }
@@ -341,16 +341,16 @@ 
    */
   protected function report_render_outcome_side_fleet_line(&$array, $lang_header_index) {
     $result = array();
-    if(!empty($array)) {
-      foreach($array as $unit_id => $unit_count) {
-        if($unit_count) {
+    if (!empty($array)) {
+      foreach ($array as $unit_id => $unit_count) {
+        if ($unit_count) {
           $result[] = array(
             'NAME' => classLocale::$lang['tech'][$unit_id],
             'LOSS' => pretty_number($unit_count),
           );
         }
       }
-      if($lang_header_index && count($result)) {
+      if ($lang_header_index && count($result)) {
         array_unshift($result, array('NAME' => classLocale::$lang[$lang_header_index]));
       }
     }
@@ -363,16 +363,16 @@ 
     $fleet_id = $this->db_id;
 
     $unit_sort_order = 0;
-    foreach($this->unit_list->_container as $UBEUnit) {
-      if($UBEUnit->units_lost || $UBEUnit->units_restored) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
+      if ($UBEUnit->units_lost || $UBEUnit->units_restored) {
         $unit_sort_order++;
         $sql_perform_report_unit[] = array(
           $ube_report_id,
           $fleet_id,
 
           $UBEUnit->unitId,
-          (float)$UBEUnit->units_restored,
-          (float)$UBEUnit->units_lost,
+          (float) $UBEUnit->units_restored,
+          (float) $UBEUnit->units_lost,
 
           $unit_sort_order,
         );
@@ -388,9 +388,9 @@ 
   function ube_combat_result_calculate_resources() {
     $resource_delta_fleet = array();
     // Если во флоте остались юниты или это планета - генерируем изменение ресурсов
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
-      $resource_change = (float)$this->resources_looted[$resource_id] + (float)$this->cargo_dropped[$resource_id];
-      if($resource_change) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
+      $resource_change = (float) $this->resources_looted[$resource_id] + (float) $this->cargo_dropped[$resource_id];
+      if ($resource_change) {
         $resource_delta_fleet[$resource_id] = -($resource_change);
       }
     }
@@ -423,12 +423,12 @@ 
     );
 
     $this->fleet_capacity = 0;
-    foreach($this->unit_list->_container as $UBEUnit) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
       $this->fleet_capacity += $UBEUnit->capacity * $UBEUnit->getCount();
 
-      if($UBEUnit->units_lost) {
-        foreach($UBEUnit->price as $resource_id => $unit_resource_price) {
-          if(!$unit_resource_price) {
+      if ($UBEUnit->units_lost) {
+        foreach ($UBEUnit->price as $resource_id => $unit_resource_price) {
+          if (!$unit_resource_price) {
             continue;
           }
 
@@ -436,7 +436,7 @@ 
           $this->resources_lost_on_units[$resource_id] += $resources_lost;
           // Если это корабль - прибавляем потери к обломкам на орбите
           // TODO - опция выбрасывания обороны в обломки
-          if($UBEUnit->getType() == UNIT_SHIPS) {
+          if ($UBEUnit->getType() == UNIT_SHIPS) {
             $this->resources_lost_on_ships[$resource_id] += $resources_lost;
           }
         }
@@ -448,11 +448,11 @@ 
 
     // Если емкость трюмов меньше количество ресурсов - часть ресов выбрасываем нахуй
     // На планете ($fleet_id = 0) ресурсы в космос не выбрасываются
-    if($this->db_id != 0 && $this->fleet_capacity < $fleet_total_resources) {
+    if ($this->db_id != 0 && $this->fleet_capacity < $fleet_total_resources) {
       $drop_share = 1 - $this->fleet_capacity / $fleet_total_resources; // Какая часть ресурсов выброшена
-      foreach($this->resource_list as $resource_id => &$resource_amount) {
+      foreach ($this->resource_list as $resource_id => &$resource_amount) {
         // Не просчитываем ресурсы, которых нет на борту кораблей флота
-        if(!$resource_amount) {
+        if (!$resource_amount) {
           continue;
         }
 
@@ -473,19 +473,19 @@ 
     $objFleet2->setDbId($this->db_id);
 
     // Если это была миссия Уничтожения И звезда смерти взорвалась И мы работаем с аттакерами - значит все аттакеры умерли
-    if($this->is_attacker == UBE_PLAYER_IS_ATTACKER && $reapers_status == UBE_MOON_REAPERS_DIED) {
+    if ($this->is_attacker == UBE_PLAYER_IS_ATTACKER && $reapers_status == UBE_MOON_REAPERS_DIED) {
       $objFleet2->dbDelete();
-    } elseif($ship_count_initial == 0) { // $ship_count_lost == $ship_count_initial ||
+    } elseif ($ship_count_initial == 0) { // $ship_count_lost == $ship_count_initial ||
       $objFleet2->dbDelete();
     } else {
-      if($ship_count_lost) {
+      if ($ship_count_lost) {
         // Просматриваем результаты изменения флотов
-        foreach($this->unit_list->_container as $UBEUnit) {
+        foreach ($this->unit_list->_container as $UBEUnit) {
           // Перебираем аутком на случай восстановления юнитов
 //          if(($units_left = $UBEUnit->getCount() - (float)$UBEUnit->units_lost) > 0) {
 //            $fleet_real_array[$UBEUnit->unitId] = $units_left;
 //          };
-          if(floatval($UBEUnit->units_lost) != 0) {
+          if (floatval($UBEUnit->units_lost) != 0) {
             $objFleet2->shipAdjustCount($UBEUnit->unitId, floatval($UBEUnit->units_lost));
           };
         }
@@ -495,7 +495,7 @@ 
       $objFleet2->resourcesAdjust($resource_delta_fleet);
 
       // Если защитник и не РМФ - отправляем флот назад
-      if($this->is_attacker == UBE_PLAYER_IS_ATTACKER || ($this->is_attacker == UBE_PLAYER_IS_DEFENDER && !$is_small_fleet_recce)) {
+      if ($this->is_attacker == UBE_PLAYER_IS_ATTACKER || ($this->is_attacker == UBE_PLAYER_IS_DEFENDER && !$is_small_fleet_recce)) {
         $objFleet2->markReturned();
       }
       $objFleet2->dbSave();
@@ -525,7 +525,7 @@ 
   public function calculate_unit_partial_data(UBEASA $side_ASA) {
     $this->fleet_share_of_side_armor = $this->total_stats[P_ARMOR] / $side_ASA->getArmor();
 
-    foreach($this->unit_list->_container as $UBEUnit) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
       $UBEUnit->share_of_side_armor = $UBEUnit->pool_armor / $side_ASA->getArmor();
     }
   }
@@ -537,9 +537,9 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function attack_fleets(UBEFleetList $fleet_list, $is_simulator) {
-    foreach($fleet_list->_container as $defending_fleet) {
+    foreach ($fleet_list->_container as $defending_fleet) {
       // Не атакуются флоты на своей стороне
-      if($this->is_attacker == $defending_fleet->is_attacker) {
+      if ($this->is_attacker == $defending_fleet->is_attacker) {
         continue;
       }
       $this->attack_fleet($defending_fleet, $is_simulator);
@@ -555,12 +555,12 @@ 
   public function attack_fleet(UBEFleet $defending_fleet, $is_simulator) {
     UBEDebug::unit_dump_header();
 
-    foreach($this->unit_list->_container as $attacking_unit_pool) {
+    foreach ($this->unit_list->_container as $attacking_unit_pool) {
       UBEDebug::unit_dump($attacking_unit_pool, 'attacker');
 
       // if($attack_unit_count <= 0) continue; // TODO: Это пока нельзя включать - вот если будут "боевые порядки юнитов..."
-      foreach($defending_fleet->unit_list->_container as $defending_unit_pool) {
-        if($defending_unit_pool->isEmpty()) {
+      foreach ($defending_fleet->unit_list->_container as $defending_unit_pool) {
+        if ($defending_unit_pool->isEmpty()) {
           continue;
         }
 

includes/includes/flt_flying_fleet_handler2.php

Doc Comments +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  *
  * @param Fleet $objFleet
  * @param bool  $start
- * @param null  $result
+ * @param integer  $result
  *
  * @return mixed
  */

Spacing +7 added lines, -11 removed lines

@@ -19,15 +19,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 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -45,13 +41,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');
     }
@@ -177,7 +173,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('Обработка миссий');

includes/classes/core_auth.php

Doc Comments +7 added lines, -1 removed lines

@@ -286,7 +286,6 @@ 
   /**
    * Функция пытается залогиниться по всем известным провайдерам
    *
-   * @param null $result
    */
   public function login() {
     if(empty(sn_module::$sn_module_list['auth'])) {
@@ -823,10 +822,17 @@ 
 
   // OK v4.5
   // TODO - REMEMBER_ME
+
+  /**
+   * @param integer $period
+   */
   protected static function cookie_set($value, $impersonate = false, $period = null) {
     sn_setcookie($impersonate ? SN_COOKIE_U_I : SN_COOKIE_U, $value, $period === null ? SN_TIME_NOW + PERIOD_YEAR : $period, SN_ROOT_RELATIVE);
   }
 
+  /**
+   * @param string $message
+   */
   protected static function flog($message, $die = false) {
     if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;

Spacing +17 added lines, -17 removed lines

@@ -224,7 +224,7 @@ 
       // Проверить наличие такого имени в истории имён
       do {
         sn_db_transaction_rollback();
-        $this->player_suggested_name = 'Emperor ' . mt_rand($max_user_id + 1, $max_user_id + 1000);
+        $this->player_suggested_name = 'Emperor '.mt_rand($max_user_id + 1, $max_user_id + 1000);
         sn_db_transaction_start();
       } while (db_player_name_exists($this->player_suggested_name));
 
@@ -233,7 +233,7 @@ 
     if ($player_name_submitted) {
       $this->register_player_db_create($this->player_suggested_name); // OK 4.5
       if ($this->register_status == LOGIN_SUCCESS) {
-        sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
+        sys_redirect(SN_ROOT_VIRTUAL.'overview.php');
       } elseif ($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
         // self::$player_suggested_name .= ' ' . $this->account->account_id;
       }
@@ -259,8 +259,8 @@ 
       );
 
     if ($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
-      $prohibited_characters = array_map(function ($value) {
-        return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
+      $prohibited_characters = array_map(function($value) {
+        return "'".htmlentities($value, ENT_QUOTES, 'UTF-8')."'";
       }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
       $template_result[F_PLAYER_REGISTER_MESSAGE] .= implode(', ', $prohibited_characters);
     }
@@ -307,7 +307,7 @@ 
 
     foreach ($this->providers as $provider_id => $provider) {
       $login_status = $provider->login(); // OK v4.5
-      self::flog(($provider->manifest['name'] . '->' . 'login_try - ') . (empty($provider->account->account_id) ? classLocale::$lang['sys_login_messages'][$provider->account_login_status] : dump($provider)));
+      self::flog(($provider->manifest['name'].'->'.'login_try - ').(empty($provider->account->account_id) ? classLocale::$lang['sys_login_messages'][$provider->account_login_status] : dump($provider)));
       if ($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) {
         $this->providers_authorised[$provider_id] = &$this->providers[$provider_id];
 
@@ -347,7 +347,7 @@ 
         if (!$this->is_player_register) {
           // Нет - отправляем на процесс регистрации
           $partner_id = sys_get_param_int('id_ref', sys_get_param_int('partner_id'));
-          sys_redirect(SN_ROOT_VIRTUAL . 'index.php?page=player_register&player_register=1' . ($partner_id ? '&id_ref=' . $partner_id : ''));
+          sys_redirect(SN_ROOT_VIRTUAL.'index.php?page=player_register&player_register=1'.($partner_id ? '&id_ref='.$partner_id : ''));
         }
       } else {
         // Да, есть доступные игроки, которые так же прописаны в базе
@@ -407,7 +407,7 @@ 
     }
 
     if ($redirect === true) {
-      sys_redirect(SN_ROOT_RELATIVE . (empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php'));
+      sys_redirect(SN_ROOT_RELATIVE.(empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php'));
     } elseif ($redirect !== false) {
       sys_redirect($redirect);
     }
@@ -702,7 +702,7 @@ 
         $user['vacation'] = SN_TIME_NOW;
       }
 
-      $user['user_lastip'] = self::$device->ip_v4_string;// $ip['ip'];
+      $user['user_lastip'] = self::$device->ip_v4_string; // $ip['ip'];
       $user['user_proxy'] = self::$device->ip_v4_proxy_chain; //$ip['proxy_chain'];
 
       $result[F_BANNED_STATUS] = $user['banaday'];
@@ -710,9 +710,9 @@ 
 
       $proxy_safe = static::$db->db_escape(self::$device->ip_v4_proxy_chain);
 
-      DBStaticUser::db_user_set_by_id($user['id'], "`onlinetime` = " . SN_TIME_NOW . ",
-      `banaday` = " . static::$db->db_escape($user['banaday']) . ", `vacation` = " . static::$db->db_escape($user['vacation']) . ",
-      `user_lastip` = '" . static::$db->db_escape($user['user_lastip']) . "', `user_last_proxy` = '{$proxy_safe}', `user_last_browser_id` = " . self::$device->browser_id
+      DBStaticUser::db_user_set_by_id($user['id'], "`onlinetime` = ".SN_TIME_NOW.",
+      `banaday` = " . static::$db->db_escape($user['banaday']).", `vacation` = ".static::$db->db_escape($user['vacation']).",
+      `user_lastip` = '" . static::$db->db_escape($user['user_lastip'])."', `user_last_proxy` = '{$proxy_safe}', `user_last_browser_id` = ".self::$device->browser_id
       );
     }
 
@@ -805,7 +805,7 @@ 
    */
   // OK v4
   public static function password_encode($password, $salt) {
-    return md5($password . $salt);
+    return md5($password.$salt);
   }
   /**
    * Генерирует соль
@@ -831,10 +831,10 @@ 
     }
     list($called, $caller) = debug_backtrace(false);
     $caller_name =
-      (!empty($caller['class']) ? $caller['class'] : '') .
-      (!empty($caller['type']) ? $caller['type'] : '') .
-      (!empty($caller['function']) ? $caller['function'] : '') .
-      (!empty($called['line']) ? ':' . $called['line'] : '');
+      (!empty($caller['class']) ? $caller['class'] : '').
+      (!empty($caller['type']) ? $caller['type'] : '').
+      (!empty($caller['function']) ? $caller['function'] : '').
+      (!empty($called['line']) ? ':'.$called['line'] : '');
 
     $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false;
 
@@ -842,7 +842,7 @@ 
     if ($die) {
       // pdump($caller);
       // pdump(debug_backtrace(false));
-      $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
+      $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в ".get_called_class()." (располагается в ".get_class()."). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
     }
   }
 

admin/includes/admin_planet_edit.inc.php

Spacing +3 added lines, -3 removed lines

@@ -21,12 +21,12 @@ 
 
 function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode) {
   $unit_list = sn_get_groups($mode);
-  if(empty($unit_list)) {
+  if (empty($unit_list)) {
     return;
   }
   $name_list = classLocale::$lang['tech'];
 
-  foreach($unit_list as $unit_id) {
+  foreach ($unit_list as $unit_id) {
     $template->assign_block_vars('unit', array(
       'ID'    => $unit_id,
       'NAME'  => $name_list[$unit_id],
@@ -39,7 +39,7 @@ 
 function admin_planet_edit_query_string($unit_id, $unit_amount, $mode) { return sn_function_call(__FUNCTION__, array($unit_id, $unit_amount, $mode)); }
 
 function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {
-  if($unit_amount && in_array($unit_id, sn_get_groups($mode))) {
+  if ($unit_amount && in_array($unit_id, sn_get_groups($mode))) {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);
     $result = "{$unit_name} = GREATEST(0, {$unit_name} + ({$unit_amount}))";

includes/functions/uni_functions.php

Braces +3 added lines, -1 removed lines

@@ -253,9 +253,11 @@
   }
 
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
-  if(!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
+  if(!isset($planet_row['id'])) {
+    // || $planet_row['id'] != $user['current_planet']
   {
     $planet_row = db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
+  }
     // Если текущей планеты не существует - выставляем Столицу
     if(!isset($planet_row['id'])) {
       $planet_row = db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id');

Spacing +39 added lines, -39 removed lines

@@ -7,12 +7,12 @@ 
 
   $possible_cores = array();
   $probability = 0;
-  foreach($density_list as $possible_core_id => $core_data) {
-    if(!$core_data[UNIT_PLANET_DENSITY_RARITY]) {
+  foreach ($density_list as $possible_core_id => $core_data) {
+    if (!$core_data[UNIT_PLANET_DENSITY_RARITY]) {
       continue;
     }
 
-    if(
+    if (
       // Core type exists
       in_array($possible_core_id, $position_data['core_types'])
       // Limit core type with planet sector count
@@ -33,8 +33,8 @@ 
 
   $random = mt_rand(1, $probability);
   $selected_core = null;
-  foreach($possible_cores as $core_type => $core_info) {
-    if($random <= $core_info[UNIT_PLANET_DENSITY_RARITY]) {
+  foreach ($possible_cores as $core_type => $core_info) {
+    if ($random <= $core_info[UNIT_PLANET_DENSITY_RARITY]) {
       $selected_core = $core_info;
       break;
     }
@@ -57,7 +57,7 @@ 
 function uni_create_planet($Galaxy, $System, $Position, $PlanetOwnerID, $planet_name_unsafe = '', $HomeWorld = false, $options = array()) {
   $Position = intval($Position);
 
-  if(!isset($options['skip_check']) && DBStaticPlanet::db_planet_by_gspt($Galaxy, $System, $Position, PT_PLANET, true, '`id`')) {
+  if (!isset($options['skip_check']) && DBStaticPlanet::db_planet_by_gspt($Galaxy, $System, $Position, PT_PLANET, true, '`id`')) {
     return false;
   }
 
@@ -66,11 +66,11 @@ 
 
   $planet_generator = sn_get_groups('planet_generator');
 
-  if($HomeWorld) {
+  if ($HomeWorld) {
     $position_data = $planet_generator[0];
   } else {
     $position_data = $planet_generator[$Position >= UNIVERSE_RANDOM_PLANET_START || $Position < 1 ? UNIVERSE_RANDOM_PLANET_START : $Position];
-    if($Position >= UNIVERSE_RANDOM_PLANET_START) {
+    if ($Position >= UNIVERSE_RANDOM_PLANET_START) {
       // Корректируем температуру для планеты-странника
       $position_data['t_max_max'] -= UNIVERSE_RANDOM_PLANET_TEMPERATURE_DECREASE * ($Position - UNIVERSE_RANDOM_PLANET_START);
     }
@@ -78,7 +78,7 @@ 
 
   $planet_images = sn_get_groups('planet_images');
   $planet_image = $position_data['planet_images'][mt_rand(0, count($position_data['planet_images']) - 1)];
-  $planet_image .= 'planet' . $planet_images[$planet_image][mt_rand(0, count($planet_images[$planet_image]) - 1)];
+  $planet_image .= 'planet'.$planet_images[$planet_image][mt_rand(0, count($planet_images[$planet_image]) - 1)];
 
   $t_max = sn_rand_gauss_range($position_data['t_max_min'], $position_data['t_max_max'], true, 1.3, true);
   $t_min = $t_max - sn_rand_gauss_range($position_data['t_delta_min'], $position_data['t_delta_max'], true, 1.3, true);
@@ -89,7 +89,7 @@ 
 
   $core_info = uni_create_planet_get_density($position_data, $user_row, $planet_sectors);
 
-  $planet_name_unsafe = $user_row['username'] . ' ' . ($planet_name_unsafe ? $planet_name_unsafe : classLocale::$lang['sys_colo_defaultname']);
+  $planet_name_unsafe = $user_row['username'].' '.($planet_name_unsafe ? $planet_name_unsafe : classLocale::$lang['sys_colo_defaultname']);
 
   $planet['name'] = db_escape(strip_tags(trim($planet_name_unsafe)));
   $planet['id_owner'] = $PlanetOwnerID;
@@ -170,15 +170,15 @@ 
   $moon_name = '';
   $moon_row = array();
   $moon = DBStaticPlanet::db_planet_by_gspt($pos_galaxy, $pos_system, $pos_planet, PT_MOON, false, 'id');
-  if(!$moon['id']) {
+  if (!$moon['id']) {
     $moon_planet = DBStaticPlanet::db_planet_by_gspt($pos_galaxy, $pos_system, $pos_planet, PT_PLANET, true, '`id`, `temp_min`, `temp_max`, `name`, `debris_metal`, `debris_crystal`');
 
-    if($moon_planet['id']) {
+    if ($moon_planet['id']) {
       $base_storage_size = BASE_STORAGE_SIZE;
 
-      if(!$moon_chance) {
+      if (!$moon_chance) {
         $size = mt_rand(1100, 8999);
-      } elseif($moon_chance <= 100) {
+      } elseif ($moon_chance <= 100) {
         $size = mt_rand($moon_chance * 100 + 1000, $moon_chance * 200 + 2999);
       } else {
         $size = $moon_chance;
@@ -194,22 +194,22 @@ 
 
       $field_max = ceil($size / 1000);
 
-      if(isset($options['image']) && $options['image']) {
+      if (isset($options['image']) && $options['image']) {
         $moon_image = $options['image'];
       } else {
         $moon_image = 'mond';
       }
 
       $moon_row = classSupernova::db_ins_record(LOC_PLANET,
-        "`id_owner` = '{$user_id}', `parent_planet` = '{$moon_planet['id']}', `name` = '{$moon_name_safe}', `last_update` = " . SN_TIME_NOW . ", `image` = '{$moon_image}',
-          `galaxy` = '{$pos_galaxy}', `system` = '{$pos_system}', `planet` = '{$pos_planet}', `planet_type` = " . PT_MOON . ",
+        "`id_owner` = '{$user_id}', `parent_planet` = '{$moon_planet['id']}', `name` = '{$moon_name_safe}', `last_update` = ".SN_TIME_NOW.", `image` = '{$moon_image}',
+          `galaxy` = '{$pos_galaxy}', `system` = '{$pos_system}', `planet` = '{$pos_planet}', `planet_type` = ".PT_MOON.",
           `diameter` = '{$size}', `field_max` = '{$field_max}', `density` = 2500, `density_index` = 2, `temp_min` = '{$temp_min}', `temp_max` = '{$temp_max}',
           `metal` = '0', `metal_perhour` = '0', `metal_max` = '{$base_storage_size}',
           `crystal` = '0', `crystal_perhour` = '0', `crystal_max` = '{$base_storage_size}',
           `deuterium` = '0', `deuterium_perhour` = '0', `deuterium_max` = '{$base_storage_size}'"
       );
 
-      if($update_debris) {
+      if ($update_debris) {
         $debris_spent = $moon_chance * 1000000;
         $metal_spent = round(min($moon_planet['debris_metal'], $debris_spent * mt_rand(50, 75) / 100));
         $crystal_spent = min($moon_planet['debris_crystal'], $debris_spent - $metal_spent);
@@ -244,28 +244,28 @@ 
   $planet_row['id'] = $user['current_planet'];
 
   // Пытаемся переключить на новую планету
-  if(($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet']) {
+  if (($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet']) {
     $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($selected_planet, $user['id'], false, 'id');
   } else {
     $planet_row = DBStaticPlanet::db_planet_by_id($planet_row['id']);
   }
 
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
-  if(!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
+  if (!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
   {
     $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
     // Если текущей планеты не существует - выставляем Столицу
-    if(!isset($planet_row['id'])) {
+    if (!isset($planet_row['id'])) {
       $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id');
       // Если и столицы не существует - значит что-то очень не так с записью пользователя
-      if(!isset($planet_row['id'])) {
+      if (!isset($planet_row['id'])) {
         classSupernova::$debug->error("User ID {$user['id']} has Capital planet {$user['id_planet']} but this planet does not exists", 'User record error', 502);
       }
     }
   }
 
   // Если производилось переключение планеты - делаем запись в юзере
-  if($user['current_planet'] != $planet_row['id']) {
+  if ($user['current_planet'] != $planet_row['id']) {
     DBStaticUser::db_user_set_by_id($user['id'], "`current_planet` = '{$planet_row['id']}'");
     $user['current_planet'] = $planet_row['id'];
   }
@@ -282,7 +282,7 @@ 
 
 // ----------------------------------------------------------------------------------------------------------------
 function uni_render_coordinates($from, $prefix = '') {
-  return "[{$from[$prefix . 'galaxy']}:{$from[$prefix . 'system']}:{$from[$prefix . 'planet']}]";
+  return "[{$from[$prefix.'galaxy']}:{$from[$prefix.'system']}:{$from[$prefix.'planet']}]";
 }
 
 function uni_render_planet($from) {
@@ -290,17 +290,17 @@ 
 }
 
 function uni_render_planet_full($from, $prefix = '', $html_safe = true, $include_id = false) {
-  if(!$from['id']) {
+  if (!$from['id']) {
     $result = classLocale::$lang['sys_planet_expedition'];
   } else {
     $from_planet_id = $include_id ? (
-      'ID {' . ($from['id'] ? $from['id'] : ($from[$prefix . 'planet_id'] ? $from[$prefix . 'planet_id'] : 0)) . '} '
+      'ID {'.($from['id'] ? $from['id'] : ($from[$prefix.'planet_id'] ? $from[$prefix.'planet_id'] : 0)).'} '
     ) : '';
 
-    $from_planet_type = $from['planet_type'] ? $from['planet_type'] : ($from[$prefix . 'type'] ? $from[$prefix . 'type'] : 0);
-    $from_planet_type = ($from_planet_type ? ' ' . classLocale::$lang['sys_planet_type_sh'][$from_planet_type] : '');
+    $from_planet_type = $from['planet_type'] ? $from['planet_type'] : ($from[$prefix.'type'] ? $from[$prefix.'type'] : 0);
+    $from_planet_type = ($from_planet_type ? ' '.classLocale::$lang['sys_planet_type_sh'][$from_planet_type] : '');
 
-    $result = $from_planet_id . uni_render_coordinates($from, $prefix) . $from_planet_type . ($from['name'] ? ' ' . $from['name'] : '');
+    $result = $from_planet_id.uni_render_coordinates($from, $prefix).$from_planet_type.($from['name'] ? ' '.$from['name'] : '');
     $result = $html_safe ? str_replace(' ', '&nbsp;', htmlentities($result, ENT_COMPAT, 'UTF-8')) : $result;
   }
 
@@ -308,11 +308,11 @@ 
 }
 
 function uni_render_coordinates_url($from, $prefix = '', $page = 'galaxy.php') {
-  return $page . (strpos($page, '?') === false ? '?' : '&') . "galaxy={$from[$prefix . 'galaxy']}&system={$from[$prefix . 'system']}&planet={$from[$prefix . 'planet']}";
+  return $page.(strpos($page, '?') === false ? '?' : '&')."galaxy={$from[$prefix.'galaxy']}&system={$from[$prefix.'system']}&planet={$from[$prefix.'planet']}";
 }
 
 function uni_render_coordinates_href($from, $prefix = '', $mode = 0, $fleet_type = '') {
-  return '<a href="' . uni_render_coordinates_url($from, $prefix, "galaxy.php?mode={$mode}") . '"' . ($fleet_type ? " {$fleet_type}" : '') . '>' . uni_render_coordinates($from, $prefix) . '</a>';
+  return '<a href="'.uni_render_coordinates_url($from, $prefix, "galaxy.php?mode={$mode}").'"'.($fleet_type ? " {$fleet_type}" : '').'>'.uni_render_coordinates($from, $prefix).'</a>';
 }
 
 function uni_get_time_to_jump($moon_row) {
@@ -340,30 +340,30 @@ 
   $coordinates["{$prefix}planet"] = intval($coordinates["{$prefix}planet"]);
 
   return
-    isset($coordinates["{$prefix}galaxy"]) && $coordinates["{$prefix}galaxy"] > 0 && $coordinates["{$prefix}galaxy"] <= Vector::$knownGalaxies&&
-    isset($coordinates["{$prefix}system"]) && $coordinates["{$prefix}system"] > 0 && $coordinates["{$prefix}system"] <= Vector::$knownSystems&&
+    isset($coordinates["{$prefix}galaxy"]) && $coordinates["{$prefix}galaxy"] > 0 && $coordinates["{$prefix}galaxy"] <= Vector::$knownGalaxies &&
+    isset($coordinates["{$prefix}system"]) && $coordinates["{$prefix}system"] > 0 && $coordinates["{$prefix}system"] <= Vector::$knownSystems &&
     isset($coordinates["{$prefix}planet"]) && $coordinates["{$prefix}planet"] > 0 && $coordinates["{$prefix}planet"] <= Vector::$knownPlanets;
 }
 
 function uni_planet_teleport_check($user, $planetrow, $new_coordinates = null) {
   try {
-    if($planetrow['planet_teleport_next'] && $planetrow['planet_teleport_next'] > SN_TIME_NOW) {
+    if ($planetrow['planet_teleport_next'] && $planetrow['planet_teleport_next'] > SN_TIME_NOW) {
       throw new exception(classLocale::$lang['ov_teleport_err_cooldown'], ERR_ERROR);
     }
 
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->planet_teleport_cost) {
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->planet_teleport_cost) {
       throw new exception(classLocale::$lang['ov_teleport_err_no_dark_matter'], ERR_ERROR);
     }
 
     // TODO: Replace quick-check with using gathered flying fleet data
-    if(FleetList::fleet_count_incoming($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'])) {
+    if (FleetList::fleet_count_incoming($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'])) {
       throw new exception(classLocale::$lang['ov_teleport_err_fleet'], ERR_ERROR);
     }
 
-    if(is_array($new_coordinates)) {
+    if (is_array($new_coordinates)) {
       $new_coordinates['planet_type'] = PT_PLANET;
       $incoming = DBStaticPlanet::db_planet_by_vector($new_coordinates, '', true, 'id');
-      if($incoming['id']) {
+      if ($incoming['id']) {
         throw new exception(classLocale::$lang['ov_teleport_err_destination_busy'], ERR_ERROR);
       }
     }
@@ -372,7 +372,7 @@ 
       'result'  => ERR_NONE,
       'message' => '',
     );
-  } catch(exception $e) {
+  } catch (exception $e) {
     $response = array(
       'result'  => $e->getCode(),
       'message' => $e->getMessage(),