supernova-ws / SuperNova

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

Spacing +10 added lines, -10 removed lines

@@ -234,24 +234,24 @@ 
     $result = '';
     $result .= $this->stringEscape($this->operation);
 
-    $result .= ' ' . $this->selectFieldsToString($this->fields);
+    $result .= ' '.$this->selectFieldsToString($this->fields);
 
     $result .= ' FROM';
-    $result .= ' `{{' . $this->stringEscape($this->table) . '}}`';
-    $result .= !empty($this->alias) ? ' AS `' . $this->stringEscape($this->alias) . '`' : '';
+    $result .= ' `{{'.$this->stringEscape($this->table).'}}`';
+    $result .= !empty($this->alias) ? ' AS `'.$this->stringEscape($this->alias).'`' : '';
 
     // TODO - fields should be escaped !!
-    $result .= !empty($this->where) ? ' WHERE ' . implode(' AND ', $this->where) : '';
+    $result .= !empty($this->where) ? ' WHERE '.implode(' AND ', $this->where) : '';
 
     // TODO - fields should be escaped !!
-    $result .= !empty($this->group) ? ' GROUP BY ' . implode(',', $this->group) : '';
+    $result .= !empty($this->group) ? ' GROUP BY '.implode(',', $this->group) : '';
 
     // TODO - fields should be escaped !!
-    $result .= !empty($this->order) ? ' ORDER BY ' . implode(',', $this->order) : '';
+    $result .= !empty($this->order) ? ' ORDER BY '.implode(',', $this->order) : '';
 
     // TODO - fields should be escaped !!
     // TODO - separate offset and row_count
-    $result .= !empty($this->limit) ? ' LIMIT ' . implode(' OFFSET ', $this->limit) : '';
+    $result .= !empty($this->limit) ? ' LIMIT '.implode(' OFFSET ', $this->limit) : '';
 
     // TODO - protect from double escape!
 
@@ -289,7 +289,7 @@ 
    */
   protected function processField($fieldName) {
     if (is_bool($fieldName)) {
-      $result = (string)intval($fieldName);
+      $result = (string) intval($fieldName);
     } elseif (is_null($fieldName)) {
       $result = 'NULL';
     } elseif ($fieldName === '*') {
@@ -307,7 +307,7 @@ 
    * @return string
    */
   protected function processFieldDefault($fieldName) {
-    $result = (string)$fieldName;
+    $result = (string) $fieldName;
     if (
       $result != ''
       &&
@@ -318,7 +318,7 @@ 
       !is_numeric($fieldName)
     ) {
       // Other should be formatted
-      $result = '`' . $this->stringEscape($result) . '`';
+      $result = '`'.$this->stringEscape($result).'`';
     }
 
     return $result;

includes/classes/DBStaticUser.php

Spacing +6 added lines, -6 removed lines

@@ -66,7 +66,7 @@ 
    * @return array|bool|mysqli_result|null
    */
   public static function db_user_list_non_bots() {
-    $query = doquery("SELECT `id` FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER . " FOR UPDATE;");
+    $query = doquery("SELECT `id` FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = ".USER_BOT_PLAYER." FOR UPDATE;");
 
     return $query;
   }
@@ -74,8 +74,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']) .
@@ -109,7 +109,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) {
@@ -127,7 +127,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;
   }
@@ -167,7 +167,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");
   }