supernova-ws / SuperNova

classes/template_compile.php

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;
 
@@ -362,8 +354,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?
@@ -386,8 +377,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] . ')';
       }
@@ -395,17 +385,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';
@@ -418,8 +405,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;
     }
@@ -429,8 +415,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.
@@ -469,8 +454,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('/(?:
       "[^"\\\\]*(?:\\\\.[^"\\\\]*)*"         |
@@ -578,8 +562,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
@@ -595,8 +578,7 @@ 
 
               // Add the block reference for the last child.
               $varref .= "['" . $block . "']";
-            }
-            else
+            } else
             {
               $varref = '$this->_tpldata';
 
@@ -604,8 +586,7 @@ 
               $varref .= "['" . $blocks[0] . "']";
             }
             $token = "sizeof($varref)";
-          }
-          else if (!empty($token))
+          } else if (!empty($token))
           {
             $token = '(' . $token . ')';
           }
@@ -626,8 +607,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))
@@ -650,8 +630,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);
 
@@ -679,8 +658,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] == '$')
     {
@@ -694,8 +672,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');";
   }
 
@@ -704,8 +681,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;
 
@@ -713,8 +689,7 @@ 
     {
       $negate_expr = true;
       $expr_type = array_shift($tokens);
-    }
-    else
+    } else
     {
       $expr_type = $first_token;
     }
@@ -727,8 +702,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "!(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "!($is_arg & 1)";
         }
@@ -740,8 +714,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "($is_arg & 1)";
         }
@@ -775,8 +748,7 @@ 
   * NOTE: expects a trailing "." on the namespace.
   * @access private
   */
-  function generate_block_varref($namespace, $varname, $echo = true, $defop = false)
-  {
+  function generate_block_varref($namespace, $varname, $echo = true, $defop = false) {
     // Strip the trailing period.
     $namespace = substr($namespace, 0, -1);
 
@@ -800,8 +772,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;
@@ -823,12 +794,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]. '\']';
     }
@@ -838,8 +807,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);
@@ -863,8 +831,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/pages/techtree.php

Braces +1 added lines, -2 removed lines

@@ -6,8 +6,7 @@
  * version 2.0 copyright (c) 2012 by Gorlum for http://supernova.ws
  */
 
-function sn_techtree_view($template = null)
-{
+function sn_techtree_view($template = null) {
   global $lang, $user, $planetrow;
 
   $tech_tree = array();

includes/includes/ube_attack_calculate.php

Braces +45 added lines, -70 removed lines

@@ -79,8 +79,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Заполняет данные по игроку
-function ube_attack_prepare_player(&$combat_data, $player_id, $is_attacker)
-{
+function ube_attack_prepare_player(&$combat_data, $player_id, $is_attacker) {
   global $ube_convert_techs;
 
   if(!isset($combat_data[UBE_PLAYERS][$player_id]))
@@ -99,8 +98,7 @@ 
     {
       $player_info[UBE_BONUSES][$ube_id] += mrc_get_level($player_data, false, $unit_id) * get_unit_param($unit_id, P_BONUS_VALUE) / 100 + $admiral_bonus;
     }
-  }
-  else
+  } else
   {
     $combat_data[UBE_PLAYERS][$player_id][UBE_ATTACKER] = $combat_data[UBE_PLAYERS][$player_id][UBE_ATTACKER] || $is_attacker;
   }
@@ -109,8 +107,7 @@ 
 // ------------------------------------------------------------------------------------------------
 // Заполняет данные по флоту
 function ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker){return sn_function_call('ube_attack_prepare_fleet', array(&$combat_data, &$fleet, $is_attacker));}
-function sn_ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker)
-{
+function sn_ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker) {
   $fleet_owner_id = $fleet['fleet_owner'];
   $fleet_id = $fleet['fleet_id'];
 
@@ -257,8 +254,7 @@ 
     foreach($acs_fleet_list as $fleet) {
       ube_attack_prepare_fleet($combat_data, $fleet, true);
     }
-  }
-  else
+  } else
   {
     ube_attack_prepare_fleet($combat_data, $fleet_row, true);
   }
