@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $this->db_saveItem(array_combine(array_keys($this->defaults), array_fill(0, count($this->defaults), null))); |
92 | 92 | } |
93 | 93 | |
94 | - public function db_saveItem($item_list, $value = NULL) { |
|
94 | + public function db_saveItem($item_list, $value = null) { |
|
95 | 95 | if(empty($item_list)) { |
96 | 96 | return; |
97 | 97 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | $qry = array(); |
103 | 103 | foreach($item_list as $item_name => $item_value) { |
104 | 104 | if($item_name) { |
105 | - $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value); |
|
105 | + $item_value = db_escape($item_value === null ? $this->$item_name : $item_value); |
|
106 | 106 | $item_name = db_escape($item_name); |
107 | 107 | $qry[] = "('{$item_name}', '{$item_value}')"; |
108 | 108 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $this->sql_index_field = "{$table_name}_name"; |
34 | 34 | $this->sql_value_field = "{$table_name}_value"; |
35 | 35 | |
36 | - if(!$this->_DB_LOADED) { |
|
36 | + if (!$this->_DB_LOADED) { |
|
37 | 37 | $this->db_loadAll(); |
38 | 38 | } |
39 | 39 | } |
@@ -53,10 +53,10 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function db_loadItem($index) { |
55 | 55 | $result = null; |
56 | - if($index) { |
|
56 | + if ($index) { |
|
57 | 57 | $index_safe = db_escape($index); |
58 | 58 | $queryResult = doquery("SELECT `{$this->sql_value_field}` FROM `{{{$this->table_name}}}` WHERE `{$this->sql_index_field}` = '{$index_safe}' FOR UPDATE", true); |
59 | - if(is_array($queryResult) && !empty($queryResult)) { |
|
59 | + if (is_array($queryResult) && !empty($queryResult)) { |
|
60 | 60 | $this->$index = $result = $queryResult[$this->sql_value_field]; |
61 | 61 | } |
62 | 62 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $this->loadDefaults(); |
69 | 69 | |
70 | 70 | $query = doquery("SELECT * FROM {{{$this->table_name}}} FOR UPDATE;"); |
71 | - while($row = db_fetch($query)) { |
|
71 | + while ($row = db_fetch($query)) { |
|
72 | 72 | $this->$row[$this->sql_index_field] = $row[$this->sql_value_field]; |
73 | 73 | } |
74 | 74 | |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | } |
77 | 77 | |
78 | 78 | public function loadDefaults() { |
79 | - foreach($this->defaults as $defName => $defValue) { |
|
79 | + foreach ($this->defaults as $defName => $defValue) { |
|
80 | 80 | $this->$defName = $defValue; |
81 | 81 | } |
82 | 82 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | } |
93 | 93 | |
94 | 94 | public function db_saveItem($item_list, $value = NULL) { |
95 | - if(empty($item_list)) { |
|
95 | + if (empty($item_list)) { |
|
96 | 96 | return; |
97 | 97 | } |
98 | 98 | |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | |
101 | 101 | // Сначала записываем данные в базу - что бы поймать все блокировки |
102 | 102 | $qry = array(); |
103 | - foreach($item_list as $item_name => $item_value) { |
|
104 | - if($item_name) { |
|
103 | + foreach ($item_list as $item_name => $item_value) { |
|
104 | + if ($item_name) { |
|
105 | 105 | $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value); |
106 | 106 | $item_name = db_escape($item_name); |
107 | 107 | $qry[] = "('{$item_name}', '{$item_value}')"; |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | doquery("REPLACE INTO `{{" . $this->table_name . "}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES " . implode(',', $qry) . ";"); |
111 | 111 | |
112 | 112 | // И только после взятия блокировок - меняем значения в кэше |
113 | - foreach($item_list as $item_name => $item_value) { |
|
114 | - if($item_name && $item_value !== null) { |
|
113 | + foreach ($item_list as $item_name => $item_value) { |
|
114 | + if ($item_name && $item_value !== null) { |
|
115 | 115 | $this->__set($item_name, $item_value); |
116 | 116 | } |
117 | 117 | } |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | } |
127 | 127 | |
128 | 128 | public function __get($name) { |
129 | - if($this->force) { |
|
129 | + if ($this->force) { |
|
130 | 130 | $this->force = false; |
131 | 131 | $this->db_loadItem($name); |
132 | 132 | } |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | } |
136 | 136 | |
137 | 137 | public function __set($name, $value) { |
138 | - if($this->force) { |
|
138 | + if ($this->force) { |
|
139 | 139 | $this->force = false; |
140 | 140 | $this->db_saveItem($name, $value); |
141 | 141 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | global $lang, $debug; |
4 | 4 | |
5 | -if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) |
|
5 | +if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) |
|
6 | 6 | { |
7 | 7 | $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403); |
8 | 8 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | if ($new_rank_name = sys_get_param_str('newRankName')) |
17 | 17 | { |
18 | - foreach($ally_rights as $fieldName) |
|
18 | + foreach ($ally_rights as $fieldName) |
|
19 | 19 | { |
20 | 20 | $newRank[$fieldName] = 0; |
21 | 21 | } |
@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | { |
29 | 29 | unset($ranks); |
30 | 30 | |
31 | - foreach($rankListInput as $rankID => $rank) |
|
31 | + foreach ($rankListInput as $rankID => $rank) |
|
32 | 32 | { |
33 | - foreach($ally_rights as $rightName) |
|
33 | + foreach ($ally_rights as $rightName) |
|
34 | 34 | { |
35 | 35 | $ranks[$rankID][$rightName] = $rank[$rightName] ? 1 : 0; |
36 | 36 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $d = sys_get_param_int('d'); |
42 | 42 | if ($d && isset($ranks[$d])) |
43 | 43 | { |
44 | - if(count($ranks) == 1) |
|
44 | + if (count($ranks) == 1) |
|
45 | 45 | { |
46 | 46 | messageBox($lang['ali_adm_lastRank'], $lang['ali_adm_rights_title']); |
47 | 47 | } |
@@ -53,16 +53,16 @@ discard block |
||
53 | 53 | |
54 | 54 | if (count($ranks)) |
55 | 55 | { |
56 | - foreach($ranks as $rankID => $rank) |
|
56 | + foreach ($ranks as $rankID => $rank) |
|
57 | 57 | { |
58 | 58 | $rank_data = array( |
59 | 59 | 'ID' => $rankID, |
60 | 60 | 'NAME' => $rank['name'], |
61 | 61 | ); |
62 | 62 | |
63 | - for($i = 1; $i < count($rank); $i++) |
|
63 | + for ($i = 1; $i < count($rank); $i++) |
|
64 | 64 | { |
65 | - $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '') ; |
|
65 | + $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : ''); |
|
66 | 66 | $rank_data['N' . $i] = $ally_rights[$i]; |
67 | 67 | } |
68 | 68 |
@@ -13,7 +13,7 @@ |
||
13 | 13 | * @return mixed |
14 | 14 | * @deprecated |
15 | 15 | */ |
16 | -function RestoreFleetToPlanet(&$fleet_row, $start = true, $only_resources = false, $safe_fleet = false){return sn_function_call('RestoreFleetToPlanet', array(&$fleet_row, $start, $only_resources, $safe_fleet, &$result));} |
|
16 | +function RestoreFleetToPlanet(&$fleet_row, $start = true, $only_resources = false, $safe_fleet = false) {return sn_function_call('RestoreFleetToPlanet', array(&$fleet_row, $start, $only_resources, $safe_fleet, &$result)); } |
|
17 | 17 | /** |
18 | 18 | * @param array $fleet_row |
19 | 19 | * @param bool $start |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | function sys_user_vacation($user) { |
10 | 10 | global $config; |
11 | 11 | |
12 | - if(sys_get_param_str('vacation') == 'leave') { |
|
12 | + if (sys_get_param_str('vacation') == 'leave') { |
|
13 | 13 | if ($user['vacation'] < SN_TIME_NOW) { |
14 | 14 | $user['vacation'] = 0; |
15 | 15 | $user['vacation_next'] = SN_TIME_NOW + $config->player_vacation_timeout; |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | } |
18 | 18 | } |
19 | 19 | |
20 | - if($user['vacation']) { |
|
20 | + if ($user['vacation']) { |
|
21 | 21 | // sn_sys_logout(false, true); |
22 | 22 | // core_auth::logout(false, true); |
23 | 23 | |
@@ -52,33 +52,33 @@ discard block |
||
52 | 52 | // TODO: Full rewrite |
53 | 53 | sn_db_transaction_start(); |
54 | 54 | $TheUser = db_user_by_id($UserID); |
55 | - if ( $TheUser['ally_id'] != 0 ) { |
|
56 | - $TheAlly = doquery ( "SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true ); |
|
55 | + if ($TheUser['ally_id'] != 0) { |
|
56 | + $TheAlly = doquery("SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true); |
|
57 | 57 | $TheAlly['ally_members'] -= 1; |
58 | - if ( $TheAlly['ally_members'] > 0 ) { |
|
59 | - doquery ( "UPDATE `{{alliance}}` SET `ally_members` = '" . $TheAlly['ally_members'] . "' WHERE `id` = '" . $TheAlly['id'] . "';"); |
|
58 | + if ($TheAlly['ally_members'] > 0) { |
|
59 | + doquery("UPDATE `{{alliance}}` SET `ally_members` = '" . $TheAlly['ally_members'] . "' WHERE `id` = '" . $TheAlly['id'] . "';"); |
|
60 | 60 | } else { |
61 | - doquery ( "DELETE FROM `{{alliance}}` WHERE `id` = '" . $TheAlly['id'] . "';"); |
|
62 | - doquery ( "DELETE FROM `{{statpoints}}` WHERE `stat_type` = '2' AND `id_owner` = '" . $TheAlly['id'] . "';"); |
|
61 | + doquery("DELETE FROM `{{alliance}}` WHERE `id` = '" . $TheAlly['id'] . "';"); |
|
62 | + doquery("DELETE FROM `{{statpoints}}` WHERE `stat_type` = '2' AND `id_owner` = '" . $TheAlly['id'] . "';"); |
|
63 | 63 | } |
64 | 64 | } |
65 | - doquery ( "DELETE FROM `{{statpoints}}` WHERE `stat_type` = '1' AND `id_owner` = '" . $UserID . "';"); |
|
65 | + doquery("DELETE FROM `{{statpoints}}` WHERE `stat_type` = '1' AND `id_owner` = '" . $UserID . "';"); |
|
66 | 66 | |
67 | 67 | DBStaticPlanet::db_planet_list_delete_by_owner($UserID); |
68 | 68 | |
69 | - doquery ( "DELETE FROM `{{messages}}` WHERE `message_sender` = '" . $UserID . "';"); |
|
70 | - doquery ( "DELETE FROM `{{messages}}` WHERE `message_owner` = '" . $UserID . "';"); |
|
71 | - doquery ( "DELETE FROM `{{notes}}` WHERE `owner` = '" . $UserID . "';"); |
|
69 | + doquery("DELETE FROM `{{messages}}` WHERE `message_sender` = '" . $UserID . "';"); |
|
70 | + doquery("DELETE FROM `{{messages}}` WHERE `message_owner` = '" . $UserID . "';"); |
|
71 | + doquery("DELETE FROM `{{notes}}` WHERE `owner` = '" . $UserID . "';"); |
|
72 | 72 | db_fleet_list_delete_by_owner($UserID); |
73 | 73 | // doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner1` = '" . $UserID . "';"); |
74 | 74 | // doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner2` = '" . $UserID . "';"); |
75 | - doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '" . $UserID . "';"); |
|
76 | - doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '" . $UserID . "';"); |
|
77 | - doquery ( "DELETE FROM `{{annonce}}` WHERE `user` = '" . $UserID . "';"); |
|
75 | + doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '" . $UserID . "';"); |
|
76 | + doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '" . $UserID . "';"); |
|
77 | + doquery("DELETE FROM `{{annonce}}` WHERE `user` = '" . $UserID . "';"); |
|
78 | 78 | |
79 | 79 | |
80 | 80 | classSupernova::db_del_record_by_id(LOC_USER, $UserID); |
81 | - doquery ( "DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');"); |
|
81 | + doquery("DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');"); |
|
82 | 82 | global $config; |
83 | 83 | $config->db_saveItem('users_amount', $config->db_loadItem('users_amount') - 1); |
84 | 84 | sn_db_transaction_commit(); |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | \DBAL\DbQuery::build()->setTable('users')->setValues($field_set)->doInsert(); |
181 | 181 | $user_new = db_user_by_id(db_insert_id()); |
182 | 182 | |
183 | - if(!($options['galaxy'] && $options['system'] && $options['planet'])) { |
|
183 | + if (!($options['galaxy'] && $options['system'] && $options['planet'])) { |
|
184 | 184 | $options['galaxy'] = $config->LastSettedGalaxyPos; |
185 | 185 | $options['system'] = $config->LastSettedSystemPos; |
186 | 186 | $segment_size = floor($config->game_maxPlanet / 3); |
@@ -188,19 +188,19 @@ discard block |
||
188 | 188 | $segment++; |
189 | 189 | $options['planet'] = mt_rand(1 + $segment * $segment_size, ($segment + 1) * $segment_size); |
190 | 190 | |
191 | - while(true) { |
|
192 | - if($options['planet'] > $config->game_maxPlanet) { |
|
191 | + while (true) { |
|
192 | + if ($options['planet'] > $config->game_maxPlanet) { |
|
193 | 193 | $options['planet'] = mt_rand(0, $segment_size - 1) + 1; |
194 | 194 | $options['system']++; |
195 | 195 | } |
196 | - if($options['system'] > $config->game_maxSystem) { |
|
196 | + if ($options['system'] > $config->game_maxSystem) { |
|
197 | 197 | $options['system'] = 1; |
198 | 198 | $options['galaxy']++; |
199 | 199 | } |
200 | 200 | $options['galaxy'] > $config->game_maxGalaxy ? $options['galaxy'] = 1 : false; |
201 | 201 | |
202 | 202 | $galaxy_row = DBStaticPlanet::db_planet_by_gspt($options['galaxy'], $options['system'], $options['planet'], PT_PLANET, true, 'id'); |
203 | - if(!$galaxy_row['id']) { |
|
203 | + if (!$galaxy_row['id']) { |
|
204 | 204 | $config->db_saveItem(array( |
205 | 205 | 'LastSettedGalaxyPos' => $options['galaxy'], |
206 | 206 | 'LastSettedSystemPos' => $options['system'], |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | $username_safe = db_escape($username_unsafe); |
224 | 224 | doquery("REPLACE INTO {{player_name_history}} SET `player_id` = {$user_new['id']}, `player_name` = '{$username_safe}'"); |
225 | 225 | |
226 | - if(!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) { |
|
226 | + if (!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) { |
|
227 | 227 | doquery("INSERT INTO {{referrals}} SET `id` = {$user_new['id']}, `id_partner` = {$options['partner_id']}"); |
228 | 228 | } |
229 | 229 |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | $user_auth_level = isset($user['authlevel']) ? $user['authlevel'] : AUTH_LEVEL_ANONYMOUS; |
15 | 15 | |
16 | 16 | $mode = sys_get_param_int('mode'); |
17 | - switch($mode) |
|
17 | + switch ($mode) |
|
18 | 18 | { |
19 | 19 | case CHAT_MODE_ALLY: |
20 | 20 | $template_result['ALLY'] = intval($user['ally_id']); |
@@ -28,12 +28,12 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | $template_result['.']['smiles'] = array(); |
31 | - foreach(classSupernova::$gc->design->getSmilesList() as $auth_level => $replaces) { |
|
32 | - if($auth_level > $user_auth_level) { |
|
31 | + foreach (classSupernova::$gc->design->getSmilesList() as $auth_level => $replaces) { |
|
32 | + if ($auth_level > $user_auth_level) { |
|
33 | 33 | continue; |
34 | 34 | } |
35 | 35 | |
36 | - foreach($replaces as $bbcode => $filename) |
|
36 | + foreach ($replaces as $bbcode => $filename) |
|
37 | 37 | { |
38 | 38 | $template_result['.']['smiles'][] = array( |
39 | 39 | 'BBCODE' => $bbcode, |
@@ -57,12 +57,12 @@ discard block |
||
57 | 57 | |
58 | 58 | define('IN_AJAX', true); |
59 | 59 | |
60 | - if($config->getMode() != classCache::CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) |
|
60 | + if ($config->getMode() != classCache::CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) |
|
61 | 61 | { |
62 | 62 | die(); |
63 | 63 | } |
64 | 64 | |
65 | - if(($message = sys_get_param_str('message')) && $user['username']) |
|
65 | + if (($message = sys_get_param_str('message')) && $user['username']) |
|
66 | 66 | { |
67 | 67 | $ally_id = sys_get_param('ally') && $user['ally_id'] ? $user['ally_id'] : 0; |
68 | 68 | $nick = db_escape(player_nick_compact(player_nick_render_current_to_array($user, array('color' => true, 'icons' => true, 'ally' => !$ally_id)))); |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | define('IN_AJAX', true); |
84 | 84 | |
85 | 85 | $history = sys_get_param_str('history'); |
86 | - if(!$history) |
|
86 | + if (!$history) |
|
87 | 87 | { |
88 | 88 | $config->array_set('users', $user['id'], 'chat_last_refresh', SN_TIME_MICRO); |
89 | 89 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | $last_message = ''; |
93 | 93 | $alliance = 0; |
94 | 94 | $template_result['.']['chat'] = array(); |
95 | - if(!$history && $config->getMode() != classCache::CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) |
|
95 | + if (!$history && $config->getMode() != classCache::CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) |
|
96 | 96 | { |
97 | 97 | $result['disable'] = true; |
98 | 98 | $template_result['.']['chat'][] = array( |
@@ -108,12 +108,12 @@ discard block |
||
108 | 108 | |
109 | 109 | $where_add = ''; |
110 | 110 | $last_message = 0; |
111 | - if($history) |
|
111 | + if ($history) |
|
112 | 112 | { |
113 | 113 | $rows = doquery("SELECT count(1) AS CNT FROM {{chat}} WHERE ally_id = '{$alliance}';", true); |
114 | 114 | $page_count = ceil($rows['CNT'] / $page_limit); |
115 | 115 | |
116 | - for($i = 0; $i < $page_count; $i++) |
|
116 | + for ($i = 0; $i < $page_count; $i++) |
|
117 | 117 | { |
118 | 118 | $template_result['.']['page'][] = array( |
119 | 119 | 'NUMBER' => $i |
@@ -135,13 +135,13 @@ discard block |
||
135 | 135 | {{chat}} AS c |
136 | 136 | LEFT JOIN {{users}} AS u ON u.id = c.chat_message_sender_id |
137 | 137 | WHERE c.chat_message_recipient_id IS NULL AND c.ally_id = '{$alliance}' {$where_add} ORDER BY messageid DESC LIMIT {$start_row}, {$page_limit};"); |
138 | - while($chat_row = db_fetch($query)) |
|
138 | + while ($chat_row = db_fetch($query)) |
|
139 | 139 | { |
140 | 140 | // Little magik here - to retain HTML codes from DB and stripping HTML codes from nick |
141 | 141 | $chat_row['user'] = player_nick_render_to_html($chat_row['user']); |
142 | 142 | $nick_stripped = htmlentities(strip_tags($chat_row['user']), ENT_QUOTES, 'utf-8'); |
143 | 143 | $nick = str_replace(strip_tags($chat_row['user']), $nick_stripped, $chat_row['user']); |
144 | - if(!$history) |
|
144 | + if (!$history) |
|
145 | 145 | { |
146 | 146 | $nick = "<span style=\"cursor: pointer;\" onclick=\"addSmiley('({$nick_stripped})');\">{$nick}</span>"; |
147 | 147 | } |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | $template = gettemplate('chat_messages', $template); |
168 | 168 | $template->assign_recursive($template_result); |
169 | 169 | |
170 | - if($history) |
|
170 | + if ($history) |
|
171 | 171 | { |
172 | 172 | $pageTitle = "{$lang['chat_history']} - {$lang[$alliance ? 'chat_ally' : 'chat_common']}"; |
173 | 173 | display($template, $pageTitle); |
@@ -4,8 +4,7 @@ discard block |
||
4 | 4 | * |
5 | 5 | */ |
6 | 6 | |
7 | -function sn_chat_model() |
|
8 | -{ |
|
7 | +function sn_chat_model() { |
|
9 | 8 | global $config, $user, $template_result, $lang; |
10 | 9 | |
11 | 10 | $config->array_set('users', $user['id'], 'chat_last_activity', SN_TIME_MICRO); |
@@ -44,15 +43,13 @@ discard block |
||
44 | 43 | |
45 | 44 | $template_result['PAGE_HEADER'] = $page_title; |
46 | 45 | } |
47 | -function sn_chat_view($template = null) |
|
48 | -{ |
|
46 | +function sn_chat_view($template = null) { |
|
49 | 47 | $template = gettemplate('chat_body', $template); |
50 | 48 | |
51 | 49 | return $template; |
52 | 50 | } |
53 | 51 | |
54 | -function sn_chat_add_model() |
|
55 | -{ |
|
52 | +function sn_chat_add_model() { |
|
56 | 53 | global $config, $user; |
57 | 54 | |
58 | 55 | define('IN_AJAX', true); |
@@ -76,8 +73,7 @@ discard block |
||
76 | 73 | |
77 | 74 | die(); |
78 | 75 | } |
79 | -function sn_chat_msg_view($template = null) |
|
80 | -{ |
|
76 | +function sn_chat_msg_view($template = null) { |
|
81 | 77 | global $config, $user, $lang; |
82 | 78 | |
83 | 79 | define('IN_AJAX', true); |
@@ -99,8 +95,7 @@ discard block |
||
99 | 95 | 'TIME' => date(FMT_DATE_TIME, htmlentities(SN_CLIENT_TIME_LOCAL, ENT_QUOTES, 'utf-8')), |
100 | 96 | 'DISABLE' => true, |
101 | 97 | ); |
102 | - } |
|
103 | - else |
|
98 | + } else |
|
104 | 99 | { |
105 | 100 | $alliance = sys_get_param_str('ally') && $user['ally_id'] ? $user['ally_id'] : 0; |
106 | 101 | |
@@ -121,8 +116,7 @@ discard block |
||
121 | 116 | } |
122 | 117 | |
123 | 118 | $page = min($page_count, max(0, sys_get_param_int('sheet'))); |
124 | - } |
|
125 | - else |
|
119 | + } else |
|
126 | 120 | { |
127 | 121 | $last_message = sys_get_param_id('last_message'); |
128 | 122 | $where_add = $last_message ? "AND `messageid` > {$last_message}" : ''; |
@@ -171,8 +165,7 @@ discard block |
||
171 | 165 | { |
172 | 166 | $pageTitle = "{$lang['chat_history']} - {$lang[$alliance ? 'chat_ally' : 'chat_common']}"; |
173 | 167 | display($template, $pageTitle); |
174 | - } |
|
175 | - else |
|
168 | + } else |
|
176 | 169 | { |
177 | 170 | $result['last_message'] = $last_message; |
178 | 171 | $result['html'] = templateRenderToHtml($template); |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | * @return array |
241 | 241 | */ |
242 | 242 | public static function parseParamStrings($array, $delimiter = '=') { |
243 | - !is_array($array) ? $array = array((string)$array) : false; |
|
243 | + !is_array($array) ? $array = array((string) $array) : false; |
|
244 | 244 | |
245 | 245 | $result = array(); |
246 | 246 | foreach ($array as $param) { |
@@ -262,8 +262,8 @@ discard block |
||
262 | 262 | * @return float|null |
263 | 263 | */ |
264 | 264 | public static function maxValueByField(&$array, $fieldName) { |
265 | - return array_reduce($array, function ($carry, $item) use ($fieldName) { |
|
266 | - if(is_array($item) && isset($item[$fieldName]) && (!isset($carry) || $carry < $item[$fieldName])) { |
|
265 | + return array_reduce($array, function($carry, $item) use ($fieldName) { |
|
266 | + if (is_array($item) && isset($item[$fieldName]) && (!isset($carry) || $carry < $item[$fieldName])) { |
|
267 | 267 | $carry = $item[$fieldName]; |
268 | 268 | } |
269 | 269 | |
@@ -280,8 +280,8 @@ discard block |
||
280 | 280 | |
281 | 281 | return |
282 | 282 | array_reduce($array, |
283 | - function ($carry, $item) use (&$fieldName, $maxValue) { |
|
284 | - if(is_array($item) && isset($item[$fieldName]) && $item[$fieldName] == $maxValue) { |
|
283 | + function($carry, $item) use (&$fieldName, $maxValue) { |
|
284 | + if (is_array($item) && isset($item[$fieldName]) && $item[$fieldName] == $maxValue) { |
|
285 | 285 | $carry[] = $item; |
286 | 286 | } |
287 | 287 | |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | } |
293 | 293 | |
294 | 294 | public static function intersectByKeys(array &$array1, array &$array2) { |
295 | - return array_uintersect_assoc($array1, $array2, function ($a, $b) {return 0;}); |
|
295 | + return array_uintersect_assoc($array1, $array2, function($a, $b) {return 0; }); |
|
296 | 296 | } |
297 | 297 | |
298 | 298 | } |
@@ -52,11 +52,11 @@ discard block |
||
52 | 52 | |
53 | 53 | $prefix_length = strlen($this->db->db_prefix); |
54 | 54 | |
55 | - while($row = $this->db->db_fetch($query)) { |
|
56 | - foreach($row as $table_name) { |
|
55 | + while ($row = $this->db->db_fetch($query)) { |
|
56 | + foreach ($row as $table_name) { |
|
57 | 57 | $this->tablesAll[$table_name] = $table_name; |
58 | 58 | |
59 | - if(strpos($table_name, $this->db->db_prefix) === 0) { |
|
59 | + if (strpos($table_name, $this->db->db_prefix) === 0) { |
|
60 | 60 | $table_name_sn = substr($table_name, $prefix_length); |
61 | 61 | $this->tablesSn[$table_name_sn] = $table_name_sn; |
62 | 62 | } |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * @return \string[] |
71 | 71 | */ |
72 | 72 | public function getAllTables() { |
73 | - if(!isset($this->tablesAll)) { |
|
73 | + if (!isset($this->tablesAll)) { |
|
74 | 74 | $this->loadTableNamesFromDb(); |
75 | 75 | } |
76 | 76 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | * @return string[] |
84 | 84 | */ |
85 | 85 | public function getSnTables() { |
86 | - if(!isset($this->tablesSn)) { |
|
86 | + if (!isset($this->tablesSn)) { |
|
87 | 87 | $this->loadTableNamesFromDb(); |
88 | 88 | } |
89 | 89 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | * @return TableSchema |
108 | 108 | */ |
109 | 109 | public function getTableSchema($tableName) { |
110 | - if(empty($this->tableSchemas[$tableName])) { |
|
110 | + if (empty($this->tableSchemas[$tableName])) { |
|
111 | 111 | $this->tableSchemas[$tableName] = new TableSchema($tableName, $this); |
112 | 112 | } |
113 | 113 |
@@ -29,7 +29,7 @@ |
||
29 | 29 | */ |
30 | 30 | protected $_repository; |
31 | 31 | |
32 | - /** |
|
32 | + /** |
|
33 | 33 | * @var ContainerPlus $_oldRepo |
34 | 34 | */ |
35 | 35 | protected $_oldRepo; |
@@ -86,7 +86,7 @@ |
||
86 | 86 | |
87 | 87 | public function get($entityClass, $id) { |
88 | 88 | $entityIndex = get_class($entityClass) . '\\' . $id; |
89 | - if(!isset($this->_repository[$entityIndex])) { |
|
89 | + if (!isset($this->_repository[$entityIndex])) { |
|
90 | 90 | |
91 | 91 | } |
92 | 92 |
@@ -11,7 +11,7 @@ |
||
11 | 11 | class SnBootstrap { |
12 | 12 | |
13 | 13 | public static function install_benchmark() { |
14 | - register_shutdown_function(function () { |
|
14 | + register_shutdown_function(function() { |
|
15 | 15 | if (defined('IN_AJAX')) { |
16 | 16 | return; |
17 | 17 | } |