supernova-ws / SuperNova

includes/classes/DBStaticUser.php

Doc Comments +6 added lines

@@ -78,6 +78,9 @@ 
   }
 
 
+  /**
+   * @param integer $config_user_birthday_range
+   */
   public static function db_user_list_to_celebrate($config_user_birthday_range) {
     return doquery(
       "SELECT
@@ -163,6 +166,9 @@ 
   }
 
 
+  /**
+   * @param boolean $player
+   */
   public static function db_user_by_id($user_id_unsafe, $for_update = false, $fields = '*', $player = null) {
     return classSupernova::db_get_user_by_id($user_id_unsafe, $for_update, $fields, $player);
   }

Spacing +5 added lines, -5 removed lines

@@ -54,7 +54,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;"
         ))
     );
 
@@ -69,7 +69,7 @@ 
 //    );
 
     return static::prepareExecute(
-      "SELECT 1 FROM {{users}} WHERE `id` = :userId" .
+      "SELECT 1 FROM {{users}} WHERE `id` = :userId".
       (!empty($planet['id_owner']) ? ' OR `id` = :planetOwnerId' : ''),
       array(
         ':userId'        => idval($user['id']),
@@ -80,7 +80,7 @@ 
 
   public static function db_user_count($online = false) {
     return static::prepareFetchValue(
-      'SELECT COUNT(id) AS user_count FROM `{{users}}` WHERE user_as_ally IS NULL' .
+      'SELECT COUNT(id) AS user_count FROM `{{users}}` WHERE user_as_ally IS NULL'.
       ($online ? ' AND onlinetime > :onlineTime' : ''),
       array(
         ':onlineTime' => SN_TIME_NOW - classSupernova::$config->game_users_online_timeout,
@@ -97,7 +97,7 @@ 
           LEFT JOIN
               {{referrals}} as r on r.id_partner = u.id
       WHERE " .
-      ($online ? "`onlinetime` >= :onlineTime" : 'user_as_ally IS NULL') .
+      ($online ? "`onlinetime` >= :onlineTime" : 'user_as_ally IS NULL').
       " GROUP BY u.id
         ORDER BY user_as_ally, {$sort} ASC",
       array(
@@ -182,7 +182,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) {

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

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
    * @param mixed &$value
    */
   public static function makeArrayRef(&$value, $index = 0) {
-    if(!is_array($value)) {
+    if (!is_array($value)) {
       $value = array($index => $value);
     }
   }

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 +32 added lines, -32 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>");
   }
 
 
@@ -169,7 +169,7 @@ 
       classSupernova::$debug->add_to_array($sql_comment);
     }
 
-    $sql_commented = '/* ' . implode("<br />", $sql_comment) . '<br /> */ ';
+    $sql_commented = '/* '.implode("<br />", $sql_comment).'<br /> */ ';
     if (defined('DEBUG_SQL_ONLINE') && constant('DEBUG_SQL_ONLINE') === true) {
       classSupernova::$debug->warning($sql_commented, 'SQL Debug', LOG_DEBUG_SQL);
     }
@@ -252,13 +252,13 @@ 
           ->execute()
           ->getResult();
       } else {
-        $queryResult = $this->db_sql_query($stringQuery . $queryTrace);
+        $queryResult = $this->db_sql_query($stringQuery.$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) {
@@ -283,10 +283,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;
@@ -301,7 +301,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:
@@ -312,37 +312,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);
 
@@ -363,7 +363,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);
@@ -494,7 +494,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/DbSqlPrepare.php

Doc Comments +6 added lines

@@ -59,6 +59,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   public function setQuery($query) {
     $this->query = $query;
 
@@ -72,6 +75,9 @@ 
     }
   }
 
+  /**
+   * @param string $comment
+   */
   public function commentAdd($comment) {
     if (empty($this->values[static::COMMENT_PLACEHOLDER])) {
       $this->query .= ' ' . static::COMMENT_PLACEHOLDER;

Spacing +3 added lines, -3 removed lines

@@ -68,13 +68,13 @@ 
   public function commentRemove() {
     if (!empty($this->values[static::COMMENT_PLACEHOLDER])) {
       unset($this->values[static::COMMENT_PLACEHOLDER]);
-      $this->query = str_replace(' ' . static::COMMENT_PLACEHOLDER, '', $this->query);
+      $this->query = str_replace(' '.static::COMMENT_PLACEHOLDER, '', $this->query);
     }
   }
 
   public function commentAdd($comment) {
     if (empty($this->values[static::COMMENT_PLACEHOLDER])) {
-      $this->query .= ' ' . static::COMMENT_PLACEHOLDER;
+      $this->query .= ' '.static::COMMENT_PLACEHOLDER;
     }
     $this->values[static::COMMENT_PLACEHOLDER] = $comment;
   }
@@ -113,7 +113,7 @@ 
         // Removing comment placeholder from statement
         $this->queryPrepared = str_replace(static::COMMENT_PLACEHOLDER, $this->comment, $this->queryPrepared);
         // Removing comment value from values list
-        $this->paramsPrepared = array_filter($this->paramsPrepared, function ($value) { return $value != DbSqlPrepare::COMMENT_PLACEHOLDER; });
+        $this->paramsPrepared = array_filter($this->paramsPrepared, function($value) { return $value != DbSqlPrepare::COMMENT_PLACEHOLDER; });
         // TODO - Add comment value directly to statement
       }
 

includes/classes/DbSqlLiteral.php

Spacing +4 added lines, -4 removed lines

@@ -50,10 +50,10 @@ 
       $alias = $this->makeAliasFromField($functionName, $field);
     }
 
-    $this->literal = strtoupper($functionName) . '(' . $this->makeFieldFromString($field) . ')';
+    $this->literal = strtoupper($functionName).'('.$this->makeFieldFromString($field).')';
 
     if (!empty($alias)) {
-      $this->literal .= ' AS `' . $alias . '`';
+      $this->literal .= ' AS `'.$alias.'`';
     }
 
     return $this;
@@ -110,10 +110,10 @@ 
       $alias = $this->makeAliasFromField($functionName, $field);
     }
 
-    $this->literal = $this->makeFieldFromString($field) . ' IS NULL';
+    $this->literal = $this->makeFieldFromString($field).' IS NULL';
 
     if (!empty($alias)) {
-      $this->literal .= ' AS `' . $alias . '`';
+      $this->literal .= ' AS `'.$alias.'`';
     }
 
     return $this;

includes/classes/DbSqlStatement.php

Spacing +11 added lines, -11 removed lines

@@ -108,11 +108,11 @@ 
     $arguments = func_get_args();
 
     // Special case - call method with array of fields
-    if(count($arguments) == 1 && is_array($arguments[0])) {
+    if (count($arguments) == 1 && is_array($arguments[0])) {
       $arguments = array_shift($arguments);
     }
 
-    foreach($arguments as $arg) {
+    foreach ($arguments as $arg) {
       $this->fields[] = $arg;
     }
 
@@ -293,9 +293,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).'`';
     }
   }
 
@@ -305,29 +305,29 @@ 
 
   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 ' . $this->selectFieldsToString($this->groupBy) : false;
+    !empty($this->groupBy) ? $this->_compiledQuery[] = 'GROUP BY '.$this->selectFieldsToString($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 : '');
     }
   }
 
@@ -371,14 +371,14 @@ 
    */
   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)) {
       $result = 'NULL';
     } else {
       // Field has other type - string or should be convertible to string
-      $result = (string)$fieldName;
+      $result = (string) $fieldName;
       if (!$fieldName instanceof DbSqlLiteral) {
         $result = $this->makeFieldFromString($fieldName);
       }