supernova-ws / SuperNova

includes/classes/DBStaticNote.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
    * @param $note_id_edit
    */
   public static function db_note_update_by_id($note_priority, $note_title, $note_text, $note_galaxy, $note_system, $note_planet, $note_planet_type, $note_sticky, $note_id_edit) {
-    classSupernova::$db->doUpdate("UPDATE {{notes}} SET `time` = " . SN_TIME_NOW . ", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
+    classSupernova::$db->doUpdate("UPDATE {{notes}} SET `time` = ".SN_TIME_NOW.", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
         `galaxy` = {$note_galaxy}, `system` = {$note_system}, `planet` = {$note_planet}, `planet_type` = {$note_planet_type}, `sticky` = {$note_sticky}
         WHERE `id` = {$note_id_edit} LIMIT 1;");
   }

includes/classes/UBE/UBEDebris.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
    */
   public function debris_add_resource($resource_id, $resource_amount) {
     // В обломках может быть только металл или кристалл
-    if($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
+    if ($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
       return;
     }
     $this->debris[$resource_id] += $resource_amount;
@@ -38,7 +38,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_wrecks(array $wreckage, $is_simulator) {
-    foreach($wreckage as $resource_id => $resource_amount) {
+    foreach ($wreckage as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_SHIP_WRECKS_TO_DEBRIS_AVG
@@ -54,7 +54,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_cargo_drop(array $dropped_resources, $is_simulator) {
-    foreach($dropped_resources as $resource_id => $resource_amount) {
+    foreach ($dropped_resources as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_CARGO_DROPPED_TO_DEBRIS_AVG
@@ -93,7 +93,7 @@ 
    * @param $moon_debris_left_part
    */
   public function debris_adjust_proportional($moon_debris_left_part) {
-    foreach($this->debris as $resource_id => &$resource_amount) {
+    foreach ($this->debris as $resource_id => &$resource_amount) {
       $resource_amount = floor($resource_amount * $moon_debris_left_part);
     }
   }
@@ -114,9 +114,9 @@ 
    */
   public function report_generate_array() {
     return array(
-      'ube_report_debris_metal'          => (float)$this->debris_get_resource(RES_METAL),
-      'ube_report_debris_crystal'        => (float)$this->debris_get_resource(RES_CRYSTAL),
-      'ube_report_debris_total_in_metal' => (float)$this->debris_in_metal(),
+      'ube_report_debris_metal'          => (float) $this->debris_get_resource(RES_METAL),
+      'ube_report_debris_crystal'        => (float) $this->debris_get_resource(RES_CRYSTAL),
+      'ube_report_debris_total_in_metal' => (float) $this->debris_in_metal(),
     );
   }
 

includes/classes/UBE/UBEMoonCalculator.php

Spacing +21 added lines, -21 removed lines

@@ -70,7 +70,7 @@ 
 
     $debris_for_moon = $debris->debris_total();
 
-    if(!$debris_for_moon) {
+    if (!$debris_for_moon) {
       return;
     }
 
@@ -78,12 +78,12 @@ 
     $moon_chance = min($debris_for_moon / UBE_MOON_DEBRIS_PER_PERCENT, UBE_MOON_PERCENT_MAX); // TODO Configure
     $moon_chance = $moon_chance >= UBE_MOON_PERCENT_MIN ? $moon_chance : 0;
     $this->create_chance = $moon_chance;
-    if($moon_chance) {
-      if($is_simulator || mt_rand(1, 100) <= $moon_chance) {
+    if ($moon_chance) {
+      if ($is_simulator || mt_rand(1, 100) <= $moon_chance) {
         $this->status = UBE_MOON_CREATE_SUCCESS;
         $this->moon_diameter = round($is_simulator ? $moon_chance * 150 + 1999 : mt_rand($moon_chance * 100 + 1000, $moon_chance * 200 + 2999));
 
-        if($debris_for_moon <= UBE_MOON_DEBRIS_MAX_SPENT) {
+        if ($debris_for_moon <= UBE_MOON_DEBRIS_MAX_SPENT) {
           $debris->_reset();
         } else {
           $moon_debris_left_percent = ($debris_for_moon - UBE_MOON_DEBRIS_MAX_SPENT) / $debris_for_moon;
@@ -102,7 +102,7 @@ 
    */
   protected function moon_destroy_try($reapers) {
     // TODO: $is_simulator
-    if($reapers <= 0) {
+    if ($reapers <= 0) {
       return;
     }
 
@@ -120,8 +120,8 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function calculate_moon(UBE $ube) {
-    if(UBE_MOON_EXISTS == $this->status) {
-      if($ube->mission_type_id == MT_DESTROY && $ube->combat_result == UBE_COMBAT_RESULT_WIN) {
+    if (UBE_MOON_EXISTS == $this->status) {
+      if ($ube->mission_type_id == MT_DESTROY && $ube->combat_result == UBE_COMBAT_RESULT_WIN) {
         $reapers = $ube->fleet_list->ube_calculate_attack_reapers();
         $this->moon_destroy_try($reapers);
       }
@@ -135,12 +135,12 @@ 
    */
   public function report_generate_array() {
     return array(
-      'ube_report_moon'                    => (int)$this->status,
-      'ube_report_moon_chance'             => (int)$this->create_chance,
-      'ube_report_moon_size'               => (float)$this->moon_diameter,
-      'ube_report_moon_reapers'            => (int)$this->reapers_status,
-      'ube_report_moon_destroy_chance'     => (int)$this->destroy_chance,
-      'ube_report_moon_reapers_die_chance' => (int)$this->reaper_die_chance,
+      'ube_report_moon'                    => (int) $this->status,
+      'ube_report_moon_chance'             => (int) $this->create_chance,
+      'ube_report_moon_size'               => (float) $this->moon_diameter,
+      'ube_report_moon_reapers'            => (int) $this->reapers_status,
+      'ube_report_moon_destroy_chance'     => (int) $this->destroy_chance,
+      'ube_report_moon_reapers_die_chance' => (int) $this->reaper_die_chance,
     );
   }
 
@@ -171,11 +171,11 @@ 
    * @param $planet_id
    */
   public function db_apply_result($planet_info, $destination_user_id) {
-    if($this->status == UBE_MOON_CREATE_SUCCESS) {
+    if ($this->status == UBE_MOON_CREATE_SUCCESS) {
       $moon_row = uni_create_moon($planet_info[PLANET_GALAXY], $planet_info[PLANET_SYSTEM], $planet_info[PLANET_PLANET], $destination_user_id, $this->moon_diameter, '', false);
       $this->moon_name = $moon_row['name'];
       unset($moon_row);
-    } elseif($this->status == UBE_MOON_DESTROY_SUCCESS) {
+    } elseif ($this->status == UBE_MOON_DESTROY_SUCCESS) {
       DBStaticPlanet::db_planet_delete_by_id($planet_info[PLANET_ID]);
     }
   }
@@ -184,18 +184,18 @@ 
     $classLocale = classLocale::$lang;
 
     $text_defender = '';
-    if($this->status == UBE_MOON_CREATE_SUCCESS) {
+    if ($this->status == UBE_MOON_CREATE_SUCCESS) {
       $text_defender .= "{$classLocale['ube_report_moon_created']} {$this->moon_diameter} {$classLocale['sys_kilometers_short']}<br /><br />";
-    } elseif($this->status == UBE_MOON_CREATE_FAILED) {
+    } elseif ($this->status == UBE_MOON_CREATE_FAILED) {
       $text_defender .= "{$classLocale['ube_report_moon_chance']} {$this->create_chance}%<br /><br />";
     }
 
-    if($ube->mission_type_id == MT_DESTROY) {
-      if($this->reapers_status == UBE_MOON_REAPERS_NONE) {
+    if ($ube->mission_type_id == MT_DESTROY) {
+      if ($this->reapers_status == UBE_MOON_REAPERS_NONE) {
         $text_defender .= classLocale::$lang['ube_report_moon_reapers_none'];
       } else {
         $text_defender .= "{$classLocale['ube_report_moon_reapers_wave']}. {$classLocale['ube_report_moon_reapers_chance']} {$this->destroy_chance}%. ";
-        $text_defender .= classLocale::$lang[$this->status == UBE_MOON_DESTROY_SUCCESS ? 'ube_report_moon_reapers_success' : 'ube_report_moon_reapers_failure'] . "<br />";
+        $text_defender .= classLocale::$lang[$this->status == UBE_MOON_DESTROY_SUCCESS ? 'ube_report_moon_reapers_success' : 'ube_report_moon_reapers_failure']."<br />";
 
         $text_defender .= "{$classLocale['ube_report_moon_reapers_outcome']} {$this->reaper_die_chance}%. ";
         $text_defender .= classLocale::$lang[$this->reapers_status == UBE_MOON_REAPERS_RETURNED ? 'ube_report_moon_reapers_survive' : 'ube_report_moon_reapers_died'];
@@ -220,7 +220,7 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function ubeInitLoadStatis($destination_planet) {
-    if($destination_planet['planet_type'] == PT_MOON || is_array($moon = DBStaticPlanet::db_planet_by_parent($destination_planet['id'], true, '`id`'))) {
+    if ($destination_planet['planet_type'] == PT_MOON || is_array($moon = DBStaticPlanet::db_planet_by_parent($destination_planet['id'], true, '`id`'))) {
       $this->status = UBE_MOON_EXISTS;
       $this->moon_diameter = !empty($moon['planet_type']) && $moon['planet_type'] == PT_MOON ? $moon['diameter'] : $destination_planet['diameter'];
       $this->reapers_status = UBE_MOON_REAPERS_NONE;

includes/classes/UBE/UBEReport.php

Spacing +32 added lines, -32 removed lines

@@ -13,14 +13,14 @@ 
    */
   public function sn_ube_report_save($ube) {
     // Если уже есть ИД репорта - значит репорт был взят из таблицы. С таким мы не работаем
-    if($ube->get_cypher()) {
+    if ($ube->get_cypher()) {
       return false;
     }
 
     // Генерируем уникальный секретный ключ и проверяем наличие в базе
     do {
       $ube->report_cypher = sys_random_string(32);
-    } while(classSupernova::$db->doSelectFetch("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$ube->report_cypher}' LIMIT 1 FOR UPDATE"));
+    } while (classSupernova::$db->doSelectFetch("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$ube->report_cypher}' LIMIT 1 FOR UPDATE"));
 
     // Инициализация таблицы для пакетной вставки информации
     $sql_perform = array(
@@ -106,21 +106,21 @@ 
 
     // Сохраняем общую информацию о бое
     classSupernova::$db->doInsertSet(TABLE_UBE_REPORT, array(
-        'ube_report_cypher'             => (string)$ube->report_cypher,
-        'ube_report_time_combat'        => (string)date(FMT_DATE_TIME_SQL, $ube->combat_timestamp),
-        'ube_report_time_spent'         => (float)$ube->time_spent,
-        'ube_report_combat_admin'       => (int)$ube->is_admin_in_combat,
-        'ube_report_mission_type'       => (int)$ube->mission_type_id,
-        'ube_report_combat_result'      => (int)$ube->combat_result,
-        'ube_report_combat_sfr'         => (int)$ube->is_small_fleet_recce,
-        'ube_report_planet_id'          => (int)$ube->ube_planet_info[PLANET_ID],
-        'ube_report_planet_name'        => (string)$ube->ube_planet_info[PLANET_NAME],
-        'ube_report_planet_size'        => (int)$ube->ube_planet_info[PLANET_SIZE],
-        'ube_report_planet_galaxy'      => (int)$ube->ube_planet_info[PLANET_GALAXY],
-        'ube_report_planet_system'      => (int)$ube->ube_planet_info[PLANET_SYSTEM],
-        'ube_report_planet_planet'      => (int)$ube->ube_planet_info[PLANET_PLANET],
-        'ube_report_planet_planet_type' => (int)$ube->ube_planet_info[PLANET_TYPE],
-        'ube_report_capture_result'     => (int)$ube->capture_result,
+        'ube_report_cypher'             => (string) $ube->report_cypher,
+        'ube_report_time_combat'        => (string) date(FMT_DATE_TIME_SQL, $ube->combat_timestamp),
+        'ube_report_time_spent'         => (float) $ube->time_spent,
+        'ube_report_combat_admin'       => (int) $ube->is_admin_in_combat,
+        'ube_report_mission_type'       => (int) $ube->mission_type_id,
+        'ube_report_combat_result'      => (int) $ube->combat_result,
+        'ube_report_combat_sfr'         => (int) $ube->is_small_fleet_recce,
+        'ube_report_planet_id'          => (int) $ube->ube_planet_info[PLANET_ID],
+        'ube_report_planet_name'        => (string) $ube->ube_planet_info[PLANET_NAME],
+        'ube_report_planet_size'        => (int) $ube->ube_planet_info[PLANET_SIZE],
+        'ube_report_planet_galaxy'      => (int) $ube->ube_planet_info[PLANET_GALAXY],
+        'ube_report_planet_system'      => (int) $ube->ube_planet_info[PLANET_SYSTEM],
+        'ube_report_planet_planet'      => (int) $ube->ube_planet_info[PLANET_PLANET],
+        'ube_report_planet_planet_type' => (int) $ube->ube_planet_info[PLANET_TYPE],
+        'ube_report_capture_result'     => (int) $ube->capture_result,
       )
       + $ube->debris->report_generate_array()
       + $ube->moon_calculator->report_generate_array()
@@ -129,22 +129,22 @@ 
 
     // Сохраняем общую информацию по игрокам
     $player_sides = $ube->players->get_player_sides();
-    foreach($player_sides as $player_id => $player_side) {
+    foreach ($player_sides as $player_id => $player_side) {
       $sql_perform['ube_report_player'][] = array(
         $ube_report_id,
         $player_id,
 
-        "'" . db_escape($ube->players[$player_id]->name) . "'",
+        "'".db_escape($ube->players[$player_id]->name)."'",
         $ube->players[$player_id]->getSide() == UBE_PLAYER_IS_ATTACKER ? 1 : 0,
 
-        (float)$ube->players[$player_id]->player_bonus->calcBonus(P_ATTACK),
-        (float)$ube->players[$player_id]->player_bonus->calcBonus(P_SHIELD),
-        (float)$ube->players[$player_id]->player_bonus->calcBonus(P_ARMOR),
+        (float) $ube->players[$player_id]->player_bonus->calcBonus(P_ATTACK),
+        (float) $ube->players[$player_id]->player_bonus->calcBonus(P_SHIELD),
+        (float) $ube->players[$player_id]->player_bonus->calcBonus(P_ARMOR),
       );
     }
 
     // Всякая информация по флотам
-    foreach($ube->fleet_list->_container as $fleet_id => $UBEFleet) {
+    foreach ($ube->fleet_list->_container as $fleet_id => $UBEFleet) {
       // Сохраняем общую информацию по флотам
       $sql_perform['ube_report_fleet'][] = $UBEFleet->sql_generate_array($ube_report_id);
 
@@ -159,12 +159,12 @@ 
     $ube->rounds->sql_generate_unit_array($sql_perform['ube_report_unit'], $ube_report_id, $ube->fleet_list);
 
     // Пакетная вставка данных
-    foreach($sql_perform as $table_name => $table_data) {
-      if(count($table_data) < 2) {
+    foreach ($sql_perform as $table_name => $table_data) {
+      if (count($table_data) < 2) {
         continue;
       }
-      foreach($table_data as &$record_data) {
-        $record_data = '(' . implode(',', $record_data) . ')';
+      foreach ($table_data as &$record_data) {
+        $record_data = '('.implode(',', $record_data).')';
       }
       $fields = $table_data[0];
       unset($table_data[0]);
@@ -186,7 +186,7 @@ 
     $report_cypher = db_escape($report_cypher);
 
     $report_row = classSupernova::$db->doSelectFetch("SELECT * FROM {{ube_report}} WHERE ube_report_cypher = '{$report_cypher}' LIMIT 1");
-    if(!$report_row) {
+    if (!$report_row) {
       return UBE_REPORT_NOT_FOUND;
     }
 
@@ -202,7 +202,7 @@ 
    * @param     $template_result
    */
   public function sn_ube_report_generate(UBE $ube, &$template_result) {
-    if(!is_object($ube)) {
+    if (!is_object($ube)) {
       return;
     }
 
@@ -217,15 +217,15 @@ 
 
     // Координаты, тип и название планеты - если есть
 //R  $planet_owner_id = $combat_data[UBE_FLEETS][0][UBE_OWNER];
-    if(isset($ube->ube_planet_info)) {
+    if (isset($ube->ube_planet_info)) {
       $template_result += $ube->ube_planet_info;
       $template_result[PLANET_NAME] = str_replace(' ', '&nbsp;', htmlentities($template_result[PLANET_NAME], ENT_COMPAT, 'UTF-8'));
     }
 
     // Обломки
     $debris = array();
-    foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) {
-      if($resource_amount = $ube->debris->debris_get_resource($resource_id)) {
+    foreach (array(RES_METAL, RES_CRYSTAL) as $resource_id) {
+      if ($resource_amount = $ube->debris->debris_get_resource($resource_id)) {
         $debris[] = array(
           'NAME'   => classLocale::$lang['tech'][$resource_id],
           'AMOUNT' => pretty_number($resource_amount),

includes/classes/DBStaticFleetACS.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
    */
   public static function db_acs_insert($fleetid, $userId, $objFleet) {
     classSupernova::$db->doInsertSet(TABLE_AKS, array(
-      'name'           => classLocale::$lang['flt_acs_prefix'] . $fleetid,
+      'name'           => classLocale::$lang['flt_acs_prefix'].$fleetid,
       'teilnehmer'     => $userId,
       'flotten'        => $fleetid,
       'ankunft'        => $objFleet->time_arrive_to_target,

includes/classes/DBStaticAlly.php

Spacing +7 added lines, -7 removed lines

@@ -63,12 +63,12 @@ 
    */
   public static function db_ally_insert($ally_name_unsafe, $ally_tag_unsafe, $userId) {
     $ally = classSupernova::$db->doInsertSet(TABLE_ALLIANCE, array(
-      'ally_name'          => (string)$ally_name_unsafe,
-      'ally_tag'           => (string)$ally_tag_unsafe,
+      'ally_name'          => (string) $ally_name_unsafe,
+      'ally_tag'           => (string) $ally_tag_unsafe,
       'ally_owner'         => $userId,
-      'ally_owner_range'   => (string)classLocale::$lang['ali_leaderRank'],
-      'ally_members'       => (int)1,
-      'ranklist'           => (string)(classLocale::$lang['ali_defaultRankName'] . ",0,0,0,0,0"),
+      'ally_owner_range'   => (string) classLocale::$lang['ali_leaderRank'],
+      'ally_members'       => (int) 1,
+      'ranklist'           => (string) (classLocale::$lang['ali_defaultRankName'].",0,0,0,0,0"),
       'ally_register_time' => SN_TIME_NOW,
     ));
 
@@ -144,7 +144,7 @@ 
    * @param $ally
    */
   public static function db_ally_update_by_changeset($ally_changeset, $ally) {
-    classSupernova::$db->doUpdate("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;");
+    classSupernova::$db->doUpdate("UPDATE {{alliance}} SET ".implode(',', $ally_changeset)." WHERE `id`='{$ally['id']}' LIMIT 1;");
   }
 
   /**
@@ -259,7 +259,7 @@ 
    * @param $d
    */
   public static function db_ally_request_deny($d) {
-    classSupernova::$db->doUpdate("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '" . classLocale::$lang['ali_req_deny_reason'] . "' WHERE `id_user`= {$d} LIMIT 1;");
+    classSupernova::$db->doUpdate("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '".classLocale::$lang['ali_req_deny_reason']."' WHERE `id_user`= {$d} LIMIT 1;");
   }
 
   /**

includes/classes/DBStaticMessages.php

Spacing +8 added lines, -8 removed lines

@@ -114,7 +114,7 @@ 
       $owners = array();
     } else {
       $insert_values = array();
-      $insert_template = "('%u'," . str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
+      $insert_template = "('%u',".str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
 
       foreach ($owners as $owner) {
         if ($user['id'] != $owner) {
@@ -155,7 +155,7 @@ 
     $sendList = array();
     $list = '';
     $query = DBStaticUser::db_user_list(
-      "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
+      "ally_id = '{$ally_id}'".($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
       false, 'id, username');
     foreach ($query as $u) {
       $sendList[] = $u['id'];
@@ -253,7 +253,7 @@ 
       $subject_unsafe = substr($subject_unsafe, strlen(classLocale::$lang['msg_answer_prefix']));
       $re++;
     }
-    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'] . $subject_unsafe : false;
+    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'].$subject_unsafe : false;
 
     $subject_unsafe = $subject_unsafe ? $subject_unsafe : classLocale::$lang['msg_subject_default'];
 
@@ -421,7 +421,7 @@ 
     return classSupernova::$db->doSelect(
       "SELECT * FROM {{messages}}
         WHERE
-          `message_type` = '" . MSG_TYPE_PLAYER . "' AND
+          `message_type` = '" . MSG_TYPE_PLAYER."' AND
           ((`message_owner` = '{$user['id']}' AND `message_sender` = '{$recipient_id}')
           OR
           (`message_sender` = '{$user['id']}' AND `message_owner` = '{$recipient_id}')) ORDER BY `message_time` DESC LIMIT 20;");
@@ -465,7 +465,7 @@ 
 FROM
   {{messages}} AS m
   LEFT JOIN {{users}} AS u ON u.id = m.message_owner " .
-      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '') .
+      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '').
       "ORDER BY
   `message_id` DESC
 LIMIT
@@ -473,7 +473,7 @@ 
   }
 
   public static function db_message_insert_all($message_type, $from, $subject, $text) {
-    return classSupernova::$db->doInsertComplex('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
+    return classSupernova::$db->doInsertComplex('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}}");
   }
 
@@ -483,7 +483,7 @@ 
    * @return array|bool|mysqli_result|null
    */
   public static function db_message_count_by_type($int_type_selected) {
-    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM `{{messages}}`' . ($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
+    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM `{{messages}}`'.($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
 
     return $page_max;
   }
@@ -507,7 +507,7 @@ 
    */
   public static function db_message_list_delete_by_date($delete_date, $int_type_selected) {
     $where[] = "message_time <= UNIX_TIMESTAMP('{$delete_date}')";
-    if($int_type_selected >= 0) {
+    if ($int_type_selected >= 0) {
       $where['message_type'] = $int_type_selected;
     }
     classSupernova::$db->doDeleteDeprecated(TABLE_MESSAGES, $where);

includes/classes/DBStaticChat.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
       JOIN {{users}} AS u ON u.id = cp.chat_player_player_id
     WHERE
       `chat_player_refresh_last` >= '{$sql_date}'
-      AND (`banaday` IS NULL OR `banaday` <= " . SN_TIME_NOW . ")
+      AND (`banaday` IS NULL OR `banaday` <= ".SN_TIME_NOW.")
       {$ally_add}
     ORDER BY authlevel DESC, `username`");
   }
@@ -140,7 +140,7 @@ 
    * @param $user
    */
   public static function db_chat_player_update($user) {
-    classSupernova::$db->doUpdate("UPDATE {{chat_player}} SET `chat_player_refresh_last` = " . SN_TIME_NOW . " WHERE `chat_player_player_id` = {$user['id']} LIMIT 1;");
+    classSupernova::$db->doUpdate("UPDATE {{chat_player}} SET `chat_player_refresh_last` = ".SN_TIME_NOW." WHERE `chat_player_player_id` = {$user['id']} LIMIT 1;");
   }
 
 
@@ -211,7 +211,7 @@ 
    * @param $user
    */
   public static function db_chat_player_update_activity($user) {
-    classSupernova::$db->doUpdate("UPDATE {{chat_player}} SET `chat_player_activity` = '" . classSupernova::$db->db_escape(SN_TIME_SQL) . "' WHERE `chat_player_player_id` = {$user['id']} LIMIT 1");
+    classSupernova::$db->doUpdate("UPDATE {{chat_player}} SET `chat_player_activity` = '".classSupernova::$db->db_escape(SN_TIME_SQL)."' WHERE `chat_player_player_id` = {$user['id']} LIMIT 1");
   }
 
 }
\ No newline at end of file

includes/db/db_queries.php

Spacing +16 added lines, -16 removed lines

@@ -4,11 +4,11 @@ 
 
 function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
   return classSupernova::$db->doSelect(
-    "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
+    "SELECT p.*, u.username".($table_parent_columns ? ', p1.name AS parent_name' : '').
     " FROM {{planets}} AS p
       LEFT JOIN {{users}} AS u ON u.id = p.id_owner" .
-    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '') .
-    " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
+    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '').
+    " WHERE ".($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
 }
 
 function db_planet_list_search($searchtext) {
@@ -106,7 +106,7 @@ 
     ORDER BY
       sp.`{$Rank}_rank`, subject.{$source['id']}
     LIMIT
-      " . $start . ",100;";
+      ".$start.",100;";
     } else { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
       $query_str =
         "SELECT
@@ -119,7 +119,7 @@ 
     ORDER BY
       subject.{$Rank} DESC, subject.{$source['id']}
     LIMIT
-      " . $start . ",100;";
+      ".$start.",100;";
     }
   } else {
     // TODO
@@ -136,7 +136,7 @@ 
   ORDER BY
     sp.`{$Rank}_rank`, subject.id
   LIMIT
-    " . $start . ",100;";
+    ".$start.",100;";
   }
 
   return classSupernova::$db->doSelect($query_str);
@@ -364,9 +364,9 @@ 
  */
 function db_payment_list_get($flt_payer, $flt_status, $flt_test, $flt_module) {
   $extra_conditions =
-    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '') .
-    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '') .
-    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '') .
+    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '').
+    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '').
+    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '').
     ($flt_module ? "AND payment_module_name = '{$flt_module}' " : '');
   $query = classSupernova::$db->doSelect("SELECT * FROM `{{payment}}` WHERE 1 {$extra_conditions} ORDER BY payment_id DESC;");
 
@@ -395,7 +395,7 @@ 
 // Log Online *************************************************************************************************************
 function db_log_online_insert() {
   classSupernova::$db->doInsertSet(LOG_USERS_ONLINE, array(
-    'online_count' => (int)classSupernova::$config->var_online_user_count,
+    'online_count' => (int) classSupernova::$config->var_online_user_count,
   ), DB_INSERT_IGNORE);
 }
 
@@ -485,10 +485,10 @@ 
 function db_log_dark_matter_insert($user_id, $change_type, $dark_matter, $comment_unsafe, $rowUserNameUnsafe, $page_url_unsafe) {
   return classSupernova::$db->doInsertSet(TABLE_LOG_DARK_MATTER, array(
     'log_dark_matter_username' => $rowUserNameUnsafe,
-    'log_dark_matter_reason'   => (int)$change_type,
-    'log_dark_matter_amount'   => (float)$dark_matter,
-    'log_dark_matter_comment'  => (string)$comment_unsafe,
-    'log_dark_matter_page'     => (string)$page_url_unsafe,
+    'log_dark_matter_reason'   => (int) $change_type,
+    'log_dark_matter_amount'   => (float) $dark_matter,
+    'log_dark_matter_comment'  => (string) $comment_unsafe,
+    'log_dark_matter_page'     => (string) $page_url_unsafe,
     'log_dark_matter_sender'   => $user_id,
   ));
 }
@@ -644,9 +644,9 @@ 
 function db_ube_report_get_best_battles() {
   $query = classSupernova::$db->doSelect("SELECT *
       FROM `{{ube_report}}`
-      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS . " DAY))
+      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS." DAY))
       ORDER BY `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC
-      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW . ";");
+      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW.";");
 
   return $query;
 }