supernova-ws / SuperNova

includes/classes/DbSqlStatement.php

Spacing +10 added lines, -10 removed lines

@@ -264,9 +264,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).'`';
     }
   }
 
@@ -276,29 +276,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 : '');
     }
   }
 
@@ -373,15 +373,15 @@ 
    */
   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;
-      if(!$fieldName instanceof DbSqlLiteral) {
+      $result = (string) $fieldName;
+      if (!$fieldName instanceof DbSqlLiteral) {
         $result = $this->makeFieldFromString($fieldName);
       }
     }

includes/classes/DbSqlPrepare.php

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

Spacing +6 added lines, -6 removed lines

@@ -52,7 +52,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;"
         ))
     );
 
@@ -64,8 +64,8 @@ 
   public static function db_user_lock_with_target_owner_and_acs($user, $planet = array()) {
     static::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']) .
@@ -75,7 +75,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;
   }
@@ -142,7 +142,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(
         ':onlineTime' => SN_TIME_NOW - classSupernova::$config->game_users_online_timeout,
@@ -199,7 +199,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/db_mysql.php

Spacing +30 added lines, -30 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);
     }
@@ -183,7 +183,7 @@ 
    * @return array|bool|mysqli_result|null
    */
   public function execute($statement) {
-    return $this->doquery((string)$statement);
+    return $this->doquery((string) $statement);
   }
 
   /**
@@ -238,13 +238,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) {
@@ -269,10 +269,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;
@@ -298,37 +298,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);