supernova-ws / SuperNova

includes/classes/db_mysql.php

Doc Comments +29 added lines, -4 removed lines

@@ -157,7 +157,7 @@ 
   /**
    * @param string $query
    *
-   * @return mixed|string
+   * @return string
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
@@ -171,7 +171,7 @@ 
   }
 
   /**
-   * @param $query
+   * @param string $query
    */
   protected function logQuery($query) {
     if (!classSupernova::$config->debug) {
@@ -301,6 +301,11 @@ 
 
 
   // INSERT/REPLACE
+
+  /**
+   * @param string $table
+   * @param integer $replace
+   */
   protected function doSet($table, $fieldsAndValues, $replace = DB_INSERT_PLAIN) {
     $query = DbQuery::build($this)
       ->setTable($table)
@@ -338,6 +343,10 @@ 
 
 
   // INSERTERS
+
+  /**
+   * @param string $query
+   */
   public function doInsertComplex($query) {
     return $this->doSql($query);
   }
@@ -358,7 +367,7 @@ 
    * Values should be passed as-is
    *
    * @param string   $table
-   * @param array    $fields
+   * @param string[]    $fields
    * @param string[] $values
    *
    * @return array|bool|mysqli_result|null
@@ -415,7 +424,7 @@ 
    * Self-contained - means no params used
    * Such queries usually used to make large amount of in-base calculations
    *
-   * @param $query
+   * @param string $query
    *
    * @return array|bool|mysqli_result|null
    */
@@ -423,6 +432,9 @@ 
     return $this->doSql($query);
   }
 
+  /**
+   * @param boolean $isOneRecord
+   */
   protected function doUpdateWhere($table, $fieldsSet, $fieldsAdjust = array(), $where = array(), $isOneRecord = DB_RECORDS_ALL) {
 //    $query = DbQuery::build($this)
 //      ->setTable($table)
@@ -457,10 +469,16 @@ 
     return $this->doSql($query);
   }
 
+  /**
+   * @param string $table
+   */
   public function doUpdateRowSet($table, $fieldsAndValues, $where) {
     return $this->doUpdateWhere($table, $fieldsAndValues, array(), $where, DB_RECORD_ONE);
   }
 
+  /**
+   * @param string $table
+   */
   public function doUpdateTableSet($table, $fieldsAndValues, $where = array()) {
     return $this->doUpdateWhere($table, $fieldsAndValues, array(), $where, DB_RECORDS_ALL);
   }
@@ -680,6 +698,10 @@ 
   }
 
   // TODO Заменить это на новый логгер
+
+  /**
+   * @param string $query
+   */
   protected function security_watch_user_queries($query) {
     global $user;
 
@@ -703,6 +725,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   public function security_query_check_bad_words($query) {
     if ($this->skipQueryCheck) {
       return;

Spacing +31 added lines, -31 removed lines

@@ -91,7 +91,7 @@ 
   public function load_db_settings($configFile = '') {
     $dbsettings = array();
 
-    empty($configFile) ? $configFile = SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX : false;
+    empty($configFile) ? $configFile = SN_ROOT_PHYSICAL."config".DOT_PHP_EX : false;
 
     require $configFile;
 
@@ -111,7 +111,7 @@ 
     }
 
     if (empty($this->dbsettings)) {
-      $this->load_db_settings(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+      $this->load_db_settings(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
     }
 
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
@@ -163,7 +163,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);
       }
     }
 
@@ -234,12 +234,12 @@ 
 
     $queryResult = null;
     try {
-      $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');
     }
 
     return $queryResult;
@@ -578,7 +578,7 @@ 
       case TYPE_EMPTY:
         // No-type defaults to string
       default:
-        $value = "'" . $this->db_escape((string)$value) . "'";
+        $value = "'".$this->db_escape((string) $value)."'";
       break;
     }
 
@@ -606,7 +606,7 @@ 
       if (is_int($fieldName)) {
         $result[$fieldName] = $fieldValue;
       } else {
-        $result[$fieldName] = "`{$fieldName}` = " . $this->castAsDbValue($fieldValue);
+        $result[$fieldName] = "`{$fieldName}` = ".$this->castAsDbValue($fieldValue);
       }
     }
 
@@ -635,7 +635,7 @@ 
       if (is_int($fieldName)) {
         $result[$fieldName] = $fieldValue;
       } else {
-        $result[$fieldName] = "`{$fieldName}` = `{$fieldName}` + (" . $this->castAsDbValue($fieldValue) . ")";
+        $result[$fieldName] = "`{$fieldName}` = `{$fieldName}` + (".$this->castAsDbValue($fieldValue).")";
       }
     }
 
