supernova-ws / SuperNova

includes/debug.class.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * Some helpers to sweeten dev's life
- */
+   * Some helpers to sweeten dev's life
+   */
 
 /*
  * debug.class.php ::  Clase Debug, maneja reporte de eventos

Doc Comments +3 added lines

@@ -70,6 +70,9 @@
     $this->numqueries = 0;
   }
 
+  /**
+   * @param string $mes
+   */
   function add($mes) {
     $this->log .= $mes;
     $this->numqueries++;

Spacing +38 added lines, -39 removed lines

@@ -30,7 +30,7 @@ 
 
 defined('INSIDE') || die();
 
-if(php_sapi_name() == "cli") {
+if (php_sapi_name() == "cli") {
   // In cli-mode
   define('__DEBUG_CRLF', "\r\n");
   define('__DEBUG_LINE', '-------------------------------------------------' . __DEBUG_CRLF);
@@ -50,16 +50,16 @@ 
   function log_file($message, $ident_change = 0) {
     static $ident = 0;
 
-    if(!defined('SN_DEBUG_LOG')) {
+    if (!defined('SN_DEBUG_LOG')) {
       return;
     }
 
-    if($this->log_file_handler === null) {
+    if ($this->log_file_handler === null) {
       $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL . '/.logs/supernova.log', 'a+');
       @fwrite($this->log_file_handler, "\r\n\r\n");
     }
     $ident_change < 0 ? $ident += $ident_change * 2 : false;
-    if($this->log_file_handler) {
+    if ($this->log_file_handler) {
       @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()) . str_repeat(' ', $ident + 1) . $message . "\r\n");
     }
     $ident_change > 0 ? $ident += $ident_change * 2 : false;
@@ -90,8 +90,8 @@ 
     $result = array();
     $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++;
     $result[] = "tID {$transaction_id}";
-    foreach($backtrace as $a_trace) {
-      if(in_array($a_trace['function'], $exclude_functions)) {
+    foreach ($backtrace as $a_trace) {
+      if (in_array($a_trace['function'], $exclude_functions)) {
         continue;
       }
       $function =
@@ -108,7 +108,7 @@ 
       // $result[] = "{$function} ({$a_trace['line']})'{$file}'";
       $result[] = "{$function} - '{$file}' Line {$a_trace['line']}";
 
-      if(!$long_comment) {
+      if (!$long_comment) {
         break;
       }
     }
@@ -122,26 +122,26 @@ 
   function dump($dump = false, $force_base = false, $deadlock = false) {
     global $user, $planetrow;
 
-    if($dump === false) {
+    if ($dump === false) {
       return;
     }
 
     $error_backtrace = array();
     $base_dump = false;
 
-    if($force_base === true) {
+    if ($force_base === true) {
       $base_dump = true;
     }
 
-    if($dump === true) {
+    if ($dump === true) {
       $base_dump = true;
     } else {
-      if(!is_array($dump)) {
+      if (!is_array($dump)) {
         $dump = array('var' => $dump);
       }
 
-      foreach($dump as $dump_var_name => $dump_var) {
-        if($dump_var_name == 'base_dump') {
+      foreach ($dump as $dump_var_name => $dump_var) {
+        if ($dump_var_name == 'base_dump') {
           $base_dump = $dump_var;
         } else {
           $error_backtrace[$dump_var_name] = $dump_var;
@@ -149,22 +149,21 @@ 
       }
     }
 
-    if($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
+    if ($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
       $error_backtrace['deadlock'] = explode("\n", $q['Status']);
       $error_backtrace['locks'] = classSupernova::$locks;
       $error_backtrace['cSN_data'] = classSupernova::$data;
-      foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) {
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
+      foreach ($error_backtrace['cSN_data'] as &$location) {
+        foreach ($location as $location_id => &$location_data) {
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
       }
       $error_backtrace['cSN_queries'] = classSupernova::$queries;
     }
 
-    if($base_dump) {
-      if(is_array($this->log_array) && count($this->log_array) > 0) {
-        foreach($this->log_array as $log) {
+    if ($base_dump) {
+      if (is_array($this->log_array) && count($this->log_array) > 0) {
+        foreach ($this->log_array as $log) {
           $error_backtrace['queries'][] = $log;
         }
       }
@@ -193,14 +192,14 @@ 
   function error($message = 'There is a error on page', $title = 'Internal Error', $error_code = 500, $dump = true) {
     global $sys_stop_log_hit, $sys_log_disabled, $user;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     sn_db_transaction_rollback();
 
-    if(classSupernova::$config->debug == 1) {
+    if (classSupernova::$config->debug == 1) {
       echo "<h2>{$title}</h2><br><font color=red>{$message}</font><br><hr>";
       echo "<table>{$this->log}</table>";
     }
@@ -210,7 +209,7 @@ 
     $error_text = db_escape($message);
     $error_backtrace = $this->dump($dump, true, strpos($message, 'Deadlock') !== false);
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($error_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -228,7 +227,7 @@ 
       ob_start();
       print("<hr>User ID {$user['id']} raised error code {$error_code} titled '{$title}' with text '{$error_text}' on page {$_SERVER['SCRIPT_NAME']}");
 
-      foreach($error_backtrace as $name => $value) {
+      foreach ($error_backtrace as $name => $value) {
         print(__DEBUG_LINE);
         pdump($value, $name);
       }
@@ -240,14 +239,14 @@ 
   function warning($message, $title = 'System Message', $log_code = 300, $dump = false) {
     global $user, $sys_log_disabled;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     $error_backtrace = $this->dump($dump, false);
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($log_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -265,11 +264,11 @@ 
 // Dump variables nicer then var_dump()
 
 function dump($value, $varname = null, $level = 0, $dumper = '') {
-  if(isset($varname)) {
+  if (isset($varname)) {
     $varname .= " = ";
   }
 
-  if($level == -1) {
+  if ($level == -1) {
     $trans[' '] = '&there4;';
     $trans["\t"] = '&rArr;';
     $trans["\n"] = '&para;;';
@@ -278,7 +277,7 @@ 
 
     return strtr(htmlspecialchars($value), $trans);
   }
-  if($level == 0) {
+  if ($level == 0) {
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
     $dumper = mt_rand(10, 99) . '|' . $varname;
   }
@@ -286,22 +285,22 @@ 
   $type = gettype($value);
   $dumper .= $type;
 
-  if($type == 'string') {
+  if ($type == 'string') {
     $dumper .= '(' . strlen($value) . ')';
     $value = dump($value, '', -1);
-  } elseif($type == 'boolean') {
+  } elseif ($type == 'boolean') {
     $value = ($value ? 'true' : 'false');
-  } elseif($type == 'object') {
+  } elseif ($type == 'object') {
     $props = get_class_vars(get_class($value));
     $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
-    foreach($props as $key => $val) {
+    foreach ($props as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
       $dumper .= dump($value->$key, '', $level + 1);
     }
     $value = '';
-  } elseif($type == 'array') {
+  } elseif ($type == 'array') {
     $dumper .= '(' . count($value) . ')';
-    foreach($value as $key => $val) {
+    foreach ($value as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
       $dumper .= dump($val, '', $level + 1);
     }
@@ -321,7 +320,7 @@ 
 //  $backtrace = $backtrace[1];
 
   $caller = '';
-  if(defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
+  if (defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
     $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '') .
       (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '') .
       $backtrace[1]['function'] .
@@ -348,7 +347,7 @@ 
 }
 
 function pr($prePrint = false) {
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
   print(mt_rand() . __DEBUG_CRLF);
@@ -358,7 +357,7 @@ 
   global $_PRINT_COUNT_VALUE;
   $_PRINT_COUNT_VALUE++;
 
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
   print($_PRINT_COUNT_VALUE . __DEBUG_CRLF);

includes/classes/DBRow.php

Doc Comments +1 added lines, -1 removed lines

@@ -411,7 +411,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 +35 added lines, -35 removed lines

@@ -138,14 +138,14 @@ 
 
     // 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(!empty($this->propertiesAdjusted[$propertyName])) {
+    if ($left3 == 'set') {
+      if (!empty($this->propertiesAdjusted[$propertyName])) {
         throw new PropertyAccessException('Property ' . $propertyName . ' already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::' . $name, ERR_ERROR);
       }
       $this->propertiesChanged[$propertyName] = 1;
@@ -154,13 +154,13 @@ 
     // 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};
     }
 
@@ -182,7 +182,7 @@ 
    */
   public function dbLoad($dbId, $lockSkip = false) {
     $dbId = idval($dbId);
-    if($dbId <= 0) {
+    if ($dbId <= 0) {
       classSupernova::$debug->error(get_called_class() . '::dbLoad $dbId not positive = ' . $dbId);
 
       return;
@@ -191,12 +191,12 @@ 
     $this->_dbId = $dbId;
     $this->lockSkip = $lockSkip;
     // TODO - Use classSupernova::$db_records_locked
-    if(false && !$lockSkip && sn_db_transaction_check(false)) {
+    if (false && !$lockSkip && sn_db_transaction_check(false)) {
       $this->dbGetLockById($this->_dbId);
     }
 
     $db_row = doquery("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId . " LIMIT 1 FOR UPDATE;", true);
-    if(empty($db_row)) {
+    if (empty($db_row)) {
       return;
     }
 
@@ -224,26 +224,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();
       }
     }
@@ -263,12 +263,12 @@ 
    */
   // TODO - protected
   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');
     }
 
@@ -281,7 +281,7 @@ 
   // TODO - protected
   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));
@@ -292,7 +292,7 @@ 
    */
   // TODO - protected
   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);
@@ -334,18 +334,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;
       }
 
@@ -356,7 +356,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;
@@ -372,21 +372,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];
@@ -416,17 +416,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;
       }
@@ -448,7 +448,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();
     }
 
@@ -466,13 +466,13 @@ 
     sn_db_field_set_safe_flag_clear($field_set);
 
     $set = array();
-    foreach($field_set as $fieldName => $value) {
-      if(!($changedProperty = $this->isFieldChanged($fieldName))) {
+    foreach ($field_set as $fieldName => $value) {
+      if (!($changedProperty = $this->isFieldChanged($fieldName))) {
         continue;
       }
 
       // 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/includes/flt_mission_colonize.php

Spacing +4 added lines, -4 removed lines

@@ -20,14 +20,14 @@ 
   $TargetAddress = sprintf($lang['sys_adress_planet'], $fleet_end_coordinates['galaxy'], $fleet_end_coordinates['system'], $fleet_end_coordinates['planet']);
 
   $TheMessage = $lang['sys_colo_no_colonizer'];
-  if($objFleet->shipsGetTotalById(SHIP_COLONIZER) >= 1) {
+  if ($objFleet->shipsGetTotalById(SHIP_COLONIZER) >= 1) {
     $TheMessage = $lang['sys_colo_notfree'];
-    if(empty($mission_data->dst_planet)) {
+    if (empty($mission_data->dst_planet)) {
       $iPlanetCount = get_player_current_colonies($src_user_row);
 
       // Can we colonize more planets?
       $TheMessage = $lang['sys_colo_maxcolo'];
-      if($iPlanetCount < get_player_max_colonies($src_user_row)) {
+      if ($iPlanetCount < get_player_max_colonies($src_user_row)) {
         // Yes, we can colonize
         $TheMessage = $lang['sys_colo_badpos'];
 
@@ -35,7 +35,7 @@ 
           $fleet_end_coordinates['galaxy'], $fleet_end_coordinates['system'], $fleet_end_coordinates['planet'],
           $objFleet->playerOwnerId, "{$lang['sys_colo_defaultname']} {$iPlanetCount}", false,
           array('user_row' => $src_user_row));
-        if($NewOwnerPlanet) {
+        if ($NewOwnerPlanet) {
           $TheMessage = $lang['sys_colo_arrival'] . $TargetAddress . $lang['sys_colo_allisok'];
           msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_SPY, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
 

includes/classes/UBE/UBEFleet.php

Spacing +63 added lines, -63 removed lines

@@ -162,20 +162,20 @@ 
       $this->owner_id,
       $this->db_id,
 
-      (float)$this->UBE_PLANET[PLANET_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),
+      (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),
     );
   }
 
@@ -190,13 +190,13 @@ 
     $this->group_id = $objFleet->group_id;
 
     $fleet_unit_list = $objFleet->shipsGetArray();
-    foreach($fleet_unit_list as $unit_id => $unit_count) {
-      if(!$unit_count) {
+    foreach ($fleet_unit_list 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->unit_list->unitAdjustCount($unit_id, $unit_count);
       }
     }
@@ -232,13 +232,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));
     }
 
@@ -297,27 +297,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;
       }
     }
@@ -344,16 +344,16 @@ 
     global $lang;
 
     $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' => $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' => $lang[$lang_header_index]));
       }
     }
@@ -366,16 +366,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,
         );
@@ -391,9 +391,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);
       }
     }
@@ -426,12 +426,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;
           }
 
@@ -439,7 +439,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;
           }
         }
@@ -451,11 +451,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;
         }
 
@@ -476,19 +476,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));
           };
         }
@@ -498,7 +498,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();
@@ -528,7 +528,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();
     }
   }
@@ -540,9 +540,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);
@@ -558,12 +558,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;
         }
 

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
    */

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 +22 added lines, -26 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 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -41,7 +37,7 @@ 
 function log_file($msg) {
   static $handler;
 
-  if(!$handler) {
+  if (!$handler) {
     $handler = fopen('event.log', 'a+');
   }
 
@@ -81,12 +77,12 @@ 
   */
   global $debug;
 
-  if(classSupernova::$config->game_disable != GAME_DISABLE_NONE || $skip_fleet_update) {
+  if (classSupernova::$config->game_disable != GAME_DISABLE_NONE || $skip_fleet_update) {
     return;
   }
 
   sn_db_transaction_start();
-  if(classSupernova::$config->db_loadItem('game_disable') != GAME_DISABLE_NONE || SN_TIME_NOW - strtotime(classSupernova::$config->db_loadItem('fleet_update_last')) <= classSupernova::$config->fleet_update_interval) {
+  if (classSupernova::$config->db_loadItem('game_disable') != GAME_DISABLE_NONE || SN_TIME_NOW - strtotime(classSupernova::$config->db_loadItem('fleet_update_last')) <= classSupernova::$config->fleet_update_interval) {
     sn_db_transaction_rollback();
 
     return;
@@ -94,14 +90,14 @@ 
 
 
   // Watchdog timer
-  if(classSupernova::$config->db_loadItem('fleet_update_lock')) {
-    if(defined('DEBUG_FLYING_FLEETS')) {
+  if (classSupernova::$config->db_loadItem('fleet_update_lock')) {
+    if (defined('DEBUG_FLYING_FLEETS')) {
       $random = 0;
     } else {
       $random = mt_rand(240, 300);
     }
 
-    if(SN_TIME_NOW - strtotime(classSupernova::$config->fleet_update_lock) <= $random) {
+    if (SN_TIME_NOW - strtotime(classSupernova::$config->fleet_update_lock) <= $random) {
       sn_db_transaction_rollback();
 
       return;
@@ -125,11 +121,11 @@ 
   $missions_used = array();
 
   $objFleetList = FleetList::dbGetFleetListCurrentTick();
-  foreach($objFleetList->_container as $objFleet) {
+  foreach ($objFleetList->_container as $objFleet) {
     set_time_limit(15);
     // TODO - Унифицировать код с темплейтным разбором эвентов на планете!
     $missions_used[$objFleet->mission_type] = 1;
-    if($objFleet->time_arrive_to_target <= SN_TIME_NOW && !$objFleet->isReturning()) {
+    if ($objFleet->time_arrive_to_target <= SN_TIME_NOW && !$objFleet->isReturning()) {
       $fleet_event_list[] = array(
         'object'      => $objFleet,
         'fleet_time'  => $objFleet->time_arrive_to_target,
@@ -137,7 +133,7 @@ 
       );
     }
 
-    if($objFleet->time_mission_job_complete > 0 && $objFleet->time_mission_job_complete <= SN_TIME_NOW && !$objFleet->isReturning()) {
+    if ($objFleet->time_mission_job_complete > 0 && $objFleet->time_mission_job_complete <= SN_TIME_NOW && !$objFleet->isReturning()) {
       $fleet_event_list[] = array(
         'object'      => $objFleet,
         'fleet_time'  => $objFleet->time_mission_job_complete,
@@ -145,7 +141,7 @@ 
       );
     }
 
-    if($objFleet->time_return_to_source <= SN_TIME_NOW) {
+    if ($objFleet->time_return_to_source <= SN_TIME_NOW) {
       $fleet_event_list[] = array(
         'object'      => $objFleet,
         'fleet_time'  => $objFleet->time_return_to_source,
@@ -171,17 +167,17 @@ 
 //    MT_MISSILE => 'flt_mission_missile.php',
     MT_EXPLORE   => 'flt_mission_explore',
   );
-  foreach($missions_used as $mission_id => $cork) {
+  foreach ($missions_used as $mission_id => $cork) {
     require_once(SN_ROOT_PHYSICAL . "includes/includes/{$mission_files[$mission_id]}" . DOT_PHP_EX);
   }
 
 //log_file('Обработка миссий');
   $sn_groups_mission = sn_get_groups('missions');
-  foreach($fleet_event_list as $fleet_event) {
+  foreach ($fleet_event_list as $fleet_event) {
     // TODO: Указатель тут потом сделать
     // TODO: СЕЙЧАС НАДО ПРОВЕРЯТЬ ПО БАЗЕ - А ЖИВОЙ ЛИ ФЛОТ?!
     $fleet_row = $fleet_event['fleet_row'];
-    if(empty($fleet_event['object'])) {
+    if (empty($fleet_event['object'])) {
       // Fleet was destroyed in course of previous actions
       continue;
     }
@@ -205,20 +201,20 @@ 
 
     $objFleet->dbLoad($objFleet->dbId);
 
-    if(!$objFleet->dbId) {
+    if (!$objFleet->dbId) {
       // Fleet was destroyed in course of previous actions
       sn_db_transaction_commit();
       continue;
     }
 
-    if($fleet_event['fleet_event'] == EVENT_FLT_RETURN) {
+    if ($fleet_event['fleet_event'] == EVENT_FLT_RETURN) {
       // Fleet returns to planet
       $objFleet->shipsLand(true);
       sn_db_transaction_commit();
       continue;
     }
 
-    if($fleet_event['fleet_event'] == EVENT_FLT_ARRIVE && $objFleet->isReturning()) {
+    if ($fleet_event['fleet_event'] == EVENT_FLT_ARRIVE && $objFleet->isReturning()) {
       // При событии EVENT_FLT_ARRIVE флот всегда должен иметь fleet_mess == 0
       // В противном случае это означает, что флот уже был обработан ранее - например, при САБе
       sn_db_transaction_commit();
@@ -238,13 +234,13 @@ 
     $objMission->dst_planet = $mission_data['dst_planet'] ? db_planet_by_vector($objFleet->target_coordinates_typed(), '', true, '`id`, `id_owner`, `name`') : null;
     $objMission->fleet_event = $fleet_event['fleet_event'];
 
-    if($objMission->dst_planet && $objMission->dst_planet['id_owner']) {
+    if ($objMission->dst_planet && $objMission->dst_planet['id_owner']) {
       $update_result = sys_o_get_updated($objMission->dst_planet['id_owner'], $objMission->dst_planet['id'], $objFleet->time_arrive_to_target);
       $objMission->dst_user = !empty($objMission->dst_user) ? $update_result['user'] : null;
       $objMission->dst_planet = $update_result['planet'];
     }
 
-    switch($objFleet->mission_type) {
+    switch ($objFleet->mission_type) {
       // Для боевых атак нужно обновлять по САБу и по холду - таки надо возвращать данные из обработчика миссий!
       case MT_AKS:
       case MT_ATTACK:

includes/vars_combats.php

Spacing +22 added lines, -22 removed lines

@@ -35,7 +35,7 @@ 
     'shield' => 10,
     'armor' => 400,
     'attack' => 5,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
   ),
   SHIP_CARGO_BIG => array(
     'name' => 'big_ship_cargo',
@@ -55,7 +55,7 @@ 
     'shield' => 25,
     'armor' => 1200,
     'attack' => 5,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -83,7 +83,7 @@ 
     'shield' => 50,
     'armor' => 3000,
     'attack' => 10,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -111,7 +111,7 @@ 
     'shield' => 200,
     'armor' => 70000,
     'attack' => 50,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -140,7 +140,7 @@ 
     'shield' => 100,
     'armor' => 3000,
     'attack' => 50,
-    'amplify' => array(SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21, ),
+    'amplify' => array(SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -168,7 +168,7 @@ 
     'shield' => 10,
     'armor' => 1600,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500.05, SHIP_SATTELITE_SOLAR => 1050, ),
+    'amplify' => array(SHIP_SPY => 500.05, SHIP_SATTELITE_SOLAR => 1050,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -196,7 +196,7 @@ 
     'shield' =>  0.01,
     'armor' => 100,
     'attack' =>  0.01,
-    'amplify' => array( SHIP_SPY => 1,),
+    'amplify' => array(SHIP_SPY => 1,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -220,7 +220,7 @@ 
       'factor' => 1,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 4 + 20) * $level * (0.1 * $production_factor);},
+      RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 4 + 20) * $level * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
 
@@ -229,7 +229,7 @@ 
     'shield' => 10,
     'armor' => 200,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 1, ),
+    'amplify' => array(SHIP_SPY => 1,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -261,7 +261,7 @@ 
     'shield' => 10,
     'armor' => 400,
     'attack' => 50,
-    'amplify' => array(SHIP_CARGO_SMALL => 16.4, SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21, ),
+    'amplify' => array(SHIP_CARGO_SMALL => 16.4, SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -290,7 +290,7 @@ 
     'shield' => 25,
     'armor' => 1000,
     'attack' => 150,
-    'amplify' => array(SHIP_CARGO_SMALL => 8.2, SHIP_SPY => 3.33367, SHIP_SATTELITE_SOLAR => 7, ),
+    'amplify' => array(SHIP_CARGO_SMALL => 8.2, SHIP_SPY => 3.33367, SHIP_SATTELITE_SOLAR => 7,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -349,7 +349,7 @@ 
     'shield' =>  50,
     'armor' => 2700,
     'attack' => 400,
-    'amplify' => array(SHIP_SMALL_FIGHTER_LIGHT => 6.15, SHIP_SPY => 1.25013, SHIP_SATTELITE_SOLAR => 2.625, UNIT_DEF_TURRET_MISSILE => 5.5, ),
+    'amplify' => array(SHIP_SMALL_FIGHTER_LIGHT => 6.15, SHIP_SPY => 1.25013, SHIP_SATTELITE_SOLAR => 2.625, UNIT_DEF_TURRET_MISSILE => 5.5,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -408,7 +408,7 @@ 
     'shield' =>  200,
     'armor' =>  6000,
     'attack' => 1000,
-    'amplify' => array(SHIP_SPY => 0.50005, SHIP_SATTELITE_SOLAR => 1.05, UNIT_DEF_TURRET_MISSILE => 1.76, ),
+    'amplify' => array(SHIP_SPY => 0.50005, SHIP_SATTELITE_SOLAR => 1.05, UNIT_DEF_TURRET_MISSILE => 1.76,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -504,7 +504,7 @@ 
     'shield' =>  500,
     'armor' => 11000,
     'attack' => 2000,
-    'amplify' => array(SHIP_SPY => 0.25003, SHIP_SATTELITE_SOLAR => 0.525, SHIP_LARGE_BATTLESHIP => 7.4, UNIT_DEF_TURRET_LASER_SMALL => 1.125, ),
+    'amplify' => array(SHIP_SPY => 0.25003, SHIP_SATTELITE_SOLAR => 0.525, SHIP_LARGE_BATTLESHIP => 7.4, UNIT_DEF_TURRET_LASER_SMALL => 1.125,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -608,7 +608,7 @@ 
     'shield' => 20,
     'armor' => 200,
     'attack' => 80,
-    'amplify' => array(SHIP_SPY => 7, ),
+    'amplify' => array(SHIP_SPY => 7,),
   ),
   UNIT_DEF_TURRET_LASER_SMALL => array(
     'name' => 'small_laser',
@@ -626,7 +626,7 @@ 
     'shield' => 25,
     'armor' => 200,
     'attack' => 100,
-    'amplify' => array(SHIP_SPY => 5, ),
+    'amplify' => array(SHIP_SPY => 5,),
   ),
   UNIT_DEF_TURRET_LASER_BIG => array(
     'name' => 'big_laser',
@@ -644,7 +644,7 @@ 
     'shield' => 100,
     'armor' => 800,
     'attack' => 250,
-    'amplify' => array(SHIP_SPY => 2, ),
+    'amplify' => array(SHIP_SPY => 2,),
   ),
   UNIT_DEF_TURRET_GAUSS => array(
     'name' => 'gauss_canyon',
@@ -662,7 +662,7 @@ 
     'armor' => 3500,
     'shield' => 200,
     'attack' => 1100,
-    'amplify' => array(SHIP_SPY => 0.5, ),
+    'amplify' => array(SHIP_SPY => 0.5,),
   ),
   UNIT_DEF_TURRET_ION => array(
     'name' => 'ionic_canyon',
@@ -680,7 +680,7 @@ 
     'shield' => 500,
     'armor' => 800,
     'attack' => 150,
-    'amplify' => array(SHIP_SPY => 3.3, ),
+    'amplify' => array(SHIP_SPY => 3.3,),
   ),
   UNIT_DEF_TURRET_PLASMA => array(
     'name' => 'buster_canyon',
@@ -698,7 +698,7 @@ 
     'shield' => 300,
     'armor' => 10000,
     'attack' => 3000,
-    'amplify' => array(SHIP_SPY => 0.17, ),
+    'amplify' => array(SHIP_SPY => 0.17,),
   ),
 
   UNIT_DEF_SHIELD_SMALL => array(
@@ -718,7 +718,7 @@ 
     'shield' => 2000,
     'armor' => 2000,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500, ),
+    'amplify' => array(SHIP_SPY => 500,),
   ),
   UNIT_DEF_SHIELD_BIG => array(
     'name' => 'big_protection_shield',
@@ -737,7 +737,7 @@ 
     'shield' => 2000,
     'armor' => 10000,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500, ),
+    'amplify' => array(SHIP_SPY => 500,),
   ),
   UNIT_DEF_SHIELD_PLANET => array(
     'name'      => 'planet_protector',

includes/classes/module.php

Doc Comments +3 added lines

@@ -239,6 +239,9 @@
     }
   }
 
+  /**
+   * @param string $arrayName
+   */
   protected function mergeArraySpecial($arrayName) {
     global $sn_mvc;
 

Spacing +30 added lines, -30 removed lines

@@ -76,7 +76,7 @@ 
     require SN_ROOT_PHYSICAL . 'config.php';
 
     $module_config_array = get_class($this) . '_config';
-    if(!empty($$module_config_array) && is_array($$module_config_array)) {
+    if (!empty($$module_config_array) && is_array($$module_config_array)) {
       $this->config = $$module_config_array;
 
       return true;
@@ -94,15 +94,15 @@ 
 
     // TODO: Load configuration from DB. Manifest setting
     // Trying to load configuration from file
-    if(!$config_exists = $this->loadModuleRootConfig()) {
+    if (!$config_exists = $this->loadModuleRootConfig()) {
       // Конфигурация может лежать в config_path в манифеста или в корне модуля
-      if(isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
+      if (isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
         $config_exists = true;
-      } elseif(file_exists($config_filename = dirname($filename) . '/config.php')) {
+      } elseif (file_exists($config_filename = dirname($filename) . '/config.php')) {
         $config_exists = true;
       }
 
-      if($config_exists) {
+      if ($config_exists) {
         include($config_filename);
         $module_config_array = $class_module_name . '_config';
         $this->config = $$module_config_array;
@@ -119,7 +119,7 @@ 
 
     // Checking module status - is it installed and active
     $this->check_status();
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       return;
     }
 
@@ -139,11 +139,11 @@ 
 
   protected function setSystemConstants() {
     // Setting constants - if any
-    if(empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
+    if (empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
       return;
     }
 
-    foreach($this->manifest['constants'] as $constant_name => $constant_value) {
+    foreach ($this->manifest['constants'] as $constant_name => $constant_value) {
       defined($constant_name) || define($constant_name, $constant_value);
     }
   }
@@ -155,48 +155,48 @@ 
     // New values from module variables will overwrite previous values (for root variables) and array elements with corresponding indexes (for arrays)
     // Constants as array indexes are honored - it's make valid such declarations as 'sn_data[ques][QUE_STRUCTURES]'
     $this->manifest['vars'] = $this->__assign_vars();
-    if(empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
+    if (empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
       return;
     }
 
     $vars_assigned = array();
-    foreach($this->manifest['vars'] as $var_name => $var_value) {
+    foreach ($this->manifest['vars'] as $var_name => $var_value) {
       $sub_vars = explode('[', str_replace(']', '', $var_name));
       $var_name = $sub_vars[0];
 
-      if(!isset($vars_assigned[$var_name])) {
+      if (!isset($vars_assigned[$var_name])) {
         $vars_assigned[$var_name] = true;
         global $$var_name;
       }
 
       $pointer = &$$var_name;
-      if(($n = count($sub_vars)) > 1) {
-        for($i = 1; $i < $n; $i++) {
-          if(defined($sub_vars[$i])) {
+      if (($n = count($sub_vars)) > 1) {
+        for ($i = 1; $i < $n; $i++) {
+          if (defined($sub_vars[$i])) {
             $sub_vars[$i] = constant($sub_vars[$i]);
           }
 
-          if(!isset($pointer[$sub_vars[$i]]) && $i != $n) {
+          if (!isset($pointer[$sub_vars[$i]]) && $i != $n) {
             $pointer[$sub_vars[$i]] = array();
           }
           $pointer = &$pointer[$sub_vars[$i]];
         }
       }
 
-      if(!isset($pointer) || !is_array($pointer)) {
+      if (!isset($pointer) || !is_array($pointer)) {
         $pointer = $var_value;
-      } elseif(is_array($$var_name)) {
+      } elseif (is_array($$var_name)) {
         $pointer = array_merge_recursive_numeric($pointer, $var_value);
       }
     }
   }
 
   protected function mergeMenu(&$sn_menu_extra, &$menu_patch) {
-    if(!is_array($menu_patch)) {
+    if (!is_array($menu_patch)) {
       return;
     }
 
-    foreach($menu_patch as $menu_item_name => $menu_item_data) {
+    foreach ($menu_patch as $menu_item_name => $menu_item_data) {
       $sn_menu_extra[$menu_item_name] = $menu_item_data;
     }
   }
@@ -205,34 +205,34 @@ 
     // Overriding function if any
     sn_sys_handler_add(classSupernova::$functions, $this->manifest['functions'], $this);
 
-    foreach(classSupernova::$sn_mvc as $handler_type => &$handler_data) {
+    foreach (classSupernova::$sn_mvc as $handler_type => &$handler_data) {
       sn_sys_handler_add($handler_data, $this->manifest['mvc'][$handler_type], $this, $handler_type);
     }
   }
 
   protected function mergeNavbarButton() {
-    if(empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
+    if (empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
       return;
     }
 
-    foreach($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
+    foreach ($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
       classSupernova::$sn_mvc['navbar_prefix_button'][$button_image] = $button_url_relative;
     }
   }
 
   protected function mergeI18N() {
     $arrayName = 'i18n';
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
       return;
     }
 
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
-      foreach($contentList as &$i18n_file_data) {
-        if(is_array($i18n_file_data) && !$i18n_file_data['path']) {
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
+      foreach ($contentList as &$i18n_file_data) {
+        if (is_array($i18n_file_data) && !$i18n_file_data['path']) {
           $i18n_file_data['path'] = $this->manifest['root_relative'];
         }
       }
-      if(!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
+      if (!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
         classSupernova::$sn_mvc[$arrayName][$pageName] = array();
       }
       classSupernova::$sn_mvc[$arrayName][$pageName] += $contentList;
@@ -240,13 +240,13 @@ 
   }
 
   protected function mergeArraySpecial($arrayName) {
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
       return;
     }
 
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
       !isset(classSupernova::$sn_mvc[$arrayName][$pageName]) ? classSupernova::$sn_mvc[$arrayName][$pageName] = array() : false;
-      foreach($contentList as $contentName => &$content) {
+      foreach ($contentList as $contentName => &$content) {
         classSupernova::$sn_mvc[$arrayName][$pageName][$contentName] = $content;
       }
     }

includes/init.php

Spacing +28 added lines, -28 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Защита от двойного инита
-if(defined('INIT')) {
+if (defined('INIT')) {
   return;
 }
 
@@ -20,8 +20,8 @@ 
 version_compare(PHP_VERSION, '5.3.2') < 0 ? die('FATAL ERROR: SuperNova REQUIRE PHP version > 5.3.2') : false;
 
 // Бенчмарк
-register_shutdown_function(function () {
-  if(defined('IN_AJAX')) {
+register_shutdown_function(function() {
+  if (defined('IN_AJAX')) {
     return;
   }
 
@@ -31,11 +31,11 @@ 
     (!empty($locale_cache_statistic['misses']) ? ', LOCALE MISSED' : '') .
     (class_exists('classSupernova') && is_object(classSupernova::$db) ? ', DB time: ' . classSupernova::$db->time_mysql_total . 'ms' : '') .
     '</div>');
-  if($user['authlevel'] >= 2 && file_exists(SN_ROOT_PHYSICAL . 'badqrys.txt') && @filesize(SN_ROOT_PHYSICAL . 'badqrys.txt') > 0) {
+  if ($user['authlevel'] >= 2 && file_exists(SN_ROOT_PHYSICAL . 'badqrys.txt') && @filesize(SN_ROOT_PHYSICAL . 'badqrys.txt') > 0) {
     echo '<a href="badqrys.txt" target="_blank" style="color:red">', 'HACK ALERT!', '</a>';
   }
 
-  if(!empty($locale_cache_statistic['misses'])) {
+  if (!empty($locale_cache_statistic['misses'])) {
     print('<!--');
     pdump($locale_cache_statistic);
     print('-->');
@@ -55,7 +55,7 @@ 
 
 define('SN_TIME_NOW_GMT_STRING', gmdate(DATE_ATOM, SN_TIME_NOW));
 
-if(strpos(strtolower($_SERVER['SERVER_NAME']), 'google.') !== false) {
+if (strpos(strtolower($_SERVER['SERVER_NAME']), 'google.') !== false) {
   define('SN_GOOGLE', true);
 }
 
@@ -105,14 +105,14 @@ 
 $debug = new debug();
 classSupernova::debug_set_handler($debug);
 
-spl_autoload_register(function ($class) {
-  if(file_exists(SN_ROOT_PHYSICAL . 'includes/classes/' . $class . '.php')) {
+spl_autoload_register(function($class) {
+  if (file_exists(SN_ROOT_PHYSICAL . 'includes/classes/' . $class . '.php')) {
     require_once SN_ROOT_PHYSICAL . 'includes/classes/' . $class . '.php';
   }
 });
 
-spl_autoload_register(function ($class) {
-  if(file_exists(SN_ROOT_PHYSICAL . 'includes/classes/UBE/' . $class . '.php')) {
+spl_autoload_register(function($class) {
+  if (file_exists(SN_ROOT_PHYSICAL . 'includes/classes/UBE/' . $class . '.php')) {
     require_once SN_ROOT_PHYSICAL . 'includes/classes/UBE/' . $class . '.php';
   }
 });
@@ -177,10 +177,10 @@ 
 
 sn_sys_load_php_files(SN_ROOT_PHYSICAL . "includes/functions/", PHP_EX);
 
-spl_autoload_register(function ($class) {
-  if(file_exists('includes/classes/' . $class . '.php')) {
+spl_autoload_register(function($class) {
+  if (file_exists('includes/classes/' . $class . '.php')) {
     require_once 'includes/classes/' . $class . '.php';
-  } elseif(file_exists('includes/classes/UBE/' . $class . '.php')) {
+  } elseif (file_exists('includes/classes/UBE/' . $class . '.php')) {
     require_once 'includes/classes/UBE/' . $class . '.php';
   } else {
 //    die("Can't find {$class} class");
@@ -214,9 +214,9 @@ 
 // Но нужно, пока у нас есть не MVC-страницы
 $sn_page_data = $sn_data['pages'][$sn_page_name];
 $sn_page_name_file = 'includes/pages/' . $sn_page_data['filename'] . DOT_PHP_EX;
-if($sn_page_name && isset($sn_page_data) && file_exists($sn_page_name_file)) {
+if ($sn_page_name && isset($sn_page_data) && file_exists($sn_page_name_file)) {
   require_once($sn_page_name_file);
-  if(is_array($sn_page_data['options'])) {
+  if (is_array($sn_page_data['options'])) {
     $supernova->options = array_merge($supernova->options, $sn_page_data['options']);
   }
 }
@@ -231,10 +231,10 @@ 
 $load_order = array();
 $sn_req = array();
 
-foreach(sn_module::$sn_module as $loaded_module_name => $module_data) {
+foreach (sn_module::$sn_module as $loaded_module_name => $module_data) {
   $load_order[$loaded_module_name] = isset($module_data->manifest['load_order']) && !empty($module_data->manifest['load_order']) ? $module_data->manifest['load_order'] : 100000;
-  if(isset($module_data->manifest['require']) && !empty($module_data->manifest['require'])) {
-    foreach($module_data->manifest['require'] as $require_name) {
+  if (isset($module_data->manifest['require']) && !empty($module_data->manifest['require'])) {
+    foreach ($module_data->manifest['require'] as $require_name) {
       $sn_req[$loaded_module_name][$require_name] = 0;
     }
   }
@@ -247,10 +247,10 @@ 
 do {
   $prev_order = $load_order;
 
-  foreach($sn_req as $loaded_module_name => &$req_data) {
+  foreach ($sn_req as $loaded_module_name => &$req_data) {
     $level = 1;
-    foreach($req_data as $req_name => &$req_level) {
-      if($load_order[$req_name] == -1 || !isset($load_order[$req_name])) {
+    foreach ($req_data as $req_name => &$req_level) {
+      if ($load_order[$req_name] == -1 || !isset($load_order[$req_name])) {
         $level = $req_level = -1;
         break;
       } else {
@@ -258,20 +258,20 @@ 
       }
       $req_level = $load_order[$req_name];
     }
-    if($level > $load_order[$loaded_module_name] || $level == -1) {
+    if ($level > $load_order[$loaded_module_name] || $level == -1) {
       $load_order[$loaded_module_name] = $level;
     }
   }
-} while($prev_order != $load_order);
+} while ($prev_order != $load_order);
 
 asort($load_order);
 
 // Инициализируем модули
 // По нормальным делам это должна быть загрузка модулей и лишь затем инициализация - что бы минимизировать размер процесса в памяти
-foreach($load_order as $loaded_module_name => $load_order_order) {
-  if($load_order_order >= 0) {
+foreach ($load_order as $loaded_module_name => $load_order_order) {
+  if ($load_order_order >= 0) {
     sn_module::$sn_module[$loaded_module_name]->check_status();
-    if(!sn_module::$sn_module[$loaded_module_name]->manifest['active']) {
+    if (!sn_module::$sn_module[$loaded_module_name]->manifest['active']) {
       unset(sn_module::$sn_module[$loaded_module_name]);
       continue;
     }
@@ -288,7 +288,7 @@ 
 unset($sn_req);
 
 // А теперь проверяем - поддерживают ли у нас загруженный код такую страницу
-if(!isset($sn_data['pages'][$sn_page_name])) {
+if (!isset($sn_data['pages'][$sn_page_name])) {
   $sn_page_name = '';
 }
 
@@ -296,6 +296,6 @@ 
 $lang = new classLocale($config->server_locale_log_usage);
 $lang->lng_switch(sys_get_param_str('lang'));
 
-if(!defined('DEBUG_INIT_SKIP_SECONDARY') || DEBUG_INIT_SKIP_SECONDARY !== true) {
+if (!defined('DEBUG_INIT_SKIP_SECONDARY') || DEBUG_INIT_SKIP_SECONDARY !== true) {
   require_once "init_secondary.php";
 }

phalanx.php

Spacing +8 added lines, -8 removed lines

@@ -18,17 +18,17 @@ 
 
 $sensorLevel = mrc_get_level($user, $planetrow, STRUC_MOON_PHALANX);
 if (!intval($sensorLevel)) {
-  message (classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 if ($planetrow['planet_type'] != PT_MOON) {
-  message (classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $scan_galaxy  = sys_get_param_int('galaxy');
 $scan_system  = sys_get_param_int('system');
 $scan_planet  = sys_get_param_int('planet');
-$scan_planet_type  = 1; // sys_get_param_int('planettype');
+$scan_planet_type = 1; // sys_get_param_int('planettype');
 $id = sys_get_param_id('id');
 
 $source_galaxy = $planetrow['galaxy'];
@@ -38,9 +38,9 @@ 
 $sensorRange = GetPhalanxRange($sensorLevel);
 
 $system_distance = abs($source_system - $scan_system);
-if($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
+if ($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
 {
-  message (classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $cost = $sensorLevel * 1000;
@@ -51,14 +51,14 @@ 
 }
 
 $planet_scanned = db_planet_by_gspt($scan_galaxy, $scan_system, $scan_planet, $scan_planet_type);
-if(!$planet_scanned['id'])
+if (!$planet_scanned['id'])
 {
   message(classLocale::$lang['phalanx_planet_not_exists'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
-if($planet_scanned['destruyed'])
+if ($planet_scanned['destruyed'])
 {
-  message (classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 db_planet_set_by_id($user['current_planet'], "deuterium = deuterium - {$cost}");