supernova-ws / SuperNova

includes/classes/DBStaticAlly.php

Spacing +5 added lines, -5 removed lines

@@ -66,9 +66,9 @@ 
     `ally_name` = '{$ally_name}',
     `ally_tag` = '{$ally_tag}',
     `ally_owner` = '{$user['id']}',
-    `ally_owner_range` = '" . classLocale::$lang['ali_leaderRank'] . "',
+    `ally_owner_range` = '".classLocale::$lang['ali_leaderRank']."',
     `ally_members` = 1,
-    `ranklist` = '" . classLocale::$lang['ali_defaultRankName'] . ",0,0,0,0,0',
+    `ranklist` = '" . classLocale::$lang['ali_defaultRankName'].",0,0,0,0,0',
     `ally_register_time`= " . SN_TIME_NOW
     );
   }
@@ -87,7 +87,7 @@ 
    * @param $POST_text
    */
   public static function db_ally_request_insert($user, $id_ally, $POST_text) {
-    doquery("INSERT INTO {{alliance_requests}} SET `id_user` = {$user['id']}, `id_ally`='{$id_ally}', request_text ='{$POST_text}', request_time=" . SN_TIME_NOW . ";");
+    doquery("INSERT INTO {{alliance_requests}} SET `id_user` = {$user['id']}, `id_ally`='{$id_ally}', request_text ='{$POST_text}', request_time=".SN_TIME_NOW.";");
   }
 
   /**
@@ -137,7 +137,7 @@ 
    * @param $ally
    */
   public static function db_ally_update_by_changeset($ally_changeset, $ally) {
-    doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;");
+    doquery("UPDATE {{alliance}} SET ".implode(',', $ally_changeset)." WHERE `id`='{$ally['id']}' LIMIT 1;");
   }
 
   /**
@@ -248,7 +248,7 @@ 
    * @param $d
    */
   public static function db_ally_request_deny($d) {
-    doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '" . classLocale::$lang['ali_req_deny_reason'] . "' WHERE `id_user`= {$d} LIMIT 1;");
+    doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '".classLocale::$lang['ali_req_deny_reason']."' WHERE `id_user`= {$d} LIMIT 1;");
   }
 
   /**

includes/classes/DBStaticFleetACS.php

Spacing +10 added lines, -10 removed lines

@@ -51,16 +51,16 @@
    */
   public static function db_acs_insert($fleetid, $user, $objFleet) {
     doquery("INSERT INTO {{aks}} SET
-          `name` = '" . db_escape(classLocale::$lang['flt_acs_prefix'] . $fleetid) . "',
-          `teilnehmer` = '" . $user['id'] . "',
-          `flotten` = '" . $fleetid . "',
-          `ankunft` = '" . $objFleet->time_arrive_to_target . "',
-          `galaxy` = '" . $objFleet->fleet_end_galaxy . "',
-          `system` = '" . $objFleet->fleet_end_system . "',
-          `planet` = '" . $objFleet->fleet_end_planet . "',
-          `planet_type` = '" . $objFleet->fleet_end_type . "',
-          `eingeladen` = '" . $user['id'] . "',
-          `fleet_end_time` = '" . $objFleet->time_return_to_source . "'");
+          `name` = '" . db_escape(classLocale::$lang['flt_acs_prefix'].$fleetid)."',
+          `teilnehmer` = '" . $user['id']."',
+          `flotten` = '" . $fleetid."',
+          `ankunft` = '" . $objFleet->time_arrive_to_target."',
+          `galaxy` = '" . $objFleet->fleet_end_galaxy."',
+          `system` = '" . $objFleet->fleet_end_system."',
+          `planet` = '" . $objFleet->fleet_end_planet."',
+          `planet_type` = '" . $objFleet->fleet_end_type."',
+          `eingeladen` = '" . $user['id']."',
+          `fleet_end_time` = '" . $objFleet->time_return_to_source."'");
   }
 
   /**

includes/classes/DBStaticFleetMissile.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
    * @return array|bool|mysqli_result|null
    */
   public static function db_missile_list_by_arrival() {
-    $iraks = doquery("SELECT * FROM {{iraks}} WHERE `fleet_end_time` <= " . SN_TIME_NOW . " FOR UPDATE;");
+    $iraks = doquery("SELECT * FROM {{iraks}} WHERE `fleet_end_time` <= ".SN_TIME_NOW." FOR UPDATE;");
 
     return $iraks;
   }

includes/classes/DBStaticNews.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 function db_news_insert_set($announce_time, $text, $detail_url, $user) {
   doquery("INSERT INTO {{announce}}
         SET `tsTimeStamp` = FROM_UNIXTIME({$announce_time}), `strAnnounce`='{$text}', detail_url = '{$detail_url}',
-        `user_id` = {$user['id']}, `user_name` = '" . db_escape($user['username']) . "'");
+        `user_id` = {$user['id']}, `user_name` = '".db_escape($user['username'])."'");
 }
 
 function db_survey_insert($announce_id, $survey_question, $survey_until) {
@@ -93,7 +93,7 @@ 
       LEFT JOIN {{survey}} AS s ON s.survey_announce_id = a.idAnnounce
       LEFT JOIN {{users}} AS u ON u.id = a.user_id
     {$query_where}
-    ORDER BY `tsTimeStamp` DESC, idAnnounce" .
+    ORDER BY `tsTimeStamp` DESC, idAnnounce".
     ($query_limit ? " LIMIT {$query_limit}" : ''));
 
   $template->assign_var('NEWS_COUNT', db_num_rows($announce_list));

includes/classes/DBStaticNote.php

Spacing +2 added lines, -2 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) {
-    doquery("UPDATE {{notes}} SET `time` = " . SN_TIME_NOW . ", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
+    doquery("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;");
   }
@@ -53,7 +53,7 @@ 
    * @param $note_sticky
    */
   public static function db_note_insert($user, $note_priority, $note_title, $note_text, $note_galaxy, $note_system, $note_planet, $note_planet_type, $note_sticky) {
-    doquery("INSERT INTO {{notes}} SET `owner` = {$user['id']}, `time` = " . SN_TIME_NOW . ", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
+    doquery("INSERT INTO {{notes}} SET `owner` = {$user['id']}, `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};");
   }
 

includes/includes/flt_flying_fleet_handler2.php

Spacing +7 added lines, -11 removed lines

@@ -19,15 +19,11 @@ 
 // ------------------------------------------------------------------
 function flt_flyingFleetsSort($a, $b) {
   // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
-    // Если время - одинаковое, сравниваем события флотов
+  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
     // Если события - одинаковые, то флоты равны
-    ($a['fleet_event'] == $b['fleet_event'] ? 0 :
-      // Если события разные - первыми считаем прибывающие флоты
-      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
-        // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
-          // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+    ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
+      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
           // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
           (
           0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -45,13 +41,13 @@ 
     $handler = fopen('event.log', 'a+');
   }
 
-  fwrite($handler, date(FMT_DATE_TIME_SQL, time()) . ' ' . $msg . "\r\n");
+  fwrite($handler, date(FMT_DATE_TIME_SQL, time()).' '.$msg."\r\n");
 }
 
 // ------------------------------------------------------------------
 function flt_flying_fleet_handler($skip_fleet_update = false) {
   if (true) {
-    if(!defined('IN_AJAX')) {
+    if (!defined('IN_AJAX')) {
       print('<div style="color: red; font-size: 300%">Fleet handler is disabled</div>');
       pdump('Fleet handler is disabled');
     }
@@ -177,7 +173,7 @@ 
     MT_EXPLORE   => 'flt_mission_explore',
   );
   foreach ($missions_used as $mission_id => $cork) {
-    require_once(SN_ROOT_PHYSICAL . "includes/includes/{$mission_files[$mission_id]}" . DOT_PHP_EX);
+    require_once(SN_ROOT_PHYSICAL."includes/includes/{$mission_files[$mission_id]}".DOT_PHP_EX);
   }
 
 //log_file('Обработка миссий');

admin/adm_user_analyze.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 define('INSTALL', false);
 define('IN_ADMIN', true);
 
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
@@ -111,7 +111,7 @@ 
   foreach ($value as $interval_data) {
     print("<tr>");
     print("<td>{$user_id}</td><td>{$user_record['username']}</td><td>{$interval_data[0]}</td><td>{$interval_data[1]}</td><td>{$interval_data[2]}</td>");
-    print("<td>" . date(FMT_DATE_TIME_SQL, $user_record['onlinetime']) . "</td>");
+    print("<td>".date(FMT_DATE_TIME_SQL, $user_record['onlinetime'])."</td>");
     print("</tr>");
   }
 }

includes/classes/DbSqlAware.php

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
    */
   protected function quoteStringAsFieldByRef(&$string) {
     $string = $this->stringEscape($string);
-    if ((string)$string && '*' != $string) {
-      $string = '`' . $string . '`';
+    if ((string) $string && '*' != $string) {
+      $string = '`'.$string.'`';
     }
   }
 

includes/classes/DBStaticUnit.php

Spacing +14 added lines, -14 removed lines

@@ -21,13 +21,13 @@ 
 
   public static function db_unit_count_by_user_and_type_and_snid($user_id, $unit_type = 0, $unit_snid = 0) {
     $query = doquery(
-      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} " .
-      ($unit_type ? "AND `unit_type` = {$unit_type} " : '') .
-      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '') .
+      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} ".
+      ($unit_type ? "AND `unit_type` = {$unit_type} " : '').
+      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '').
       'GROUP BY `unit_snid`'
     );
     $result = array();
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[$row['unit_snid']] = $row;
     }
 
@@ -43,8 +43,8 @@ 
     WHERE
       f.fleet_owner = {$user_id} AND
       (f.fleet_start_planet_id = {$location_id} OR f.fleet_end_planet_id = {$location_id})
-      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = " . LOC_FLEET . " AND " . self::db_unit_time_restrictions() .
-      " LIMIT 1" .
+      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = ".LOC_FLEET." AND ".self::db_unit_time_restrictions().
+      " LIMIT 1".
       ($for_update ? ' FOR UPDATE' : '')
       , true);
   }
