supernova-ws / SuperNova

buddy.php

Braces +12 added lines, -11 removed lines

@@ -56,8 +56,7 @@ 
             sprintf($lang['buddy_msg_accept_text'], $user['username']));
           sn_db_transaction_commit();
           throw new exception('buddy_err_accept_none', ERR_NONE);
-        }
-        else
+        } else
         {
           throw new exception('buddy_err_accept_internal', ERR_ERROR);
         }
@@ -69,9 +68,11 @@ 
           throw new exception('buddy_err_delete_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
+        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) {
+          // Existing friendship
         {
           $ex_friend_id = $buddy_row['BUDDY_SENDER_ID'] == $user['id'] ? $buddy_row['BUDDY_OWNER_ID'] : $buddy_row['BUDDY_SENDER_ID'];
+        }
 
           msg_send_simple_message($ex_friend_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_unfriend_title'],
             sprintf($lang['buddy_msg_unfriend_text'], $user['username']));
@@ -79,17 +80,19 @@ 
           doquery("DELETE FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
           sn_db_transaction_commit();
           throw new exception('buddy_err_unfriend_none', ERR_NONE);
-        }
-        elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
+        } elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) {
+          // Player's outcoming request - either denied or waiting
         {
           doquery("DELETE FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
+        }
           sn_db_transaction_commit();
           throw new exception('buddy_err_delete_own', ERR_NONE);
-        }
-        elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
+        } elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) {
+          // Deny incoming request
         {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_deny_title'],
             sprintf($lang['buddy_msg_deny_text'], $user['username']));
+        }
 
           doquery("UPDATE {{buddy}} SET `BUDDY_STATUS` = " . BUDDY_REQUEST_DENIED . " WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
           sn_db_transaction_commit();
@@ -104,8 +107,7 @@ 
   if($new_friend_id = sys_get_param_id('request_user_id'))
   {
     $new_friend_row = db_user_by_id($new_friend_id, true, '`id`, `username`');
-  }
-  elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
+  } elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
   {
     $new_friend_row = db_user_by_username($new_friend_name);
     $new_friend_name = db_escape($new_friend_name);
@@ -138,8 +140,7 @@ 
     sn_db_transaction_commit();
     throw new exception('buddy_err_adding_none', ERR_NONE);
   }
-}
-catch(exception $e)
+} catch(exception $e)
 {
   $result[] = array(
     'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,

includes/db/db_queries.php

Braces +11 added lines, -22 removed lines

@@ -6,8 +6,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
@@ -16,8 +15,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,
@@ -37,8 +35,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,
@@ -56,8 +53,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
@@ -87,8 +83,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
@@ -99,8 +94,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
@@ -184,15 +178,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(
@@ -206,13 +198,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`,
@@ -231,8 +221,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/includes/ube_attack_calculate.php

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

includes/functions/uni_functions.php

Braces +3 added lines, -1 removed lines

@@ -236,9 +236,11 @@
   }
 
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
-  if (!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
+  if (!isset($planet_row['id'])) {
+    // || $planet_row['id'] != $user['current_planet']
   {
     $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
+  }
     // Если текущей планеты не существует - выставляем Столицу
     if (!isset($planet_row['id'])) {
       $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id');

language/ru/buildings.mo.php

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 $a_lang_array = array(
   'built' => 'Построено',

language/en/buildings.mo.php

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 
 $a_lang_array = array(

classes/SN.php

Braces +12 added lines, -4 removed lines

@@ -419,7 +419,8 @@ 
     $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()) {
         // Обновляем данные только если ряд был затронут
@@ -427,6 +428,7 @@ 
 
         // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее
         _SnCacheInternal::$data[$location_type][$record_id] = null;
+    }
         // Вытаскиваем обновленную запись
         static::db_get_record_by_id($location_type, $record_id);
         _SnCacheInternal::cache_clear($location_type, false); // Мягкий сброс - только $queries
@@ -460,9 +462,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);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -483,10 +487,12 @@ 
     $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()) {
+        // Обновляем данные только если ряд был затронут
       {
         _SnCacheInternal::cache_unset($location_type, $safe_record_id);
       }
+      }
     }
 
     return $result;
@@ -500,11 +506,13 @@ 
     $table_name = static::$location_info[$location_type][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()) {
+        // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         _SnCacheInternal::cache_clear($location_type);
       }
+      }
     }
 
     return $result;

includes/alliance/ali_internal_admin_diplomacy.inc

Braces +7 added lines, -14 removed lines

@@ -67,8 +67,7 @@ 
       ->doInsert();
 
     $accept_offer = false;
-  }
-  else
+  } else
   {
     $accept_offer = true;
     $autoAccept = true;
@@ -80,8 +79,7 @@ 
       'alliance_negotiation_relation' => $alliance_negotiation_relation,
     );
   }
-}
-else
+} else
 {
   $offer_id = sys_get_param_id('offer_id');
   if($offer_id)
@@ -92,31 +90,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);
       }

includes/functions/flt_mission_missile.php

Braces +2 added lines, -4 removed lines

@@ -7,8 +7,7 @@ 
 use DBAL\OldDbChangeSet;
 use Planet\DBStaticPlanet;
 
-function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0')
-{
+function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0') {
   // Here we select which part of defense should take damage: structure or shield
   // $damageTo = P_SHIELD;
   // $damageTo = P_STRUCTURE;
@@ -37,8 +36,7 @@ 
     $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] );
     $structures[$targetedStructure][0] -= $structsDestroyed;
     $MIPDamage -= $structsDestroyed*$damageDone;
-  }
-  else
+  } else
   {
     // REALLY random attack
     $can_be_damaged = sn_get_groups('defense_active');