@@ -273,8 +269,7 @@ 
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_prepare_first_round(&$combat_data)
-{
+function sn_ube_combat_prepare_first_round(&$combat_data) {
   global $ube_combat_bonus_list, $ube_convert_to_techs;
 
   // Готовим информацию для первого раунда - проводим все нужные вычисления из исходных данных
@@ -339,8 +334,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Вычисление дополнительной информации для расчета раунда
-function sn_ube_combat_round_prepare(&$combat_data, $round)
-{
+function sn_ube_combat_round_prepare(&$combat_data, $round) {
   global $ube_combat_bonus_list;
 
   $is_simulator = $combat_data[UBE_OPTIONS][UBE_SIMULATOR];
@@ -401,8 +395,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассчитывает результат столкновения флотов ака раунд
-function sn_ube_combat_round_crossfire_fleet(&$combat_data, $round)
-{
+function sn_ube_combat_round_crossfire_fleet(&$combat_data, $round) {
   if(BE_DEBUG === true)
   {
     // sn_ube_combat_helper_round_header($round);
@@ -437,8 +430,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассчитывает результат столкновения двух юнитов ака ход
-function sn_ube_combat_round_crossfire_unit(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options)
-{
+function sn_ube_combat_round_crossfire_unit(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options) {
   $attack_fleet_info = &$attack_fleet_data[UBE_FLEET_INFO];
   $defend_fleet_info = &$defend_fleet_data[UBE_FLEET_INFO];
   $defend_unit_armor = $defend_fleet_info[UBE_ARMOR][$defend_unit_id];
@@ -518,8 +510,7 @@ 
   }
 }
 
-function sn_ube_combat_round_crossfire_unit_damage_current(&$defend_fleet_data, $defend_unit_id, &$amplified_damage, &$units_lost, &$units_boomed, &$combat_options)
-{
+function sn_ube_combat_round_crossfire_unit_damage_current(&$defend_fleet_data, $defend_unit_id, &$amplified_damage, &$units_lost, &$units_boomed, &$combat_options) {
   $unit_is_lost = false;
 
   $units_boomed = $units_boomed ? $units_boomed : 0;
@@ -580,8 +571,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассчитывает результат столкновения двух юнитов ака ход
-function sn_ube_combat_round_crossfire_unit2(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options)
-{
+function sn_ube_combat_round_crossfire_unit2(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options) {
   if($defend_fleet_data[UBE_COUNT][$defend_unit_id] <= 0)
   {
     return;
@@ -618,8 +608,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Анализирует результаты раунда и генерирует данные для следующего раунда
-function sn_ube_combat_round_analyze(&$combat_data, $round)
-{
+function sn_ube_combat_round_analyze(&$combat_data, $round) {
   $round_data = &$combat_data[UBE_ROUNDS][$round];
   $round_data[UBE_OUTCOME] = UBE_COMBAT_RESULT_DRAW;
 
@@ -649,12 +638,10 @@ 
   if(count($outcome) == 0 || $round == 10)
   {
     $round_data[UBE_OUTCOME] = UBE_COMBAT_RESULT_DRAW_END;
-  }
-  elseif(count($outcome) == 1)
+  } elseif(count($outcome) == 1)
   {
     $round_data[UBE_OUTCOME] = isset($outcome[UBE_ATTACKERS]) ? UBE_COMBAT_RESULT_WIN : UBE_COMBAT_RESULT_LOSS;
-  }
-  elseif(count($outcome) == 2)
+  } elseif(count($outcome) == 2)
   {
     if($round < 10)
     {
@@ -667,8 +654,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Общий алгоритм расчета боя
-function sn_ube_combat(&$combat_data)
-{
+function sn_ube_combat(&$combat_data) {
   // TODO: Сделать атаку по типам,  когда они будут
 
   $start = microtime(true);
@@ -696,8 +682,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Разбирает данные боя для генерации отчета
-function sn_ube_combat_analyze(&$combat_data)
-{
+function sn_ube_combat_analyze(&$combat_data) {
   global $config;
 
 //  $combat_data[UBE_OUTCOME] = array();
@@ -742,14 +727,12 @@ 
         if($combat_data[UBE_OPTIONS][UBE_SIMULATOR])
         { // for simulation just return 75% of loss
           $units_giveback = round($units_lost * $giveback_chance / 100);
-        }
-        else
+        } else
         {
           if($unit_count > 10)
           { // if there were more then 10 defense elements - mass-calculating giveback
             $units_giveback = round($units_lost * mt_rand($giveback_chance * 0.8, $giveback_chance * 1.2) / 100);
-          }
-          else
+          } else
           { //if there were less then 10 defense elements - calculating giveback per element
             $units_giveback = 0;
             for($i = 1; $i <= $units_lost; $i++)
@@ -852,8 +835,7 @@ 
     if($combat_data[UBE_OPTIONS][UBE_MOON_WAS])
     {
       $outcome[UBE_MOON] = UBE_MOON_WAS;
-    }
-    else
+    } else
     {
       sn_ube_combat_analyze_moon($outcome, $combat_data[UBE_OPTIONS][UBE_SIMULATOR]);
     }
@@ -872,8 +854,7 @@ 
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_analyze_loot(&$combat_data)
-{
+function sn_ube_combat_analyze_loot(&$combat_data) {
   $exchange = &$combat_data[UBE_OPTIONS][UBE_EXCHANGE];
   $planet_resource_list = &$combat_data[UBE_FLEETS][0][UBE_RESOURCES];
   $outcome = &$combat_data[UBE_OUTCOME];
@@ -916,13 +897,14 @@ 
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_analyze_moon(&$outcome, $is_simulator)
-{
+function sn_ube_combat_analyze_moon(&$outcome, $is_simulator) {
   $outcome[UBE_DEBRIS_TOTAL] = 0;
-  foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
+  foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) {
+    // TODO via array
   {
     $outcome[UBE_DEBRIS_TOTAL] += $outcome[UBE_DEBRIS][$resource_id];
   }
+  }
 
   if($outcome[UBE_DEBRIS_TOTAL])
   {
@@ -941,35 +923,33 @@ 
         {
           $outcome[UBE_DEBRIS_TOTAL] = 0;
           $outcome[UBE_DEBRIS] = array();
-        }
-        else
+        } else
         {
           $moon_debris_spent = 30000000;
           $moon_debris_left_percent = ($outcome[UBE_DEBRIS_TOTAL] - $moon_debris_spent) / $outcome[UBE_DEBRIS_TOTAL];
 
           $outcome[UBE_DEBRIS_TOTAL] = 0;
-          foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
+          foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) {
+            // TODO via array
           {
             $outcome[UBE_DEBRIS][$resource_id] = floor($outcome[UBE_DEBRIS][$resource_id] * $moon_debris_left_percent);
+          }
             $outcome[UBE_DEBRIS_TOTAL] += $outcome[UBE_DEBRIS][$resource_id];
           }
         }
-      }
-      else
+      } else
       {
         $outcome[UBE_MOON] = UBE_MOON_CREATE_FAILED;
       }
     }
-  }
-  else
+  } else
   {
     $outcome[UBE_MOON] = UBE_MOON_NONE;
   }
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_analyze_moon_destroy(&$combat_data)
-{
+function sn_ube_combat_analyze_moon_destroy(&$combat_data) {
   // TODO: $is_simulator
   $reapers = 0;
   foreach($combat_data[UBE_ROUNDS][count($combat_data[UBE_ROUNDS])-1][UBE_FLEETS] as $fleet_data)
@@ -993,8 +973,7 @@ 
     $combat_data[UBE_OUTCOME][UBE_MOON] = $random <= $combat_data[UBE_OUTCOME][UBE_MOON_DESTROY_CHANCE] ? UBE_MOON_DESTROY_SUCCESS : UBE_MOON_DESTROY_FAILED;
     $random = mt_rand(1, 100);
     $combat_data[UBE_OUTCOME][UBE_MOON_REAPERS] = $random <= $combat_data[UBE_OUTCOME][UBE_MOON_REAPERS_DIE_CHANCE] ? UBE_MOON_REAPERS_DIED : UBE_MOON_REAPERS_RETURNED;
-  }
-  else
+  } else
   {
     $combat_data[UBE_OUTCOME][UBE_MOON_REAPERS] = UBE_MOON_REAPERS_NONE;
   }
@@ -1002,8 +981,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассылает письма всем участникам боя
-function sn_ube_message_send(&$combat_data)
-{
+function sn_ube_message_send(&$combat_data) {
   global $lang;
 
   // TODO: Отсылать каждому игроку сообщение на его языке!
@@ -1042,8 +1020,7 @@ 
   if($outcome[UBE_MOON] == UBE_MOON_CREATE_SUCCESS)
   {
     $text_defender .= "{$lang['ube_report_moon_created']} {$outcome[UBE_MOON_SIZE]} {$lang['sys_kilometers_short']}<br /><br />";
-  }
-  elseif($outcome[UBE_MOON] == UBE_MOON_CREATE_FAILED)
+  } elseif($outcome[UBE_MOON] == UBE_MOON_CREATE_FAILED)
   {
     $text_defender .= "{$lang['ube_report_moon_chance']} {$outcome[UBE_MOON_CHANCE]}%<br /><br />";
   }
@@ -1053,8 +1030,7 @@ 
     if($outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_NONE)
     {
       $text_defender .= $lang['ube_report_moon_reapers_none'];
-    }
-    else
+    } else
     {
       $text_defender .= "{$lang['ube_report_moon_reapers_wave']}. {$lang['ube_report_moon_reapers_chance']} {$outcome[UBE_MOON_DESTROY_CHANCE]}%. ";
       $text_defender .= $lang[$outcome[UBE_MOON] == UBE_MOON_DESTROY_SUCCESS ? 'ube_report_moon_reapers_success' : 'ube_report_moon_reapers_failure'] . "<br />";
@@ -1081,8 +1057,7 @@ 
 // Записывает результат боя в БД
 /** @noinspection SpellCheckingInspection */
 function ube_combat_result_apply(&$combat_data){return sn_function_call('ube_combat_result_apply', array(&$combat_data));}
-function sn_ube_combat_result_apply(&$combat_data)
-{
+function sn_ube_combat_result_apply(&$combat_data) {
 // TODO: Поменять все отладки на запросы
   $destination_user_id = $combat_data[UBE_FLEETS][0][UBE_OWNER];
 
@@ -1130,8 +1105,7 @@ 
         {
           // Не планета - всегда сразу записываем строку итогов флота
           $fleet_query[$unit_id] = "{$unit_id},{$units_left}";
-        }
-        elseif($units_lost)
+        } elseif($units_lost)
         {
           // Планета - записываем в ИД юнита его потери только если есть потери
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, -$units_lost, $combat_data[UBE_PLAYERS][$destination_user_id][UBE_PLAYER_DATA], $planet_id);
@@ -1186,11 +1160,13 @@ 
 
 //global $debug;
 //    $fleet_query = implode(',', $fleet_query);
-    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)
@@ -1202,16 +1178,14 @@ 
           $fleet_query['fleet_amount'] = $new_fleet_count;
           fleet_update_set($fleet_id, $fleet_query, $fleet_delta);
         }
-      }
-      else
+      } else
       {
         // Удаляем пустые флоты
         // doquery("DELETE FROM {{fleets}} WHERE `fleet_id` = {$fleet_id} LIMIT 1");
         db_fleet_delete($fleet_id);
         DBStaticUnit::db_unit_list_delete(0, LOC_FLEET, $fleet_id, 0);
       }
-    }
-    else // Планета
+    } else // Планета
     {
       // Сохраняем изменения ресурсов - если они есть
       if(!empty($fleet_delta))
@@ -1222,10 +1196,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);
       }
+      }
     }
   }
 
@@ -1242,8 +1218,7 @@ 
     $moon_row = uni_create_moon($planet_info[PLANET_GALAXY], $planet_info[PLANET_SYSTEM], $planet_info[PLANET_PLANET], $destination_user_id, $outcome[UBE_MOON_SIZE], '', false);
     $outcome[UBE_MOON_NAME] = $moon_row['name'];
     unset($moon_row);
-  }
-  elseif($outcome[UBE_MOON] == UBE_MOON_DESTROY_SUCCESS)
+  } elseif($outcome[UBE_MOON] == UBE_MOON_DESTROY_SUCCESS)
   {
     DBStaticPlanet::db_planet_delete_by_id($planet_id);
   }

includes/includes/flt_functions.php

Braces +9 added lines, -18 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function flt_fleet_speed($user, $fleet)
-{
+function flt_fleet_speed($user, $fleet) {
   if (!is_array($fleet))
   {
     $fleet = array($fleet => 1);
@@ -29,16 +28,13 @@ 
   if($from['galaxy'] != $to['galaxy'])
   {
     $distance = abs($from['galaxy'] - $to['galaxy']) * $config->uni_galaxy_distance;
-  }
-  elseif($from['system'] != $to['system'])
+  } elseif($from['system'] != $to['system'])
   {
     $distance = abs($from['system'] - $to['system']) * 5 * 19 + 2700;
-  }
-  elseif($from['planet'] != $to['planet'])
+  } elseif($from['planet'] != $to['planet'])
   {
     $distance = abs($from['planet'] - $to['planet']) * 5 + 1000;
-  }
-  else
+  } else
   {
     $distance = 5;
   }
@@ -55,8 +51,7 @@ 
  *
  * @return array
  */
-function flt_travel_data($user_row, $from, $to, $fleet_array, $speed_percent = 10)
-{
+function flt_travel_data($user_row, $from, $to, $fleet_array, $speed_percent = 10) {
   $distance = flt_travel_distance($from, $to);
 
   $consumption = 0;
@@ -120,8 +115,7 @@ 
   );
 }
 
-function flt_bashing_check($user, $enemy, $planet_dst, $mission, $flight_duration, $fleet_group = 0)
-{
+function flt_bashing_check($user, $enemy, $planet_dst, $mission, $flight_duration, $fleet_group = 0) {
   global $config;
 
   $config_bashing_attacks = $config->fleet_bashing_attacks;
@@ -531,8 +525,7 @@ 
       $fleet_ship_count += $amount;
       $fleet_string     .= "{$unit_id},{$amount};";
       $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, -$amount, $user, $from['id']);
-    }
-    elseif(in_array($unit_id, sn_get_groups('resources_loot')))
+    } elseif(in_array($unit_id, sn_get_groups('resources_loot')))
     {
       $planet_fields[pname_resource_name($unit_id)]['delta'] -= $amount;
     }
@@ -624,8 +617,7 @@ 
 //ini_set('error_reporting', E_ALL ^ E_NOTICE);
 }
 
-function flt_calculate_ship_to_transport_sort($a, $b)
-{
+function flt_calculate_ship_to_transport_sort($a, $b) {
   return $a['transport_effectivness'] == $b['transport_effectivness'] ? 0 : ($a['transport_effectivness'] > $b['transport_effectivness'] ? -1 : 1);
 }
 
@@ -634,8 +626,7 @@ 
 // $resource_amount - how much amount of resources need to be transported
 // $from - transport from
 // $to - transport to
-function flt_calculate_fleet_to_transport($ship_list, $resource_amount, $from, $to)
-{
+function flt_calculate_fleet_to_transport($ship_list, $resource_amount, $from, $to) {
   global $user;
 
   $ship_data = array();

jumpgate.php

Braces +1 added lines, -2 removed lines

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

includes/alliance/ali_internal_admin.inc

Braces +3 added lines, -6 removed lines

@@ -74,14 +74,12 @@ 
     doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;");
     sys_redirect('alliance.php?mode=admin&edit=ally');
   }
-}
-elseif(sys_get_param_str('isSaveText'))
+} elseif(sys_get_param_str('isSaveText'))
 {
   $text = sys_get_param_str_both('text');
   doquery("UPDATE {{alliance}} SET `{$text_list[$allyTextID]['db_field']}`='{$text['safe']}' WHERE `id`='{$ally['id']}';");
   $ally[$text_list[$allyTextID]['db_field']] = $text['unsafe'];
-}
-elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
+} elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
 {
   if(!$isAllyOwner)
   {
@@ -98,8 +96,7 @@ 
     sn_db_transaction_commit();
     sys_redirect('alliance.php');
   }
-}
-elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
+} elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
 {
   if(!$isAllyOwner)
   {

includes/alliance/ali_info.inc

Braces +5 added lines, -10 removed lines

@@ -23,16 +23,14 @@ 
     $lang['Go_out_welldone'] = str_replace("%s", $ally_name, $lang['Go_out_welldone']);
     messageBox(sprintf($lang['ali_info_leave_success'], $ally['ally_name']), $lang['sys_alliance']);
   }
-}
-elseif($mode == 'ainfo')
+} elseif($mode == 'ainfo')
 {
   $tag = sys_get_param_str('tag');
   $id_ally = sys_get_param_id('a');
   if($tag)
   {
     $ally = doquery("SELECT * FROM {{alliance}} WHERE ally_tag='{$tag}' LIMIT 1;", '', true);
-  }
-  elseif($id_ally)
+  } elseif($id_ally)
   {
     $ally = doquery("SELECT * FROM {{alliance}} WHERE id='{$id_ally}' LIMIT 1;", '', true);
   }