@@ -692,10 +692,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;
@@ -721,37 +721,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);
 

includes/classes/DBAL/DbQuery.php

Spacing +9 added lines, -9 removed lines

@@ -101,17 +101,17 @@ 
   protected function buildCommand() {
     switch ($this->command) {
       case static::UPDATE:
-        $this->build[] = $this->command . " " . $this->quoteTable($this->table);
+        $this->build[] = $this->command." ".$this->quoteTable($this->table);
       break;
 
       case static::DELETE:
-        $this->build[] = $this->command . " FROM " . $this->quoteTable($this->table);
+        $this->build[] = $this->command." FROM ".$this->quoteTable($this->table);
       break;
 
       case static::REPLACE:
       case static::INSERT_IGNORE:
       case static::INSERT:
-        $this->build[] = $this->command . " INTO " . $this->quoteTable($this->table);
+        $this->build[] = $this->command." INTO ".$this->quoteTable($this->table);
       break;
     }
   }
@@ -170,7 +170,7 @@ 
     $compiled = array();
 
     foreach ($this->values as $valuesVector) {
-      $compiled[] = '(' . implode(',', $this->safeFields($valuesVector)) . ')';
+      $compiled[] = '('.implode(',', $this->safeFields($valuesVector)).')';
     }
 
     $this->build[] = implode(',', $compiled);
@@ -380,7 +380,7 @@ 
    * @return string
    */
   protected function stringValue($value) {
-    return "'" . $this->escape((string)$value) . "'";
+    return "'".$this->escape((string) $value)."'";
   }
 
   /**
@@ -391,7 +391,7 @@ 
    * @return string
    */
   protected function quote($fieldName) {
-    return "`" . $this->escape((string)$fieldName) . "`";
+    return "`".$this->escape((string) $fieldName)."`";
   }
 
   /**
@@ -402,7 +402,7 @@ 
    * @return string
    */
   protected function quoteTable($tableName) {
-    return "`{{" . $this->escape((string)$tableName) . "}}`";
+    return "`{{".$this->escape((string) $tableName)."}}`";
   }
 
   protected function castAsDbValue($value) {
@@ -482,7 +482,7 @@ 
     foreach ($fieldValues as $fieldName => $fieldValue) {
       // Integer $fieldName is DANGER! They skipped there!
       if (!is_int($fieldName)) {
-        $result[$fieldName] = $this->quote($fieldName) . " = " . $this->castAsDbValue($fieldValue);
+        $result[$fieldName] = $this->quote($fieldName)." = ".$this->castAsDbValue($fieldValue);
       }
     }
 
@@ -524,7 +524,7 @@ 
     foreach ($fields as $fieldName => $fieldValue) {
       // Integer $fieldName means "leave as is" - for expressions and already processed fields
       if (is_string($fieldName)) {
-        $result[$fieldName] = "`{$fieldName}` = `{$fieldName}` + (" . $this->castAsDbValue($fieldValue) . ")";
+        $result[$fieldName] = "`{$fieldName}` = `{$fieldName}` + (".$this->castAsDbValue($fieldValue).")";
       }
     }