supernova-ws / SuperNova

includes/classes/DBStaticRecord.php

Doc Comments +2 added lines, -2 removed lines

@@ -96,8 +96,8 @@
   }
 
   /**
-   * @param int|string $user_id
-   * @param array      $fieldList
+   * @param integer $user_id
+   * @param string[]      $fieldList
    * @param bool       $for_update
    *
    * @return array|null

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
             $result[] = 'NULL';
           break;
           default:
-            $result[] = '`' . (string)$fieldName . '`';
+            $result[] = '`'.(string) $fieldName.'`';
         }
       }
     } else {
@@ -57,10 +57,10 @@ 
     if (!empty($fieldList)) {
       $user_record = doquery(
         (
-          "SELECT {$fieldList}" .
-          " FROM {{" . self::$_table . "}}" .
-          (!empty($where) ? " WHERE {$where}" : '') .
-          (!empty($for_update) ? " FOR UPDATE" : '') .
+          "SELECT {$fieldList}".
+          " FROM {{".self::$_table."}}".
+          (!empty($where) ? " WHERE {$where}" : '').
+          (!empty($for_update) ? " FOR UPDATE" : '').
           ($returnFirst ? ' LIMIT 1' : '')
         ),
         $returnFirst
@@ -90,7 +90,7 @@ 
    * @return int
    */
   public static function getMaxId() {
-    $maxId = classSupernova::$db->doquery("SELECT MAX(`" . static::$_idField . "`) AS `maxId` FROM `{{" . static::$_table . "}}`", true);
+    $maxId = classSupernova::$db->doquery("SELECT MAX(`".static::$_idField."`) AS `maxId` FROM `{{".static::$_table."}}`", true);
 
     return !empty($maxId['maxId']) ? $maxId['maxId'] : 0;
   }
@@ -103,7 +103,7 @@ 
    * @return array|null
    */
   public static function getRecordById($user_id, $fieldList = array(), $for_update = false) {
-    return static::getRecord(static::$_idField . ' = ' . $user_id, $fieldList, $for_update);
+    return static::getRecord(static::$_idField.' = '.$user_id, $fieldList, $for_update);
   }
 
 