@@ -52,20 +50,17 @@ 
     'USER_ALLY_ID' => $user['ally_id'],
   ));
   $page_header          = $lang['sys_alliance'];
-}
-else
+} else
 {
   $page_header = $lang['your_alliance'];
 
   if($ally['ally_owner'] == $user['id'])
   {
     $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : $lang['Founder'];
-  }
-  elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
+  } elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
   {
     $range = $ranks[$user['ally_rank_id']]['name'];
-  }
-  else
+  } else
   {
     $range = $lang['member'];
   }

includes/alliance/ali_internal_admin_diplomacy.inc

Braces +7 added lines, -14 removed lines

@@ -66,8 +66,7 @@ 
       ->doInsert();
 
     $accept_offer = false;
-  }
-  else
+  } else
   {
     $accept_offer = true;
     $negotiation = array(
@@ -78,8 +77,7 @@ 
       'alliance_negotiation_relation' => $alliance_negotiation_relation,
     );
   }
-}
-else
+} else
 {
   $offer_id = sys_get_param_id('offer_id');
   if($offer_id)
@@ -90,31 +88,26 @@ 
     if(!$negotiation)
     {
       messageBox($lang['ali_dip_err_offer_none'], $page_title);
-    }
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
+    } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
     {
       // TODO: Add log of hack attempt
       messageBox($lang['ali_dip_err_offer_alien'], $page_title);
-    }
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
+    } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
     {
       if($offer_answer == 'accept')
       {
         // TODO: Add log of hack attempt
         messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
-      }
-      elseif($offer_answer == 'deny')
+      } elseif($offer_answer == 'deny')
       {
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
       }
-    }
-    else
+    } else
     {
       if($offer_answer == 'accept')
       {
         $accept_offer = true;
-      }
-      elseif($offer_answer == 'deny')
+      } elseif($offer_answer == 'deny')
       {
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
       }

admin/statbuilder.php

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
   </script>';
 
   messageBoxAdmin("{$script}<img src=\"design/images/progressbar.gif\"><br>{$lang['sys_wait']}", $lang['adm_stat_title'], '', 0);
-}
-else
+} else
 {
   messageBoxAdmin($lang['adm_stat_already_started'], $lang['adm_stat_title'], 'admin/overview.php');
 }