supernova-ws / SuperNova

includes/classes/DBStaticNews.php

Doc Comments +3 added lines, -3 removed lines

@@ -25,9 +25,9 @@
   }
 
   /**
-   * @param $template
-   * @param $query_where
-   * @param $query_limit
+   * @param template $template
+   * @param string $query_where
+   * @param integer $query_limit
    *
    * @return array|bool|mysqli_result|null
    */

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

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
    * @param $user
    * @param $survey_id
    * @param $survey_vote_id
-   * @param $user_name_safe
+   * @param string $user_name_safe
    */
   public static function db_survey_vote_insert(&$user, $survey_id, $survey_vote_id, $user_name_safe) {
     doquery("INSERT INTO {{survey_votes}} SET `survey_parent_id` = {$survey_id}, `survey_parent_answer_id` = {$survey_vote_id}, `survey_vote_user_id` = {$user['id']}, `survey_vote_user_name` = '{$user_name_safe}';");

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/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

Doc Comments +2 added lines, -2 removed lines

@@ -55,8 +55,8 @@
   }
 
   /**
-   * @param int|string  $recordId
-   * @param mixed|array $fieldList
+   * @param integer  $recordId
+   * @param string[] $fieldList
    * @param bool        $forUpdate
    *
    * @return array|null

Spacing +4 added lines, -4 removed lines

@@ -91,7 +91,7 @@ 
    * @return array|null
    */
   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);
   }
 
   /**
@@ -104,7 +104,7 @@ 
       $query = static::selectIterator(
         static::buildSelect()
           ->fields(static::$_idField)
-          ->where(array("`" . static::$_idField . "` IN (" . implode(',', $idList) . ")"))
+          ->where(array("`".static::$_idField."` IN (".implode(',', $idList).")"))
       );
     } else {
       $query = new DbEmptyIterator();
@@ -125,7 +125,7 @@ 
 
     $result = array();
     if (!empty($idList)) {
-      foreach(static::queryExistsIdInList($idList) as $row) {
+      foreach (static::queryExistsIdInList($idList) as $row) {
         $result[] = $row[static::$_idField];
       }
     }
@@ -150,7 +150,7 @@ 
    */
   protected static function selectIterator($sql) {
     $result = static::$dbStatic->selectIterator($sql, false);
-    if(!($result instanceof DbResultIterator)) {
+    if (!($result instanceof DbResultIterator)) {
       $result = new DbEmptyIterator();
     }
     return $result;

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

Doc Comments +10 added lines, -3 removed lines

@@ -124,7 +124,7 @@ 
   /**
    * @param string $query
    *
-   * @return mixed|string
+   * @return string
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
@@ -138,8 +138,8 @@ 
   }
 
   /**
-   * @param       $query
-   * @param       $fetch
+   * @param       string $query
+   * @param       boolean $fetch
    */
   protected function logQuery($query, $fetch) {
     if (!classSupernova::$config->debug) {
@@ -257,6 +257,10 @@ 
 
 
   // TODO Заменить это на новый логгер
+
+  /**
+   * @param string $query
+   */
   protected function security_watch_user_queries($query) {
     global $user;
 
@@ -280,6 +284,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   public function security_query_check_bad_words($query, $skip_query_check = false) {
     if ($skip_query_check) {
       return;

Spacing +33 added lines, -33 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;
   }
@@ -130,7 +130,7 @@ 
     $sql = $query;
     if (strpos($sql, '{{') !== false) {
       foreach ($this->table_list as $tableName) {
-        $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
+        $sql = str_replace("{{{$tableName}}}", $this->db_prefix.$tableName, $sql);
       }
     }
 
@@ -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>");
   }
 
 
@@ -219,13 +219,13 @@ 
           ->execute()
           ->getResult();
       } else {
-        $queryResult = $this->db_sql_query($stringQuery . DbSqlHelper::quoteComment($queryTrace));
+        $queryResult = $this->db_sql_query($stringQuery.DbSqlHelper::quoteComment($queryTrace));
       }
       if (!$queryResult) {
         throw new Exception();
       }
     } catch (Exception $e) {
-      classSupernova::$debug->error($this->db_error() . "<br />{$query}<br />", 'SQL Error');
+      classSupernova::$debug->error($this->db_error()."<br />{$query}<br />", 'SQL Error');
     }
 
     if ($fetch) {
@@ -272,7 +272,7 @@ 
           ->execute()
           ->getIterator();
       } else {
-        $queryResult = $this->db_sql_query($stringQuery . DbSqlHelper::quoteComment($queryTrace));
+        $queryResult = $this->db_sql_query($stringQuery.DbSqlHelper::quoteComment($queryTrace));
 
         if (!$queryResult) {
           throw new Exception();
@@ -285,7 +285,7 @@ 
         }
       }
     } catch (Exception $e) {
-      classSupernova::$debug->error($this->db_error() . "<br />{$query}<br />", 'SQL Error');
+      classSupernova::$debug->error($this->db_error()."<br />{$query}<br />", 'SQL Error');
     }
 
     return $result;
@@ -354,10 +354,10 @@ 
       $this->isWatching = true;
       $msg = "\$query = \"{$query}\"\n\r";
       if (!empty($_POST)) {
-        $msg .= "\n\r" . dump($_POST, '$_POST');
+        $msg .= "\n\r".dump($_POST, '$_POST');
       }
       if (!empty($_GET)) {
-        $msg .= "\n\r" . dump($_GET, '$_GET');
+        $msg .= "\n\r".dump($_GET, '$_GET');
       }
       classSupernova::$debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
       $this->isWatching = false;
@@ -372,7 +372,7 @@ 
 
     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:
@@ -383,37 +383,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);
 
@@ -434,7 +434,7 @@ 
     $prefix_length = strlen($this->db_prefix);
 
     $tl = array();
-    while($row = $this->db_fetch($query)) {
+    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);
@@ -565,7 +565,7 @@ 
     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/DbSqlLiteral.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
    * @return $this
    */
   public function literal($value) {
-    $this->literal = (string)$value;
+    $this->literal = (string) $value;
 
     return $this;
   }
@@ -64,10 +64,10 @@ 
       $alias = $this->aliasFromField($functionName, $field);
     }
 
-    $this->literal = strtoupper($functionName) . '(' . $this->quoteField($field) . ')';
+    $this->literal = strtoupper($functionName).'('.$this->quoteField($field).')';
 
     if (self::SQL_LITERAL_ALIAS_NONE !== $alias && !empty($alias)) {
-      $this->literal .= ' AS `' . $alias . '`';
+      $this->literal .= ' AS `'.$alias.'`';
     }
 
     return $this;
@@ -124,10 +124,10 @@ 
       $alias = $this->aliasFromField($functionName, $field);
     }
 
-    $this->literal = $this->quoteField($field) . ' IS NULL';
+    $this->literal = $this->quoteField($field).' IS NULL';
 
     if (!empty($alias)) {
-      $this->literal .= ' AS `' . $alias . '`';
+      $this->literal .= ' AS `'.$alias.'`';
     }
 
     return $this;

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
   }
 
   /**
-   * @param mixed $value
+   * @param string $value
    *
    * @return $this
    */