supernova-ws / SuperNova

includes/general/formatters.php

Spacing +5 added lines, -5 removed lines

@@ -112,10 +112,10 @@ 
     $rexep = "#" . strtr(preg_quote($format), $masks) . "#";
     if (preg_match($rexep, $date, $out)) {
       $ret = array(
-        "tm_sec"  => (int)$out['S'],
-        "tm_min"  => (int)$out['M'],
-        "tm_hour" => (int)$out['H'],
-        "tm_mday" => (int)$out['d'],
+        "tm_sec"  => (int) $out['S'],
+        "tm_min"  => (int) $out['M'],
+        "tm_hour" => (int) $out['H'],
+        "tm_mday" => (int) $out['d'],
         "tm_mon"  => $out['m'] ? $out['m'] - 1 : 0,
         "tm_year" => $out['Y'] > 1900 ? $out['Y'] - 1900 : 0,
       );
@@ -150,5 +150,5 @@ 
  * @return int
  */
 function datePart($fullDate) {
-  return (int)strtotime(date('Y-m-d', $fullDate));
+  return (int) strtotime(date('Y-m-d', $fullDate));
 }

includes/functions/_news.php

Spacing +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
       'ANNOUNCE'        => classSupernova::$gc->bbCodeParser->expandBbCode($announce['strAnnounce'], intval($announce['authlevel'])),
       'DETAIL_URL'      => $announce['detail_url'],
       'USER_NAME'       =>
-        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) :
-          js_safe_string($announce['user_name']),
+        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) : js_safe_string($announce['user_name']),
       'NEW'             => $announce['unix_time'] + $config->game_news_actual >= SN_TIME_NOW,
       'FUTURE'          => $announce['unix_time'] > SN_TIME_NOW,
       'SURVEY_ID'       => $announce['survey_id'],

includes/pages/options.php

Spacing +46 added lines, -46 removed lines

@@ -11,7 +11,7 @@ 
 
   $language_new = sys_get_param_str('langer', $user['lang']);
 
