supernova-ws / SuperNova

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

classes/OldDbChangeSet.php

Braces +12 added lines, -7 removed lines

@@ -23,8 +23,7 @@ 
    * @return array
    * @deprecated
    */
-  public static function db_changeset_prepare_unit($unit_id, $unit_value, $user, $planet_id = null)
-  {
+  public static function db_changeset_prepare_unit($unit_id, $unit_value, $user, $planet_id = null) {
     if(!is_array($user))
     {
       // TODO - remove later
@@ -61,8 +60,7 @@ 
           ),
         ),
       );
-    }
-    else
+    } else
     {
       $db_changeset = array(
         'action' => SQL_OP_INSERT,
@@ -176,14 +174,21 @@ 
    */
   public static function db_changeset_apply($db_changeset) {
     $result = true;
-    if(!is_array($db_changeset) || empty($db_changeset)) return $result;
+    if(!is_array($db_changeset) || empty($db_changeset)) {
+      return $result;
+    }
 
     foreach($db_changeset as $table_name => &$table_data) {
       foreach($table_data as $record_id => &$conditions) {
         OldDbChangeSet::db_changeset_condition_compile($conditions, $table_name);
 
-        if($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) continue;
-        if($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) continue; // Защита от случайного удаления всех данных в таблице
+        if($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) {
+          continue;
+        }
+        if($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) {
+          continue;
+        }
+        // Защита от случайного удаления всех данных в таблице
 
         if($conditions[P_LOCATION] != LOC_NONE) {
           switch($conditions['action'])

includes/pages/chat.php

Braces +7 added lines, -14 removed lines

@@ -4,8 +4,7 @@ 
  *
  */
 
-function sn_chat_model()
-{
+function sn_chat_model() {
   global $config, $user, $template_result, $lang;
 
   $config->array_set('users', $user['id'], 'chat_last_activity', SN_TIME_MICRO);
@@ -44,15 +43,13 @@ 
 
   $template_result['PAGE_HEADER'] = $page_title;
 }
-function sn_chat_view($template = null)
-{
+function sn_chat_view($template = null) {
   $template = gettemplate('chat_body', $template);
 
   return $template;
 }
 
-function sn_chat_add_model()
-{
+function sn_chat_add_model() {
   global $config, $user;
 
   define('IN_AJAX', true);
@@ -76,8 +73,7 @@ 
 
   die();
 }
-function sn_chat_msg_view($template = null)
-{
+function sn_chat_msg_view($template = null) {
   global $config, $user, $lang;
 
   define('IN_AJAX', true);
@@ -99,8 +95,7 @@ 
       'TIME' => date(FMT_DATE_TIME, htmlentities(SN_CLIENT_TIME_LOCAL, ENT_QUOTES, 'utf-8')),
       'DISABLE' => true,
     );
-  }
-  else
+  } else
   {
     $alliance = sys_get_param_str('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
 
@@ -121,8 +116,7 @@ 
       }
 
       $page = min($page_count, max(0, sys_get_param_int('sheet')));
-    }
-    else
+    } else
     {
       $last_message = sys_get_param_id('last_message');
       $where_add = $last_message ? "AND `messageid` > {$last_message}" : '';
@@ -171,8 +165,7 @@ 
   {
     $pageTitle = "{$lang['chat_history']} - {$lang[$alliance ? 'chat_ally' : 'chat_common']}";
     display($template, $pageTitle);
-  }
-  else
+  } else
   {
     $result['last_message'] = $last_message;
     $result['html'] = templateRenderToHtml($template);

classes/phpbb_hook.php

Braces +11 added lines, -22 removed lines

@@ -22,8 +22,7 @@ 
 /**
 * phpBB Hook Class
 */
-class phpbb_hook
-{
+class phpbb_hook {
 	/**
 	* Registered hooks
 	*/
@@ -44,8 +43,7 @@ 
 	*
 	* @param array $valid_hooks array containing the hookable functions/methods
 	*/
-	function phpbb_hook($valid_hooks)
-	{
+	function phpbb_hook($valid_hooks) {
 		foreach ($valid_hooks as $_null => $method)
 		{
 			$this->add_hook($method);
@@ -65,8 +63,7 @@ 
 	* @param mixed $hook The replacement function/method to be called. Passing function name or array with object/class definition
 	* @param string $mode Specify the priority/chain mode. 'normal' -> hook gets appended to the chain. 'standalone' -> only the specified hook gets called - later hooks are not able to overwrite this (E_NOTICE is triggered then). 'first' -> hook is called as the first one within the chain. 'last' -> hook is called as the last one within the chain.
 	*/
-	function register($definition, $hook, $mode = 'normal')
-	{
+	function register($definition, $hook, $mode = 'normal') {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -79,8 +76,7 @@ 
 					if (!isset($this->hooks[$class][$function]['standalone']))
 					{
 						$this->hooks[$class][$function] = array('standalone' => $hook);
-					}
-					else
+					} else
 					{
 						trigger_error('Hook not able to be called standalone, previous hook already standalone.', E_NOTICE);
 					}
@@ -106,8 +102,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return bool False if no hook got executed, true otherwise
 	*/
-	function call_hook($definition)
-	{
+	function call_hook($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -128,8 +123,7 @@ 
 			if (isset($this->hooks[$class][$function]['standalone']))
 			{
 				$this->hook_result[$class][$function] = call_user_func_array($this->hooks[$class][$function]['standalone'], $arguments);
-			}
-			else
+			} else
 			{
 				foreach (array('first', 'normal', 'last') as $mode)
 				{
@@ -159,8 +153,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return mixed False if nothing returned if there is no result, else array('result' => ... )
 	*/
-	function previous_hook_result($definition)
-	{
+	function previous_hook_result($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -178,8 +171,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return bool True if results are there, false if not
 	*/
-	function hook_return($definition)
-	{
+	function hook_return($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -197,8 +189,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return mixed The result
 	*/
-	function hook_return_result($definition)
-	{
+	function hook_return_result($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -217,8 +208,7 @@ 
 	*
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	*/
-	function add_hook($definition)
-	{
+	function add_hook($definition) {
 		if (!is_array($definition))
 		{
 			$definition = array('__global', $definition);
@@ -232,8 +222,7 @@ 
 	*
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	*/
-	function remove_hook($definition)
-	{
+	function remove_hook($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 

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(
@@ -25,8 +24,7 @@ 
  * @param $edit_planet_row
  * @param $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);
@@ -48,15 +46,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 = '';
   }

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) {
     /**
      * @var phpbb_hook $phpbb_hook
      */
@@ -264,8 +254,7 @@ 
     if ($filename = $this->_tpl_load($handle))
     {
       ($include_once) ? include_once($filename) : include($filename);
-    }
-    else
+    } else
     {
       $this->evaluate($this->compiled_code[$handle]);
     }
@@ -277,8 +266,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();
@@ -297,8 +285,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]))
@@ -319,8 +306,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]))
@@ -403,15 +389,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'];
           }
@@ -421,8 +405,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'];
@@ -437,8 +420,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))
@@ -449,8 +431,7 @@ 
             }
           }
         }
-      }
-      else
+      } else
       {
         $file = $this->root . '/' . $row['template_filename'];
 
@@ -477,8 +458,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;
@@ -491,8 +471,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;
@@ -502,8 +481,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.
@@ -538,8 +516,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;
@@ -593,8 +570,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
@@ -639,8 +615,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;
@@ -679,8 +654,7 @@ 
   * Include a separate template
   * @access private
   */
-  function _tpl_include($filename, $include = true)
-  {
+  function _tpl_include($filename, $include = true) {
     // This is used to access global vars
     global $lang, $config, $user;
 
@@ -710,8 +684,7 @@ 
   * Include a php-file
   * @access private
   */
-  function _php_include($filename)
-  {
+  function _php_include($filename) {
     $file = $this->rootPhysical . $filename;
 
     if (!file_exists($file))
@@ -727,8 +700,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['.'];
@@ -738,8 +710,7 @@ 
     if(!$name)
     {
       $this->assign_vars($values);
-    }
-    else
+    } else
     {
       $this->assign_block_vars($name, $values);
     }

resources.php

Braces +1 added lines, -2 removed lines

@@ -30,8 +30,7 @@
  * @param $resource_id
  * @param ResourceCalculations $capsObj
  */
-function int_calc_storage_bar($resource_id, $capsObj)
-{
+function int_calc_storage_bar($resource_id, $capsObj) {
   global $lang, $template, $planetrow, $user;
 
   $totalProduction      = $capsObj->getProduction($resource_id);