supernova-ws / SuperNova

language/ru/overview.mo.php

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 
 $a_lang_array = (array(

language/ru/market.mo.php

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 
 $a_lang_array = (array(

language/ru/artifacts.mo.php

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 
 $a_lang_array = (array(

admin/includes/admin_planet_edit.inc.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call(__FUNCTION__, array(&$template, &$admin_planet_edit_mode_list));}
+function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {return sn_function_call(__FUNCTION__, array(&$template, &$admin_planet_edit_mode_list)); }
 function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
 {
   global $lang;
@@ -19,19 +19,19 @@ 
   return $mode;
 }
 
-function admin_planet_edit_template(&$template, $edit_planet_row, $mode){return sn_function_call(__FUNCTION__, array(&$template, $edit_planet_row, $mode));}
+function admin_planet_edit_template(&$template, $edit_planet_row, $mode) {return sn_function_call(__FUNCTION__, array(&$template, $edit_planet_row, $mode)); }
 function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode)
 {
   global $lang;
 
   $unit_list = sn_get_groups($mode);
-  if(empty($unit_list))
+  if (empty($unit_list))
   {
     return;
   }
   $name_list = $lang['tech'];
 
-  foreach($unit_list as $unit_id)
+  foreach ($unit_list as $unit_id)
   {
     $template->assign_block_vars('unit', array(
       'ID'    => $unit_id,
@@ -42,10 +42,10 @@ 
   }
 }
 
-function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call(__FUNCTION__, array($unit_id, $unit_amount, $mode));}
+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);

includes/classes/Bonus.php

Doc Comments +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
   /**
    * Добавляет юнит к списку бонусов
    *
-   * @param $unit_id
+   * @param integer $unit_id
    * @param $unit_level
    */
   public function add_unit_by_snid($unit_id, $unit_level) {
@@ -67,7 +67,7 @@ 
    *
    * Выдает финальный бонус в виде множителя
    *
-   * @param string|int $param - ИД бонуса
+   * @param string $param - ИД бонуса
    *
    * @return float
    */

Spacing +7 added lines, -7 removed lines

@@ -28,12 +28,12 @@ 
    * @param $unit_level
    */
   public function add_unit_by_snid($unit_id, $unit_level) {
-    if(!$unit_level) {
+    if (!$unit_level) {
       return;
     }
 
-    foreach(static::$_bonus_group as $param_name => $unit_list) {
-      if(!empty($unit_list[$unit_id])) {
+    foreach (static::$_bonus_group as $param_name => $unit_list) {
+      if (!empty($unit_list[$unit_id])) {
         // Простейший вариант - мультипликатор по базе
         // Общий мультипликатор добавляется в конец
         $this->grants[$param_name][$unit_id] = $unit_level;
@@ -82,16 +82,16 @@ 
 //    $this->grants[$param_name][$unit_id] = $unit_level * get_unit_param($unit_id, P_BONUS_VALUE) / 100;;
     $value_add = floatval($base_value);
     $cumulative = 1.0; // Для случая BONUS_PERCENT
-    if(!empty($this->grants[$param]) && is_array($this->grants[$param])) {
-      foreach($this->grants[$param] as $unit_id => $unit_level) {
+    if (!empty($this->grants[$param]) && is_array($this->grants[$param])) {
+      foreach ($this->grants[$param] as $unit_id => $unit_level) {
         $unit_bonus = 0;
-        if($unit_id < 0) {
+        if ($unit_id < 0) {
           // Meta-unit - leave as is
         } else {
           // TODO - Подумать, что будет при смешивании разных бонусов и как этого избежать
           $bonus_value = get_unit_param($unit_id, P_BONUS_VALUE);
           $bonus_type = get_unit_param($unit_id, P_BONUS_TYPE);
-          switch($bonus_type) {
+          switch ($bonus_type) {
             case BONUS_PERCENT:
               $unit_bonus = $unit_level * $bonus_value / 100;
               $cumulative += $unit_bonus;

includes/classes/DBRow.php

Doc Comments +2 added lines, -2 removed lines

@@ -266,7 +266,7 @@ 
   /**
    * Inserts record to DB
    *
-   * @return int|string
+   * @return integer
    */
   public function dbInsert() {
     if(!$this->isNew()) {
@@ -398,7 +398,7 @@ 
   /**
    * @param array $field_set
    *
-   * @return int|string
+   * @return integer
    */
   protected function db_field_set_create(array $field_set) {
     !sn_db_field_set_is_safe($field_set) ? $field_set = sn_db_field_set_make_safe($field_set) : false;

Spacing +33 added lines, -33 removed lines

@@ -168,26 +168,26 @@ 
 
     // If method is not getter or setter OR property name not exists in $_properties - raising exception
     // Descendants can catch this Exception to make own __call magic
-    if(($left3 != 'get' && $left3 != 'set') || empty(static::$_properties[$propertyName])) {
+    if (($left3 != 'get' && $left3 != 'set') || empty(static::$_properties[$propertyName])) {
       throw new ExceptionPropertyNotExists('Property ' . $propertyName . ' not exists when calling getter/setter ' . get_called_class() . '::' . $name, ERR_ERROR);
     }
 
     // TODO check for read-only
 
-    if($left3 == 'set') {
+    if ($left3 == 'set') {
       $this->propertiesChanged[$propertyName] = 1;
     }
 
     // Now deciding - will we call a protected setter or will we work with protected property
 
     // If method exists - just calling it
-    if(method_exists($this, $name)) {
+    if (method_exists($this, $name)) {
       return call_user_func_array(array($this, $name), $arguments);
     }
     // No getter/setter exists - works directly with protected property
 
     // Is it getter?
-    if($left3 === 'get') {
+    if ($left3 === 'get') {
       return $this->{'_' . $propertyName};
     }
 
@@ -208,14 +208,14 @@ 
 //    $this->_reset();
 
     $dbId = idval($dbId);
-    if($dbId <= 0) {
+    if ($dbId <= 0) {
       classSupernova::$debug->error(get_called_class() . '::dbLoad $dbId not positive = ' . $dbId);
 
       return;
     }
 
     $db_row = doquery("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $dbId . " LIMIT 1 FOR UPDATE;", true);
-    if(empty($db_row)) {
+    if (empty($db_row)) {
       return;
     }
 
@@ -231,26 +231,26 @@ 
    */
   // TODO - perform operations only if properties was changed
   public function dbSave() {
-    if($this->isNew()) {
+    if ($this->isNew()) {
       // No DB_ID - new unit
-      if($this->isEmpty()) {
+      if ($this->isEmpty()) {
         classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - object is empty on ' . get_called_class() . '::dbSave');
       }
       $this->dbInsert();
     } else {
       // DB_ID is present
-      if($this->isEmpty()) {
+      if ($this->isEmpty()) {
         $this->dbDelete();
       } else {
-        if(!sn_db_transaction_check(false)) {
+        if (!sn_db_transaction_check(false)) {
           classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - transaction should always be started on ' . get_called_class() . '::dbUpdate');
         }
         $this->dbUpdate();
       }
     }
 
-    if(!empty($this->triggerDbOperationOn)) {
-      foreach($this->triggerDbOperationOn as $item) {
+    if (!empty($this->triggerDbOperationOn)) {
+      foreach ($this->triggerDbOperationOn as $item) {
         $item->dbSave();
       }
     }
@@ -269,12 +269,12 @@ 
    * @return int|string
    */
   public function dbInsert() {
-    if(!$this->isNew()) {
+    if (!$this->isNew()) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - record db_id is not empty on ' . get_called_class() . '::dbInsert');
     }
     $this->_dbId = $this->db_field_set_create($this->dbMakeFieldSet());
 
-    if(empty($this->_dbId)) {
+    if (empty($this->_dbId)) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - error saving record ' . get_called_class() . '::dbInsert');
     }
 
@@ -286,7 +286,7 @@ 
    */
   public function dbUpdate() {
     // TODO - Update
-    if($this->isNew()) {
+    if ($this->isNew()) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbUpdate');
     }
     $this->db_field_update($this->dbMakeFieldSet(true));
@@ -296,7 +296,7 @@ 
    * Deletes record from DB
    */
   public function dbDelete() {
-    if($this->isNew()) {
+    if ($this->isNew()) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbDelete');
     }
     doquery("DELETE FROM {{" . static::$_table . "}} WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId);
@@ -322,18 +322,18 @@ 
    * @param array $db_row
    */
   public function dbRowParse(array $db_row) {
-    foreach(static::$_properties as $property_name => &$property_data) {
+    foreach (static::$_properties as $property_name => &$property_data) {
       // Advanced values extraction procedure. Should be used when at least one of following rules is matched:
       // - one field should translate to several properties;
       // - one property should be filled according to several fields;
       // - property filling requires some lookup in object values;
-      if(!empty($property_data[P_METHOD_EXTRACT]) && is_callable(array($this, $property_data[P_METHOD_EXTRACT]))) {
+      if (!empty($property_data[P_METHOD_EXTRACT]) && is_callable(array($this, $property_data[P_METHOD_EXTRACT]))) {
         call_user_func_array(array($this, $property_data[P_METHOD_EXTRACT]), array(&$db_row));
         continue;
       }
 
       // If property is read-only - doing nothing
-      if(!empty($property_data[P_READ_ONLY])) {
+      if (!empty($property_data[P_READ_ONLY])) {
         continue;
       }
 
@@ -344,7 +344,7 @@ 
       !empty($property_data[P_FUNC_INPUT]) && is_callable($property_data[P_FUNC_INPUT]) ? $value = call_user_func($property_data[P_FUNC_INPUT], $value) : false;
 
       // If there is setter for this field - using it. Setters is always a methods of $THIS
-      if(!empty($property_data[P_METHOD_SET]) && is_callable(array($this, $property_data[P_METHOD_SET]))) {
+      if (!empty($property_data[P_METHOD_SET]) && is_callable(array($this, $property_data[P_METHOD_SET]))) {
         call_user_func(array($this, $property_data[P_METHOD_SET]), $value);
       } else {
         $this->{$property_name} = $value;
@@ -360,21 +360,21 @@ 
   protected function dbMakeFieldSet($isUpdate = false) {
     $array = array();
 
-    foreach(static::$_properties as $property_name => &$property_data) {
+    foreach (static::$_properties as $property_name => &$property_data) {
       // TODO - on isUpdate add only changed/adjusted properties
 
-      if(!empty($property_data[P_METHOD_INJECT]) && is_callable(array($this, $property_data[P_METHOD_INJECT]))) {
+      if (!empty($property_data[P_METHOD_INJECT]) && is_callable(array($this, $property_data[P_METHOD_INJECT]))) {
         call_user_func_array(array($this, $property_data[P_METHOD_INJECT]), array(&$array));
         continue;
       }
 
       // Skipping properties which have no corresponding field in DB
-      if(empty($property_data[P_DB_FIELD])) {
+      if (empty($property_data[P_DB_FIELD])) {
         continue;
       }
 
       // Checking - is property was adjusted or changed
-      if($isUpdate && array_key_exists($property_name, $this->propertiesAdjusted)) {
+      if ($isUpdate && array_key_exists($property_name, $this->propertiesAdjusted)) {
         // For adjusted property - take value from propertiesAdjusted array
         // TODO - differ how treated conversion to string for changed and adjusted properties
         $value = $this->propertiesAdjusted[$property_name];
@@ -408,7 +408,7 @@ 
     $fields = implode(',', array_keys($field_set));
 
     $result = 0;
-    if(classSupernova::db_query("INSERT INTO `{{" . static::$_table . "}}` ({$fields}) VALUES ({$values});")) {
+    if (classSupernova::db_query("INSERT INTO `{{" . static::$_table . "}}` ({$fields}) VALUES ({$values});")) {
       $result = db_insert_id();
     }
 
@@ -424,17 +424,17 @@ 
    */
   protected function isFieldChanged($fieldName) {
     $isFieldChanged = false;
-    foreach($this->propertiesChanged as $propertyName => $cork) {
+    foreach ($this->propertiesChanged as $propertyName => $cork) {
       $propertyScheme = static::$_properties[$propertyName];
-      if(!empty($propertyScheme[P_DB_FIELDS_LINKED])) {
-        foreach($propertyScheme[P_DB_FIELDS_LINKED] as $linkedFieldName) {
-          if($linkedFieldName == $fieldName) {
+      if (!empty($propertyScheme[P_DB_FIELDS_LINKED])) {
+        foreach ($propertyScheme[P_DB_FIELDS_LINKED] as $linkedFieldName) {
+          if ($linkedFieldName == $fieldName) {
             $isFieldChanged = $propertyName;
             break 2;
           }
         }
       }
-      if(!empty($propertyScheme[P_DB_FIELD]) && $propertyScheme[P_DB_FIELD] == $fieldName) {
+      if (!empty($propertyScheme[P_DB_FIELD]) && $propertyScheme[P_DB_FIELD] == $fieldName) {
         $isFieldChanged = $propertyName;
         break;
       }
@@ -456,13 +456,13 @@ 
     $set = array();
 //pdump($field_set);
 //pdump($this->propertiesAdjusted);
-    foreach($field_set as $fieldName => $value) {
-      if(!($changedProperty = $this->isFieldChanged($fieldName))) {
+    foreach ($field_set as $fieldName => $value) {
+      if (!($changedProperty = $this->isFieldChanged($fieldName))) {
         continue;
       }
 //pdump($changedProperty);
       // TODO - separate sets from adjusts
-      if(array_key_exists($changedProperty, $this->propertiesAdjusted)) {
+      if (array_key_exists($changedProperty, $this->propertiesAdjusted)) {
         $value = "`{$fieldName}` + ($value)"; // braces for negative values
       }
 

includes/classes/Fleet.php

Doc Comments +8 added lines, -1 removed lines

@@ -296,6 +296,10 @@ 
    * @return array|bool|mysqli_result|null
    */
   // TODO - унести куда-то глубоко. Например в DBAware или даже в БД-драйвер
+
+  /**
+   * @param string $set_safe_string
+   */
   protected function db_fleet_update_set_safe_string($set_safe_string) {
     $fleet_id_safe = idval($this->_dbId);
     if(!empty($fleet_id_safe) && !empty($set_safe_string)) {
@@ -561,6 +565,9 @@ 
     $this->core_field_set_list['fleet_mission'] = $this->mission_type = $mission_id;
   }
 
+  /**
+   * @param integer $ship_id
+   */
   public function shipCountById($ship_id) {
     return $this->unitList->unitCountById($ship_id);
   }
@@ -672,7 +679,7 @@ 
   /**
    * Set current resource list from array of units
    *
-   * @param array $resource_list
+   * @param integer[] $resource_list
    */
   public function replace_resources($resource_list) {
     // TODO - Resets also delta and changes?!

Spacing +27 added lines, -27 removed lines

@@ -298,7 +298,7 @@ 
   // TODO - унести куда-то глубоко. Например в DBAware или даже в БД-драйвер
   protected function db_fleet_update_set_safe_string($set_safe_string) {
     $fleet_id_safe = idval($this->_dbId);
-    if(!empty($fleet_id_safe) && !empty($set_safe_string)) {
+    if (!empty($fleet_id_safe) && !empty($set_safe_string)) {
       $result = doquery("UPDATE `{{fleets}}` SET {$set_safe_string} WHERE `fleet_id` = {$fleet_id_safe} LIMIT 1;");
     } else {
       $result = false;
@@ -362,7 +362,7 @@ 
    */
   public function db_delete_this_fleet() {
     $fleet_id_safe = idval($this->_dbId);
-    if(!empty($fleet_id_safe)) {
+    if (!empty($fleet_id_safe)) {
       $result = doquery("DELETE FROM {{fleets}} WHERE `fleet_id` = {$fleet_id_safe} LIMIT 1;");
     } else {
       $result = false;
@@ -406,7 +406,7 @@ 
     $this->flush_changes_to_db();
 //    $this->dbSave();
 
-    if($this->_group_id) {
+    if ($this->_group_id) {
       // TODO: Make here to delete only one AKS - by adding aks_fleet_count to AKS table
       db_fleet_aks_purge();
     }
@@ -473,7 +473,7 @@ 
     sn_db_transaction_check(true);
 
     // Если флот уже обработан - не существует или возращается - тогда ничего не делаем
-    if(!$this->_dbId || ($this->_is_returning == 1 && $only_resources)) {
+    if (!$this->_dbId || ($this->_is_returning == 1 && $only_resources)) {
       return $result;
     }
 
@@ -493,7 +493,7 @@ 
 
     // TODO - Проверка, что планета всё еще существует на указанных координатах, а не телепортировалась, не удалена хозяином, не уничтожена врагом
     // Флот, который возвращается на захваченную планету, пропадает
-    if($start && $this->_is_returning == 1 && $planet_arrival['id_owner'] != $this->_playerOwnerId) {
+    if ($start && $this->_is_returning == 1 && $planet_arrival['id_owner'] != $this->_playerOwnerId) {
       $result = RestoreFleetToPlanet($this, $start, $only_resources, $result);
 
       $this->db_delete_this_fleet();
@@ -502,20 +502,20 @@ 
     }
 
 //pdump($planet_arrival);
-    if(!$only_resources) {
+    if (!$only_resources) {
       // Landing ships
       $db_changeset = array();
 
-      if($this->_playerOwnerId == $planet_arrival['id_owner']) {
+      if ($this->_playerOwnerId == $planet_arrival['id_owner']) {
         $fleet_array = $this->get_unit_list();
-        foreach($fleet_array as $ship_id => $ship_count) {
-          if($ship_count) {
+        foreach ($fleet_array as $ship_id => $ship_count) {
+          if ($ship_count) {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, $ship_count, $user, $planet_arrival['id']);
           }
         }
 
         // Adjusting ship amount on planet
-        if(!empty($db_changeset)) {
+        if (!empty($db_changeset)) {
           db_changeset_apply($db_changeset);
         }
       }
@@ -526,13 +526,13 @@ 
     }
 
     // Restoring resources to planet
-    if($this->get_resources_amount() != 0) {
+    if ($this->get_resources_amount() != 0) {
       $fleet_resources = $this->get_resource_list();
       db_planet_set_by_id($planet_arrival['id'],
         "`metal` = `metal` + '{$fleet_resources[RES_METAL]}', `crystal` = `crystal` + '{$fleet_resources[RES_CRYSTAL]}', `deuterium` = `deuterium` + '{$fleet_resources[RES_DEUTERIUM]}'");
     }
 
-    if(!$only_resources) {
+    if (!$only_resources) {
       $this->db_delete_this_fleet();
     }
 
@@ -592,7 +592,7 @@ 
     $this->unitList->dbSave();
 
     // Добавляем REPLACE ресурсов
-    if(!empty($this->resource_replace)) {
+    if (!empty($this->resource_replace)) {
       $field_replace_changes = array_merge(
         $field_replace_changes,
         UnitResourceLoot::convert_id_to_field_name($this->resource_replace, 'fleet_resource_')
@@ -630,7 +630,7 @@ 
     pdie('Replace_ships should be rewritten! Deletes ships by setting their count to 0, adding ship with UnitList standard procedure');
     !is_array($unit_list) ? $unit_list = array() : false;
 
-    foreach($unit_list as $unit_id => $unit_count) {
+    foreach ($unit_list as $unit_id => $unit_count) {
       // TODO - проверка на допустимые корабли
 //      if(!UnitShip::is_in_group($unit_id) || !($unit_count = floor($unit_count))) {
 //        // Not a ship - continuing
@@ -650,8 +650,8 @@ 
   public function update_resources($resource_delta_list) {
     !is_array($resource_delta_list) ? $resource_delta_list = array() : false;
 
-    foreach($resource_delta_list as $resource_id => $unit_delta) {
-      if(!UnitResourceLoot::is_in_group($resource_id) || !($unit_delta = floor($unit_delta))) {
+    foreach ($resource_delta_list as $resource_id => $unit_delta) {
+      if (!UnitResourceLoot::is_in_group($resource_id) || !($unit_delta = floor($unit_delta))) {
         // Not a resource or no resources - continuing
         continue;
       }
@@ -659,7 +659,7 @@ 
       $this->resource_list[$resource_id] += $unit_delta;
 
       // Check for negative unit value
-      if($this->resource_list[$resource_id] < 0) {
+      if ($this->resource_list[$resource_id] < 0) {
         // TODO
         die('$unit_delta is less then resource amount in ' . __FILE__ . ' ' . __FUNCTION__ . ' ' . __LINE__);
       }
@@ -680,14 +680,14 @@ 
 
     !is_array($resource_list) ? $resource_list = array() : false;
 
-    foreach($resource_list as $resource_id => $unit_count) {
-      if(!UnitResourceLoot::is_in_group($resource_id) || !($unit_count = floor($unit_count))) {
+    foreach ($resource_list as $resource_id => $unit_count) {
+      if (!UnitResourceLoot::is_in_group($resource_id) || !($unit_count = floor($unit_count))) {
         // Not a resource or zero resource - continuing
         continue;
       }
 
       // Check for negative unit value
-      if($unit_count < 0) {
+      if ($unit_count < 0) {
         // TODO
         die('$unit_count can not be negative in ' . __FUNCTION__);
       }
@@ -713,15 +713,15 @@ 
    * @param $unit_array
    */
   public function unitsSetFromArray($unit_array) {
-    foreach($unit_array as $unit_id => $unit_count) {
+    foreach ($unit_array as $unit_id => $unit_count) {
       $unit_count = floatval($unit_count);
-      if(!$unit_count) {
+      if (!$unit_count) {
         continue;
       }
 
-      if($this->isUnit($unit_id)) {
+      if ($this->isUnit($unit_id)) {
         $this->unitList->unitSetCount($unit_id, $unit_count);
-      } elseif($this->isResource($unit_id)) {
+      } elseif ($this->isResource($unit_id)) {
         $this->resource_list[$unit_id] = $unit_count;
       } else {
         throw new Exception('Trying to pass to fleet non-resource and non-ship ' . var_export($unit_array, true), ERR_ERROR);
@@ -773,7 +773,7 @@ 
 
     // WARNING! MISSION TIMES MUST BE SET WITH set_times() method!
     // TODO - more checks!
-    if(empty($this->_time_launch)) {
+    if (empty($this->_time_launch)) {
       die('Fleet time not set!');
     }
 
@@ -851,7 +851,7 @@ 
   public function parse_missile_db_row($missile_db_row) {
 //    $this->_reset();
 
-    if(empty($missile_db_row) || !is_array($missile_db_row)) {
+    if (empty($missile_db_row) || !is_array($missile_db_row)) {
       return;
     }
 
@@ -900,7 +900,7 @@ 
   public function fleet_recyclers_capacity(array $recycler_info) {
     $recyclers_incoming_capacity = 0;
     $fleet_data = $this->get_unit_list();
-    foreach($recycler_info as $recycler_id => $recycler_data) {
+    foreach ($recycler_info as $recycler_id => $recycler_data) {
       $recyclers_incoming_capacity += $fleet_data[$recycler_id] * $recycler_data['capacity'];
     }
 

includes/classes/UBE/UBE.php

Doc Comments +2 added lines, -2 removed lines

@@ -464,7 +464,7 @@ 
    * Преобразовывает данные симулятора в данные для расчета боя
    *
    * @param     $side_info
-   * @param     $attacker
+   * @param     boolean $attacker
    * @param int $player_id
    *
    * @version 41a6.22
@@ -572,7 +572,7 @@ 
   }
 
   /**
-   * @param $template
+   * @param null|template $template
    *
    * @return template
    */

Spacing +44 added lines, -45 removed lines

@@ -147,7 +147,7 @@ 
     $this->players->db_load_player_by_id($player_id, UBE_PLAYER_IS_DEFENDER);
 
     $player_db_row = $this->players[$player_id]->getDbRow();
-    if($fortifier_level = mrc_get_level($player_db_row, $this->combatMission->dst_planet, MRC_FORTIFIER)) {
+    if ($fortifier_level = mrc_get_level($player_db_row, $this->combatMission->dst_planet, MRC_FORTIFIER)) {
       $this->planet_bonus->add_unit_by_snid(MRC_FORTIFIER, $fortifier_level);
     }
 
@@ -179,7 +179,7 @@ 
     $this->rounds[0] = new UBERound(0);
     $this->rounds[0]->make_snapshot($this->fleet_list);
 
-    for($round = 1; $round <= 10; $round++) {
+    for ($round = 1; $round <= 10; $round++) {
       // Проводим раунд
       defined('DEBUG_UBE') ? print("Round {$round}<br>") : false;
 
@@ -192,7 +192,7 @@ 
 
       // Анализируем итоги текущего раунда и готовим данные для следующего
       $this->combat_result = $this->fleet_list->ubeAnalyzeFleetOutcome($round);
-      if($this->combat_result != UBE_COMBAT_RESULT_DRAW) {
+      if ($this->combat_result != UBE_COMBAT_RESULT_DRAW) {
         break;
       }
 
@@ -221,11 +221,11 @@ 
     // Генерируем результат боя
     $this->fleet_list->ube_analyze_fleets($this->is_simulator, $this->debris, $this->resource_exchange_rates);
 
-    if(!$this->is_ube_loaded) {
+    if (!$this->is_ube_loaded) {
       $this->moon_calculator->calculate_moon($this);
 
       // Лутаем ресурсы - если аттакер выиграл
-      if($this->combat_result == UBE_COMBAT_RESULT_WIN) {
+      if ($this->combat_result == UBE_COMBAT_RESULT_WIN) {
         $this->sn_ube_combat_analyze_loot();
       }
     }
@@ -245,7 +245,7 @@ 
       RES_DEUTERIUM => 0,
     );
 
-    if(
+    if (
       (($planet_resource_total = $this->fleet_list[0]->get_resources_amount()) > 0)
       &&
       (($total_capacity = $this->fleet_list->ube_get_capacity_attackers()) > 0)
@@ -257,9 +257,9 @@ 
       $planet_lootable_percent = $planet_lootable / $planet_resource_total;
 
       // Вычисляем сколько ресурсов вывезено
-      foreach($this->fleet_list->_container as $fleet_id => $fleet) {
+      foreach ($this->fleet_list->_container as $fleet_id => $fleet) {
         $looted_in_metal = 0;
-        foreach($this->fleet_list[0]->resource_list as $resource_id => $resource_amount) {
+        foreach ($this->fleet_list[0]->resource_list as $resource_id => $resource_amount) {
           // Вычисляем какой процент общей емкости трюмов атакующих будет задействован
           $fleet_lootable_percent = $fleet->fleet_capacity / $total_capacity;
           $looted = floor($resource_amount * $planet_lootable_percent * $fleet_lootable_percent);
@@ -325,16 +325,16 @@ 
     $destination_user_id = $this->fleet_list[0]->owner_id;
 
     // Обновляем поле обломков на планете
-    if(!$this->is_admin_in_combat && $this->debris->debris_total() > 0) {
+    if (!$this->is_admin_in_combat && $this->debris->debris_total() > 0) {
       db_planet_set_by_gspt($this->ube_planet_info[PLANET_GALAXY], $this->ube_planet_info[PLANET_SYSTEM], $this->ube_planet_info[PLANET_PLANET], PT_PLANET,
         "`debris_metal` = `debris_metal` + " . $this->debris->debris_get_resource(RES_METAL) . ", `debris_crystal` = `debris_crystal` + " . $this->debris->debris_get_resource(RES_CRYSTAL)
       );
     }
 
-    foreach($this->fleet_list->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->fleet_list->_container as $fleet_id => $UBEFleet) {
       $ship_count_lost = $UBEFleet->unit_list->unitCountLost();
 
-      if($fleet_id) {
+      if ($fleet_id) {
         // Флот
         $UBEFleet->db_save_combat_result_fleet($this->is_small_fleet_recce, $this->moon_calculator->get_reapers_status());
       } else {
@@ -342,19 +342,19 @@ 
 
         // Сохраняем изменения ресурсов - если они есть
         $resource_delta = $UBEFleet->ube_combat_result_calculate_resources();
-        if(!empty($resource_delta)) {
+        if (!empty($resource_delta)) {
           $temp = array();
-          foreach($resource_delta as $resource_id => $resource_amount) {
+          foreach ($resource_delta as $resource_id => $resource_amount) {
             $resource_db_name = pname_resource_name($resource_id);
             $temp[] = "`{$resource_db_name}` = `{$resource_db_name}` + ({$resource_amount})";
           }
           db_planet_set_by_id($this->ube_planet_info[PLANET_ID], implode(',', $temp));
         }
 
-        if($ship_count_lost) {
+        if ($ship_count_lost) {
           $db_changeset = array();
           $planet_row_cache = $this->players[$destination_user_id]->getDbRow();
-          foreach($UBEFleet->unit_list->_container as $UBEUnit) {
+          foreach ($UBEFleet->unit_list->_container as $UBEUnit) {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($UBEUnit->unitId, -$UBEUnit->units_lost, $planet_row_cache, $this->ube_planet_info[PLANET_ID]);
           }
           db_changeset_apply($db_changeset);
@@ -365,7 +365,7 @@ 
     // TODO: Связать сабы с флотами констраинтами ON DELETE SET NULL
     // Для САБов
     $fleet_group_id_list = $this->fleet_list->ube_get_groups();
-    if(!empty($fleet_group_id_list)) {
+    if (!empty($fleet_group_id_list)) {
       $fleet_group_id_list = implode(',', $fleet_group_id_list);
       db_acs_delete_by_list($fleet_group_id_list);
     }
@@ -374,19 +374,19 @@ 
 
     $bashing_list = array();
     $players_sides = $this->players->get_player_sides();
-    foreach($players_sides as $player_id => $player_side) {
-      if($player_side != UBE_PLAYER_IS_ATTACKER) {
+    foreach ($players_sides as $player_id => $player_side) {
+      if ($player_side != UBE_PLAYER_IS_ATTACKER) {
         continue;
       }
-      if($this->moon_calculator->get_status() != UBE_MOON_DESTROY_SUCCESS) {
+      if ($this->moon_calculator->get_status() != UBE_MOON_DESTROY_SUCCESS) {
         $bashing_list[] = "({$player_id}, {$this->ube_planet_info[PLANET_ID]}, {$this->combat_timestamp})";
       }
-      if($this->mission_type_id == MT_ATTACK && $this->is_defender_active_player) {
+      if ($this->mission_type_id == MT_ATTACK && $this->is_defender_active_player) {
         $str_loose_or_win = $this->combat_result == UBE_COMBAT_RESULT_WIN ? 'raidswin' : 'raidsloose';
         db_user_set_by_id($player_id, "`xpraid` = `xpraid` + 1, `raids` = `raids` + 1, `{$str_loose_or_win}` = `{$str_loose_or_win}` + 1");
       }
     }
-    if(!empty($bashing_list)) {
+    if (!empty($bashing_list)) {
       $bashing_list = implode(',', $bashing_list);
       db_bashing_insert($bashing_list);
     }
@@ -413,20 +413,19 @@ 
       $planet_info[PLANET_SYSTEM],
       $planet_info[PLANET_PLANET],
       htmlentities($planet_info[PLANET_NAME], ENT_COMPAT, 'UTF-8'),
-      $lang[$this->combat_result == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' :
-        ($this->combat_result == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
+      $lang[$this->combat_result == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' : ($this->combat_result == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
     );
 
     $text_defender = '';
     $debris = $this->debris->get_debris();
-    foreach($debris as $resource_id => $resource_amount) {
-      if($resource_id == RES_DEUTERIUM) {
+    foreach ($debris as $resource_id => $resource_amount) {
+      if ($resource_id == RES_DEUTERIUM) {
         continue;
       }
 
       $text_defender .= "{$lang['tech'][$resource_id]}: " . pretty_number($resource_amount) . '<br />';
     }
-    if($text_defender) {
+    if ($text_defender) {
       $text_defender = "{$lang['ube_report_msg_body_debris']}{$text_defender}<br />";
     }
 
@@ -436,7 +435,7 @@ 
 
     // TODO: Оптимизировать отсылку сообщений - отсылать пакетами
     $player_sides = $this->players->get_player_sides();
-    foreach($player_sides as $player_id => $player_side) {
+    foreach ($player_sides as $player_id => $player_side) {
       $message = $text_common . ($this->is_small_fleet_recce && ($player_side == UBE_PLAYER_IS_ATTACKER) ? $lang['ube_report_msg_body_sfr'] : $text_defender);
       msg_send_simple_message($player_id, '', $this->combat_timestamp, MSG_TYPE_COMBAT, $lang['sys_mess_tower'], $lang['sys_mess_attack_report'], $message);
     }
@@ -473,11 +472,11 @@ 
     $player_id = $player_id == -1 ? $this->players->count() : $player_id;
     $fleet_id = $player_id; // FOR SIMULATOR!
 
-    if(empty($this->players[$player_id])) {
+    if (empty($this->players[$player_id])) {
       $this->players[$player_id] = new UBEPlayer();
     }
 
-    foreach($side_info as $fleet_data) {
+    foreach ($side_info as $fleet_data) {
       $this->players[$player_id]->name = $player_id;
       $this->players[$player_id]->setSide($attacker);
 
@@ -485,32 +484,32 @@ 
       $this->fleet_list[$fleet_id] = $objFleet;
 
       $this->fleet_list[$fleet_id]->owner_id = $player_id;
-      foreach($fleet_data as $unit_id => $unit_count) {
-        if(!$unit_count) {
+      foreach ($fleet_data as $unit_id => $unit_count) {
+        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->fleet_list[$fleet_id]->unit_list->unitAdjustCount($unit_id, $unit_count);
-        } elseif($unit_type == UNIT_RESOURCES) {
+        } elseif ($unit_type == UNIT_RESOURCES) {
           $this->fleet_list[$fleet_id]->resource_list[$unit_id] = $unit_count;
-        } elseif($unit_type == UNIT_TECHNOLOGIES) {
-          if($unit_id == TECH_WEAPON) {
+        } elseif ($unit_type == UNIT_TECHNOLOGIES) {
+          if ($unit_id == TECH_WEAPON) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_WEAPON, $unit_count);
-          } elseif($unit_id == TECH_SHIELD) {
+          } elseif ($unit_id == TECH_SHIELD) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_SHIELD, $unit_count);
-          } elseif($unit_id == TECH_ARMOR) {
+          } elseif ($unit_id == TECH_ARMOR) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_ARMOR, $unit_count);
           }
-        } elseif($unit_type == UNIT_GOVERNORS) {
-          if($unit_id == MRC_FORTIFIER) {
+        } elseif ($unit_type == UNIT_GOVERNORS) {
+          if ($unit_id == MRC_FORTIFIER) {
             // Фортифаер даёт бонус ко всему
             $this->planet_bonus->add_unit_by_snid(MRC_FORTIFIER, $unit_count);
           }
-        } elseif($unit_type == UNIT_MERCENARIES) {
-          if($unit_id == MRC_ADMIRAL) {
+        } elseif ($unit_type == UNIT_MERCENARIES) {
+          if ($unit_id == MRC_ADMIRAL) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(MRC_ADMIRAL, $unit_count);
           }
         }
@@ -581,7 +580,7 @@ 
 
     $ube_report = new UBEReport();
     $ube = $ube_report->sn_ube_report_load(sys_get_param_str('cypher'));
-    if($ube != UBE_REPORT_NOT_FOUND) {
+    if ($ube != UBE_REPORT_NOT_FOUND) {
       $ube_report->sn_ube_report_generate($ube, $template_result);
 
       $template = gettemplate('ube_combat_report', $template);
@@ -614,9 +613,9 @@ 
 //    sn_ube_report_save($combat_data);
 //  }
 
-    if(sys_get_param_str('reload')) {
+    if (sys_get_param_str('reload')) {
       $ube_new = $ube_report->sn_ube_report_load($ube->get_cypher()); // $combat_data = sn_ube_report_load($combat_data[UBE_REPORT_CYPHER]);
-      if($ube_new != UBE_REPORT_NOT_FOUND && is_object($ube_new)) {
+      if ($ube_new != UBE_REPORT_NOT_FOUND && is_object($ube_new)) {
         $ube = $ube_new;
       }
     }
@@ -664,7 +663,7 @@ 
     $this->debris->load_from_report_row($report_row);
 
     $query = doquery("SELECT * FROM {{ube_report_player}} WHERE `ube_report_id` = {$report_row['ube_report_id']}");
-    while($player_row = db_fetch($query)) {
+    while ($player_row = db_fetch($query)) {
       $this->players->init_player_from_report_info($player_row);
     }
 

includes/classes/UBE/UBEDebris.php

Doc Comments +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
   }
 
   /**
-   * @param $moon_debris_left_part
+   * @param double $moon_debris_left_part
    */
   public function debris_adjust_proportional($moon_debris_left_part) {
     foreach($this->debris as $resource_id => &$resource_amount) {
@@ -104,7 +104,7 @@ 
   /**
    * @param classConfig $config
    *
-   * @return int
+   * @return double
    */
   public function debris_in_metal($config) {
     return floatval(

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
    */
   public function debris_add_resource($resource_id, $resource_amount) {
     // В обломках может быть только металл или кристалл
-    if($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
+    if ($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
       return;
     }
     $this->debris[$resource_id] += $resource_amount;
@@ -41,7 +41,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_wrecks(array $wreckage, $is_simulator) {
-    foreach($wreckage as $resource_id => $resource_amount) {
+    foreach ($wreckage as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_SHIP_WRECKS_TO_DEBRIS_AVG
@@ -57,7 +57,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_cargo_drop(array $dropped_resources, $is_simulator) {
-    foreach($dropped_resources as $resource_id => $resource_amount) {
+    foreach ($dropped_resources as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_CARGO_DROPPED_TO_DEBRIS_AVG
@@ -96,7 +96,7 @@ 
    * @param $moon_debris_left_part
    */
   public function debris_adjust_proportional($moon_debris_left_part) {
-    foreach($this->debris as $resource_id => &$resource_amount) {
+    foreach ($this->debris as $resource_id => &$resource_amount) {
       $resource_amount = floor($resource_amount * $moon_debris_left_part);
     }
   }
@@ -121,9 +121,9 @@ 
    */
   public function report_generate_sql(classConfig $config) {
     return "
-      `ube_report_debris_metal` = " . (float)$this->debris_get_resource(RES_METAL) . ",
-      `ube_report_debris_crystal` = " . (float)$this->debris_get_resource(RES_CRYSTAL) . ",
-      `ube_report_debris_total_in_metal` = " . (float)$this->debris_in_metal($config) . ", ";
+      `ube_report_debris_metal` = " . (float) $this->debris_get_resource(RES_METAL) . ",
+      `ube_report_debris_crystal` = " . (float) $this->debris_get_resource(RES_CRYSTAL) . ",
+      `ube_report_debris_total_in_metal` = " . (float) $this->debris_in_metal($config) . ", ";
   }
 
   /**