supernova-ws / SuperNova

includes/general.php

Spacing +1 added lines, -1 removed lines

@@ -284,7 +284,7 @@
     $time_left = min(floor($time_left / PERIOD_DAY), $term_original);
     $cost_left = $term_original > 0 ? ceil($time_left / $term_original * $original_cost) : 0;
 
-    array_walk_recursive($result, function (&$value) use ($cost_left) {
+    array_walk_recursive($result, function(&$value) use ($cost_left) {
       $value -= $cost_left;
     });
   }

classes/Bonus/BonusListAtom.php

Spacing +2 added lines, -2 removed lines

@@ -58,8 +58,8 @@
   protected function bonusSort(BonusAtom $a, BonusAtom $b) {
     static $bonusOrder = [BonusAtom::class, BonusAtomAbility::class, BonusAtomAdd::class, BonusAtomPercent::class, BonusAtomMultiply::class];
 
-    $indexA = (int)array_search(get_class($a), $bonusOrder);
-    $indexB = (int)array_search(get_class($b), $bonusOrder);
+    $indexA = (int) array_search(get_class($a), $bonusOrder);
+    $indexB = (int) array_search(get_class($b), $bonusOrder);
 
     return $indexA == $indexB ? 0 : ($indexA > $indexB ? +1 : -1);
   }

includes/includes/flt_mission_explore.php

Spacing +37 added lines, -38 removed lines

@@ -14,11 +14,11 @@ 
 
   $fleet_left = 1 - mt_rand(1, 3) * mt_rand(200000, 300000) / 1000000;
   $fleet_lost = array();
-  foreach($fleet as $unit_id => &$unit_amount) {
+  foreach ($fleet as $unit_id => &$unit_amount) {
     $ships_left = floor($unit_amount * $fleet_left);
     $fleet_lost[$unit_id] = $unit_amount - $ships_left;
     $unit_amount = $ships_left;
-    if(!$unit_amount) {
+    if (!$unit_amount) {
       unset($fleet[$unit_id]);
     }
   }
@@ -31,14 +31,14 @@ 
 //  $fleet = array();
 }
 
-function flt_mission_explore_addon(&$result){return sn_function_call('flt_mission_explore_addon', array(&$result));}
+function flt_mission_explore_addon(&$result) {return sn_function_call('flt_mission_explore_addon', array(&$result)); }
 function sn_flt_mission_explore_addon(&$result) {
   return $result;
 }
 
 
 function flt_mission_explore(&$mission_data) {
-  if(!isset($mission_data['fleet_event']) || $mission_data['fleet_event'] != EVENT_FLT_ACOMPLISH) {
+  if (!isset($mission_data['fleet_event']) || $mission_data['fleet_event'] != EVENT_FLT_ACOMPLISH) {
     return CACHE_NONE;
   }
 
@@ -71,10 +71,10 @@ 
   $outcome_list = &$result['$outcome_list'];
   $fleet_metal_points = &$result['$fleet_metal_points'];
 
-  if(!$ship_data) {
-    foreach(sn_get_groups('fleet') as $unit_id) {
+  if (!$ship_data) {
+    foreach (sn_get_groups('fleet') as $unit_id) {
       $unit_info = get_unit_param($unit_id);
-      if($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
+      if ($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
         continue;
       }
       $ship_data[$unit_id][P_COST_METAL] = get_unit_cost_in($unit_info[P_COST]);
@@ -86,7 +86,7 @@ 
   $fleet = sys_unit_str2arr($fleet_row['fleet_array']);
   $fleet_capacity = 0;
   $fleet_metal_points = 0;
-  foreach($fleet as $ship_id => $ship_amount) {
+  foreach ($fleet as $ship_id => $ship_amount) {
     $unit_info = get_unit_param($ship_id);
     $fleet_capacity += $ship_amount * $unit_info[P_CAPACITY];
     $fleet_metal_points += $ship_amount * $ship_data[$ship_id][P_COST_METAL];
@@ -96,11 +96,11 @@ 
   $flt_stay_hours = ($fleet_row['fleet_end_stay'] - $fleet_row['fleet_start_time']) / 3600 * ($config->game_speed_expedition ? $config->game_speed_expedition : 1);
 
   $outcome_list = sn_get_groups(GROUP_MISSION_EXPLORE_OUTCOMES);
-  $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1/1.7));
+  $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1 / 1.7));
 
   $chance_max = 0;
-  foreach($outcome_list as $key => &$value) {
-    if(!$value['chance']) {
+  foreach ($outcome_list as $key => &$value) {
+    if (!$value['chance']) {
       unset($outcome_list[$key]);
       continue;
     }
@@ -109,13 +109,13 @@ 
   $outcome_value = mt_rand(0, $chance_max);
 // $outcome_value = 409;
   $outcome_description = &$outcome_list[$mission_outcome = FLT_EXPEDITION_OUTCOME_NONE];
-  foreach($outcome_list as $key => &$value) {
-    if(!$value['chance']) {
+  foreach ($outcome_list as $key => &$value) {
+    if (!$value['chance']) {
       continue;
     }
     $mission_outcome = $key;
     $outcome_description = $value;
-    if($outcome_value <= $outcome_description['value']) {
+    if ($outcome_value <= $outcome_description['value']) {
       break;
     }
   }
@@ -131,7 +131,7 @@ 
   $found_dark_matter = 0;
 //  $outcome_mission_sub = -1;
 
-  switch($mission_outcome) {
+  switch ($mission_outcome) {
 //  switch(FLT_EXPEDITION_OUTCOME_LOST_FLEET) { // TODO DEBUG!
     case FLT_EXPEDITION_OUTCOME_LOST_FLEET:
       flt_mission_explore_outcome_lost_fleet($result);
@@ -166,14 +166,14 @@ 
 
       // Рассчитываем стоимость самого дорого корабля в металле
       $max_metal_cost = 0;
-      foreach($fleet as $ship_id => $ship_amount) {
+      foreach ($fleet as $ship_id => $ship_amount) {
         $max_metal_cost = max($max_metal_cost, $ship_data[$ship_id]['metal_cost']);
       }
 
       // Ограничиваем корабли только теми, чья стоимость в металле меньше или равно стоимости самого дорогого корабля
       $can_be_found = array();
-      foreach($ship_data as $ship_id => $ship_info) {
-        if($ship_info['metal_cost'] < $max_metal_cost) {
+      foreach ($ship_data as $ship_id => $ship_info) {
+        if ($ship_info['metal_cost'] < $max_metal_cost) {
           $can_be_found[$ship_id] = $ship_info['metal_cost'];
         }
       }
@@ -182,13 +182,13 @@ 
       unset($can_be_found[SHIP_SPY]);
 
       $fleet_found = array();
-      while(count($can_be_found) && $found_in_metal >= max($can_be_found)) {
+      while (count($can_be_found) && $found_in_metal >= max($can_be_found)) {
         $found_index = mt_rand(1, count($can_be_found)) - 1;
         $found_ship = array_slice($can_be_found, $found_index, 1, true);
         $found_ship_cost = reset($found_ship);
         $found_ship_id = key($found_ship);
 
-        if($found_ship_cost > $found_in_metal) {
+        if ($found_ship_cost > $found_in_metal) {
           unset($can_be_found[$found_ship_id]);
         } else {
           $found_ship_count = mt_rand(1, floor($found_in_metal / $found_ship_cost));
@@ -197,10 +197,10 @@ 
         }
       }
 
-      if(empty($fleet_found)) {
+      if (empty($fleet_found)) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       } else {
-        foreach($fleet_found as $unit_id => $unit_amount) {
+        foreach ($fleet_found as $unit_id => $unit_amount) {
           $fleet[$unit_id] += $unit_amount;
         }
       }
@@ -226,7 +226,7 @@ 
       $fleet_row['fleet_resource_crystal'] += $resources_found[RES_CRYSTAL];
       $fleet_row['fleet_resource_deuterium'] += $resources_found[RES_DEUTERIUM];
 
-      if(array_sum($resources_found) == 0) {
+      if (array_sum($resources_found) == 0) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       }
     break;
@@ -237,7 +237,7 @@ 
       // Рассчитываем количество найденной ТМ
       $found_dark_matter = floor(min($outcome_percent * $fleet_metal_points / $rates[RES_DARK_MATTER], 10000) * mt_rand(750000, 1000000) / 1000000);
 
-      if(!$found_dark_matter) {
+      if (!$found_dark_matter) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       }
     break;
@@ -251,31 +251,31 @@ 
 
   flt_mission_explore_addon($result);
 
-  if($found_dark_matter) {
+  if ($found_dark_matter) {
     rpg_points_change($fleet_row['fleet_owner'], RPG_EXPEDITION, $found_dark_matter, 'Expedition Bonus');
     $msg_text_addon = sprintf($lang['flt_mission_expedition']['found_dark_matter'], $found_dark_matter);
   }
 
-  if(!empty($fleet_lost)) {
+  if (!empty($fleet_lost)) {
     $msg_text_addon = $lang['flt_mission_expedition']['lost_fleet'];
-    foreach($fleet_lost as $ship_id => $ship_amount) {
+    foreach ($fleet_lost as $ship_id => $ship_amount) {
       $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
     }
   }
 
   $fleet_row['fleet_amount'] = array_sum($fleet);
-  if(!empty($fleet) && $fleet_row['fleet_amount']) {
-    if(!empty($fleet_found)) {
+  if (!empty($fleet) && $fleet_row['fleet_amount']) {
+    if (!empty($fleet_found)) {
       $msg_text_addon = $lang['flt_mission_expedition']['found_fleet'];
-      foreach($fleet_found as $ship_id => $ship_amount) {
+      foreach ($fleet_found as $ship_id => $ship_amount) {
         $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
       }
     }
 
     $query_delta = array();
-    if(!empty($resources_found) && array_sum($resources_found) > 0) {
+    if (!empty($resources_found) && array_sum($resources_found) > 0) {
       $msg_text_addon = $lang['flt_mission_expedition']['found_resources'];
-      foreach($resources_found as $ship_id => $ship_amount) {
+      foreach ($resources_found as $ship_id => $ship_amount) {
         $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
       }
 
@@ -288,7 +288,7 @@ 
     }
 
     $query_data = array();
-    if(!empty($fleet_lost) || !empty($fleet_found)) {
+    if (!empty($fleet_lost) || !empty($fleet_found)) {
       $fleet_row['fleet_array'] = sys_unit_arr2str($fleet);
 
 //      $query_data[] = "`fleet_amount` = {$fleet_row['fleet_amount']}";
@@ -316,17 +316,16 @@ 
 
   db_user_set_by_id($fleet_row['fleet_owner'], "`player_rpg_explore_xp` = `player_rpg_explore_xp` + 1");
 
-  if(!$msg_text) {
+  if (!$msg_text) {
     $messages = &$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['messages'];
-    if($outcome_mission_sub >= 0 && is_array($messages)) {
+    if ($outcome_mission_sub >= 0 && is_array($messages)) {
       $messages = &$messages[$outcome_mission_sub];
     }
 
-    $msg_text = is_string($messages) ? $messages :
-      (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
+    $msg_text = is_string($messages) ? $messages : (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
   }
   $msg_text = sprintf($msg_text, $fleet_row['fleet_id'], uni_render_coordinates($fleet_row, 'fleet_end_')) .
-    ($msg_text_addon ? "\r\n" . $msg_text_addon: '');
+    ($msg_text_addon ? "\r\n" . $msg_text_addon : '');
 
   msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_end_stay'], MSG_TYPE_EXPLORE, $msg_sender, $msg_title, $msg_text);
 

classes/Bonus/ValueStorage.php

Spacing +7 added lines, -7 removed lines

@@ -48,20 +48,20 @@ 
   }
 
   protected function initValues() {
-    $this[UNIT_SERVER_SPEED_BUILDING] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_SPEED_BUILDING] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_SPEED_BUILDING, floatval($vs->getGlobalContainer()->config->game_speed));
     };
-    $this[UNIT_SERVER_SPEED_MINING] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_SPEED_MINING] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_SPEED_MINING, floatval($vs->getGlobalContainer()->config->resource_multiplier));
     };
-    $this[UNIT_SERVER_SPEED_FLEET] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_SPEED_FLEET] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_SPEED_FLEET, floatval($vs->getGlobalContainer()->config->fleet_speed));
     };
-    $this[UNIT_SERVER_SPEED_EXPEDITION] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_SPEED_EXPEDITION] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_SPEED_EXPEDITION, floatval(1));
     };
 
-    $this[UNIT_SERVER_FLEET_NOOB_POINTS] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_FLEET_NOOB_POINTS] = function(ValueStorage $vs) {
       $config = $vs->getGlobalContainer()->config;
 
       return new ValueBonused(
@@ -69,11 +69,11 @@ 
         floatval($config->game_noob_points * $vs->getBase(UNIT_SERVER_SPEED_MINING))
       );
     };
-    $this[UNIT_SERVER_FLEET_NOOB_FACTOR] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_FLEET_NOOB_FACTOR] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_FLEET_NOOB_FACTOR, floatval($vs->getGlobalContainer()->config->game_noob_factor));
     };
 
-    $this[UNIT_SERVER_PAYMENT_MM_PER_CURRENCY] = function (ValueStorage $vs) {
+    $this[UNIT_SERVER_PAYMENT_MM_PER_CURRENCY] = function(ValueStorage $vs) {
       return new ValueBonused(UNIT_SERVER_PAYMENT_MM_PER_CURRENCY, floatval($vs->getGlobalContainer()->config->payment_currency_exchange_mm_));
     };
   }

classes/Unit/Governor.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
    * @return int
    */
   public function getMaxLevel() {
-    $snId =  $this->getSnId();
+    $snId = $this->getSnId();
     return !empty($snId) ? get_unit_param($snId, P_MAX_STACK) : 0;
   }
 

classes/DBAL/ActiveRecordAbstract.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
       $dbq->setWhereArray(static::translateNames($propertyFilter, static::PROPERTIES_TO_FIELDS));
     }
 
-    if(static::$_forUpdate == DbQuery::DB_FOR_UPDATE) {
+    if (static::$_forUpdate == DbQuery::DB_FOR_UPDATE) {
       $dbq->setForUpdate();
       static::$_forUpdate = DbQuery::DB_SHARED;
     }

classes/template_compile.php

Indentation +55 added lines, -55 removed lines

@@ -55,9 +55,9 @@ 
   }
 
   /**
-  * Load template source from file
-  * @access private
-  */
+   * Load template source from file
+   * @access private
+   */
   function _tpl_load_file($handle, $store_in_db = false)
   {
     // Try and open template for read
@@ -100,10 +100,10 @@ 
   }
 
   /**
-  * Remove any PHP tags that do not belong, these regular expressions are derived from
-  * the ones that exist in zend_language_scanner.l
-  * @access private
-  */
+   * Remove any PHP tags that do not belong, these regular expressions are derived from
+   * the ones that exist in zend_language_scanner.l
+   * @access private
+   */
   function remove_php_tags(&$code)
   {
     // This matches the information gathered from the internal PHP lexer
@@ -117,9 +117,9 @@ 
   }
 
   /**
-  * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
-  * @access private
-  */
+   * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
+   * @access private
+   */
   function compile($code, $no_echo = false, $echo_var = '')
   {
     global $config;
@@ -290,9 +290,9 @@ 
   }
 
   /**
-  * Compile variables
-  * @access private
-  */
+   * Compile variables
+   * @access private
+   */
   function compile_var_tags(&$text_blocks)
   {
     // including $lang variable
@@ -365,9 +365,9 @@ 
   }
 
   /**
-  * Compile blocks
-  * @access private
-  */
+   * Compile blocks
+   * @access private
+   */
   function compile_tag_block($tag_args)
   {
     $no_nesting = false;
@@ -453,14 +453,14 @@ 
     $tag_template_php .= 'if ($_' . $tag_args . '_count) {';
 
     /**
-    * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
-    * <code>
-    * if (!$offset)
-    * {
-    *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
-    * }
-    * </code>
-    */
+     * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
+     * <code>
+     * if (!$offset)
+     * {
+     *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
+     * }
+     * </code>
+     */
 
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
@@ -471,10 +471,10 @@ 
   }
 
   /**
-  * Compile IF tags - much of this is from Smarty with
-  * some adaptions for our block level methods
-  * @access private
-  */
+   * Compile IF tags - much of this is from Smarty with
+   * some adaptions for our block level methods
+   * @access private
+   */
   function compile_tag_if($tag_args, $elseif)
   {
     // Tokenize args for 'if' tag.
@@ -629,9 +629,9 @@ 
   }
 
   /**
-  * Compile DEFINE tags
-  * @access private
-  */
+   * Compile DEFINE tags
+   * @access private
+   */
   function compile_tag_define($tag_args, $op)
   {
     preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
@@ -682,9 +682,9 @@ 
   }
 
   /**
-  * Compile INCLUDE tag
-  * @access private
-  */
+   * Compile INCLUDE tag
+   * @access private
+   */
   function compile_tag_include($tag_args)
   {
     // Process dynamic includes
@@ -697,19 +697,19 @@ 
   }
 
   /**
-  * Compile INCLUDE_PHP tag
-  * @access private
-  */
+   * Compile INCLUDE_PHP tag
+   * @access private
+   */
   function compile_tag_include_php($tag_args)
   {
     return "\$this->_php_include('$tag_args');";
   }
 
   /**
-  * parse expression
-  * This is from Smarty
-  * @access private
-  */
+   * parse expression
+   * This is from Smarty
+   * @access private
+   */
   function _parse_is_expr($is_arg, $tokens)
   {
     $expr_end = 0;
@@ -802,14 +802,14 @@ 
   }
 
   /**
-  * Generates a reference to the array of data values for the given
-  * (possibly nested) block namespace. This is a string of the form:
-  * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
-  *
-  * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
-  * NOTE: does not expect a trailing "." on the blockname.
-  * @access private
-  */
+   * Generates a reference to the array of data values for the given
+   * (possibly nested) block namespace. This is a string of the form:
+   * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
+   *
+   * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
+   * NOTE: does not expect a trailing "." on the blockname.
+   * @access private
+   */
   function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
   {
     // Get an array of the blocks involved.
@@ -845,9 +845,9 @@ 
   }
 
   /**
-  * Write compiled file to cache directory
-  * @access private
-  */
+   * Write compiled file to cache directory
+   * @access private
+   */
   function compile_write($handle, $data)
   {
     $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
@@ -870,9 +870,9 @@ 
 
   // Gorlum's minifier BOF
   /**
-  * Minifies template w/i PHP code by removing extra spaces
-  * @access private
-  */
+   * Minifies template w/i PHP code by removing extra spaces
+   * @access private
+   */
   function minify($html)
   {
     global $config;

Spacing +14 added lines, -14 removed lines

@@ -143,9 +143,9 @@ 
 
     preg_match_all('#<!-- INCLUDE (\{\$?[A-Z0-9\-_]+\}|[a-zA-Z0-9\_\-\+\./]+) -->#', $code, $matches);
     $include_blocks = $matches[1];
-    if($include_blocks)
+    if ($include_blocks)
     {
-      foreach($include_blocks as &$included_file)
+      foreach ($include_blocks as &$included_file)
       {
         $included_file .= '.tpl.html';
       }
@@ -310,7 +310,7 @@ 
       $varname = $var_val[3];
       $new = $this->generate_block_varref($namespace, $varname, $var_val[2]);
 
-      if(!empty($var_val[4])) {
+      if (!empty($var_val[4])) {
         $new = \Ptl\PtlVariableDecorator::decorate($var_val[0], $new, $this->template);
       }
 
@@ -464,8 +464,8 @@ 
 
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
-    $tag_template_php .= '$_'. $tag_args . '_val = &' . $varref . '[$_'. $tag_args. '_i];';
-    $tag_template_php .= '$this->_block_value["'. $tag_args . '"] = &' . $varref . '[$_'. $tag_args. '_i];';
+    $tag_template_php .= '$_' . $tag_args . '_val = &' . $varref . '[$_' . $tag_args . '_i];';
+    $tag_template_php .= '$this->_block_value["' . $tag_args . '"] = &' . $varref . '[$_' . $tag_args . '_i];';
 
     return $tag_template_php;
   }
@@ -569,10 +569,10 @@ 
         break;
 
         case 'is':
-          $is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1;
+          $is_arg_start = ($tokens[$i - 1] == ')') ? array_pop($is_arg_stack) : $i - 1;
           $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
 
-          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
+          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1));
 
           array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens);
 
@@ -836,11 +836,11 @@ 
     }
     else if ($include_last_iterator)
     {
-      return '$_'. $blocks[$blockcount] . '_val';
+      return '$_' . $blocks[$blockcount] . '_val';
     }
     else
     {
-      return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
+      return '$_' . $blocks[$blockcount - 1] . '_val[\'' . $blocks[$blockcount] . '\']';
     }
   }
 
@@ -857,7 +857,7 @@ 
     if ($fp = @fopen($filename, 'wb'))
     {
       @flock($fp, LOCK_EX);
-      @fwrite ($fp, $data);
+      @fwrite($fp, $data);
       @flock($fp, LOCK_UN);
       @fclose($fp);
 
@@ -877,7 +877,7 @@ 
   {
     global $config;
 
-    if(!$config->tpl_minifier)
+    if (!$config->tpl_minifier)
     {
       return $html;
     }
@@ -889,14 +889,14 @@ 
     //$html = preg_replace('/[\r\n\t]+/', ' ', $html);
     $html = preg_replace('/>[\s]*</', '><', $html); // Strip spacechars between tags
     $html = preg_replace('/[\s]+/', ' ', $html); // Replace several spacechars with one space
-    if(!empty($pre[0]))
+    if (!empty($pre[0]))
     {
-      foreach($pre[0] as $tag)
+      foreach ($pre[0] as $tag)
       {
         $tag = preg_replace('/^\ *\/\/[^\<]*?$/m', ' ', $tag); // Strips comments - except those that contains HTML comment inside
         $tag = preg_replace('/[\ \t]{2,}/', ' ', $tag); // Replace several spaces by one
         $tag = preg_replace('/\s{2,}/', "\r\n", $tag); // Replace several linefeeds by one
-        $html = preg_replace('/#pre#/', $tag, $html,1);
+        $html = preg_replace('/#pre#/', $tag, $html, 1);
       }
     }
 

Braces +33 added lines, -66 removed lines

@@ -37,8 +37,7 @@ 
 *
 * @package phpBB3
 */
-class template_compile
-{
+class template_compile {
   var $template;
 
   // Various storage arrays
@@ -58,8 +57,7 @@ 
   * Load template source from file
   * @access private
   */
-  function _tpl_load_file($handle, $store_in_db = false)
-  {
+  function _tpl_load_file($handle, $store_in_db = false) {
     // Try and open template for read
     if (!file_exists($this->template->files[$handle]))
     {
@@ -67,8 +65,7 @@ 
       {
         return;
         trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR);
-      }
-      else
+      } else
       {
         $this->template->files[$handle] = $this->template->files_inherit[$handle];
       }
@@ -104,8 +101,7 @@ 
   * the ones that exist in zend_language_scanner.l
   * @access private
   */
-  function remove_php_tags(&$code)
-  {
+  function remove_php_tags(&$code) {
     // This matches the information gathered from the internal PHP lexer
     $match = array(
       '#<([\?%])=?.*?\1>#s',
@@ -120,8 +116,7 @@ 
   * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
   * @access private
   */
-  function compile($code, $no_echo = false, $echo_var = '')
-  {
+  function compile($code, $no_echo = false, $echo_var = '') {
     global $config;
 
     if ($echo_var)
@@ -226,15 +221,13 @@ 
               $var = substr($temp, 2, -1);
               //$file = $this->template->_tpldata['DEFINE']['.'][$var];
               $temp = "\$this->_tpldata['DEFINE']['.']['$var']";
-            }
-            else
+            } else
             {
               $var = substr($temp, 1, -1);
               //$file = $this->template->_rootref[$var];
               $temp = "\$this->_rootref['$var']";
             }
-          }
-          else
+          } else
           {
             $file = $temp;
           }
@@ -293,8 +286,7 @@ 
   * Compile variables
   * @access private
   */
-  function compile_var_tags(&$text_blocks)
-  {
+  function compile_var_tags(&$text_blocks) {
     // including $lang variable
     global $lang, $config;
 
@@ -368,8 +360,7 @@ 
   * Compile blocks
   * @access private
   */
-  function compile_tag_block($tag_args)
-  {
+  function compile_tag_block($tag_args) {
     $no_nesting = false;
 
     // Is the designer wanting to call another loop in a loop?
@@ -392,8 +383,7 @@ 
       if ($match[2] < 0)
       {
         $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')';
-      }
-      else
+      } else
       {
         $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')';
       }
@@ -401,17 +391,14 @@ 
       if (strlen($match[3]) < 1 || $match[3] == -1)
       {
         $loop_end = '$_' . $tag_args . '_count';
-      }
-      else if ($match[3] >= 0)
+      } else if ($match[3] >= 0)
       {
         $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')';
-      }
-      else //if ($match[3] < -1)
+      } else //if ($match[3] < -1)
       {
         $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1);
       }
-    }
-    else
+    } else
     {
       $loop_start = 0;
       $loop_end = '$_' . $tag_args . '_count';
@@ -424,8 +411,7 @@ 
     {
       // We need to implode $no_nesting times from the end...
       $block = array_slice($this->block_names, -$no_nesting);
-    }
-    else
+    } else
     {
       $block = $this->block_names;
     }
@@ -435,8 +421,7 @@ 
       // Block is not nested.
       $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;";
       $varref = "\$this->_tpldata['$tag_args']";
-    }
-    else
+    } else
     {
       // This block is nested.
       // Generate a namespace string for this block.
@@ -475,8 +460,7 @@ 
   * some adaptions for our block level methods
   * @access private
   */
-  function compile_tag_if($tag_args, $elseif)
-  {
+  function compile_tag_if($tag_args, $elseif) {
     // Tokenize args for 'if' tag.
     preg_match_all('/(?:
       "[^"\\\\]*(?:\\\\.[^"\\\\]*)*"         |
@@ -584,8 +568,7 @@ 
           if (preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Za-z])([A-Za-z0-9\-_]+)#s', $token, $varrefs))
           {
             $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']');
-          }
-          else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
+          } else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
           {
             // Allow checking if loops are set with .loopname
             // It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example
@@ -601,8 +584,7 @@ 
 
               // Add the block reference for the last child.
               $varref .= "['" . $block . "']";
-            }
-            else
+            } else
             {
               $varref = '$this->_tpldata';
 
@@ -610,8 +592,7 @@ 
               $varref .= "['" . $blocks[0] . "']";
             }
             $token = "sizeof($varref)";
-          }
-          else if (!empty($token))
+          } else if (!empty($token))
           {
             $token = '(' . $token . ')';
           }
@@ -632,8 +613,7 @@ 
   * Compile DEFINE tags
   * @access private
   */
-  function compile_tag_define($tag_args, $op)
-  {
+  function compile_tag_define($tag_args, $op) {
     preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
 
     if (empty($match[2]) || (!isset($match[4]) && $op))
@@ -656,8 +636,7 @@ 
 
       // Now replace the php code
       $match[4] = "'" . str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4]) . "'";
-    }
-    else
+    } else
     {
       preg_match('#true|false|\.#i', $match[4], $type);
 
@@ -685,8 +664,7 @@ 
   * Compile INCLUDE tag
   * @access private
   */
-  function compile_tag_include($tag_args)
-  {
+  function compile_tag_include($tag_args) {
     // Process dynamic includes
     if ($tag_args[0] == '$')
     {
@@ -700,8 +678,7 @@ 
   * Compile INCLUDE_PHP tag
   * @access private
   */
-  function compile_tag_include_php($tag_args)
-  {
+  function compile_tag_include_php($tag_args) {
     return "\$this->_php_include('$tag_args');";
   }
 
@@ -710,8 +687,7 @@ 
   * This is from Smarty
   * @access private
   */
-  function _parse_is_expr($is_arg, $tokens)
-  {
+  function _parse_is_expr($is_arg, $tokens) {
     $expr_end = 0;
     $negate_expr = false;
 
@@ -719,8 +695,7 @@ 
     {
       $negate_expr = true;
       $expr_type = array_shift($tokens);
-    }
-    else
+    } else
     {
       $expr_type = $first_token;
     }
@@ -733,8 +708,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "!(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "!($is_arg & 1)";
         }
@@ -746,8 +720,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "($is_arg & 1)";
         }
@@ -786,8 +759,7 @@ 
    *
    * @return string
    */
-  private function generate_block_varref($namespace, $varname, $defop = false)
-  {
+  private function generate_block_varref($namespace, $varname, $defop = false) {
     // Strip the trailing period.
     $namespace = substr($namespace, 0, -1);
 
@@ -810,8 +782,7 @@ 
   * NOTE: does not expect a trailing "." on the blockname.
   * @access private
   */
-  function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
-  {
+  function generate_block_data_ref($blockname, $include_last_iterator, $defop = false) {
     // Get an array of the blocks involved.
     $blocks = explode('.', $blockname);
     $blockcount = sizeof($blocks) - 1;
@@ -833,12 +804,10 @@ 
         $varref .= '[$_' . $blocks[$blockcount] . '_i]';
       }
       return $varref;
-    }
-    else if ($include_last_iterator)
+    } else if ($include_last_iterator)
     {
       return '$_'. $blocks[$blockcount] . '_val';
-    }
-    else
+    } else
     {
       return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
     }
@@ -848,8 +817,7 @@ 
   * Write compiled file to cache directory
   * @access private
   */
-  function compile_write($handle, $data)
-  {
+  function compile_write($handle, $data) {
     $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
 
     $data = "<?php if (!defined('INSIDE')) exit;" . ((strpos($data, '<?php') === 0) ? substr($data, 5) : ' ?>' . $data);
@@ -873,8 +841,7 @@ 
   * Minifies template w/i PHP code by removing extra spaces
   * @access private
   */
-  function minify($html)
-  {
+  function minify($html) {
     global $config;
 
     if(!$config->tpl_minifier)

includes/includes/ube_attack_calculate.php

Spacing +3 added lines, -4 removed lines

@@ -165,8 +165,7 @@ 
     $planet_info[PLANET_SYSTEM],
     $planet_info[PLANET_PLANET],
     htmlentities($planet_info[PLANET_NAME], ENT_COMPAT, 'UTF-8'),
-    $lang[$outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' :
-      ($outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
+    $lang[$outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' : ($outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
   );
 
   $text_defender = '';
@@ -251,7 +250,7 @@ 
       // Просматриваем результаты изменения флотов
       foreach ($fleet_info[UBE_COUNT] as $unit_id => $unit_count) {
         // Перебираем аутком на случай восстановления юнитов
-        $units_lost = (float)$fleets_outcome[$fleet_id][UBE_UNITS_LOST][$unit_id];
+        $units_lost = (float) $fleets_outcome[$fleet_id][UBE_UNITS_LOST][$unit_id];
 
         $units_left = $unit_count - $units_lost;
         if ($fleet_id) {
@@ -275,7 +274,7 @@ 
     // Если во флоте остались юниты или это планета - генерируем изменение ресурсов
     if ($new_fleet_count || !$fleet_id) {
       foreach (sn_get_groups('resources_loot') as $resource_id) {
-        $resource_change = (float)$fleets_outcome[$fleet_id][UBE_RESOURCES_LOOTED][$resource_id] + (float)$fleets_outcome[$fleet_id][UBE_CARGO_DROPPED][$resource_id];
+        $resource_change = (float) $fleets_outcome[$fleet_id][UBE_RESOURCES_LOOTED][$resource_id] + (float) $fleets_outcome[$fleet_id][UBE_CARGO_DROPPED][$resource_id];
         if ($resource_change) {
           $resource_db_name = ($fleet_id ? 'fleet_resource_' : '') . pname_resource_name($resource_id);
           $fleet_delta[$resource_db_name] = -($resource_change);

Braces +6 added lines, -2 removed lines

@@ -290,10 +290,12 @@ 
       }
     }
 
-    if ($fleet_id) // Не планета
+    if ($fleet_id) {
+      // Не планета
     {
       if ($fleet_info[UBE_FLEET_TYPE] == UBE_ATTACKERS && $outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_DIED) {
         $new_fleet_count = 0;
+    }
       }
 
       if ($new_fleet_count) {
@@ -316,10 +318,12 @@ 
         }
         DBStaticPlanet::db_planet_set_by_id($planet_id, implode(',', $temp));
       }
-      if (!empty($db_changeset)) // Сохраняем изменения юнитов на планете - если они есть
+      if (!empty($db_changeset)) {
+        // Сохраняем изменения юнитов на планете - если они есть
       {
         OldDbChangeSet::db_changeset_apply($db_changeset);
       }
+      }
     }
   }
 

includes/functions/uni_functions.php

Braces +3 added lines, -1 removed lines

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