@@ -1721,7 +1721,7 @@ discard block |
||
1721 | 1721 | { |
1722 | 1722 | // Avoid double separators and empty titled sections |
1723 | 1723 | $empty_section = true; |
1724 | - for ($j=$i+1; $j < count($context['theme_options']); $j++) |
|
1724 | + for ($j = $i + 1; $j < count($context['theme_options']); $j++) |
|
1725 | 1725 | { |
1726 | 1726 | // Found another separator, so we're done |
1727 | 1727 | if (!is_array($context['theme_options'][$j])) |
@@ -2700,8 +2700,7 @@ discard block |
||
2700 | 2700 | foreach ($context['post_errors'] as $error) |
2701 | 2701 | { |
2702 | 2702 | $text_key_error = $error == 'password_short' ? |
2703 | - sprintf($txt['profile_error_' . $error], (empty($modSettings['password_strength']) ? 4 : 8)) : |
|
2704 | - (isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : ''); |
|
2703 | + sprintf($txt['profile_error_' . $error], (empty($modSettings['password_strength']) ? 4 : 8)) : (isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : ''); |
|
2705 | 2704 | |
2706 | 2705 | echo ' |
2707 | 2706 | <li>', isset($txt['profile_error_' . $error]) ? $text_key_error : $error, '</li>'; |
@@ -807,7 +807,8 @@ |
||
807 | 807 | { |
808 | 808 | $context['spider_logs']['rows'][$k]['data']['viewing']['value'] = $txt[$new_url['label']]; |
809 | 809 | $context['spider_logs']['rows'][$k]['data']['viewing']['class'] = $new_url['class']; |
810 | - } else |
|
810 | + } |
|
811 | + else |
|
811 | 812 | $context['spider_logs']['rows'][$k]['data']['viewing']['value'] = $new_url; |
812 | 813 | } |
813 | 814 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | require_once($sourcedir . '/Security.php'); |
79 | 79 | |
80 | 80 | // If $maintenance is set specifically to 2, then we're upgrading or something. |
81 | -if (!empty($maintenance) && 2 === $maintenance) |
|
81 | +if (!empty($maintenance) && 2 === $maintenance) |
|
82 | 82 | { |
83 | 83 | display_maintenance_message(); |
84 | 84 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * |
95 | 95 | * @param string $class The fully-qualified class name. |
96 | 96 | */ |
97 | -spl_autoload_register(function ($class) use ($sourcedir) |
|
97 | +spl_autoload_register(function($class) use ($sourcedir) |
|
98 | 98 | { |
99 | 99 | $classMap = array( |
100 | 100 | 'ReCaptcha\\' => 'ReCaptcha/', |
@@ -340,7 +340,7 @@ |
||
340 | 340 | WHERE t.id_board = {int:current_board} ' |
341 | 341 | . (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : ' |
342 | 342 | AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . (!empty($message_index_topic_wheres) ? ' |
343 | - AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : ''). ' |
|
343 | + AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : '') . ' |
|
344 | 344 | ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') . ' |
345 | 345 | LIMIT {int:maxindex} |
346 | 346 | OFFSET {int:start} '; |
@@ -1283,7 +1283,7 @@ |
||
1283 | 1283 | if ($context['can_post_attachment']) |
1284 | 1284 | { |
1285 | 1285 | $acceptedFiles = empty($context['allowed_extensions']) ? '' : implode(',', array_map( |
1286 | - function ($val) use ($smcFunc) |
|
1286 | + function($val) use ($smcFunc) |
|
1287 | 1287 | { |
1288 | 1288 | return !empty($val) ? ('.' . $smcFunc['htmltrim']($val)) : ''; |
1289 | 1289 | }, |
@@ -2205,7 +2205,7 @@ |
||
2205 | 2205 | function($a, $b) |
2206 | 2206 | { |
2207 | 2207 | if ($a['filesize'] == $b['filesize']) |
2208 | - return 0; |
|
2208 | + return 0; |
|
2209 | 2209 | |
2210 | 2210 | return ($a['filesize'] < $b['filesize']) ? -1 : 1; |
2211 | 2211 | } |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | ); |
92 | 92 | foreach (array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit', 'offset') as $var) |
93 | 93 | if (isset($_GET[$var])) |
94 | - $feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';' ) . $var . '=' . $_GET[$var]; |
|
94 | + $feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';') . $var . '=' . $_GET[$var]; |
|
95 | 95 | |
96 | 96 | // Handle the cases where a board, boards, or category is asked for. |
97 | 97 | $query_this_board = 1; |
@@ -303,17 +303,17 @@ discard block |
||
303 | 303 | * namespaces, which could cause it to mangle the XML horrifically |
304 | 304 | * during processing. |
305 | 305 | */ |
306 | - $smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/' . $subaction; |
|
306 | + $smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/' . $subaction; |
|
307 | 307 | |
308 | 308 | // Allow mods to add extra namespaces and tags to the feed/channel |
309 | 309 | $namespaces = array( |
310 | 310 | 'rss' => array(), |
311 | - 'rss2' => array('atom' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'), |
|
312 | - 'atom' => array('' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'), |
|
311 | + 'rss2' => array('atom' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'), |
|
312 | + 'atom' => array('' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'), |
|
313 | 313 | 'rdf' => array( |
314 | - '' => 'htt'.'p:/'.'/purl.o'.'rg/rss/1.0/', |
|
315 | - 'rdf' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/02/22-rdf-syntax-ns#', |
|
316 | - 'dc' => 'htt'.'p:/'.'/purl.o'.'rg/dc/elements/1.1/', |
|
314 | + '' => 'htt' . 'p:/' . '/purl.o' . 'rg/rss/1.0/', |
|
315 | + 'rdf' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/02/22-rdf-syntax-ns#', |
|
316 | + 'dc' => 'htt' . 'p:/' . '/purl.o' . 'rg/dc/elements/1.1/', |
|
317 | 317 | ), |
318 | 318 | 'smf' => array( |
319 | 319 | 'smf' => $smf_ns, |
@@ -2141,7 +2141,7 @@ discard block |
||
2141 | 2141 | m.id_msg, m.id_topic, m.id_board, m.id_member, m.poster_email, m.poster_ip, |
2142 | 2142 | m.poster_time, m.subject, m.modified_time, m.modified_name, m.modified_reason, m.body, |
2143 | 2143 | m.likes, m.approved, m.smileys_enabled |
2144 | - FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ?' |
|
2144 | + FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ? ' |
|
2145 | 2145 | INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)' : '') . ' |
2146 | 2146 | WHERE m.id_member = {int:uid} |
2147 | 2147 | AND m.id_msg > {int:start_after} |
@@ -1840,7 +1840,7 @@ |
||
1840 | 1840 | // Make sure this is an array of integers |
1841 | 1841 | $excluded_groups = array_filter( |
1842 | 1842 | (array) $excluded_groups, |
1843 | - function ($v) |
|
1843 | + function($v) |
|
1844 | 1844 | { |
1845 | 1845 | return is_int($v) || is_string($v) && (string) intval($v) === $v; |
1846 | 1846 | } |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | } |
175 | 175 | } |
176 | 176 | |
177 | - $unnotified = array_filter($this->members['watching'], function ($member) { |
|
177 | + $unnotified = array_filter($this->members['watching'], function($member) { |
|
178 | 178 | return empty($member['sent']); |
179 | 179 | }); |
180 | 180 | |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | $this->members['mentioned'] = array_intersect_key($this->members['mentioned'], $unnotified); |
188 | 188 | |
189 | 189 | // Notifications about modified posts only go to members who were mentioned or quoted |
190 | - $this->members['watching'] = $type == 'edit' ? array(): $unnotified; |
|
190 | + $this->members['watching'] = $type == 'edit' ? array() : $unnotified; |
|
191 | 191 | |
192 | 192 | // If this post has no quotes or mentions, just delete any obsolete alerts and bail out. |
193 | 193 | if (empty($this->members['quoted']) && empty($this->members['mentioned'])) |
@@ -500,8 +500,7 @@ discard block |
||
500 | 500 | if (!empty($member_data['id_topic']) && $type != 'topic' && !empty($this->prefs[$member_id])) |
501 | 501 | { |
502 | 502 | $pref = !empty($this->prefs[$member_id]['topic_notify_' . $topicOptions['id']]) ? |
503 | - $this->prefs[$member_id]['topic_notify_' . $topicOptions['id']] : |
|
504 | - (!empty($this->prefs[$member_id]['topic_notify']) ? $this->prefs[$member_id]['topic_notify'] : 0); |
|
503 | + $this->prefs[$member_id]['topic_notify_' . $topicOptions['id']] : (!empty($this->prefs[$member_id]['topic_notify']) ? $this->prefs[$member_id]['topic_notify'] : 0); |
|
505 | 504 | |
506 | 505 | $message_type = 'notification_' . $type; |
507 | 506 | |
@@ -520,8 +519,7 @@ discard block |
||
520 | 519 | elseif ($type == 'topic') |
521 | 520 | { |
522 | 521 | $pref = !empty($this->prefs[$member_id]['board_notify_' . $topicOptions['board']]) ? |
523 | - $this->prefs[$member_id]['board_notify_' . $topicOptions['board']] : |
|
524 | - (!empty($this->prefs[$member_id]['board_notify']) ? $this->prefs[$member_id]['board_notify'] : 0); |
|
522 | + $this->prefs[$member_id]['board_notify_' . $topicOptions['board']] : (!empty($this->prefs[$member_id]['board_notify']) ? $this->prefs[$member_id]['board_notify'] : 0); |
|
525 | 523 | |
526 | 524 | $content_type = 'board'; |
527 | 525 |
@@ -174,7 +174,8 @@ |
||
174 | 174 | } |
175 | 175 | } |
176 | 176 | |
177 | - $unnotified = array_filter($this->members['watching'], function ($member) { |
|
177 | + $unnotified = array_filter($this->members['watching'], function ($member) |
|
178 | + { |
|
178 | 179 | return empty($member['sent']); |
179 | 180 | }); |
180 | 181 |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | $feed_meta = array( |
205 | 205 | 'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']), |
206 | 206 | 'desc' => sentence_list(array_map( |
207 | - function ($datatype) use ($txt) |
|
207 | + function($datatype) use ($txt) |
|
208 | 208 | { |
209 | 209 | return $txt[$datatype]; |
210 | 210 | }, |
@@ -726,7 +726,7 @@ discard block |
||
726 | 726 | 'src' => 'src="' . $currentAttachment['href'] . '" onerror="$(\'.dlattach_' . $currentAttachment['id'] . '\').show(); $(\'.dlattach_' . $currentAttachment['id'] . '\').css({\'position\': \'absolute\'});"', |
727 | 727 | ), |
728 | 728 | $returnContext |
729 | - ) . $hidden_orig_link . '</span>' ; |
|
729 | + ) . $hidden_orig_link . '</span>'; |
|
730 | 730 | } |
731 | 731 | elseif (strpos($currentAttachment['mime_type'], 'video/') === 0) |
732 | 732 | { |