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 +6 added lines, -6 removed lines

@@ -49,7 +49,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;"
         ))
     );
 
@@ -61,8 +61,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']) .
@@ -72,7 +72,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;
   }
@@ -112,7 +112,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");
   }
@@ -168,7 +168,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/includes/flt_flying_fleet_handler2.php

Spacing +7 added lines, -11 removed lines

@@ -19,15 +19,11 @@ 
 // ------------------------------------------------------------------
 function flt_flyingFleetsSort($a, $b) {
   // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
-    // Если время - одинаковое, сравниваем события флотов
+  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
     // Если события - одинаковые, то флоты равны
-    ($a['fleet_event'] == $b['fleet_event'] ? 0 :
-      // Если события разные - первыми считаем прибывающие флоты
-      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
-        // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
-          // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+    ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
+      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
           // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
           (
           0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -45,13 +41,13 @@ 
     $handler = fopen('event.log', 'a+');
   }
 
-  fwrite($handler, date(FMT_DATE_TIME_SQL, time()) . ' ' . $msg . "\r\n");
+  fwrite($handler, date(FMT_DATE_TIME_SQL, time()).' '.$msg."\r\n");
 }
 
 // ------------------------------------------------------------------
 function flt_flying_fleet_handler($skip_fleet_update = false) {
   if (true) {
-    if(!defined('IN_AJAX')) {
+    if (!defined('IN_AJAX')) {
       print('<div style="color: red; font-size: 300%">Fleet handler is disabled</div>');
       pdump('Fleet handler is disabled');
     }
@@ -177,7 +173,7 @@ 
     MT_EXPLORE   => 'flt_mission_explore',
   );
   foreach ($missions_used as $mission_id => $cork) {
-    require_once(SN_ROOT_PHYSICAL . "includes/includes/{$mission_files[$mission_id]}" . DOT_PHP_EX);
+    require_once(SN_ROOT_PHYSICAL."includes/includes/{$mission_files[$mission_id]}".DOT_PHP_EX);
   }
 
 //log_file('Обработка миссий');

includes/classes/classSupernova.php

Spacing +18 added lines, -20 removed lines

@@ -236,7 +236,7 @@ 
   public static function cache_clear($location_type, $hard = true) {
     if ($hard && !empty(static::$data[$location_type])) {
       // Здесь нельзя делать unset - надо записывать NULL, что бы это отразилось на зависимых записях
-      array_walk(static::$data[$location_type], function (&$item) { $item = null; });
+      array_walk(static::$data[$location_type], function(&$item) { $item = null; });
     }
     static::$locator[$location_type] = array();
     static::$queries[$location_type] = array();
@@ -354,7 +354,7 @@ 
 
     if (!empty($error_msg)) {
       // TODO - Убрать позже
-      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - ' . $error_msg . '</h1>');
+      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - '.$error_msg.'</h1>');
       $backtrace = debug_backtrace();
       array_shift($backtrace);
       pdump($backtrace);
@@ -367,7 +367,7 @@ 
   public static function db_transaction_start($level = '') {
     static::db_transaction_check(null);
 
-    $level ? doquery('SET TRANSACTION ISOLATION LEVEL ' . $level) : false;
+    $level ? doquery('SET TRANSACTION ISOLATION LEVEL '.$level) : false;
 
     static::$transaction_id++;
     doquery('START TRANSACTION');
@@ -427,7 +427,7 @@ 
   public static function db_lock_tables($tables) {
     $tables = is_array($tables) ? $tables : array($tables => '');
     foreach ($tables as $table_name => $condition) {
-      self::$db->doquery("SELECT 1 FROM {{{$table_name}}}" . ($condition ? ' WHERE ' . $condition : ''));
+      self::$db->doquery("SELECT 1 FROM {{{$table_name}}}".($condition ? ' WHERE '.$condition : ''));
     }
   }
 
@@ -503,8 +503,8 @@ 
           $query = static::db_query(
             "SELECT
               distinct({{{$location_info[P_TABLE_NAME]}}}.{$owner_data[P_OWNER_FIELD]}) AS parent_id
-            FROM {{{$location_info[P_TABLE_NAME]}}}" .
-            ($filter ? ' WHERE ' . $filter : '') .
+            FROM {{{$location_info[P_TABLE_NAME]}}}".
+            ($filter ? ' WHERE '.$filter : '').
             ($fetch ? ' LIMIT 1' : ''), false, true);
 
           while ($row = db_fetch($query)) {
@@ -517,13 +517,13 @@ 
           if ($indexes_str = implode(',', $parent_id_list)) {
             $parent_id_field = static::$location_info[$owner_location_type][P_ID];
             static::db_get_record_list($owner_location_type,
-              $parent_id_field . (count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
+              $parent_id_field.(count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
           }
         }
       }
 
       $query = static::db_query(
-        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}" .
+        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}".
         (($filter = trim($filter)) ? " WHERE {$filter}" : '')
       );
       while ($row = db_fetch($query)) {
@@ -589,7 +589,7 @@ 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
-    if ($result = static::db_query("UPDATE {{{$table_name}}} SET " . $set . ($condition ? ' WHERE ' . $condition : ''))) {
+    if ($result = static::db_query("UPDATE {{{$table_name}}} SET ".$set.($condition ? ' WHERE '.$condition : ''))) {
 
       if (static::$db->db_affected_rows()) { // Обновляем данные только если ряд был затронут
         // Поскольку нам неизвестно, что и как обновилось - сбрасываем кэш этого типа полностью
@@ -751,7 +751,7 @@ 
       // TODO переписать
       $user = static::dbFetchOne(
         DBStaticUser::buildSelect()
-          ->where(array("`username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"))
+          ->where(array("`username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"))
       );
 
 //      $user = static::db_query(
@@ -844,7 +844,7 @@ 
 
     $query_cache = &static::$locator[LOC_UNIT][$location_type][$location_id];
     if (!isset($query_cache)) {
-      $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND " . static::db_unit_time_restrictions());
+      $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND ".static::db_unit_time_restrictions());
       if (is_array($got_data)) {
         foreach ($got_data as $unit_id => $unit_data) {
           $query_cache[$unit_data['unit_snid']] = &static::$data[LOC_UNIT][$unit_id];
@@ -905,7 +905,7 @@ 
     if ($que_type == QUE_RESEARCH || $planet_id === null) {
       $query[] = "`que_planet_id` IS NULL";
     } elseif ($planet_id) {
-      $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
+      $query[] = "(`que_planet_id` = {$planet_id}".($que_type ? '' : ' OR que_planet_id IS NULL').")";
     }
     if ($que_type) {
       $query[] = "`que_type` = {$que_type}";
@@ -1026,13 +1026,13 @@ 
         $condition = "`{$field_name}` = ";
         $value = '';
         if ($field_data['delta']) {
-          $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
+          $value = "`{$field_name}`".($field_data['delta'] >= 0 ? '+' : '').$field_data['delta'];
         } elseif ($field_data['set']) {
           $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
         }
 
         if ($value) {
-          $fields[] = $condition . $value;
+          $fields[] = $condition.$value;
         }
       }
       $conditions[P_FIELDS_STR] = implode(',', $fields);
@@ -1046,9 +1046,7 @@ 
           // Простое условие - $field_id = $field_value
           if (is_string($field_id)) {
             $field_value =
-              $field_value === null ? 'NULL' :
-                (is_string($field_value) ? "'" . db_escape($field_value) . "'" :
-                  (is_bool($field_value) ? intval($field_value) : $field_value));
+              $field_value === null ? 'NULL' : (is_string($field_value) ? "'".db_escape($field_value)."'" : (is_bool($field_value) ? intval($field_value) : $field_value));
             $the_conditions[] = "`{$field_id}` = {$field_value}";
           } else {
             die('Неподдерживаемый тип условия');
@@ -1075,7 +1073,7 @@ 
         die('Неподдерживаемая операция в classSupernova::db_changeset_condition_compile');
     }
 
-    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR] . ' ' . $conditions[P_FIELDS_STR] . (' WHERE ' . $conditions[P_WHERE_STR]);
+    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR].' '.$conditions[P_FIELDS_STR].(' WHERE '.$conditions[P_WHERE_STR]);
   }
 
   public static function db_changeset_apply($db_changeset, $flush_delayed = false) {
@@ -1173,7 +1171,7 @@ 
     ini_get('magic_quotes_sybase') ? die('SN is incompatible with \'magic_quotes_sybase\' turned on. Disable it in php.ini or .htaccess...') : false;
     if (@get_magic_quotes_gpc()) {
       $gpcr = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
-      array_walk_recursive($gpcr, function (&$value, $key) {
+      array_walk_recursive($gpcr, function(&$value, $key) {
         $value = stripslashes($value);
       });
     }
@@ -1187,7 +1185,7 @@ 
   public static function init_3_load_config_file() {
     $dbsettings = array();
 
-    require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+    require(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
     self::$cache_prefix = !empty($dbsettings['cache_prefix']) ? $dbsettings['cache_prefix'] : $dbsettings['prefix'];
     self::$db_name = $dbsettings['name'];
     self::$sn_secret_word = $dbsettings['secretword'];

includes/classes/DbSqlStatement.php

Spacing +11 added lines, -11 removed lines

@@ -260,28 +260,28 @@ 
     $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 !!
-    $result .= !empty($this->having) ? ' HAVING ' . implode(' AND ', $this->having) : '';
+    $result .= !empty($this->having) ? ' HAVING '.implode(' AND ', $this->having) : '';
 
     // TODO - fields should be escaped !!
     $limit = $this->fetchOne ? 1 : $this->limit;
     $result .= !empty($limit)
-      ? ' LIMIT ' . $limit . (!empty($this->offset) ? ' OFFSET ' . $this->offset : '')
+      ? ' LIMIT '.$limit.(!empty($this->offset) ? ' OFFSET '.$this->offset : '')
       : '';
 
     $result .=
@@ -327,7 +327,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 === '*') {
@@ -345,7 +345,7 @@ 
    * @return string
    */
   protected function processFieldDefault($fieldName) {
-    $result = (string)$fieldName;
+    $result = (string) $fieldName;
     if (
       $result != ''
       &&
@@ -356,7 +356,7 @@ 
       !is_numeric($fieldName)
     ) {
       // Other should be formatted
-      $result = '`' . $this->stringEscape($result) . '`';
+      $result = '`'.$this->stringEscape($result).'`';
     }
 
     return $result;