supernova-ws / SuperNova

announce.php

Spacing +15 added lines, -15 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 $allow_anonymous = true;
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 global $config;
 
@@ -23,40 +23,40 @@ 
 $mode = sys_get_param_str('mode');
 
 $announce = array();
-if($user['authlevel'] >= 3) {
-  if(!empty($text)) {
+if ($user['authlevel'] >= 3) {
+  if (!empty($text)) {
     $announce_time = strtotime($announce_time, SN_TIME_NOW);
     $announce_time = $announce_time ? $announce_time : SN_TIME_NOW;
 
-    if($mode == 'edit') {
+    if ($mode == 'edit') {
       DBStaticNews::db_news_update_set($announce_time, $text, $detail_url, $announce_id);
       DBStaticSurvey::db_survey_delete_by_id($announce_id);
     } else {
       DBStaticNews::db_news_insert_set($announce_time, $text, $detail_url, $user);
       $announce_id = db_insert_id();
     }
-    if(($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
+    if (($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
       $survey_answers = explode("\r\n", $survey_answers);
       $survey_until = strtotime($survey_until = sys_get_param_str('survey_until'), SN_TIME_NOW);
       $survey_until = date(FMT_DATE_TIME_SQL, $survey_until ? $survey_until : SN_TIME_NOW + PERIOD_DAY * 1);
       DBStaticSurvey::db_survey_insert($announce_id, $survey_question, $survey_until);
       $survey_id = db_insert_id();
-      foreach($survey_answers as $survey_answer) {
+      foreach ($survey_answers as $survey_answer) {
         $survey_answer = db_escape(trim($survey_answer));
-        if(empty($survey_answer)) {
+        if (empty($survey_answer)) {
           continue;
         }
         DBStaticSurveyAnswer::db_survey_answer_insert($survey_id, $survey_answer);
       }
     }
 
-    if($announce_time <= SN_TIME_NOW) {
-      if($announce_time > $config->var_news_last && $announce_time == SN_TIME_NOW) {
+    if ($announce_time <= SN_TIME_NOW) {
+      if ($announce_time > $config->var_news_last && $announce_time == SN_TIME_NOW) {
         $config->db_saveItem('var_news_last', $announce_time);
       }
 
-      if(sys_get_param_int('news_mass_mail')) {
-        $text = sys_get_param('text') . ($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang['news_more']}</span></a>" : '');
+      if (sys_get_param_int('news_mass_mail')) {
+        $text = sys_get_param('text').($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang['news_more']}</span></a>" : '');
         msg_send_simple_message('*', 0, 0, MSG_TYPE_ADMIN, $lang['sys_administration'], $lang['news_title'], $text);
       }
     }
@@ -66,7 +66,7 @@ 
   }
 
   $survey_answers = '';
-  switch($mode) {
+  switch ($mode) {
     case 'del':
       DBStaticNews::db_news_delete_by_id($announce_id);
       $mode = '';
@@ -76,9 +76,9 @@ 
       $template->assign_var('ID', $announce_id);
     case 'copy':
       $announce = DBStaticNews::db_news_with_survey_select_by_id($announce_id);
-      if($announce['survey_id']) {
+      if ($announce['survey_id']) {
         $query = DBStaticSurveyAnswer::db_survey_answer_text_select_by_news($announce);
-        while($row = db_fetch($query)) {
+        while ($row = db_fetch($query)) {
           $survey_answers[] = $row['survey_answer_text'];
         }
         $survey_answers = implode("\r\n", $survey_answers);
@@ -86,7 +86,7 @@ 
     break;
   }
 } else {
-  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= ' . SN_TIME_NOW;
+  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= '.SN_TIME_NOW;
 }
 
 nws_render($template, $annQuery, 20);

includes/classes/db_mysql.php

Spacing +55 added lines, -55 removed lines

@@ -65,7 +65,7 @@ 
   public function load_db_settings() {
     $dbsettings = array();
 
-    require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+    require(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
 
     $this->dbsettings = $dbsettings;
   }
@@ -73,23 +73,23 @@ 
   public function sn_db_connect($external_db_settings = null) {
     $this->db_disconnect();
 
-    if(!empty($external_db_settings) && is_array($external_db_settings)) {
+    if (!empty($external_db_settings) && is_array($external_db_settings)) {
       $this->dbsettings = $external_db_settings;
     }
 
-    if(empty($this->dbsettings)) {
+    if (empty($this->dbsettings)) {
       $this->load_db_settings();
     }
 
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
-    if(!empty($this->dbsettings)) {
+    if (!empty($this->dbsettings)) {
       $driver_name = empty($this->dbsettings['sn_driver']) ? 'db_mysql_v5' : $this->dbsettings['sn_driver'];
       $this->driver = new $driver_name();
       $this->db_prefix = $this->dbsettings['prefix'];
 
       $this->connected = $this->connected || $this->driver_connect();
 
-      if($this->connected) {
+      if ($this->connected) {
         $this->table_list = $this->db_get_table_list();
         // TODO Проверка на пустоту
       }
@@ -101,11 +101,11 @@ 
   }
 
   protected function driver_connect() {
-    if(!is_object($this->driver)) {
+    if (!is_object($this->driver)) {
       classSupernova::$debug->error_fatal('DB Error - No driver for MySQL found!');
     }
 
-    if(!method_exists($this->driver, 'mysql_connect')) {
+    if (!method_exists($this->driver, 'mysql_connect')) {
       classSupernova::$debug->error_fatal('DB Error - WRONG MySQL driver!');
     }
 
@@ -113,7 +113,7 @@ 
   }
 
   public function db_disconnect() {
-    if($this->connected) {
+    if ($this->connected) {
       $this->connected = !$this->driver_disconnect();
       $this->connected = false;
     }
@@ -128,9 +128,9 @@ 
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
-    if(strpos($sql, '{{') !== false) {
-      foreach($this->table_list as $tableName) {
-        $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
+    if (strpos($sql, '{{') !== false) {
+      foreach ($this->table_list as $tableName) {
+        $sql = str_replace("{{{$tableName}}}", $this->db_prefix.$tableName, $sql);
       }
     }
 
@@ -142,7 +142,7 @@ 
    * @param       $fetch
    */
   protected function logQuery($query, $fetch) {
-    if(!classSupernova::$config->debug) {
+    if (!classSupernova::$config->debug) {
       return;
     }
 
@@ -150,7 +150,7 @@ 
     $arr = debug_backtrace();
     $file = end(explode('/', $arr[0]['file']));
     $line = $arr[0]['line'];
-    classSupernova::$debug->add("<tr><th>Query {$this->queryCount}: </th><th>$query</th><th>{$file} @ {$line}</th><th>&nbsp;</th><th> " . ($fetch ? '+' : '&nbsp;') . " </th></tr>");
+    classSupernova::$debug->add("<tr><th>Query {$this->queryCount}: </th><th>$query</th><th>{$file} @ {$line}</th><th>&nbsp;</th><th> ".($fetch ? '+' : '&nbsp;')." </th></tr>");
   }
 
 
@@ -160,18 +160,18 @@ 
    * @return void
    */
   protected function commentQuery(&$sql) {
-    if(!defined('DEBUG_SQL_COMMENT')) {
+    if (!defined('DEBUG_SQL_COMMENT')) {
       return;
     }
     $backtrace = debug_backtrace();
     $sql_comment = classSupernova::$debug->compact_backtrace($backtrace, defined('DEBUG_SQL_COMMENT_LONG'));
 
-    $sql_commented = '/* ' . implode("<br />", $sql_comment) . '<br /> */ ' . preg_replace("/\s+/", ' ', $sql);
-    if(defined('DEBUG_SQL_ONLINE')) {
+    $sql_commented = '/* '.implode("<br />", $sql_comment).'<br /> */ '.preg_replace("/\s+/", ' ', $sql);
+    if (defined('DEBUG_SQL_ONLINE')) {
       classSupernova::$debug->warning($sql_commented, 'SQL Debug', LOG_DEBUG_SQL);
     }
 
-    if(defined('DEBUG_SQL_ERROR')) {
+    if (defined('DEBUG_SQL_ERROR')) {
       array_unshift($sql_comment, preg_replace("/\s+/", ' ', $sql));
       classSupernova::$debug->add_to_array($sql_comment);
     }
@@ -185,7 +185,7 @@ 
    * @return array|bool|mysqli_result|null
    */
   public function execute($statement) {
-    return $this->doquery((string)$statement);
+    return $this->doquery((string) $statement);
   }
 
   /**
@@ -199,11 +199,11 @@ 
   }
 
   public function doquery($query, $table = '', $fetch = false, $skip_query_check = false) {
-    if(!is_string($table)) {
+    if (!is_string($table)) {
       $fetch = $table;
     }
 
-    if(!$this->connected) {
+    if (!$this->connected) {
       $this->sn_db_connect();
     }
 
@@ -214,7 +214,7 @@ 
 
     $sql = $this->replaceTablePlaceholders($query);
     $this->commentQuery($sql);
-    !($sqlquery = $this->db_sql_query($sql)) ? classSupernova::$debug->error(db_error() . "<br />$sql<br />", 'SQL Error') : false;
+    !($sqlquery = $this->db_sql_query($sql)) ? classSupernova::$debug->error(db_error()."<br />$sql<br />", 'SQL Error') : false;
 
     return $fetch ? $this->db_fetch($sqlquery) : $sqlquery;
   }
@@ -224,7 +224,7 @@ 
   protected function security_watch_user_queries($query) {
     global $user;
 
-    if(
+    if (
       !$this->isWatching // Not already watching
       && !empty(classSupernova::$config->game_watchlist_array) // There is some players in watchlist
       && in_array($user['id'], classSupernova::$config->game_watchlist_array) // Current player is in watchlist
@@ -232,11 +232,11 @@ 
     ) {
       $this->isWatching = true;
       $msg = "\$query = \"{$query}\"\n\r";
-      if(!empty($_POST)) {
-        $msg .= "\n\r" . dump($_POST, '$_POST');
+      if (!empty($_POST)) {
+        $msg .= "\n\r".dump($_POST, '$_POST');
       }
-      if(!empty($_GET)) {
-        $msg .= "\n\r" . dump($_GET, '$_GET');
+      if (!empty($_GET)) {
+        $msg .= "\n\r".dump($_GET, '$_GET');
       }
       classSupernova::$debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
       $this->isWatching = false;
@@ -247,7 +247,7 @@ 
   public function security_query_check_bad_words($query) {
     global $user, $dm_change_legit, $mm_change_legit;
 
-    switch(true) {
+    switch (true) {
       case stripos($query, 'RUNCATE TABL') != false:
       case stripos($query, 'ROP TABL') != false:
       case stripos($query, 'ENAME TABL') != false:
@@ -258,37 +258,37 @@ 
       case stripos($query, 'RPG_POINTS') != false && stripos(trim($query), 'UPDATE ') === 0 && !$dm_change_legit:
       case stripos($query, 'METAMATTER') != false && stripos(trim($query), 'UPDATE ') === 0 && !$mm_change_legit:
       case stripos($query, 'AUTHLEVEL') != false && $user['authlevel'] < 3 && stripos($query, 'SELECT') !== 0:
-        $report = "Hacking attempt (" . date("d.m.Y H:i:s") . " - [" . time() . "]):\n";
+        $report = "Hacking attempt (".date("d.m.Y H:i:s")." - [".time()."]):\n";
         $report .= ">Database Inforamation\n";
-        $report .= "\tID - " . $user['id'] . "\n";
-        $report .= "\tUser - " . $user['username'] . "\n";
-        $report .= "\tAuth level - " . $user['authlevel'] . "\n";
-        $report .= "\tAdmin Notes - " . $user['adminNotes'] . "\n";
-        $report .= "\tCurrent Planet - " . $user['current_planet'] . "\n";
-        $report .= "\tUser IP - " . $user['user_lastip'] . "\n";
-        $report .= "\tUser IP at Reg - " . $user['ip_at_reg'] . "\n";
-        $report .= "\tUser Agent- " . $_SERVER['HTTP_USER_AGENT'] . "\n";
-        $report .= "\tCurrent Page - " . $user['current_page'] . "\n";
-        $report .= "\tRegister Time - " . $user['register_time'] . "\n";
+        $report .= "\tID - ".$user['id']."\n";
+        $report .= "\tUser - ".$user['username']."\n";
+        $report .= "\tAuth level - ".$user['authlevel']."\n";
+        $report .= "\tAdmin Notes - ".$user['adminNotes']."\n";
+        $report .= "\tCurrent Planet - ".$user['current_planet']."\n";
+        $report .= "\tUser IP - ".$user['user_lastip']."\n";
+        $report .= "\tUser IP at Reg - ".$user['ip_at_reg']."\n";
+        $report .= "\tUser Agent- ".$_SERVER['HTTP_USER_AGENT']."\n";
+        $report .= "\tCurrent Page - ".$user['current_page']."\n";
+        $report .= "\tRegister Time - ".$user['register_time']."\n";
         $report .= "\n";
 
         $report .= ">Query Information\n";
-        $report .= "\tQuery - " . $query . "\n";
+        $report .= "\tQuery - ".$query."\n";
         $report .= "\n";
 
         $report .= ">\$_SERVER Information\n";
-        $report .= "\tIP - " . $_SERVER['REMOTE_ADDR'] . "\n";
-        $report .= "\tHost Name - " . $_SERVER['HTTP_HOST'] . "\n";
-        $report .= "\tUser Agent - " . $_SERVER['HTTP_USER_AGENT'] . "\n";
-        $report .= "\tRequest Method - " . $_SERVER['REQUEST_METHOD'] . "\n";
-        $report .= "\tCame From - " . $_SERVER['HTTP_REFERER'] . "\n";
-        $report .= "\tPage is - " . $_SERVER['SCRIPT_NAME'] . "\n";
-        $report .= "\tUses Port - " . $_SERVER['REMOTE_PORT'] . "\n";
-        $report .= "\tServer Protocol - " . $_SERVER['SERVER_PROTOCOL'] . "\n";
+        $report .= "\tIP - ".$_SERVER['REMOTE_ADDR']."\n";
+        $report .= "\tHost Name - ".$_SERVER['HTTP_HOST']."\n";
+        $report .= "\tUser Agent - ".$_SERVER['HTTP_USER_AGENT']."\n";
+        $report .= "\tRequest Method - ".$_SERVER['REQUEST_METHOD']."\n";
+        $report .= "\tCame From - ".$_SERVER['HTTP_REFERER']."\n";
+        $report .= "\tPage is - ".$_SERVER['SCRIPT_NAME']."\n";
+        $report .= "\tUses Port - ".$_SERVER['REMOTE_PORT']."\n";
+        $report .= "\tServer Protocol - ".$_SERVER['SERVER_PROTOCOL']."\n";
 
         $report .= "\n--------------------------------------------------------------------------------------------------\n";
 
-        $fp = fopen(SN_ROOT_PHYSICAL . 'badqrys.txt', 'a');
+        $fp = fopen(SN_ROOT_PHYSICAL.'badqrys.txt', 'a');
         fwrite($fp, $report);
         fclose($fp);
 
@@ -309,11 +309,11 @@ 
     $prefix_length = strlen($this->db_prefix);
 
     $tl = array();
-    while($row = $this->db_fetch($query)) {
-      foreach($row as $table_name) {
-        if(strpos($table_name, $this->db_prefix) === 0) {
+    while ($row = $this->db_fetch($query)) {
+      foreach ($row as $table_name) {
+        if (strpos($table_name, $this->db_prefix) === 0) {
           $table_name = substr($table_name, $prefix_length);
-        } elseif($prefixed_only) {
+        } elseif ($prefixed_only) {
           continue;
         }
         // $table_name = str_replace($db_prefix, '', $table_name);
@@ -408,7 +408,7 @@ 
     $result = array();
 
     $status = explode('  ', $this->driver->mysql_stat());
-    foreach($status as $value) {
+    foreach ($status as $value) {
       $row = explode(': ', $value);
       $result[$row[0]] = $row[1];
     }
@@ -424,10 +424,10 @@ 
     $result = array();
 
     $query = $this->db_sql_query('SHOW STATUS;');
-    if(is_bool($query)) {
+    if (is_bool($query)) {
       throw new Exception('Result of SHOW STATUS command is boolean - which should never happen. Connection to DB is lost?');
     }
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[$row['Variable_name']] = $row['Value'];
     }
 

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/classes/DBStaticRecord.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
    */
   public static function getRecordById($recordId, $fieldList = '*', $forUpdate = false) {
 //    return static::getRecord(array(static::$_idField => $recordId), $fieldList, $forUpdate);
-    return static::getRecord(array(static::$_idField . '=' . $recordId), $fieldList, $forUpdate);
+    return static::getRecord(array(static::$_idField.'='.$recordId), $fieldList, $forUpdate);
   }
 
 
@@ -84,7 +84,7 @@ 
         DbSqlStatement::build(null, get_called_class())
           ->select()
           ->fields(static::$_idField)
-          ->where(array("`" . static::$_idField . "` IN (" . implode(',', $idList) . ")"))
+          ->where(array("`".static::$_idField."` IN (".implode(',', $idList).")"))
       );
     }
 

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('Обработка миссий');

includes/classes/DBStaticUser.php

Spacing +6 added lines, -6 removed lines

@@ -49,7 +49,7 @@ 
       static::buildSelect()
         ->fields('id')
         ->where(array(
-          "`user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER . " FOR UPDATE;"
+          "`user_as_ally` IS NULL AND `user_bot` = ".USER_BOT_PLAYER." FOR UPDATE;"
         ))
     );
 
@@ -61,8 +61,8 @@ 
   public static function db_user_lock_with_target_owner_and_acs($user, $planet = array()) {
     static::$dbStatic->execute(
       static::buildSelectLock()
-        ->where(array("`id` = " . idval($user['id']) .
-          (isset($planet['id_owner']) ? ' OR `id` = ' . idval($planet['id_owner']) : '')))
+        ->where(array("`id` = ".idval($user['id']).
+          (isset($planet['id_owner']) ? ' OR `id` = '.idval($planet['id_owner']) : '')))
     );
 
 //    doquery("SELECT 1 FROM {{users}} WHERE `id` = " . idval($user['id']) .
@@ -72,7 +72,7 @@ 
   }
 
   public static 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;
   }
@@ -112,7 +112,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");
   }
@@ -168,7 +168,7 @@ 
   }
 
   public static 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);
   }
 
   public static function db_user_list_set_by_ally_and_rank($ally_id, $ally_rank_id, $set) {

includes/classes/classSupernova.php

Spacing +18 added lines, -20 removed lines

@@ -236,7 +236,7 @@ 
   public static function cache_clear($location_type, $hard = true) {
     if ($hard && !empty(static::$data[$location_type])) {
       // Здесь нельзя делать unset - надо записывать NULL, что бы это отразилось на зависимых записях
-      array_walk(static::$data[$location_type], function (&$item) { $item = null; });
+      array_walk(static::$data[$location_type], function(&$item) { $item = null; });
     }
     static::$locator[$location_type] = array();
     static::$queries[$location_type] = array();
@@ -354,7 +354,7 @@ 
 
     if (!empty($error_msg)) {
       // TODO - Убрать позже
-      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - ' . $error_msg . '</h1>');
+      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - '.$error_msg.'</h1>');
       $backtrace = debug_backtrace();
       array_shift($backtrace);
       pdump($backtrace);
@@ -367,7 +367,7 @@ 
   public static function db_transaction_start($level = '') {
     static::db_transaction_check(null);
 
-    $level ? doquery('SET TRANSACTION ISOLATION LEVEL ' . $level) : false;
+    $level ? doquery('SET TRANSACTION ISOLATION LEVEL '.$level) : false;
 
     static::$transaction_id++;
     doquery('START TRANSACTION');
@@ -427,7 +427,7 @@ 
   public static function db_lock_tables($tables) {
     $tables = is_array($tables) ? $tables : array($tables => '');
     foreach ($tables as $table_name => $condition) {
-      self::$db->doquery("SELECT 1 FROM {{{$table_name}}}" . ($condition ? ' WHERE ' . $condition : ''));
+      self::$db->doquery("SELECT 1 FROM {{{$table_name}}}".($condition ? ' WHERE '.$condition : ''));
     }
   }
 
@@ -503,8 +503,8 @@ 
           $query = static::db_query(
             "SELECT
               distinct({{{$location_info[P_TABLE_NAME]}}}.{$owner_data[P_OWNER_FIELD]}) AS parent_id
-            FROM {{{$location_info[P_TABLE_NAME]}}}" .
-            ($filter ? ' WHERE ' . $filter : '') .
+            FROM {{{$location_info[P_TABLE_NAME]}}}".
+            ($filter ? ' WHERE '.$filter : '').
             ($fetch ? ' LIMIT 1' : ''), false, true);
 
           while ($row = db_fetch($query)) {
@@ -517,13 +517,13 @@ 
           if ($indexes_str = implode(',', $parent_id_list)) {
             $parent_id_field = static::$location_info[$owner_location_type][P_ID];
             static::db_get_record_list($owner_location_type,
-              $parent_id_field . (count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
+              $parent_id_field.(count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
           }
         }
       }
 
       $query = static::db_query(
-        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}" .
+        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}".
         (($filter = trim($filter)) ? " WHERE {$filter}" : '')
       );
       while ($row = db_fetch($query)) {
@@ -589,7 +589,7 @@ 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
-    if ($result = static::db_query("UPDATE {{{$table_name}}} SET " . $set . ($condition ? ' WHERE ' . $condition : ''))) {
+    if ($result = static::db_query("UPDATE {{{$table_name}}} SET ".$set.($condition ? ' WHERE '.$condition : ''))) {
 
       if (static::$db->db_affected_rows()) { // Обновляем данные только если ряд был затронут
         // Поскольку нам неизвестно, что и как обновилось - сбрасываем кэш этого типа полностью
@@ -751,7 +751,7 @@ 
       // TODO переписать
       $user = static::dbFetchOne(
         DBStaticUser::buildSelect()
-          ->where(array("`username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"))
+          ->where(array("`username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"))
       );
 
 //      $user = static::db_query(
@@ -844,7 +844,7 @@ 
 
     $query_cache = &static::$locator[LOC_UNIT][$location_type][$location_id];
     if (!isset($query_cache)) {
-      $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND " . static::db_unit_time_restrictions());
+      $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND ".static::db_unit_time_restrictions());
       if (is_array($got_data)) {
         foreach ($got_data as $unit_id => $unit_data) {
           $query_cache[$unit_data['unit_snid']] = &static::$data[LOC_UNIT][$unit_id];
@@ -905,7 +905,7 @@ 
     if ($que_type == QUE_RESEARCH || $planet_id === null) {
       $query[] = "`que_planet_id` IS NULL";
     } elseif ($planet_id) {
-      $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
+      $query[] = "(`que_planet_id` = {$planet_id}".($que_type ? '' : ' OR que_planet_id IS NULL').")";
     }
     if ($que_type) {
       $query[] = "`que_type` = {$que_type}";
@@ -1026,13 +1026,13 @@ 
         $condition = "`{$field_name}` = ";
         $value = '';
         if ($field_data['delta']) {
-          $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
+          $value = "`{$field_name}`".($field_data['delta'] >= 0 ? '+' : '').$field_data['delta'];
         } elseif ($field_data['set']) {
           $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
         }
 
         if ($value) {
-          $fields[] = $condition . $value;
+          $fields[] = $condition.$value;
         }
       }
       $conditions[P_FIELDS_STR] = implode(',', $fields);
@@ -1046,9 +1046,7 @@ 
           // Простое условие - $field_id = $field_value
           if (is_string($field_id)) {
             $field_value =
-              $field_value === null ? 'NULL' :
-                (is_string($field_value) ? "'" . db_escape($field_value) . "'" :
-                  (is_bool($field_value) ? intval($field_value) : $field_value));
+              $field_value === null ? 'NULL' : (is_string($field_value) ? "'".db_escape($field_value)."'" : (is_bool($field_value) ? intval($field_value) : $field_value));
             $the_conditions[] = "`{$field_id}` = {$field_value}";
           } else {
             die('Неподдерживаемый тип условия');
@@ -1075,7 +1073,7 @@ 
         die('Неподдерживаемая операция в classSupernova::db_changeset_condition_compile');
     }
 
-    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR] . ' ' . $conditions[P_FIELDS_STR] . (' WHERE ' . $conditions[P_WHERE_STR]);
+    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR].' '.$conditions[P_FIELDS_STR].(' WHERE '.$conditions[P_WHERE_STR]);
   }
 
   public static function db_changeset_apply($db_changeset, $flush_delayed = false) {
@@ -1173,7 +1171,7 @@ 
     ini_get('magic_quotes_sybase') ? die('SN is incompatible with \'magic_quotes_sybase\' turned on. Disable it in php.ini or .htaccess...') : false;
     if (@get_magic_quotes_gpc()) {
       $gpcr = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
-      array_walk_recursive($gpcr, function (&$value, $key) {
+      array_walk_recursive($gpcr, function(&$value, $key) {
         $value = stripslashes($value);
       });
     }
@@ -1187,7 +1185,7 @@ 
   public static function init_3_load_config_file() {
     $dbsettings = array();
 
-    require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+    require(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
     self::$cache_prefix = !empty($dbsettings['cache_prefix']) ? $dbsettings['cache_prefix'] : $dbsettings['prefix'];
     self::$db_name = $dbsettings['name'];
     self::$sn_secret_word = $dbsettings['secretword'];

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/DbSqlStatement.php

Spacing +10 added lines, -10 removed lines

@@ -243,9 +243,9 @@ 
   }
 
   protected function compileFrom() {
-    $this->_compiledQuery[] = 'FROM `{{' . $this->stringEscape($this->table) . '}}`';
+    $this->_compiledQuery[] = 'FROM `{{'.$this->stringEscape($this->table).'}}`';
     if (!empty($this->alias)) {
-      $this->_compiledQuery[] = 'AS `' . $this->stringEscape($this->alias) . '`';
+      $this->_compiledQuery[] = 'AS `'.$this->stringEscape($this->alias).'`';
     }
   }
 
@@ -254,28 +254,28 @@ 
 
   protected function compileWhere() {
     // TODO - fields should be escaped !!
-    !empty($this->where) ? $this->_compiledQuery[] = 'WHERE ' . implode(' AND ', $this->where) : false;
+    !empty($this->where) ? $this->_compiledQuery[] = 'WHERE '.implode(' AND ', $this->where) : false;
   }
 
   protected function compileGroupBy() {
     // TODO - fields should be escaped !!
-    !empty($this->groupBy) ? $this->_compiledQuery[] = 'GROUP BY ' . implode(',', $this->arrayEscape($this->groupBy)) : false;
+    !empty($this->groupBy) ? $this->_compiledQuery[] = 'GROUP BY '.implode(',', $this->arrayEscape($this->groupBy)) : false;
   }
 
   protected function compileOrderBy() {
     // TODO - fields should be escaped !!
-    !empty($this->orderBy) ? $this->_compiledQuery[] = 'ORDER BY ' . implode(',', $this->arrayEscape($this->orderBy)) : false;
+    !empty($this->orderBy) ? $this->_compiledQuery[] = 'ORDER BY '.implode(',', $this->arrayEscape($this->orderBy)) : false;
   }
 
   protected function compileHaving() {
     // TODO - fields should be escaped !!
-    !empty($this->having) ? $this->_compiledQuery[] = 'HAVING ' . implode(' AND ', $this->having) : false;
+    !empty($this->having) ? $this->_compiledQuery[] = 'HAVING '.implode(' AND ', $this->having) : false;
   }
 
   protected function compileLimit() {
     // TODO - fields should be escaped !!
     if ($limit = $this->fetchOne ? 1 : $this->limit) {
-      $this->_compiledQuery[] = 'LIMIT ' . $limit . (!empty($this->offset) ? ' OFFSET ' . $this->offset : '');
+      $this->_compiledQuery[] = 'LIMIT '.$limit.(!empty($this->offset) ? ' OFFSET '.$this->offset : '');
     }
   }
 
@@ -349,7 +349,7 @@ 
    * @return string
    */
   protected function processFieldString($fieldName) {
-    $result = (string)$fieldName;
+    $result = (string) $fieldName;
     if (
       $result != ''
       &&
@@ -357,7 +357,7 @@ 
       !($fieldName instanceof DbSqlLiteral)
     ) {
       // Other should be formatted
-      $result = '`' . $this->stringEscape($result) . '`';
+      $result = '`'.$this->stringEscape($result).'`';
     }
 
     return $result;
@@ -370,7 +370,7 @@ 
    */
   protected function processField($fieldName) {
     if (is_bool($fieldName)) {
-      $result = (string)intval($fieldName);
+      $result = (string) intval($fieldName);
     } elseif (is_numeric($fieldName)) {
       $result = $fieldName;
     } elseif (is_null($fieldName)) {