supernova-ws / SuperNova

includes/includes/sys_avatar.php

Braces +3 added lines, -6 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function sys_avatar_upload($subject_id, &$avatar_field, $prefix = 'avatar')
-{
+function sys_avatar_upload($subject_id, &$avatar_field, $prefix = 'avatar') {
   global $config, $lang, $user;
 
   try
@@ -17,8 +16,7 @@ 
       }
       $avatar_field = 0;
       throw new Exception($lang['opt_msg_avatar_removed'], ERR_NONE);
-    }
-    elseif($_FILES['avatar']['size'])
+    } elseif($_FILES['avatar']['size'])
     {
       if(!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800)
       {
@@ -61,8 +59,7 @@ 
       imagedestroy($avatar_image);
       throw new Exception($lang['opt_msg_avatar_uploaded'], ERR_NONE);
     }
-  }
-  catch (Exception $e)
+  } catch (Exception $e)
   {
     return array(
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,

includes/includes/flt_mission_colonize.php

Braces +1 added lines, -2 removed lines

@@ -10,8 +10,7 @@
 // ----------------------------------------------------------------------------------------------------------------
 // Mission Case 9: -> Coloniser
 //
-function flt_mission_colonize(&$mission_data)
-{
+function flt_mission_colonize(&$mission_data) {
   $fleet_row          = &$mission_data['fleet'];
   $src_user_row       = &$mission_data['src_user'];
 

admin/includes/admin_planet_edit.inc.php

Braces +4 added lines, -8 removed lines

@@ -1,8 +1,7 @@ 
 <?php
 
 function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list));}
-function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
-{
+function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {
   global $lang;
 
   $admin_planet_edit_mode_list = array_merge(isset($admin_planet_edit_mode_list) ? $admin_planet_edit_mode_list : array(), array(
@@ -20,8 +19,7 @@ 
 }
 
 function admin_planet_edit_template(&$template, $edit_planet_row, $mode){return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode));}
-function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode)
-{
+function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode) {
   global $lang;
 
   $unit_list = sn_get_groups($mode);
@@ -43,15 +41,13 @@ 
 }
 
 function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode));}
-function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode)
-{
+function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {
   if($unit_amount && in_array($unit_id, sn_get_groups($mode)))
   {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);
     $result = "{$unit_name} = GREATEST(0, {$unit_name} + ({$unit_amount}))";
-  }
-  else
+  } else
   {
     $result = '';
   }

simulator.php

Braces +2 added lines, -4 removed lines

@@ -21,8 +21,7 @@ 
 
   $sym_defender = $unpacked['D'];
   $sym_attacker = $unpacked['A'];
-}
-else
+} else
 {
   $sym_defender = array(0 => $sym_defender);
   $sym_attacker = array(1 => $sym_attacker);
@@ -62,8 +61,7 @@ 
   ));
 
   display($template);
