supernova-ws / SuperNova

includes/classes/FleetValidator.php

Spacing +8 added lines, -8 removed lines

@@ -871,8 +871,8 @@ 
    */
   protected function checkACSInvited() {
     $playersInvited = !empty($this->fleet->acs['eingeladen']) ? explode(',', $this->fleet->acs['eingeladen']) : array();
-    foreach($playersInvited as $playerId) {
-      if(intval($playerId) == $this->fleet->dbOwnerRow['id']) {
+    foreach ($playersInvited as $playerId) {
+      if (intval($playerId) == $this->fleet->dbOwnerRow['id']) {
         return true;
       }
     }
@@ -959,9 +959,9 @@ 
 
     // Retrieving flying fleets
     $objFleetsBashing = FleetList::dbGetFleetListBashing($user['id'], $this->fleet->dbTargetRow);
-    foreach($objFleetsBashing->_container as $fleetBashing) {
+    foreach ($objFleetsBashing->_container as $fleetBashing) {
       // Checking for ACS - each ACS count only once
-      if($fleetBashing->group_id) {
+      if ($fleetBashing->group_id) {
         $bashing_list["{$user['id']}_{$fleetBashing->group_id}"] = $fleetBashing->time_arrive_to_target;
       } else {
         $bashing_list[] = $fleetBashing->time_arrive_to_target;
@@ -969,12 +969,12 @@ 
     }
 
     // Check for joining to ACS - if there are already fleets in ACS no checks should be done
-    if($this->fleet->mission_type == MT_ACS && $bashing_list["{$user['id']}_{$this->fleet->group_id}"]) {
+    if ($this->fleet->mission_type == MT_ACS && $bashing_list["{$user['id']}_{$this->fleet->group_id}"]) {
       return true;
     }
 
     $query = db_bashing_list_get($user, $this->fleet->dbTargetRow, $time_limit);
-    while($bashing_row = db_fetch($query)) {
+    while ($bashing_row = db_fetch($query)) {
       $bashing_list[] = $bashing_row['bashing_time'];
     }
 
@@ -983,9 +983,9 @@ 
     $last_attack = 0;
     $wave = 0;
     $attack = 1;
-    foreach($bashing_list as &$bash_time) {
+    foreach ($bashing_list as &$bash_time) {
       $attack++;
-      if(
+      if (
         $bash_time - $last_attack > classSupernova::$config->fleet_bashing_interval
         ||
         $attack > classSupernova::$config->fleet_bashing_attacks

includes/classes/DBStaticRecord.php

Doc Comments +2 added lines, -2 removed lines

@@ -96,8 +96,8 @@
   }
 
   /**
-   * @param int|string $user_id
-   * @param array      $fieldList
+   * @param integer $user_id
+   * @param string[]      $fieldList
    * @param bool       $for_update
    *
    * @return array|null

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
             $result[] = 'NULL';
           break;
           default:
-            $result[] = '`' . (string)$fieldName . '`';
+            $result[] = '`'.(string) $fieldName.'`';
         }
       }
     } else {
@@ -57,10 +57,10 @@ 
     if (!empty($fieldList)) {
       $user_record = doquery(
         (
-          "SELECT {$fieldList}" .
-          " FROM {{" . self::$_table . "}}" .
-          (!empty($where) ? " WHERE {$where}" : '') .
-          (!empty($for_update) ? " FOR UPDATE" : '') .
+          "SELECT {$fieldList}".
+          " FROM {{".self::$_table."}}".
+          (!empty($where) ? " WHERE {$where}" : '').
+          (!empty($for_update) ? " FOR UPDATE" : '').
           ($returnFirst ? ' LIMIT 1' : '')
         ),
         $returnFirst
@@ -90,7 +90,7 @@ 
    * @return int
    */
   public static function getMaxId() {
-    $maxId = classSupernova::$db->doquery("SELECT MAX(`" . static::$_idField . "`) AS `maxId` FROM `{{" . static::$_table . "}}`", true);
+    $maxId = classSupernova::$db->doquery("SELECT MAX(`".static::$_idField."`) AS `maxId` FROM `{{".static::$_table."}}`", true);
 
     return !empty($maxId['maxId']) ? $maxId['maxId'] : 0;
   }
@@ -103,7 +103,7 @@ 
    * @return array|null
    */
   public static function getRecordById($user_id, $fieldList = array(), $for_update = false) {
-    return static::getRecord(static::$_idField . ' = ' . $user_id, $fieldList, $for_update);
+    return static::getRecord(static::$_idField.' = '.$user_id, $fieldList, $for_update);
   }
 
 
@@ -115,7 +115,7 @@ 
   public static function queryExistsIdInList($idList) {
     $query = null;
     if (!empty($idList)) {
-      $query = doquery("SELECT `" . static::$_idField . "` FROM `{{" . static::$_table . "}}` WHERE `" . static::$_idField . "` IN (" . implode(',', $idList) . ")");
+      $query = doquery("SELECT `".static::$_idField."` FROM `{{".static::$_table."}}` WHERE `".static::$_idField."` IN (".implode(',', $idList).")");
     }
 
     return !empty($query) ? $query : null;

admin/ajax_maintenance.php

Spacing +25 added lines, -25 removed lines

@@ -2,9 +2,9 @@ 
 
 define('IN_ADMIN', true);
 
-require('../includes/init.' . substr(strrchr(__FILE__, '.'), 1));
+require('../includes/init.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   message(classLocale::$lang['sys_noalloaw'], classLocale::$lang['sys_noaccess']);
   die();
@@ -20,13 +20,13 @@ 
 // [#] info_best_battles 1b0
 $best_reports = array();
 
-if(defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
+if (defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
   $query = db_ube_report_get_best_battles();
-  while($row = db_fetch($query)) {
+  while ($row = db_fetch($query)) {
     $best_reports[] = $row['ube_report_id'];
   }
 }
-$best_reports = !empty($best_reports) ? ' AND ube_report_id NOT IN (' . implode(',', $best_reports) . ')' : '';
+$best_reports = !empty($best_reports) ? ' AND ube_report_id NOT IN ('.implode(',', $best_reports).')' : '';
 
 
 $ques = array(
@@ -90,14 +90,14 @@ 
   // Удаляем юниты без планет
   'DELETE un FROM {{unit}} AS un
     LEFT JOIN {{planets}} AS pl ON pl.id = un.unit_location_id
-  WHERE unit_location_type = ' . LOC_PLANET . ' AND pl.id IS NULL;',
+  WHERE unit_location_type = ' . LOC_PLANET.' AND pl.id IS NULL;',
   // Удаляем пустые юниты с 0 уровнем (кроме Капитана)
-  'DELETE FROM {{unit}} WHERE unit_location_type = ' . LOC_PLANET . ' AND unit_level = 0 AND unit_type <> ' . UNIT_CAPTAIN,
+  'DELETE FROM {{unit}} WHERE unit_location_type = '.LOC_PLANET.' AND unit_level = 0 AND unit_type <> '.UNIT_CAPTAIN,
   // Удаляем очереди на ничьих планетах
   'DELETE q FROM {{que}} AS q
     LEFT JOIN {{planets}} AS p ON p.id = q.que_planet_id
   WHERE
-    que_type IN (' . QUE_STRUCTURES . ', ' . QUE_HANGAR . ', ' . SUBQUE_FLEET . ', ' . SUBQUE_DEFENSE . ')
+    que_type IN (' . QUE_STRUCTURES.', '.QUE_HANGAR.', '.SUBQUE_FLEET.', '.SUBQUE_DEFENSE.')
     AND
     (p.id_owner = 0 OR p.id_owner IS NULL);',
 
@@ -112,12 +112,12 @@ 
   // Удаляются сообщения, старше  4 недель, кроме личных и Альянсовских
   'DELETE FROM {{messages}} WHERE
     UNIX_TIMESTAMP() - message_time > 4*7 * 24 * 60 * 60 AND
-    message_type NOT IN (' . MSG_TYPE_PLAYER . ', ' . MSG_TYPE_ALLIANCE . ');',
+    message_type NOT IN (' . MSG_TYPE_PLAYER.', '.MSG_TYPE_ALLIANCE.');',
   // Удаляются сообщения у пользователей, которые неактивны больше 4 недель - кроме личных и Альянсовских
   'DELETE m FROM `{{users}}` AS u
   JOIN {{messages}} AS m ON m.message_owner = u.id
   WHERE
-    message_type NOT IN (' . MSG_TYPE_PLAYER . ', ' . MSG_TYPE_ALLIANCE . ') AND
+    message_type NOT IN (' . MSG_TYPE_PLAYER.', '.MSG_TYPE_ALLIANCE.') AND
     authlevel = 0 AND  user_as_ally IS NULL AND /* Не админы, Не Альянсы */
     UNIX_TIMESTAMP() - onlinetime > 4*7 *86400;',
 
@@ -137,7 +137,7 @@ 
       (log_dark_matter_timestamp, log_dark_matter_username, log_dark_matter_reason, log_dark_matter_amount,
       log_dark_matter_comment, log_dark_matter_page, log_dark_matter_sender)
     SELECT
-      '{$pack_until}', IF(u.username IS NULL, ldm.log_dark_matter_username, u.username), " . RPG_CUMULATIVE . ", sum(ldm.log_dark_matter_amount),
+      '{$pack_until}', IF(u.username IS NULL, ldm.log_dark_matter_username, u.username), ".RPG_CUMULATIVE.", sum(ldm.log_dark_matter_amount),
       'Баланс на {$pack_until}', 'admin/ajax_maintenance.php', ldm.log_dark_matter_sender
     FROM
       {{log_dark_matter}} AS ldm
@@ -155,22 +155,22 @@ 
     "REPLACE INTO `{{log_users_online}}`
       (online_timestamp, online_count, online_aggregated)
     SELECT
-      FROM_UNIXTIME((UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10 . ") * (" . PERIOD_MINUTE_10 . ")), ceil(avg(online_count)), " . LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10 . "
+      FROM_UNIXTIME((UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10.") * (".PERIOD_MINUTE_10.")), ceil(avg(online_count)), ".LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10."
     FROM
       `{{log_users_online}}`
     WHERE
-      online_timestamp < '{$pack_until}' AND online_aggregated = " . LOG_ONLIINE_AGGREGATE_NONE . "
+      online_timestamp < '{$pack_until}' AND online_aggregated = ".LOG_ONLIINE_AGGREGATE_NONE."
     GROUP BY
-      (UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10 . ") * (" . PERIOD_MINUTE_10 . ");",
+      (UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10.") * (".PERIOD_MINUTE_10.");",
 
-    "DELETE FROM {{log_users_online}} WHERE online_timestamp < '{$pack_until}' AND online_aggregated = " . LOG_ONLIINE_AGGREGATE_NONE,
+    "DELETE FROM {{log_users_online}} WHERE online_timestamp < '{$pack_until}' AND online_aggregated = ".LOG_ONLIINE_AGGREGATE_NONE,
   ),
 
   // Удаляем старые записи из логов
   "DELETE FROM `{{logs}}` WHERE log_timestamp < '{$pack_until}';",
   // Удаляем записи о маинтенансе, апдейте и пересчете статистики более чем недельной давности - они нам уже не нужны
   'DELETE FROM `{{logs}}` WHERE
-    `log_code` IN (' . LOG_INFO_DB_CHANGE . ', ' . LOG_INFO_MAINTENANCE . ', ' . LOG_INFO_STAT_START . ', ' . LOG_INFO_STAT_PROCESS . ', ' . LOG_INFO_STAT_FINISH . ')
+    `log_code` IN (' . LOG_INFO_DB_CHANGE.', '.LOG_INFO_MAINTENANCE.', '.LOG_INFO_STAT_START.', '.LOG_INFO_STAT_PROCESS.', '.LOG_INFO_STAT_FINISH.')
     AND `log_timestamp` < DATE_SUB(NOW(),INTERVAL 7 DAY);',
 
 
@@ -189,13 +189,13 @@ 
 $old_server_status == GAME_DISABLE_NONE ? classSupernova::$config->db_saveItem('game_disable', GAME_DISABLE_MAINTENANCE) : false;
 sn_db_transaction_commit();
 
-foreach($ques as $que_transaction) {
+foreach ($ques as $que_transaction) {
   sn_db_transaction_start();
 
   !is_array($que_transaction) ? $que_transaction = array($que_transaction) : false;
-  foreach($que_transaction as $que) {
+  foreach ($que_transaction as $que) {
     set_time_limit(120);
-    if(is_callable($que)) {
+    if (is_callable($que)) {
       $QryResult = call_user_func($que);
     } else {
       $QryResult = doquery($que);
@@ -206,12 +206,12 @@ 
     //$que = str_replace('}}', '', $que);
 
     $msg .=
-      '<li>' . htmlspecialchars($que) .
-        ' --- <span style="' . ($QryResult ? 'ok">OK' : 'error">FAILED!') . '</span> ' .
-      classSupernova::$db->db_affected_rows() . ' ' . classLocale::$lang['adm_records'] .
+      '<li>'.htmlspecialchars($que).
+        ' --- <span style="'.($QryResult ? 'ok">OK' : 'error">FAILED!').'</span> '.
+      classSupernova::$db->db_affected_rows().' '.classLocale::$lang['adm_records'].
       "</li>";
 
-    classSupernova::$debug->warning($que . ' --- ' . ($QryResult ? 'OK' : 'FAILED!') . ' ' . classSupernova::$db->db_affected_rows() . ' ' . classLocale::$lang['adm_records'], 'System maintenance', LOG_INFO_MAINTENANCE);
+    classSupernova::$debug->warning($que.' --- '.($QryResult ? 'OK' : 'FAILED!').' '.classSupernova::$db->db_affected_rows().' '.classLocale::$lang['adm_records'], 'System maintenance', LOG_INFO_MAINTENANCE);
   }
 
   sn_db_transaction_commit();
@@ -239,5 +239,5 @@ 
 
 $adm_stat_title = classLocale::$lang['adm_stat_title'];
 $result = $result ? "<li>{$adm_stat_title} - {$result}</li>" : '';
-$result = '<div align="left"><ul>' . $msg . $result . '</ul></div>';
-echo json_encode($result . ' ' . $totaltime);
+$result = '<div align="left"><ul>'.$msg.$result.'</ul></div>';
+echo json_encode($result.' '.$totaltime);

includes/classes/DBStaticUser.php

Doc Comments +6 added lines

@@ -90,6 +90,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);
   }
@@ -126,6 +129,9 @@ 
 
 
 
+  /**
+   * @param integer $config_user_birthday_range
+   */
   public static function db_user_list_to_celebrate($config_user_birthday_range) {
     return doquery(
       "SELECT

Spacing +7 added lines, -7 removed lines

@@ -56,14 +56,14 @@ 
    * @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;
   }
 
   public static function db_user_lock_with_target_owner_and_acs($user, $planet = array()) {
-    doquery("SELECT 1 FROM {{users}} WHERE `id` = " . idval($user['id']) .
-      (isset($planet['id_owner']) ? ' OR `id` = ' . idval($planet['id_owner']) : '') .
+    doquery("SELECT 1 FROM {{users}} WHERE `id` = ".idval($user['id']).
+      (isset($planet['id_owner']) ? ' OR `id` = '.idval($planet['id_owner']) : '').
       " FOR UPDATE;"
     );
   }
@@ -79,7 +79,7 @@ 
     !is_array($user_id_list) ? $user_id_list = array($user_id_list) : false;
 
     $user_list = array();
-    foreach($user_id_list as $user_id_unsafe) {
+    foreach ($user_id_list as $user_id_unsafe) {
       $user = DBStaticUser::db_user_by_id($user_id_unsafe);
       !empty($user) ? $user_list[$user_id_unsafe] = $user : false;
     }
@@ -95,7 +95,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) {
@@ -113,7 +113,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;
   }
@@ -160,7 +160,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");
   }

common.php

Spacing +7 added lines, -7 removed lines

@@ -12,24 +12,24 @@ 
 global $template_result, $user;
 
 // Напоминание для Администрации, что игра отключена
-if($template_result[F_GAME_DISABLE]) {
+if ($template_result[F_GAME_DISABLE]) {
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
 }
 unset($disable_reason);
 
 
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
   lng_include('admin');
-} elseif($sys_user_logged_in) {
+} elseif ($sys_user_logged_in) {
   sys_user_vacation($user);
 
   $planet_id = SetSelectedPlanet($user);
 
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
-  if($user['ally_id']) {
+  if ($user['ally_id']) {
     sn_db_transaction_start();
     sn_ali_fill_user_ally($user);
-    if(!$user['ally']['player']['id']) {
+    if (!$user['ally']['player']['id']) {
       // sn_sys_logout(false, true);
       // core_auth::logout(false);
       classSupernova::$auth->logout(false);
@@ -37,7 +37,7 @@ 
     }
     // TODO UNCOMMENT
     que_process($user['ally']['player']);
-    DBStaticUser::db_user_set_by_id($user['ally']['player']['id'], '`onlinetime` = ' . SN_TIME_NOW);
+    DBStaticUser::db_user_set_by_id($user['ally']['player']['id'], '`onlinetime` = '.SN_TIME_NOW);
     sn_db_transaction_commit();
   }
 
@@ -48,7 +48,7 @@ 
   sn_db_transaction_commit();
 
   $planetrow = $global_data['planet'];
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false);
     classSupernova::$auth->logout(false);

admin/admin_user.php

Spacing +7 added lines, -7 removed lines

@@ -3,22 +3,22 @@ 
 define('INSIDE', true);
 define('INSTALL', false);
 define('IN_ADMIN', true);
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
 lng_include('admin');
 
 $user_id = sys_get_param_id('uid');
-if(!($user_row = DBStaticUser::db_user_by_id($user_id))) {
+if (!($user_row = DBStaticUser::db_user_by_id($user_id))) {
   AdminMessage(sprintf(classLocale::$lang['adm_dm_user_none'], $user_id));
 }
 
 $template = gettemplate('admin/admin_user', true);
 
-if(!empty($user_row['user_last_browser_id'])) {
+if (!empty($user_row['user_last_browser_id'])) {
   $user_row['browser_user_agent'] = db_browser_agent_get_by_id($user_row['user_last_browser_id']);
 }
 
@@ -54,10 +54,10 @@ 
     'raidsloose',
     'raidswin',
     'total_rank',
-    'total_points',  ),
+    'total_points',),
 );
-foreach($formats as $callable => $field_list) {
-  foreach($field_list as $field_name) {
+foreach ($formats as $callable => $field_list) {
+  foreach ($field_list as $field_name) {
     $user_row[$field_name] = call_user_func($callable, $user_row[$field_name]);
   }
 }

includes/functions/_news.php

Spacing +15 added lines, -16 removed lines

@@ -11,15 +11,15 @@ 
   $announce_list = db_news_list_get_by_query($template, $query_where, $query_limit);
 
   $users = array();
-  while($announce = db_fetch($announce_list)) {
-    if($announce['user_id'] && !isset($users[$announce['user_id']])) {
+  while ($announce = db_fetch($announce_list)) {
+    if ($announce['user_id'] && !isset($users[$announce['user_id']])) {
       $users[$announce['user_id']] = DBStaticUser::db_user_by_id($announce['user_id']);
     }
 
     $survey_vote = array('survey_vote_id' => 1);
     $survey_complete = strtotime($announce['survey_until']) < SN_TIME_NOW;
 
-    if($announce['survey_id'] && !empty($user['id'])) {
+    if ($announce['survey_id'] && !empty($user['id'])) {
       $survey_vote = !$survey_complete ? db_survey_get_vote($announce, $user) : array();
     }
 
@@ -31,8 +31,7 @@ 
       'ANNOUNCE'        => cht_message_parse($announce['strAnnounce'], false, intval($announce['authlevel'])),
       'DETAIL_URL'      => $announce['detail_url'],
       'USER_NAME'       =>
-        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) :
-          js_safe_string($announce['user_name']),
+        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) : js_safe_string($announce['user_name']),
       'NEW'             => $announce['unix_time'] + classSupernova::$config->game_news_actual >= SN_TIME_NOW,
       'FUTURE'          => $announce['unix_time'] > SN_TIME_NOW,
       'SURVEY_ID'       => $announce['survey_id'],
@@ -42,25 +41,25 @@ 
       'SURVEY_UNTIL'    => $announce['survey_until'],
     ));
 
-    foreach($announce_exploded as $announce_paragraph) {
+    foreach ($announce_exploded as $announce_paragraph) {
       $template->assign_block_vars('announces.paragraph', array(
         'TEXT' => $announce_paragraph,
       ));
     }
 
-    if($announce['survey_id']) {
+    if ($announce['survey_id']) {
       $survey_query = db_survey_get_answer_texts($announce);
       $survey_vote_result = array();
       $total_votes = 0;
-      while($row = db_fetch($survey_query)) {
+      while ($row = db_fetch($survey_query)) {
         $survey_vote_result[] = $row;
         $total_votes += $row['VOTES'];
       }
 
-      if(empty($survey_vote) && !$survey_complete) {
+      if (empty($survey_vote) && !$survey_complete) {
         // Can vote
         $survey_query = db_survey_answers_get_list_by_parent($announce);
-        while($row = db_fetch($survey_query)) {
+        while ($row = db_fetch($survey_query)) {
           $template->assign_block_vars('announces.survey_answers', array(
             'ID'   => $row['survey_answer_id'],
             'TEXT' => $row['survey_answer_text'],
@@ -68,7 +67,7 @@ 
         }
       } else {
         // Show result
-        foreach($survey_vote_result as &$vote_result) {
+        foreach ($survey_vote_result as &$vote_result) {
           $vote_percent = $total_votes ? $vote_result['VOTES'] / $total_votes * 100 : 0;
           $vote_result['PERCENT'] = $vote_percent;
           $vote_result['PERCENT_TEXT'] = round($vote_percent, 1);
@@ -85,8 +84,8 @@ 
 }
 
 function nws_mark_read(&$user) {
-  if(isset($user['id'])) {
-    DBStaticUser::db_user_set_by_id($user['id'], '`news_lastread` = ' . SN_TIME_NOW);
+  if (isset($user['id'])) {
+    DBStaticUser::db_user_set_by_id($user['id'], '`news_lastread` = '.SN_TIME_NOW);
     $user['news_lastread'] = SN_TIME_NOW;
   }
 
@@ -94,17 +93,17 @@ 
 }
 
 function survey_vote(&$user) {
-  if(empty($user['id'])) {
+  if (empty($user['id'])) {
     return true;
   }
 
   sn_db_transaction_start();
   $survey_id = sys_get_param_id('survey_id');
   $is_voted = db_survey_vote_get($user, $survey_id);
-  if(empty($is_voted)) {
+  if (empty($is_voted)) {
     $survey_vote_id = sys_get_param_id('survey_vote');
     $is_answer_exists = db_survey_answer_get($survey_id, $survey_vote_id);
-    if(!empty($is_answer_exists)) {
+    if (!empty($is_answer_exists)) {
       $user_name_safe = db_escape($user['username']);
       db_survey_vote_insert($user, $survey_id, $survey_vote_id, $user_name_safe);
     }

includes/alliance/ali_internal_members.inc

Spacing +30 added lines, -30 removed lines

@@ -2,31 +2,31 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
 // Changing rank for single user
 $id_user = sys_get_param_id('id_user');
-if(isset($_GET['id_rank'])) {
+if (isset($_GET['id_rank'])) {
   $id_rank = sys_get_param_int('id_rank');
 }
-if($id_user && isset($id_rank) && $user_admin) {
+if ($id_user && isset($id_rank) && $user_admin) {
   DBStaticUser::db_user_set_by_id($id_user, "`ally_rank_id` = {$id_rank}");
 }
 
 $id_kick = sys_get_param_id('kick');
 
-if($id_kick && $user_can_kick) {
+if ($id_kick && $user_can_kick) {
   $u = DBStaticUser::db_user_by_id($id_kick, true);
-  if($u['ally_id'] == $ally['id'] && $u['id'] != $ally['ally_owner']) {
+  if ($u['ally_id'] == $ally['id'] && $u['id'] != $ally['ally_owner']) {
     DBStaticUser::db_user_set_by_id($id_kick, '`ally_id`= null, `ally_name` = null, `ally_tag` = null, ally_register_time = 0, ally_rank_id = 0');
     db_ally_update_member_decrease($ally);
   }
 }
 
 $sort2 = sys_get_param_int('sort2');
-if($sort2) {
+if ($sort2) {
   $sort2s = "DESC";
   $sort2 = 0;
 } else {
@@ -35,7 +35,7 @@ 
 }
 
 $sort1 = sys_get_param_int('sort1');
-if($sort1 > 5 || $sort1 < 0) {
+if ($sort1 > 5 || $sort1 < 0) {
   $sort1 = 0;
 }
 $sort1s = array(
@@ -49,28 +49,28 @@ 
 
 $template = gettemplate('ali_members', true);
 
-$userList = DBStaticUser::db_user_list("`ally_id`= {$user['ally_id']} ORDER BY " . sprintf($sort1s[$sort1], $sort2s), false,
+$userList = DBStaticUser::db_user_list("`ally_id`= {$user['ally_id']} ORDER BY ".sprintf($sort1s[$sort1], $sort2s), false,
   'id, username, galaxy, system, planet, onlinetime, ally_rank_id, ally_register_time, total_points');
 
 // while ($userRow = db_fetch($userList))
-foreach($userList as $userRow) {
+foreach ($userList as $userRow) {
   $i++;
-  if(!isset($ranks[$userRow['ally_rank_id']])) {
+  if (!isset($ranks[$userRow['ally_rank_id']])) {
     $userRow['ally_rank_id'] = 0;
   }
 
-  if($ally['ally_owner'] == $userRow['id']) {
+  if ($ally['ally_owner'] == $userRow['id']) {
     $ally_range = ($ally['ally_owner_range']) ? $ally['ally_owner_range'] : classLocale::$lang['Founder'];
   } else {
-    if($user_admin) {
-      $ally_range = '<select onchange="window.location=\'alliance.php?mode=admin&edit=members&id_user=' . $userRow['id'] . '&id_rank=\' + this.value">';
+    if ($user_admin) {
+      $ally_range = '<select onchange="window.location=\'alliance.php?mode=admin&edit=members&id_user='.$userRow['id'].'&id_rank=\' + this.value">';
 
-      foreach($ranks as $rankID => $rankArray) {
-        $ally_range .= '<option value="' . $rankID . '"';
-        if($rankID == $userRow['ally_rank_id']) {
+      foreach ($ranks as $rankID => $rankArray) {
+        $ally_range .= '<option value="'.$rankID.'"';
+        if ($rankID == $userRow['ally_rank_id']) {
           $ally_range .= " selected";
         }
-        $ally_range .= '>' . $rankArray['name'];
+        $ally_range .= '>'.$rankArray['name'];
         $ally_range .= '</option>';
       }
       $ally_range .= '</select>';
@@ -80,20 +80,20 @@ 
   }
 
   $last_active = time() - $userRow["onlinetime"];
-  if($user_admin) {
-    if($last_active < 60) {
+  if ($user_admin) {
+    if ($last_active < 60) {
       $tmp = "lime>{$classLocale['On']}";
-    } elseif($last_active < 60 * 60) {
+    } elseif ($last_active < 60 * 60) {
       $last_active = round($last_active / 60);
       $tmp = "lime>{$last_active} {$classLocale['sys_min_short']}";
-    } elseif($last_active < 60 * 60 * 24) {
+    } elseif ($last_active < 60 * 60 * 24) {
       $last_active = round($last_active / (60 * 60));
       $tmp = "green>{$last_active} {$classLocale['sys_hrs_short']}";
     } else {
       $last_active = round($last_active / (60 * 60 * 24));
-      if($last_active < 7) {
+      if ($last_active < 7) {
         $tmp = "yellow";
-      } elseif($last_active < 30) {
+      } elseif ($last_active < 30) {
         $tmp = "orange";
       } else {
         $tmp = "red";
@@ -101,10 +101,10 @@ 
       $tmp .= ">{$last_active} {$classLocale['sys_day_short']}";
     }
   } else {
-    if($user_onlinestatus) {
-      if($last_active < 60 * 5) {
+    if ($user_onlinestatus) {
+      if ($last_active < 60 * 5) {
         $tmp = "lime>{$classLocale['On']}";
-      } elseif($last_active < 60 * 15) {
+      } elseif ($last_active < 60 * 15) {
         $tmp = "yellow>{$classLocale['ali_lessThen15min']}";
       } else {
         $tmp = "red>{$classLocale['Off']}";
@@ -124,21 +124,21 @@ 
     'SYSTEM'        => $userRow['system'],
     'PLANET'        => $userRow['planet'],
     'POINTS'        => pretty_number($userRow['total_points']),
-    'ONLINE'        => '<font color=' . $tmp . '</font>',
+    'ONLINE'        => '<font color='.$tmp.'</font>',
     'RANK'          => $ally_range,
     'REGISTER_TIME' => date(FMT_DATE_TIME, $userRow['ally_register_time']),
     'SHOW_KICK'     => $user['id'] != $userRow['id'] && $ally['ally_owner'] != $userRow['id'],
   ));
 }
 
-if($i != $ally['ally_members']) {
+if ($i != $ally['ally_members']) {
   db_ally_update_member_set($i, $ally);
 }
 
 $template->assign_vars(array(
-  'mode'          => $mode . ($edit ? "&edit=" . $edit : ''),
+  'mode'          => $mode.($edit ? "&edit=".$edit : ''),
   'ADMIN_MODE'    => $user_can_kick,
-  'dpath'         => SN_ROOT_VIRTUAL . $dpath,
+  'dpath'         => SN_ROOT_VIRTUAL.$dpath,
   'onlineMessage' => $user_admin ? classLocale::$lang['ali_sys_lastActive'] : classLocale::$lang['Online'],
   'memberCount'   => count($userList),
   'memberslist'   => $page_list,

includes/alliance/ali_external_create_ally.inc

Spacing +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 // Pretty Safe
 // TODO: Add ally_tag to usertable
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
@@ -11,21 +11,21 @@ 
 $ally_name_raw = sys_get_param_str_unsafe('name');
 $ally_name = db_escape($ally_name_raw);
 
-if($ally_tag) {
-  if(!$ally_name_raw || !$ally_tag_raw) {
+if ($ally_tag) {
+  if (!$ally_name_raw || !$ally_tag_raw) {
     message(classLocale::$lang['have_not_name'], classLocale::$lang['make_alliance']);
   }
 
   $query = db_ally_get_by_name_or_tag($ally_tag, $ally_name);
-  if($query) {
+  if ($query) {
     message(str_replace('%s', $query['ally_tag'] == $ally_tag_raw ? $ally_tag_raw : $ally_name_raw, classLocale::$lang['always_exist']), classLocale::$lang['make_alliance']);
   }
 
   db_ally_insert($ally_name, $ally_tag, $user);
   $ally_id = db_insert_id();
-  DBStaticUser::db_user_set_by_id($user['id'], "`ally_tag` = '{$ally_tag}', `ally_id`= {$ally_id}, `ally_name`='{$ally_name}', `ally_register_time`= " . SN_TIME_NOW . "");
+  DBStaticUser::db_user_set_by_id($user['id'], "`ally_tag` = '{$ally_tag}', `ally_id`= {$ally_id}, `ally_name`='{$ally_name}', `ally_register_time`= ".SN_TIME_NOW."");
 
-  $ally_user = classSupernova::db_ins_record(LOC_USER, "`username` = '[{$ally_tag}]', `register_time` = " . SN_TIME_NOW . ", `user_as_ally` = {$ally_id}");
+  $ally_user = classSupernova::db_ins_record(LOC_USER, "`username` = '[{$ally_tag}]', `register_time` = ".SN_TIME_NOW.", `user_as_ally` = {$ally_id}");
   // $ally_user_id = db_insert_id();
   $ally_user_id = is_array($ally_user) ? $ally_user['id'] : 'NULL';
   db_ally_update_ally_user($ally_user_id, $ally_id);