@@ -115,7 +115,7 @@ 
   public static function queryExistsIdInList($idList) {
     $query = null;
     if (!empty($idList)) {
-      $query = doquery("SELECT `" . static::$_idField . "` FROM `{{" . static::$_table . "}}` WHERE `" . static::$_idField . "` IN (" . implode(',', $idList) . ")");
+      $query = doquery("SELECT `".static::$_idField."` FROM `{{".static::$_table."}}` WHERE `".static::$_idField."` IN (".implode(',', $idList).")");
     }
 
     return !empty($query) ? $query : null;

admin/ajax_maintenance.php

Spacing +25 added lines, -25 removed lines

@@ -2,9 +2,9 @@ 
 
 define('IN_ADMIN', true);
 
-require('../includes/init.' . substr(strrchr(__FILE__, '.'), 1));
+require('../includes/init.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   message(classLocale::$lang['sys_noalloaw'], classLocale::$lang['sys_noaccess']);
   die();
@@ -20,13 +20,13 @@ 
 // [#] info_best_battles 1b0
 $best_reports = array();
 
-if(defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
+if (defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
   $query = db_ube_report_get_best_battles();
-  while($row = db_fetch($query)) {
+  while ($row = db_fetch($query)) {
     $best_reports[] = $row['ube_report_id'];
   }
 }
-$best_reports = !empty($best_reports) ? ' AND ube_report_id NOT IN (' . implode(',', $best_reports) . ')' : '';
+$best_reports = !empty($best_reports) ? ' AND ube_report_id NOT IN ('.implode(',', $best_reports).')' : '';
 
 
 $ques = array(
@@ -90,14 +90,14 @@ 
   // Удаляем юниты без планет
   'DELETE un FROM {{unit}} AS un
     LEFT JOIN {{planets}} AS pl ON pl.id = un.unit_location_id
-  WHERE unit_location_type = ' . LOC_PLANET . ' AND pl.id IS NULL;',
+  WHERE unit_location_type = ' . LOC_PLANET.' AND pl.id IS NULL;',
   // Удаляем пустые юниты с 0 уровнем (кроме Капитана)
-  'DELETE FROM {{unit}} WHERE unit_location_type = ' . LOC_PLANET . ' AND unit_level = 0 AND unit_type <> ' . UNIT_CAPTAIN,
+  'DELETE FROM {{unit}} WHERE unit_location_type = '.LOC_PLANET.' AND unit_level = 0 AND unit_type <> '.UNIT_CAPTAIN,
   // Удаляем очереди на ничьих планетах
   'DELETE q FROM {{que}} AS q
     LEFT JOIN {{planets}} AS p ON p.id = q.que_planet_id
   WHERE
-    que_type IN (' . QUE_STRUCTURES . ', ' . QUE_HANGAR . ', ' . SUBQUE_FLEET . ', ' . SUBQUE_DEFENSE . ')
+    que_type IN (' . QUE_STRUCTURES.', '.QUE_HANGAR.', '.SUBQUE_FLEET.', '.SUBQUE_DEFENSE.')
     AND
     (p.id_owner = 0 OR p.id_owner IS NULL);',
 
@@ -112,12 +112,12 @@ 
   // Удаляются сообщения, старше  4 недель, кроме личных и Альянсовских
   'DELETE FROM {{messages}} WHERE
     UNIX_TIMESTAMP() - message_time > 4*7 * 24 * 60 * 60 AND
-    message_type NOT IN (' . MSG_TYPE_PLAYER . ', ' . MSG_TYPE_ALLIANCE . ');',
+    message_type NOT IN (' . MSG_TYPE_PLAYER.', '.MSG_TYPE_ALLIANCE.');',
   // Удаляются сообщения у пользователей, которые неактивны больше 4 недель - кроме личных и Альянсовских
   'DELETE m FROM `{{users}}` AS u
   JOIN {{messages}} AS m ON m.message_owner = u.id
   WHERE
-    message_type NOT IN (' . MSG_TYPE_PLAYER . ', ' . MSG_TYPE_ALLIANCE . ') AND
+    message_type NOT IN (' . MSG_TYPE_PLAYER.', '.MSG_TYPE_ALLIANCE.') AND
     authlevel = 0 AND  user_as_ally IS NULL AND /* Не админы, Не Альянсы */
     UNIX_TIMESTAMP() - onlinetime > 4*7 *86400;',
 
@@ -137,7 +137,7 @@ 
       (log_dark_matter_timestamp, log_dark_matter_username, log_dark_matter_reason, log_dark_matter_amount,
       log_dark_matter_comment, log_dark_matter_page, log_dark_matter_sender)
     SELECT
-      '{$pack_until}', IF(u.username IS NULL, ldm.log_dark_matter_username, u.username), " . RPG_CUMULATIVE . ", sum(ldm.log_dark_matter_amount),
+      '{$pack_until}', IF(u.username IS NULL, ldm.log_dark_matter_username, u.username), ".RPG_CUMULATIVE.", sum(ldm.log_dark_matter_amount),
       'Баланс на {$pack_until}', 'admin/ajax_maintenance.php', ldm.log_dark_matter_sender
     FROM
       {{log_dark_matter}} AS ldm
@@ -155,22 +155,22 @@ 
     "REPLACE INTO `{{log_users_online}}`
       (online_timestamp, online_count, online_aggregated)
     SELECT
-      FROM_UNIXTIME((UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10 . ") * (" . PERIOD_MINUTE_10 . ")), ceil(avg(online_count)), " . LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10 . "
+      FROM_UNIXTIME((UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10.") * (".PERIOD_MINUTE_10.")), ceil(avg(online_count)), ".LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10."
     FROM
       `{{log_users_online}}`
     WHERE
-      online_timestamp < '{$pack_until}' AND online_aggregated = " . LOG_ONLIINE_AGGREGATE_NONE . "
+      online_timestamp < '{$pack_until}' AND online_aggregated = ".LOG_ONLIINE_AGGREGATE_NONE."
     GROUP BY
-      (UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10 . ") * (" . PERIOD_MINUTE_10 . ");",
+      (UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10.") * (".PERIOD_MINUTE_10.");",
 
-    "DELETE FROM {{log_users_online}} WHERE online_timestamp < '{$pack_until}' AND online_aggregated = " . LOG_ONLIINE_AGGREGATE_NONE,
+    "DELETE FROM {{log_users_online}} WHERE online_timestamp < '{$pack_until}' AND online_aggregated = ".LOG_ONLIINE_AGGREGATE_NONE,
   ),
 
   // Удаляем старые записи из логов
   "DELETE FROM `{{logs}}` WHERE log_timestamp < '{$pack_until}';",
   // Удаляем записи о маинтенансе, апдейте и пересчете статистики более чем недельной давности - они нам уже не нужны
   'DELETE FROM `{{logs}}` WHERE
-    `log_code` IN (' . LOG_INFO_DB_CHANGE . ', ' . LOG_INFO_MAINTENANCE . ', ' . LOG_INFO_STAT_START . ', ' . LOG_INFO_STAT_PROCESS . ', ' . LOG_INFO_STAT_FINISH . ')
+    `log_code` IN (' . LOG_INFO_DB_CHANGE.', '.LOG_INFO_MAINTENANCE.', '.LOG_INFO_STAT_START.', '.LOG_INFO_STAT_PROCESS.', '.LOG_INFO_STAT_FINISH.')
     AND `log_timestamp` < DATE_SUB(NOW(),INTERVAL 7 DAY);',
 
 
@@ -189,13 +189,13 @@ 
 $old_server_status == GAME_DISABLE_NONE ? classSupernova::$config->db_saveItem('game_disable', GAME_DISABLE_MAINTENANCE) : false;
 sn_db_transaction_commit();
 
-foreach($ques as $que_transaction) {
+foreach ($ques as $que_transaction) {
   sn_db_transaction_start();
 
   !is_array($que_transaction) ? $que_transaction = array($que_transaction) : false;
-  foreach($que_transaction as $que) {
+  foreach ($que_transaction as $que) {
     set_time_limit(120);
-    if(is_callable($que)) {
+    if (is_callable($que)) {
       $QryResult = call_user_func($que);
     } else {
       $QryResult = doquery($que);
@@ -206,12 +206,12 @@ 
     //$que = str_replace('}}', '', $que);
 
     $msg .=
-      '<li>' . htmlspecialchars($que) .
-        ' --- <span style="' . ($QryResult ? 'ok">OK' : 'error">FAILED!') . '</span> ' .
-      classSupernova::$db->db_affected_rows() . ' ' . classLocale::$lang['adm_records'] .
+      '<li>'.htmlspecialchars($que).
+        ' --- <span style="'.($QryResult ? 'ok">OK' : 'error">FAILED!').'</span> '.
+      classSupernova::$db->db_affected_rows().' '.classLocale::$lang['adm_records'].
       "</li>";
 
-    classSupernova::$debug->warning($que . ' --- ' . ($QryResult ? 'OK' : 'FAILED!') . ' ' . classSupernova::$db->db_affected_rows() . ' ' . classLocale::$lang['adm_records'], 'System maintenance', LOG_INFO_MAINTENANCE);
+    classSupernova::$debug->warning($que.' --- '.($QryResult ? 'OK' : 'FAILED!').' '.classSupernova::$db->db_affected_rows().' '.classLocale::$lang['adm_records'], 'System maintenance', LOG_INFO_MAINTENANCE);
   }
 
   sn_db_transaction_commit();
@@ -239,5 +239,5 @@ 
 
 $adm_stat_title = classLocale::$lang['adm_stat_title'];
 $result = $result ? "<li>{$adm_stat_title} - {$result}</li>" : '';
-$result = '<div align="left"><ul>' . $msg . $result . '</ul></div>';
-echo json_encode($result . ' ' . $totaltime);
+$result = '<div align="left"><ul>'.$msg.$result.'</ul></div>';
+echo json_encode($result.' '.$totaltime);

includes/db/db_queries_users.php

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
 
 
 function db_user_list_set_mass_mail(&$owners_list, $set) {
-  return classSupernova::db_upd_record_list(LOC_USER, !empty($owners_list) ? '`id` IN (' . implode(',', $owners_list) . ');' : '', $set);
+  return classSupernova::db_upd_record_list(LOC_USER, !empty($owners_list) ? '`id` IN ('.implode(',', $owners_list).');' : '', $set);
 }
 
 function db_user_list_set_by_ally_and_rank($ally_id, $ally_rank_id, $set) {
@@ -66,7 +66,7 @@ 
 }
 
 function db_user_count($online = false) {
-  $result = doquery('SELECT COUNT(id) AS user_count FROM `{{users}}` WHERE user_as_ally IS NULL' . ($online ? ' AND onlinetime > ' . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : ''), true);
+  $result = doquery('SELECT COUNT(id) AS user_count FROM `{{users}}` WHERE user_as_ally IS NULL'.($online ? ' AND onlinetime > '.(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : ''), true);
 
   return isset($result['user_count']) ? $result['user_count'] : 0;
 }
@@ -92,7 +92,7 @@ 
     "SELECT `id` AS `ID`, `username` AS `NAME`, `ally_name` AS `ALLY`, `total_points` AS `STAT_POINTS`,
       `onlinetime` AS `ACTIVITY`
     FROM `{{users}}`
-    WHERE `onlinetime` >= " . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) . " ORDER BY user_as_ally, `" . $TypeSort . "` ASC;");
+    WHERE `onlinetime` >= " . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout)." ORDER BY user_as_ally, `".$TypeSort."` ASC;");
 }
 
 
@@ -105,7 +105,7 @@ 
   return doquery("SELECT u.*, COUNT(r.id) AS referral_count, SUM(r.dark_matter) AS referral_dm FROM {{users}} as u
     LEFT JOIN {{referrals}} as r on r.id_partner = u.id
     WHERE" .
-    ($online ? " `onlinetime` >= " . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : ' user_as_ally IS NULL') .
+    ($online ? " `onlinetime` >= ".(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : ' user_as_ally IS NULL').
     " GROUP BY u.id
     ORDER BY user_as_ally, {$sort} ASC");
 }
@@ -121,7 +121,7 @@ 
   !is_array($user_id_list) ? $user_id_list = array($user_id_list) : false;
 
   $user_list = array();
-  foreach($user_id_list as $user_id_unsafe) {
+  foreach ($user_id_list as $user_id_unsafe) {
     $user = db_user_by_id($user_id_unsafe);
     !empty($user) ? $user_list[$user_id_unsafe] = $user : false;
   }
@@ -140,14 +140,14 @@ 
  * @return array|bool|mysqli_result|null
  */
 function db_user_list_non_bots() {
-  $query = doquery("SELECT `id` FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER . " FOR UPDATE;");
+  $query = doquery("SELECT `id` FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = ".USER_BOT_PLAYER." FOR UPDATE;");
 
   return $query;
 }
 
 function db_user_lock_with_target_owner_and_acs($user, $planet = array()) {
-  doquery("SELECT 1 FROM {{users}} WHERE `id` = " . idval($user['id']) .
-    (isset($planet['id_owner']) ? 'OR `id` = ' . idval($planet['id_owner']) . ' ' : '') .
+  doquery("SELECT 1 FROM {{users}} WHERE `id` = ".idval($user['id']).
+    (isset($planet['id_owner']) ? 'OR `id` = '.idval($planet['id_owner']).' ' : '').
   "FOR UPDATE;"
   );
 }

tests/HelperArrayTest.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
    * @cover ::filter
    */
   public function testFilter() {
-    $callback = function ($value) {
+    $callback = function($value) {
       return !empty($value);
     };