supernova-ws / SuperNova

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

includes/db/db_queries.php

Braces +12 added lines, -24 removed lines

@@ -7,8 +7,7 @@ 
 require_once('db_queries_fleet.php');
 
 
-function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type)
-{
+function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
   return doquery(
     "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
     " FROM {{planets}} AS p
@@ -17,8 +16,7 @@ 
     " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
 }
 
-function db_planet_list_search($searchtext)
-{
+function db_planet_list_search($searchtext) {
   return doquery(
     "SELECT
       p.galaxy, p.system, p.planet, p.planet_type, p.name as planet_name,
@@ -38,8 +36,7 @@ 
 
 
 
-function db_user_list_search($searchtext)
-{
+function db_user_list_search($searchtext) {
   return doquery(
     "SELECT
       pn.player_name, u.id as uid, u.username, u.ally_id, u.id_planet, u.total_points, u.total_rank,
@@ -57,8 +54,7 @@ 
   );
 }
 
-function db_buddy_list_by_user($user_id)
-{
+function db_buddy_list_by_user($user_id) {
 //  return ($user_id = intval($user_id)) ? doquery(
   return ($user_id = idval($user_id)) ? doquery(
     "SELECT
@@ -84,8 +80,7 @@ 
 
 
 
-function db_message_list_outbox_by_user_id($user_id)
-{
+function db_message_list_outbox_by_user_id($user_id) {
   // return ($user_id = intval($user_id))
   return ($user_id = idval($user_id))
     ? doquery("SELECT {{messages}}.message_id, {{messages}}.message_owner, {{users}}.id AS message_sender, {{messages}}.message_time,
@@ -101,8 +96,7 @@ 
 
 
 
-function db_unit_records_sum($unit_id, $user_skip_list_unit)
-{
+function db_unit_records_sum($unit_id, $user_skip_list_unit) {
   return doquery (
     "SELECT unit_player_id, username, sum(unit_level) as unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -113,8 +107,7 @@ 
     , true);
 }
 
-function db_unit_records_plain($unit_id, $user_skip_list_unit)
-{
+function db_unit_records_plain($unit_id, $user_skip_list_unit) {
   return doquery (
     "SELECT unit_player_id, username, unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -198,15 +191,13 @@ 
 }
 
 
-function db_stat_list_delete_ally_player()
-{
+function db_stat_list_delete_ally_player() {
   return doquery('DELETE s FROM {{statpoints}} AS s JOIN {{users}} AS u ON u.id = s.id_owner WHERE s.id_ally IS NULL AND u.user_as_ally IS NOT NULL');
 }
 
 
 
-function db_chat_player_list_online($chat_refresh_rate, $ally_add)
-{
+function db_chat_player_list_online($chat_refresh_rate, $ally_add) {
   $sql_date = SN_TIME_NOW - $chat_refresh_rate * 2;
 
   return doquery(
@@ -220,13 +211,11 @@ 
     ORDER BY authlevel DESC, `username`");
 }
 
-function db_referrals_list_by_id($user_id)
-{
+function db_referrals_list_by_id($user_id) {
   return doquery("SELECT r.*, u.username, u.register_time FROM {{referrals}} AS r LEFT JOIN {{users}} AS u ON u.id = r.id WHERE id_partner = {$user_id}");
 }
 
-function db_message_list_admin_by_type($int_type_selected, $StartRec)
-{
+function db_message_list_admin_by_type($int_type_selected, $StartRec) {
   return doquery("SELECT
   message_id as `ID`,
   message_from as `FROM`,
@@ -245,8 +234,7 @@ 
 }
 
 
-function db_message_insert_all($message_type, $from, $subject, $text)
-{
+function db_message_insert_all($message_type, $from, $subject, $text) {
   return doquery($QryInsertMessage = 'INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
     "SELECT `id`, 0, unix_timestamp(now()), {$message_type}, '{$from}', '{$subject}', '{$text}' FROM {{users}}");
 }

includes/functions/tpl_helpers.php

Braces +9 added lines, -18 removed lines

@@ -1,8 +1,7 @@ 
 <?php
 
 // Compare function to sort fleet in time order
-function tpl_assign_fleet_compare($a, $b)
-{
+function tpl_assign_fleet_compare($a, $b) {
   if($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET'])
   {
     if($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT'])
@@ -10,15 +9,13 @@ 
       return 0;
     }
     return ($a['fleet']['OV_LEFT'] < $b['fleet']['OV_LEFT']) ? -1 : 1;
-  }
-  else
+  } else
   {
     return $a['fleet']['OV_THIS_PLANET'] ? -1 : 1;
   }
 }
 
-function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets')
-{
+function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets') {
   if(!$fleets)
   {
     return;
@@ -41,8 +38,7 @@ 
 }
 
 // function that parses internal fleet representation (as array(id => count))
-function tpl_parse_fleet_sn($fleet, $fleet_id)
-{
+function tpl_parse_fleet_sn($fleet, $fleet_id) {
   global $lang, $user;
 
   $user_data = &$user;
@@ -182,8 +178,7 @@ 
   return $result;
 }
 
-function tpl_parse_planet_que($que, $planet, $que_id)
-{
+function tpl_parse_planet_que($que, $planet, $que_id) {
   $hangar_que = array();
   $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']];
   if(!empty($que_hangar))
@@ -198,8 +193,7 @@ 
   return $hangar_que;
 }
 
-function tpl_parse_planet($planet, &$fleets)
-{
+function tpl_parse_planet($planet, &$fleets) {
   global $lang;
 
   $que = que_get($planet['id_owner'], $planet['id'], false);
@@ -268,8 +262,7 @@ 
   return $result;
 }
 
-function flt_get_fleets_to_planet($planet, $fleet_db_list = 0)
-{
+function flt_get_fleets_to_planet($planet, $fleet_db_list = 0) {
   if(!($planet && $planet['id']) && !$fleet_db_list)
   {
     return $planet;
@@ -291,8 +284,7 @@ 
         continue;
       }
       $fleet_ownage = 'own';
-    }
-    else
+    } else
     {
       switch($fleet['fleet_mission'])
       {
@@ -341,8 +333,7 @@ 
  * @param array    $fleets_to_planet
  * @param int      $round
  */
-function tpl_set_resource_info(&$template, $planetrow, $fleets_to_planet = array(), $round = 0)
-{
+function tpl_set_resource_info(&$template, $planetrow, $fleets_to_planet = array(), $round = 0) {
   $template->assign_vars(array(
     'RESOURCE_ROUNDING' => $round,