@@ -53,7 +53,7 @@ 
   public static function db_unit_list_laboratories($user_id) {
     return doquery("SELECT DISTINCT unit_location_id AS `id`
     FROM {{unit}}
-    WHERE unit_player_id = {$user_id} AND unit_location_type = " . LOC_PLANET . " AND unit_level > 0 AND unit_snid IN (" . STRUC_LABORATORY . ", " . STRUC_LABORATORY_NANO . ");");
+    WHERE unit_player_id = {$user_id} AND unit_location_type = ".LOC_PLANET." AND unit_level > 0 AND unit_snid IN (".STRUC_LABORATORY.", ".STRUC_LABORATORY_NANO.");");
   }
 
   public static function db_unit_set_by_id($unit_id, $set) {
@@ -71,9 +71,9 @@ 
 
   public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id = 0, $unit_snid = 0) {
     return classSupernova::db_del_record_list(LOC_UNIT,
-      "`unit_location_type` = {$unit_location_type}" .
-      ($unit_location_id = idval($unit_location_id) ? " AND `unit_location_id` = {$unit_location_id}" : '') .
-      ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '') .
+      "`unit_location_type` = {$unit_location_type}".
+      ($unit_location_id = idval($unit_location_id) ? " AND `unit_location_id` = {$unit_location_id}" : '').
+      ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '').
       ($unit_snid = idval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : ''));
   }
 
@@ -81,7 +81,7 @@ 
     return doquery(
       "SELECT unit_player_id, unit_type, unit_snid, unit_level, count(*) AS unit_amount
     FROM `{{unit}}`
-    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions() .
+    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions().
       " GROUP BY unit_player_id, unit_type, unit_snid, unit_level"
     );
   }
@@ -93,15 +93,15 @@ 
 
 
   public static function db_unit_list_admin_delete_mercenaries_finished() {
-    return doquery("DELETE FROM {{unit}} WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(" . SN_TIME_NOW . ") AND unit_type = " . UNIT_MERCENARIES);
+    return doquery("DELETE FROM {{unit}} WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(".SN_TIME_NOW.") AND unit_type = ".UNIT_MERCENARIES);
   }
 
   public static function db_unit_list_admin_set_mercenaries_expire_time($default_length) {
     return doquery(
       "UPDATE {{unit}}
     SET
-      unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW . "),
-      unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length) . ")
+      unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW."),
+      unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length).")
     WHERE unit_type = " . UNIT_MERCENARIES
     );
   }