supernova-ws / SuperNova

flotenajax.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('viewreport', true);
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);

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);

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);

includes/alliance/ali_internal_admin_request.inc

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-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);
 }
 
@@ -10,16 +10,16 @@ 
 
 $d = sys_get_param_id('d');
 
-if($d) {
+if ($d) {
   db_ally_request_deny($d);
 }
 
 $id_user = sys_get_param_id('id_user');
 
-if($id_user) {
+if ($id_user) {
   $ally_name_safe = db_escape($ally['ally_name']);
   $ally_tag_safe = db_escape($ally['ally_tag']);
-  DBStaticUser::db_user_set_by_id($id_user, "`ally_id` = '{$ally['id']}', `ally_name` = '{$ally_name_safe}', `ally_tag` = '{$ally_tag_safe}', `ally_register_time` = " . SN_TIME_NOW . ", `ally_rank_id` = 0");
+  DBStaticUser::db_user_set_by_id($id_user, "`ally_id` = '{$ally['id']}', `ally_name` = '{$ally_name_safe}', `ally_tag` = '{$ally_tag_safe}', `ally_register_time` = ".SN_TIME_NOW.", `ally_rank_id` = 0");
   db_ally_update_member_increase($ally);
   db_ally_request_delete_by_user_id($id_user);
 }

includes/classes/classSupernova.php

Braces +6 added lines, -2 removed lines

@@ -542,7 +542,8 @@ 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if ($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if ($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) {
+      // TODO Как-то вернуть может быть LIMIT 1 ?
     {
       if (static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
@@ -550,6 +551,7 @@ 
 
         // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее
         static::$data[$location_type][$record_id] = null;
+    }
         // Вытаскиваем обновленную запись
         static::db_get_record_by_id($location_type, $record_id);
         static::cache_clear($location_type, false); // Мягкий сброс - только $queries
@@ -589,9 +591,11 @@ 
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if ($result = static::db_query("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего

Doc Comments +5 added lines, -2 removed lines

@@ -323,7 +323,7 @@ 
    *   <p>null - транзакция НЕ должна быть запущена</p>
    *   <p>true - транзакция должна быть запущена - для совместимости с $for_update</p>
    *   <p>false - всё равно - для совместимости с $for_update</p>
-   * @return bool Текущий статус транзакции
+   * @return null|boolean Текущий статус транзакции
    */
   public static function db_transaction_check($status = null) {
     $error_msg = false;
@@ -399,7 +399,7 @@ 
   /**
    * Блокирует указанные таблицу/список таблиц
    *
-   * @param string|array $tables Таблица/список таблиц для блокировки. Названия таблиц - без префиксов
+   * @param string $tables Таблица/список таблиц для блокировки. Названия таблиц - без префиксов
    * <p>string - название таблицы для блокировки</p>
    * <p>array - массив, где ключ - имя таблицы, а значение - условия блокировки элементов</p>
    */
@@ -574,6 +574,9 @@ 
     return $result;
   }
 
+  /**
+   * @param integer $location_type
+   */
   public static function db_ins_field_set($location_type, $field_set, $serialize = false) {
     // TODO multiinsert
     !sn_db_field_set_is_safe($field_set) ? $field_set = sn_db_field_set_make_safe($field_set, $serialize) : false;

Spacing +25 added lines, -27 removed lines

@@ -228,7 +228,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);
@@ -241,7 +241,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');
@@ -305,7 +305,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 : ''));
     }
   }
 
@@ -365,8 +365,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)) {
@@ -379,13 +379,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)) {
@@ -456,7 +456,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()) { // Обновляем данные только если ряд был затронут
         // Поскольку нам неизвестно, что и как обновилось - сбрасываем кэш этого типа полностью
@@ -614,7 +614,7 @@ 
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
 
       $user = static::db_query(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
+        "SELECT * FROM {{users}} WHERE `username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"
         , true);
       SnCache::cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
     }
@@ -671,7 +671,7 @@ 
     }
 
     if (SnCache::isUnitLocatorNotSet($location_type, $location_id)) {
-      $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 (!empty($got_data) && is_array($got_data)) {
         foreach ($got_data as $unit_id => $unit_data) {
           SnCache::setUnitLocatorByLocationAndIDs($location_type, $location_id, $unit_data);
@@ -730,7 +730,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}";
@@ -844,13 +844,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);
@@ -864,9 +864,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('Неподдерживаемый тип условия');
@@ -893,7 +891,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) {
@@ -981,7 +979,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);
       });
     }
@@ -998,39 +996,39 @@ 
       'buddyClass' => 'Buddy\BuddyModel',
     ));
 
-    $container->db = function ($c) {};
+    $container->db = function($c) {};
 
-      $container->db = function ($c) {
+      $container->db = function($c) {
       $db = new db_mysql();
       $db->sn_db_connect();
 
       return $db;
     };
 
-    $container->debug = function ($c) {
+    $container->debug = function($c) {
       return new debug();
     };
 
-    $container->cache = function ($c) {
+    $container->cache = function($c) {
       return new classCache(classSupernova::$cache_prefix);
     };
 
-    $container->config = function ($c) {
+    $container->config = function($c) {
       return new classConfig(classSupernova::$cache_prefix);
     };
 
-    $container->dbRowOperator = function ($c) {
+    $container->dbRowOperator = function($c) {
       return new DbRowSimple($c);
     };
 
-    $container->buddy = $container->factory(function ($c) {
+    $container->buddy = $container->factory(function($c) {
       return new $c->buddyClass($c);
     });
 //    $container->buddy = $container->factory(function ($c) {
 //      return new Buddy\Buddy($c);
 //    });
 
-    $container->query = $container->factory(function (Pimple\GlobalContainer $c) {
+    $container->query = $container->factory(function(Pimple\GlobalContainer $c) {
       return new DbQueryConstructor($c->db);
     });
 
@@ -1045,7 +1043,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'];