-}
-else
+} else
 {
   $template = gettemplate('simulator', true);
   $techs_and_officers = array(TECH_WEAPON, TECH_SHIELD, TECH_ARMOR, MRC_ADMIRAL);

classes/classSupernova.php

Braces +78 added lines, -50 removed lines

@@ -188,14 +188,18 @@ 
   // Перепаковывает массив на заданную глубину, убирая поля с null
   public static function array_repack(&$array, $level = 0) {
     // TODO $lock_table не нужна тут
-    if(!is_array($array)) return;
+    if(!is_array($array)) {
+      return;
+    }
 
     foreach($array as $key => &$value) {
       if($value === null) {
         unset($array[$key]);
       } elseif($level > 0 && is_array($value)) {
         static::array_repack($value, $level - 1);
-        if(empty($value)) unset($array[$key]);
+        if(empty($value)) {
+          unset($array[$key]);
+        }
       }
     }
   }
@@ -204,7 +208,9 @@ 
   // TODO Вынести в отдельный объект
   public static function cache_repack($location_type, $record_id = 0) {
     // Если есть $user_id - проверяем, а надо ли перепаковывать?
-    if($record_id && isset(static::$data[$location_type][$record_id]) && static::$data[$location_type][$record_id] !== null) return;
+    if($record_id && isset(static::$data[$location_type][$record_id]) && static::$data[$location_type][$record_id] !== null) {
+      return;
+    }
 
     static::array_repack(static::$data[$location_type]);
     static::array_repack(static::$locator[$location_type], 3); // TODO У каждого типа локации - своя глубина!!!! Но можно и глубже ???
@@ -249,7 +255,9 @@ 
   */
   public static function cache_set($location_type, $record_id, $record, $force_overwrite = false, $skip_lock = false) {
     // нет идентификатора - выход
-    if(!($record_id = $record[static::$location_info[$location_type][P_ID]])) return;
+    if(!($record_id = $record[static::$location_info[$location_type][P_ID]])) {
+      return;
+    }
 
     $in_transaction = static::db_transaction_check(false);
     if(
@@ -283,8 +291,9 @@ 
     return static::$locks[$location_type][$record_id] = true; // Не всегда - от результата
   }
   public static function cache_lock_unset($location_type, $record_id) {
-    if(isset(static::$locks[$location_type][$record_id]))
-      unset(static::$locks[$location_type][$record_id]);
+    if(isset(static::$locks[$location_type][$record_id])) {
+          unset(static::$locks[$location_type][$record_id]);
+    }
     return true; // Не всегда - от результата
   }
   public static function cache_lock_unset_all() {
@@ -454,8 +463,9 @@ 
 
           while($row = db_fetch($query)) {
             // Исключаем из списка родительских ИД уже заблокированные записи
-            if(!static::cache_lock_get($owner_location_type, $row['parent_id']))
-              $parent_id_list[$row['parent_id']] = $row['parent_id'];
+            if(!static::cache_lock_get($owner_location_type, $row['parent_id'])) {
+                          $parent_id_list[$row['parent_id']] = $row['parent_id'];
+            }
           }
 
           // Если все-таки какие-то записи еще не заблокированы - вынимаем текущие версии из базы
@@ -483,7 +493,9 @@ 
       if(is_array($query_cache)) {
         foreach($query_cache as $key => $value) {
           $result[$key] = $value;
-          if($fetch) break;
+          if($fetch) {
+            break;
+          }
         }
       }
       return $fetch ? (is_array($result) ? reset($result) : false) : $result;
@@ -491,12 +503,15 @@ 
   }
 
   public static function db_upd_record_by_id($location_type, $record_id, $set) {
-    if(!($record_id = idval($record_id)) || !($set = trim($set))) return false;
+    if(!($record_id = idval($record_id)) || !($set = trim($set))) {
+      return false;
+    }
 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) {
+      // TODO Как-то вернуть может быть LIMIT 1 ?
     {
       if(static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
@@ -504,6 +519,7 @@ 
 
         // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее
         static::$data[$location_type][$record_id] = null;
+    }
         // Вытаскиваем обновленную запись
         static::db_get_record_by_id($location_type, $record_id);
         static::cache_clear($location_type, false); // Мягкий сброс - только $queries
@@ -513,7 +529,9 @@ 
     return $result;
   }
   public static function db_upd_record_list($location_type, $condition, $set) {
-    if(!($set = trim($set))) return false;
+    if(!($set = trim($set))) {
+      return false;
+    }
 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
@@ -534,9 +552,11 @@ 
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if($result = static::db_query_insert("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -548,37 +568,43 @@ 
     return $result;
   }
 
-  public static function db_del_record_by_id($location_type, $safe_record_id)
-  {
-    if(!($safe_record_id = idval($safe_record_id))) return false;
+  public static function db_del_record_by_id($location_type, $safe_record_id) {
+    if(!($safe_record_id = idval($safe_record_id))) {
+      return false;
+    }
 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
     if($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}"))
     {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         static::cache_unset($location_type, $safe_record_id);
       }
+      }
     }
 
     return $result;
   }
-  public static function db_del_record_list($location_type, $condition)
-  {
-    if(!($condition = trim($condition))) return false;
+  public static function db_del_record_list($location_type, $condition) {
+    if(!($condition = trim($condition))) {
+      return false;
+    }
 
     $location_info = &static::$location_info[$location_type];
     $table_name = $location_info[P_TABLE_NAME];
 
     if($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE {$condition}"))
     {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         static::cache_clear($location_type);
       }
+      }
     }
 
     return $result;
@@ -604,8 +630,7 @@ 
    *    <p>false - Нет записи с указанным ID и $player</p>
    *    <p>array - запись типа $user</p>
    */
-  public static function db_get_user_by_id($user_id_unsafe, $for_update = false, $fields = '*', $player = null)
-  {
+  public static function db_get_user_by_id($user_id_unsafe, $for_update = false, $fields = '*', $player = null) {
     $user = static::db_get_record_by_id(LOC_USER, $user_id_unsafe, $for_update, $fields);
 
     return (is_array($user) &&
@@ -617,14 +642,15 @@ 
       ($player === false && $user['user_as_ally'])
     )) ? $user : false;
   }
-  public static function db_get_user_by_username($username_unsafe, $for_update = false, $fields = '*', $player = null, $like = false)
-  {
+  public static function db_get_user_by_username($username_unsafe, $for_update = false, $fields = '*', $player = null, $like = false) {
     // TODO Проверить, кстати - а везде ли нужно выбирать юзеров или где-то все-таки ищутся Альянсы ?
-    if(!($username_unsafe = trim($username_unsafe))) return false;
+    if(!($username_unsafe = trim($username_unsafe))) {
+      return false;
+    }
 
     $user = null;
-    if(is_array(static::$data[LOC_USER]))
-    foreach(static::$data[LOC_USER] as $user_id => $user_data)
+    if(is_array(static::$data[LOC_USER])) {
+        foreach(static::$data[LOC_USER] as $user_id => $user_data)
     {
       if(is_array($user_data) && isset($user_data['username']))
       {
@@ -634,6 +660,7 @@ 
         {
           // $user_as_ally = intval($user_data['user_as_ally']);
           $user_as_ally = idval($user_data['user_as_ally']);
+    }
           if($player === null || ($player === true && !$user_as_ally) || ($player === false && $user_as_ally))
           {
             $user = $user_data;
@@ -659,7 +686,9 @@ 
   }
   // UNUSED
   public static function db_get_user_by_email($email_unsafe, $use_both = false, $for_update = false, $fields = '*') {
-    if(!($email_unsafe = strtolower(trim($email_unsafe)))) return false;
+    if(!($email_unsafe = strtolower(trim($email_unsafe)))) {
+      return false;
+    }
 
     $user = null;
     if(is_array(static::$data[LOC_USER])) {
@@ -718,15 +747,13 @@ 
 
 
 
-  public static function db_unit_time_restrictions($date = SN_TIME_NOW)
-  {
+  public static function db_unit_time_restrictions($date = SN_TIME_NOW) {
     $date = is_numeric($date) ? "FROM_UNIXTIME({$date})" : "'{$date}'";
     return
       "(unit_time_start IS NULL OR unit_time_start <= {$date}) AND
     (unit_time_finish IS NULL OR unit_time_finish = '1970-01-01 03:00:00' OR unit_time_finish >= {$date})";
   }
-  public static function db_get_unit_by_id($unit_id, $for_update = false, $fields = '*')
-  {
+  public static function db_get_unit_by_id($unit_id, $for_update = false, $fields = '*') {
     // TODO запихивать в $data[LOC_LOCATION][$location_type][$location_id]
     $unit = static::db_get_record_by_id(LOC_UNIT, $unit_id, $for_update, $fields);
     if(is_array($unit))
@@ -737,9 +764,10 @@ 
     return $unit;
   }
 
-  public static function db_get_unit_list_by_location($user_id = 0, $location_type, $location_id)
-  {
-    if(!($location_type = idval($location_type)) || !($location_id = idval($location_id))) return false;
+  public static function db_get_unit_list_by_location($user_id = 0, $location_type, $location_id) {
+    if(!($location_type = idval($location_type)) || !($location_id = idval($location_id))) {
+      return false;
+    }
 
     $query_cache = &static::$locator[LOC_UNIT][$location_type][$location_id];
     if(!isset($query_cache))
@@ -764,8 +792,7 @@ 
 
     return $result;
   }
-  public static function db_get_unit_by_location($user_id = 0, $location_type, $location_id, $unit_snid = 0, $for_update = false, $fields = '*')
-  {
+  public static function db_get_unit_by_location($user_id = 0, $location_type, $location_id, $unit_snid = 0, $for_update = false, $fields = '*') {
     static::db_get_unit_list_by_location($user_id, $location_type, $location_id);
 
     return $unit_snid ? static::$locator[LOC_UNIT][$location_type][$location_id][$unit_snid] : static::$locator[LOC_UNIT][$location_type][$location_id];
@@ -793,8 +820,7 @@ 
    * TODO Переформатировать вывод данных, что бы можно было возвращать данные по всем планетам и юзерам в одном запросе: добавить подмассивы 'que', 'planets', 'players'
    *
    */
-  public static function db_que_list_by_type_location($user_id, $planet_id = null, $que_type = false, $for_update = false)
-  {
+  public static function db_que_list_by_type_location($user_id, $planet_id = null, $que_type = false, $for_update = false) {
     if(!$user_id)
     {
       pdump(debug_backtrace());
@@ -805,15 +831,18 @@ 
 
     $query = array();
 
-    if($user_id = idval($user_id))
-      $query[] = "`que_player_id` = {$user_id}";
+    if($user_id = idval($user_id)) {
+          $query[] = "`que_player_id` = {$user_id}";
+    }
 
-    if($que_type == QUE_RESEARCH || $planet_id === null)
-      $query[] = "`que_planet_id` IS NULL";
-    elseif($planet_id)
-      $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
-    if($que_type)
-      $query[] = "`que_type` = {$que_type}";
+    if($que_type == QUE_RESEARCH || $planet_id === null) {
+          $query[] = "`que_planet_id` IS NULL";
+    } elseif($planet_id) {
+          $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
+    }
+    if($que_type) {
+          $query[] = "`que_type` = {$que_type}";
+    }
 
     $ques['items'] = static::db_get_record_list(LOC_QUE, implode(' AND ', $query));
 
@@ -861,8 +890,7 @@ 
 
 
 
-  public static function db_changeset_revert()
-  {
+  public static function db_changeset_revert() {
     // TODO Для этапа 1 - достаточно чистить только те таблицы, что были затронуты
     // Для этапа 2 - чистить только записи
     // Для этапа 3 - возвращать всё

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)

classes/template.php

Braces +29 added lines, -58 removed lines

@@ -22,8 +22,7 @@ 
 * Base Template class.
 * @package phpBB3
 */
-class template
-{
+class template {
   /** variable that holds all the data we'll be substituting into
   * the compiled templates. Takes form:
   * --> $this->_tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value
@@ -82,8 +81,7 @@ 
   * Set template location
   * @access public
   */
-  function set_template()
-  {
+  function set_template() {
     global $user;
 
     if (file_exists($this->rootPhysical. 'styles/' . $user->theme['template_path'] . '/template'))
@@ -108,8 +106,7 @@ 
       {
         $this->inherit_root = $this->rootPhysical . 'styles/' . $user->theme['template_inherit_path'] . '/template';
       }
-    }
-    else
+    } else
     {
       trigger_error('Template path could not be found: styles/' . $user->theme['template_path'] . '/template', E_USER_ERROR);
     }
@@ -123,8 +120,7 @@ 
   * Set custom template location (able to use directory outside of phpBB)
   * @access public
   */
-  function set_custom_template($template_path, $template_name, $fallback_template_path = false)
-  {
+  function set_custom_template($template_path, $template_name, $fallback_template_path = false) {
     global $user;
 
     // Make sure $template_path has no ending slash
@@ -145,8 +141,7 @@ 
 
       $this->inherit_root = $fallback_template_path;
       $this->orig_tpl_inherits_id = true;
-    }
-    else
+    } else
     {
       $this->orig_tpl_inherits_id = false;
     }
@@ -165,8 +160,7 @@ 
   * should be a hash of handle => filename pairs.
   * @access public
   */
-  function set_filenames($filename_array)
-  {
+  function set_filenames($filename_array) {
     if (!is_array($filename_array))
     {
       return false;
@@ -194,8 +188,7 @@ 
   * Destroy template data set
   * @access public
   */
-  function destroy()
-  {
+  function destroy() {
     $this->_tpldata = array('.' => array(0 => array()));
     $this->_rootref = &$this->_tpldata['.'][0];
   }
@@ -204,8 +197,7 @@ 
   * Reset/empty complete block
   * @access public
   */
-  function destroy_block_vars($blockname)
-  {
+  function destroy_block_vars($blockname) {
     if (strpos($blockname, '.') !== false)
     {
       // Nested block.
@@ -220,8 +212,7 @@ 
       }
 
       unset($str[$blocks[$blockcount]]);
-    }
-    else
+    } else
     {
       // Top-level block.
       unset($this->_tpldata[$blockname]);
@@ -234,8 +225,7 @@ 
   * Display handle
   * @access public
   */
-  function display($handle, $include_once = true)
-  {
+  function display($handle, $include_once = true) {
     global $phpbb_hook,
           // This is used for accessing from compiled templates via include
            $user, $lang, $config;
@@ -260,8 +250,7 @@ 
     if ($filename = $this->_tpl_load($handle))
     {
       ($include_once) ? include_once($filename) : include($filename);
-    }
-    else
+    } else
     {
       eval(' ?>' . $this->compiled_code[$handle] . '<?php ');
     }
@@ -273,8 +262,7 @@ 
   * Display the handle and assign the output to a template variable or return the compiled result.
   * @access public
   */
-  function assign_display($handle, $template_var = '', $return_content = true, $include_once = false)
-  {
+  function assign_display($handle, $template_var = '', $return_content = true, $include_once = false) {
     ob_start();
     $this->display($handle, $include_once);
     $contents = ob_get_clean();
@@ -293,8 +281,7 @@ 
   * Load a compiled template if possible, if not, recompile it
   * @access private
   */
-  function _tpl_load(&$handle)
-  {
+  function _tpl_load(&$handle) {
     global $user, $config;
 
     if (!isset($this->filename[$handle]))
@@ -315,8 +302,7 @@ 
     if (!file_exists($filename) || @filesize($filename) === 0)
     {
       $recompile = true;
-    }
-    else if ($config->load_tplcompile)
+    } else if ($config->load_tplcompile)
     {
       // No way around it: we need to check inheritance here
       if ($user->theme['template_inherits_id'] && !file_exists($this->files[$handle]))
@@ -399,15 +385,13 @@ 
               $this->files[$row['template_filename']] = $file;
               $this->files_inherit[$row['template_filename']] = $file;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
-            }
-            else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
+            } else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
             {
               // Ok, we have a situation. There is a file in the subtemplate, but nothing in the DB. We have to fix that.
               $force_reload = true;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
             }
-          }
-          else
+          } else
           {
             $this->files_template[$row['template_filename']] = $user->theme['template_id'];
           }
@@ -417,8 +401,7 @@ 
             if ($row['template_filename'] == $this->filename[$handle])
             {
               $compile->_tpl_load_file($handle, true);
-            }
-            else
+            } else
             {
               $this->files[$row['template_filename']] = $file;
               $this->filename[$row['template_filename']] = $row['template_filename'];
@@ -433,8 +416,7 @@ 
           {
             $this->compiled_code[$handle] = $compile->compile(trim($row['template_data']));
             $compile->compile_write($handle, $this->compiled_code[$handle]);
-          }
-          else
+          } else
           {
             // Only bother compiling if it doesn't already exist
             if (!file_exists($this->cachepath . str_replace('/', '.', $row['template_filename']) . DOT_PHP_EX))
@@ -445,8 +427,7 @@ 
             }
           }
         }
-      }
-      else
+      } else
       {
         $file = $this->root . '/' . $row['template_filename'];
 
@@ -473,8 +454,7 @@ 
   * Assign key variable pairs from an array
   * @access public
   */
-  function assign_vars($vararray)
-  {
+  function assign_vars($vararray) {
     foreach ($vararray as $key => $val)
     {
       $this->_rootref[$key] = $val;
@@ -487,8 +467,7 @@ 
   * Assign a single variable to a single key
   * @access public
   */
-  function assign_var($varname, $varval)
-  {
+  function assign_var($varname, $varval) {
     $this->_rootref[$varname] = $varval;
 
     return true;
@@ -498,8 +477,7 @@ 
   * Assign key variable pairs from an array to a specified block
   * @access public
   */
-  function assign_block_vars($blockname, $vararray)
-  {
+  function assign_block_vars($blockname, $vararray) {
     if (strpos($blockname, '.') !== false)
     {
       // Nested block.
@@ -534,8 +512,7 @@ 
       // We're adding a new iteration to this block with the given
       // variable assignments.
       $str[$blocks[$blockcount]][] = $vararray;
-    }
-    else
+    } else
     {
       // Top-level block.
       $s_row_count = (isset($this->_tpldata[$blockname])) ? sizeof($this->_tpldata[$blockname]) : 0;
@@ -589,8 +566,7 @@ 
   * @return bool false on error, true on success
   * @access public
   */
-  function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert')
-  {
+  function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert') {
     if (strpos($blockname, '.') !== false)
     {
       // Nested blocks are not supported
@@ -635,8 +611,7 @@ 
         $key = sizeof($this->_tpldata[$blockname]);
         unset($this->_tpldata[$blockname][($key - 1)]['S_LAST_ROW']);
         $vararray['S_LAST_ROW'] = true;
-      }
-      else if ($key === 0)
+      } else if ($key === 0)
       {
         unset($this->_tpldata[$blockname][0]['S_FIRST_ROW']);
         $vararray['S_FIRST_ROW'] = true;
@@ -675,8 +650,7 @@ 
   * Include a separate template
   * @access private
   */
-  function _tpl_include($filename, $include = true)
-  {
+  function _tpl_include($filename, $include = true) {
     global $lang, $config;
 
     $handle = $filename;
@@ -706,8 +680,7 @@ 
   * Include a php-file
   * @access private
   */
-  function _php_include($filename)
-  {
+  function _php_include($filename) {
     $file = $this->rootPhysical . $filename;
 
     if (!file_exists($file))
@@ -723,8 +696,7 @@ 
   * Assign key variable pairs from an array with block support
   * @access public
   */
-  function assign_recursive($values, $name = '')
-  {
+  function assign_recursive($values, $name = '') {
     if(isset($values['.']))
     {
       $values_extra = $values['.'];
@@ -734,8 +706,7 @@ 
     if(!$name)
     {
       $this->assign_vars($values);
-    }
-    else
+    } else
     {
       $this->assign_block_vars($name, $values);
     }

admin/planet_compensate.php

Braces +2 added lines, -4 removed lines

@@ -74,8 +74,7 @@ 
         'TEXT' => $error,
       ));
     }
-  }
-  else
+  } else
   {
     $template->assign_var('CHECK', 1);
 
@@ -132,8 +131,7 @@ 
 
 display($template, $lang['adm_pl_comp_title']);
 
-function killer_add_planet($planet)
-{
+function killer_add_planet($planet) {
   global $final_cost;
 
   $final_cost = array();

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();