-  if($language_new != $user['lang']) {
+  if ($language_new != $user['lang']) {
     $lang->lng_switch($language_new);
   }
 
@@ -20,35 +20,35 @@ 
 
   $FMT_DATE = preg_replace(array('/d/', '/m/', '/Y/'), array('DD', 'MM', 'YYYY'), FMT_DATE);
 
-  if(sys_get_param_str('mode') == 'change') {
-    if($user['authlevel'] > 0) {
+  if (sys_get_param_str('mode') == 'change') {
+    if ($user['authlevel'] > 0) {
       $planet_protection = sys_get_param_int('adm_pl_prot') ? $user['authlevel'] : 0;
       DBStaticPlanet::db_planet_set_by_owner($user['id'], "`id_level` = '{$planet_protection}'");
       db_user_set_by_id($user['id'], "`admin_protection` = '{$planet_protection}'");
       $user['admin_protection'] = $planet_protection;
     }
 
-    if(sys_get_param_int('vacation') && !$config->user_vacation_disable) {
+    if (sys_get_param_int('vacation') && !$config->user_vacation_disable) {
       sn_db_transaction_start();
-      if($user['authlevel'] < 3) {
-        if($user['vacation_next'] > SN_TIME_NOW) {
+      if ($user['authlevel'] < 3) {
+        if ($user['vacation_next'] > SN_TIME_NOW) {
           messageBox($lang['opt_vacation_err_timeout'], $lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
-        if(fleet_count_flying($user['id'])) {
+        if (fleet_count_flying($user['id'])) {
           messageBox($lang['opt_vacation_err_your_fleet'], $lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
         $que = que_get($user['id'], false);
-        if(!empty($que)) {
+        if (!empty($que)) {
           messageBox($lang['opt_vacation_err_que'], $lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
         $query = classSupernova::db_get_record_list(LOC_PLANET, "`id_owner` = {$user['id']}");
-        foreach($query as $planet) {
+        foreach ($query as $planet) {
           DBStaticPlanet::db_planet_set_by_id($planet['id'],
             "last_update = " . SN_TIME_NOW . ", energy_used = '0', energy_max = '0',
             metal_perhour = '{$config->metal_basic_income}', crystal_perhour = '{$config->crystal_basic_income}', deuterium_perhour = '{$config->deuterium_basic_income}',
@@ -63,9 +63,9 @@ 
       sn_db_transaction_commit();
     }
 
-    foreach($user_option_list as $option_group_id => $option_group) {
-      foreach($option_group as $option_name => $option_value) {
-        if($user[$option_name] !== null) {
+    foreach ($user_option_list as $option_group_id => $option_group) {
+      foreach ($option_group as $option_name => $option_value) {
+        if ($user[$option_name] !== null) {
           $user[$option_name] = sys_get_param_str($option_name);
         } else {
           $user[$option_name] = $option_value;
@@ -76,12 +76,12 @@ 
 
 
     $player_options = sys_get_param('options');
-    if(!empty($player_options)) {
-      if($player_options[PLAYER_OPTION_TUTORIAL_CURRENT] == classSupernova::$config->tutorial_first_item) {
+    if (!empty($player_options)) {
+      if ($player_options[PLAYER_OPTION_TUTORIAL_CURRENT] == classSupernova::$config->tutorial_first_item) {
         $player_options[PLAYER_OPTION_TUTORIAL_FINISHED] = 0;
       }
 
-      array_walk($player_options, function (&$value) {
+      array_walk($player_options, function(&$value) {
         // TODO - Когда будет больше параметров - сделать больше проверок
         $value = intval($value);
       });
@@ -90,15 +90,15 @@ 
 
     $username = substr(sys_get_param_str_unsafe('username'), 0, 32);
     $username_safe = db_escape($username);
-    if($username && $user['username'] != $username && $config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
+    if ($username && $user['username'] != $username && $config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
       // проверка на корректность
       sn_db_transaction_start();
       $name_check = doquery("SELECT * FROM `{{player_name_history}}` WHERE `player_name` LIKE \"{$username_safe}\" LIMIT 1 FOR UPDATE;", true);
-      if(!$name_check || $name_check['player_id'] == $user['id']) {
+      if (!$name_check || $name_check['player_id'] == $user['id']) {
         $user = db_user_by_id($user['id'], true);
-        switch($config->game_user_changename) {
+        switch ($config->game_user_changename) {
           case SERVER_PLAYER_NAME_CHANGE_PAY:
-            if(mrc_get_level($user, [], RES_DARK_MATTER) < $config->game_user_changename_cost) {
+            if (mrc_get_level($user, [], RES_DARK_MATTER) < $config->game_user_changename_cost) {
               $template_result['.']['result'][] = array(
                 'STATUS'  => ERR_ERROR,
                 'MESSAGE' => $lang['opt_msg_name_change_err_no_dm'],
@@ -128,18 +128,18 @@ 
       sn_db_transaction_commit();
     }
 
-    if($new_password = sys_get_param('newpass1')) {
+    if ($new_password = sys_get_param('newpass1')) {
       try {
-        if($new_password != sys_get_param('newpass2')) {
+        if ($new_password != sys_get_param('newpass2')) {
           throw new Exception($lang['opt_err_pass_unmatched'], ERR_WARNING);
         }
 
-        if(!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
+        if (!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
           throw new Exception($lang['opt_err_pass_wrong'], ERR_WARNING);
         }
 
         throw new Exception($lang['opt_msg_pass_changed'], ERR_NONE);
-      } catch(Exception $e) {
+      } catch (Exception $e) {
         $template_result['.']['result'][] = array(
           'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
           'MESSAGE' => $e->getMessage()
@@ -160,12 +160,12 @@ 
     $user['gender'] = $user['gender'] == GENDER_UNKNOWN ? $gender : $user['gender'];
 
     try {
-      if($user['birthday']) {
+      if ($user['birthday']) {
         throw new exception();
       }
 
       $user_birthday = sys_get_param_str_unsafe('user_birthday');
-      if(!$user_birthday || $user_birthday == $FMT_DATE) {
+      if (!$user_birthday || $user_birthday == $FMT_DATE) {
         throw new exception();
       }
 
@@ -175,16 +175,16 @@ 
       $pos['Y'] = strpos(FMT_DATE, 'Y');
       asort($pos);
       $i = 0;
-      foreach($pos as &$position) {
+      foreach ($pos as &$position) {
         $position = ++$i;
       }
 
       $regexp = "/" . preg_replace(array('/\\\\/', '/\//', '/\./', '/\-/', '/d/', '/m/', '/Y/'), array('\\\\\\', '\/', '\.', '\-', '(\d?\d)', '(\d?\d)', '(\d{4})'), FMT_DATE) . "/";
-      if(!preg_match($regexp, $user_birthday, $match)) {
+      if (!preg_match($regexp, $user_birthday, $match)) {
         throw new exception();
       }
 
-      if(!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
+      if (!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
         throw new exception();
       }
 
@@ -192,13 +192,13 @@ 
       // EOF black magic! Now we have valid SQL date in $user['user_birthday'] - independent of date format
 
       $year = date('Y', SN_TIME_NOW);
-      if(mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
+      if (mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
         $year--;
       }
       $user['user_birthday_celebrated'] = db_escape("{$year}-{$match[$pos['m']]}-{$match[$pos['d']]}");
 
       $user_birthday = ", `user_birthday` = '{$user['user_birthday']}', `user_birthday_celebrated` = '{$user['user_birthday_celebrated']}'";
-    } catch(exception $e) {
+    } catch (exception $e) {
       $user_birthday = '';
     }
 
@@ -208,14 +208,14 @@ 
     $template_result['.']['result'][] = $avatar_upload_result;
 
     $user_time_diff = playerTimeDiff::user_time_diff_get();
-    if(sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
+    if (sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
       playerTimeDiff::user_time_diff_set(array(
         PLAYER_OPTION_TIME_DIFF              => sys_get_param_int('PLAYER_OPTION_TIME_DIFF'),
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
         PLAYER_OPTION_TIME_DIFF_FORCED       => 1,
         PLAYER_OPTION_TIME_DIFF_MEASURE_TIME => SN_TIME_SQL,
       ));
-    } elseif(sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
+    } elseif (sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
       playerTimeDiff::user_time_diff_set(array(
         PLAYER_OPTION_TIME_DIFF              => '',
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
@@ -235,7 +235,7 @@ 
       'STATUS'  => ERR_NONE,
       'MESSAGE' => $lang['opt_msg_saved']
     );
-  } elseif(sys_get_param_str('result') == 'ok') {
+  } elseif (sys_get_param_str('result') == 'ok') {
     $template_result['.']['result'][] = array(
       'STATUS'  => ERR_NONE,
       'MESSAGE' => $lang['opt_msg_saved']
@@ -258,8 +258,8 @@ 
   $template = gettemplate('options', $template);
 
   $dir = dir(SN_ROOT_PHYSICAL . 'skins');
-  while(($entry = $dir->read()) !== false) {
-    if(is_dir("skins/{$entry}") && $entry[0] != '.') {
+  while (($entry = $dir->read()) !== false) {
+    if (is_dir("skins/{$entry}") && $entry[0] != '.') {
       $template_result['.']['skin_list'][] = array(
         'VALUE'    => $entry,
         'NAME'     => $entry,
@@ -269,7 +269,7 @@ 
   }
   $dir->close();
 
-  foreach($lang['opt_planet_sort_options'] as $key => &$value) {
+  foreach ($lang['opt_planet_sort_options'] as $key => &$value) {
     $template_result['.']['planet_sort_options'][] = array(
       'VALUE'    => $key,
       'NAME'     => $value,
@@ -277,7 +277,7 @@ 
     );
   }
 
-  foreach($lang['sys_gender_list'] as $key => $value) {
+  foreach ($lang['sys_gender_list'] as $key => $value) {
     $template_result['.']['gender_list'][] = array(
       'VALUE'    => $key,
       'NAME'     => $value,
@@ -286,7 +286,7 @@ 
   }
 
   $lang_list = lng_get_list();
-  foreach($lang_list as $lang_id => $lang_data) {
+  foreach ($lang_list as $lang_id => $lang_data) {
     $template_result['.']['languages'][] = array(
       'VALUE'    => $lang_id,
       'NAME'     => $lang_data['LANG_NAME_NATIVE'],
@@ -295,8 +295,8 @@ 
   }
 
 
-  if(isset($lang['menu_customize_show_hide_button_state'])) {
-    foreach($lang['menu_customize_show_hide_button_state'] as $key => $value) {
+  if (isset($lang['menu_customize_show_hide_button_state'])) {
+    foreach ($lang['menu_customize_show_hide_button_state'] as $key => $value) {
       $template->assign_block_vars('menu_customize_show_hide_button_state', array(
         'ID'   => $key,
         'NAME' => $value,
@@ -407,10 +407,10 @@ 
     'PAGE_HEADER' => $lang['opt_header'],
   ));
 
-  foreach($user_option_list as $option_group_id => $option_group) {
-    if($option_group_id == OPT_MESSAGE) {
-      foreach($sn_message_class_list as $message_class_id => $message_class_data) {
-        if($message_class_data['switchable'] || ($message_class_data['email'] && $config->game_email_pm)) {
+  foreach ($user_option_list as $option_group_id => $option_group) {
+    if ($option_group_id == OPT_MESSAGE) {
+      foreach ($sn_message_class_list as $message_class_id => $message_class_data) {
+        if ($message_class_data['switchable'] || ($message_class_data['email'] && $config->game_email_pm)) {
           $option_name = $message_class_data['name'];
 
           $template->assign_block_vars("options_{$option_group_id}", array(
@@ -422,8 +422,8 @@ 
         }
       }
     } else {
-      foreach($option_group as $option_name => $option_value) {
-        if(array_key_exists($option_name, $user_option_types)) {
+      foreach ($option_group as $option_name => $option_value) {
+        if (array_key_exists($option_name, $user_option_types)) {
           $option_type = $user_option_types[$option_name];
         } else {
           $option_type = 'switch';

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)

metamatter.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
 }
 
 $payment_methods_available = array_combine(array_keys(sn_module_payment::$payment_methods), array_fill(0, count(sn_module_payment::$payment_methods), null));
-array_walk($payment_methods_available, function (&$value, $index) {
+array_walk($payment_methods_available, function(&$value, $index) {
   $value = !empty(sn_module_payment::$payment_methods[$index]) ? array_combine(array_keys(sn_module_payment::$payment_methods[$index]), array_fill(0, count(sn_module_payment::$payment_methods[$index]), null)) : $value;
 });
 
@@ -300,7 +300,7 @@ 
   'PLAYER_CURRENCY'              => $player_currency,
   'PLAYER_CURRENCY_PRICE_PER_MM' => sn_module_payment::currency_convert(1, $player_currency, 'MM_', 10),
 
-  'UNIT_AMOUNT'                 => (float)$request['metamatter'],
+  'UNIT_AMOUNT'                 => (float) $request['metamatter'],
   'UNIT_AMOUNT_TEXT'            => HelperString::numberFloorAndFormat($request['metamatter']),
   'UNIT_AMOUNT_BONUS_PERCENT'   => $bonus_percent,
   'UNIT_AMOUNT_TEXT_DISCOUNTED' => $income_metamatter_text,

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);
       }
+      }
     }
   }