SimpleMachines /
SMF2.1
@@ -73,10 +73,10 @@ discard block |
||
| 73 | 73 | <subject is_first="', $context['message']['first_in_topic'] ? '1' : '0', '"><![CDATA[', cleanXml($context['message']['subject']), ']]></subject> |
| 74 | 74 | <body><![CDATA[', $context['message']['body'], ']]></body> |
| 75 | 75 | <success><![CDATA[', $txt['quick_modify_message'], ']]></success>'; |
| 76 | - } |
|
| 77 | - else |
|
| 78 | - echo ' |
|
| 76 | + } else { |
|
| 77 | + echo ' |
|
| 79 | 78 | <error in_subject="', $context['message']['error_in_subject'] ? '1' : '0', '" in_body="', cleanXml($context['message']['error_in_body']) ? '1' : '0', '"><![CDATA[', implode('<br />', $context['message']['errors']), ']]></error>'; |
| 79 | + } |
|
| 80 | 80 | echo ' |
| 81 | 81 | </message> |
| 82 | 82 | </smf>'; |
@@ -101,13 +101,14 @@ discard block |
||
| 101 | 101 | echo ' |
| 102 | 102 | <modified><![CDATA[', empty($modified) ? '' : cleanXml('« <em>' . $modified . '</em>»'), ']]></modified>'; |
| 103 | 103 | |
| 104 | - if (!empty($context['message']['subject'])) |
|
| 105 | - echo ' |
|
| 104 | + if (!empty($context['message']['subject'])) { |
|
| 105 | + echo ' |
|
| 106 | 106 | <subject><![CDATA[', cleanXml($context['message']['subject']), ']]></subject>'; |
| 107 | - } |
|
| 108 | - else |
|
| 109 | - echo ' |
|
| 107 | + } |
|
| 108 | + } else { |
|
| 109 | + echo ' |
|
| 110 | 110 | <error in_subject="', $context['message']['error_in_subject'] ? '1' : '0', '"><![CDATA[', cleanXml(implode('<br />', $context['message']['errors'])), ']]></error>'; |
| 111 | + } |
|
| 111 | 112 | echo ' |
| 112 | 113 | </message> |
| 113 | 114 | </smf>'; |
@@ -128,10 +129,11 @@ discard block |
||
| 128 | 129 | </preview> |
| 129 | 130 | <errors serious="', empty($context['error_type']) || $context['error_type'] != 'serious' ? '0' : '1', '" topic_locked="', $context['locked'] ? '1' : '0', '">'; |
| 130 | 131 | |
| 131 | - if (!empty($context['post_error'])) |
|
| 132 | - foreach ($context['post_error'] as $message) |
|
| 132 | + if (!empty($context['post_error'])) { |
|
| 133 | + foreach ($context['post_error'] as $message) |
|
| 133 | 134 | echo ' |
| 134 | 135 | <error><![CDATA[', cleanXml($message), ']]></error>'; |
| 136 | + } |
|
| 135 | 137 | |
| 136 | 138 | echo ' |
| 137 | 139 | <caption name="guestname" class="', isset($context['post_error']['long_name']) || isset($context['post_error']['no_name']) || isset($context['post_error']['bad_name']) ? 'error' : '', '" /> |
@@ -148,14 +150,15 @@ discard block |
||
| 148 | 150 | echo ' |
| 149 | 151 | <new_posts>'; |
| 150 | 152 | |
| 151 | - foreach ($context['previous_posts'] as $post) |
|
| 152 | - echo ' |
|
| 153 | + foreach ($context['previous_posts'] as $post) { |
|
| 154 | + echo ' |
|
| 153 | 155 | <post id="', $post['id'], '"> |
| 154 | 156 | <time><![CDATA[', $post['time'], ']]></time> |
| 155 | 157 | <poster><![CDATA[', cleanXml($post['poster']), ']]></poster> |
| 156 | 158 | <message><![CDATA[', cleanXml($post['message']), ']]></message> |
| 157 | 159 | <is_ignored>', $post['is_ignored'] ? '1' : '0', '</is_ignored> |
| 158 | 160 | </post>'; |
| 161 | + } |
|
| 159 | 162 | |
| 160 | 163 | echo ' |
| 161 | 164 | </new_posts>'; |
@@ -181,10 +184,11 @@ discard block |
||
| 181 | 184 | </preview> |
| 182 | 185 | <errors serious="', empty($context['error_type']) || $context['error_type'] != 'serious' ? '0' : '1', '">'; |
| 183 | 186 | |
| 184 | - if (!empty($context['post_error']['messages'])) |
|
| 185 | - foreach ($context['post_error']['messages'] as $message) |
|
| 187 | + if (!empty($context['post_error']['messages'])) { |
|
| 188 | + foreach ($context['post_error']['messages'] as $message) |
|
| 186 | 189 | echo ' |
| 187 | 190 | <error><![CDATA[', cleanXml($message), ']]></error>'; |
| 191 | + } |
|
| 188 | 192 | |
| 189 | 193 | echo ' |
| 190 | 194 | <caption name="to" class="', isset($context['post_error']['no_to']) ? 'error' : '', '" /> |
@@ -214,10 +218,11 @@ discard block |
||
| 214 | 218 | </preview> |
| 215 | 219 | <errors serious="', empty($context['error_type']) || $context['error_type'] != 'serious' ? '0' : '1', '">'; |
| 216 | 220 | |
| 217 | - if (!empty($context['post_error']['messages'])) |
|
| 218 | - foreach ($context['post_error']['messages'] as $message) |
|
| 221 | + if (!empty($context['post_error']['messages'])) { |
|
| 222 | + foreach ($context['post_error']['messages'] as $message) |
|
| 219 | 223 | echo ' |
| 220 | 224 | <error><![CDATA[', cleanXml($message), ']]></error>'; |
| 225 | + } |
|
| 221 | 226 | |
| 222 | 227 | echo ' |
| 223 | 228 | </errors>'; |
@@ -233,20 +238,23 @@ discard block |
||
| 233 | 238 | { |
| 234 | 239 | global $context, $modSettings; |
| 235 | 240 | |
| 236 | - if (empty($context['yearly'])) |
|
| 237 | - return; |
|
| 241 | + if (empty($context['yearly'])) { |
|
| 242 | + return; |
|
| 243 | + } |
|
| 238 | 244 | |
| 239 | 245 | echo '<', '?xml version="1.0" encoding="', $context['character_set'], '"?', '> |
| 240 | 246 | <smf>'; |
| 241 | - foreach ($context['yearly'] as $year) |
|
| 242 | - foreach ($year['months'] as $month) |
|
| 247 | + foreach ($context['yearly'] as $year) { |
|
| 248 | + foreach ($year['months'] as $month) |
|
| 243 | 249 | { |
| 244 | 250 | echo ' |
| 245 | 251 | <month id="', $month['date']['year'], $month['date']['month'], '">'; |
| 252 | + } |
|
| 246 | 253 | |
| 247 | - foreach ($month['days'] as $day) |
|
| 248 | - echo ' |
|
| 254 | + foreach ($month['days'] as $day) { |
|
| 255 | + echo ' |
|
| 249 | 256 | <day date="', $day['year'], '-', $day['month'], '-', $day['day'], '" new_topics="', $day['new_topics'], '" new_posts="', $day['new_posts'], '" new_members="', $day['new_members'], '" most_members_online="', $day['most_members_online'], '"', empty($modSettings['hitStats']) ? '' : ' hits="' . $day['hits'] . '"', ' />'; |
| 257 | + } |
|
| 250 | 258 | |
| 251 | 259 | echo ' |
| 252 | 260 | </month>'; |
@@ -269,17 +277,18 @@ discard block |
||
| 269 | 277 | <pageIndex section="selected" startFrom="', $context['selected']['start'], '"><![CDATA[', $context['selected']['page_index'], ']]></pageIndex>'; |
| 270 | 278 | foreach ($context['changes'] as $change) |
| 271 | 279 | { |
| 272 | - if ($change['type'] == 'remove') |
|
| 273 | - echo ' |
|
| 280 | + if ($change['type'] == 'remove') { |
|
| 281 | + echo ' |
|
| 274 | 282 | <change id="', $change['id'], '" curAction="remove" section="', $change['section'], '" />'; |
| 275 | - else |
|
| 276 | - echo ' |
|
| 283 | + } else { |
|
| 284 | + echo ' |
|
| 277 | 285 | <change id="', $change['id'], '" curAction="insert" section="', $change['section'], '"> |
| 278 | 286 | <subject><![CDATA[', cleanXml($change['insert_value']['subject']), ']]></subject> |
| 279 | 287 | <time><![CDATA[', cleanXml($change['insert_value']['time']), ']]></time> |
| 280 | 288 | <body><![CDATA[', cleanXml($change['insert_value']['body']), ']]></body> |
| 281 | 289 | <poster><![CDATA[', cleanXml($change['insert_value']['poster']), ']]></poster> |
| 282 | 290 | </change>'; |
| 291 | + } |
|
| 283 | 292 | } |
| 284 | 293 | echo ' |
| 285 | 294 | </smf>'; |
@@ -310,10 +319,10 @@ discard block |
||
| 310 | 319 | echo '<', '?xml version="1.0" encoding="', $context['character_set'], '"?', '> |
| 311 | 320 | <smf>'; |
| 312 | 321 | |
| 313 | - if (empty($context['topics'])) |
|
| 314 | - echo ' |
|
| 322 | + if (empty($context['topics'])) { |
|
| 323 | + echo ' |
|
| 315 | 324 | <noresults>', $txt['search_no_results'], '</noresults>'; |
| 316 | - else |
|
| 325 | + } else |
|
| 317 | 326 | { |
| 318 | 327 | echo ' |
| 319 | 328 | <results>'; |
@@ -382,9 +391,10 @@ discard block |
||
| 382 | 391 | echo ' |
| 383 | 392 | <item type="category" id="', $category['id'], '"><![CDATA[', cleanXml($category['name']), ']]></item>'; |
| 384 | 393 | |
| 385 | - foreach ($category['boards'] as $board) |
|
| 386 | - echo ' |
|
| 394 | + foreach ($category['boards'] as $board) { |
|
| 395 | + echo ' |
|
| 387 | 396 | <item type="board" id="', $board['id'], '" childlevel="', $board['child_level'], '"><![CDATA[', cleanXml($board['name']), ']]></item>'; |
| 397 | + } |
|
| 388 | 398 | } |
| 389 | 399 | echo ' |
| 390 | 400 | </smf>'; |
@@ -400,9 +410,10 @@ discard block |
||
| 400 | 410 | echo '<', '?xml version="1.0" encoding="', $context['character_set'], '"?', '> |
| 401 | 411 | <smf>'; |
| 402 | 412 | |
| 403 | - foreach ($context['icons'] as $icon) |
|
| 404 | - echo ' |
|
| 413 | + foreach ($context['icons'] as $icon) { |
|
| 414 | + echo ' |
|
| 405 | 415 | <icon value="', $icon['value'], '" url="', $icon['url'], '"><![CDATA[', cleanXml($icon['name']), ']]></icon>'; |
| 416 | + } |
|
| 406 | 417 | |
| 407 | 418 | echo ' |
| 408 | 419 | </smf>'; |
@@ -452,16 +463,18 @@ discard block |
||
| 452 | 463 | foreach ($xml_data as $key => $data) |
| 453 | 464 | { |
| 454 | 465 | // A group? |
| 455 | - if (is_array($data) && isset($data['identifier'])) |
|
| 456 | - template_generic_xml_recursive($data['children'], $key, $data['identifier'], $level); |
|
| 466 | + if (is_array($data) && isset($data['identifier'])) { |
|
| 467 | + template_generic_xml_recursive($data['children'], $key, $data['identifier'], $level); |
|
| 468 | + } |
|
| 457 | 469 | // An item... |
| 458 | 470 | elseif (is_array($data) && isset($data['value'])) |
| 459 | 471 | { |
| 460 | 472 | echo "\n", str_repeat("\t", $level), '<', $child_ident; |
| 461 | 473 | |
| 462 | - if (!empty($data['attributes'])) |
|
| 463 | - foreach ($data['attributes'] as $k => $v) |
|
| 474 | + if (!empty($data['attributes'])) { |
|
| 475 | + foreach ($data['attributes'] as $k => $v) |
|
| 464 | 476 | echo ' ' . $k . '="' . $v . '"'; |
| 477 | + } |
|
| 465 | 478 | echo '><![CDATA[', cleanXml($data['value']), ']]></', $child_ident, '>'; |
| 466 | 479 | } |
| 467 | 480 | } |
@@ -20,17 +20,19 @@ discard block |
||
| 20 | 20 | echo ' |
| 21 | 21 | <form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '" name="searchform" id="searchform">'; |
| 22 | 22 | |
| 23 | - if (!empty($context['search_errors'])) |
|
| 24 | - echo ' |
|
| 23 | + if (!empty($context['search_errors'])) { |
|
| 24 | + echo ' |
|
| 25 | 25 | <div class="errorbox"> |
| 26 | 26 | ', implode('<br>', $context['search_errors']['messages']), ' |
| 27 | 27 | </div>'; |
| 28 | + } |
|
| 28 | 29 | |
| 29 | - if (!empty($context['search_ignored'])) |
|
| 30 | - echo ' |
|
| 30 | + if (!empty($context['search_ignored'])) { |
|
| 31 | + echo ' |
|
| 31 | 32 | <div class="noticebox"> |
| 32 | 33 | ', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), ' |
| 33 | 34 | </div>'; |
| 35 | + } |
|
| 34 | 36 | |
| 35 | 37 | echo ' |
| 36 | 38 | <div class="cat_bar"> |
@@ -48,9 +50,10 @@ discard block |
||
| 48 | 50 | <dd> |
| 49 | 51 | <input type="search" name="search" id="searchfor" ', !empty($context['search_params']['search']) ? ' value="' . $context['search_params']['search'] . '"' : '', ' maxlength="', $context['search_string_limit'], '" size="40">'; |
| 50 | 52 | |
| 51 | - if (empty($modSettings['search_simple_fulltext'])) |
|
| 52 | - echo ' |
|
| 53 | + if (empty($modSettings['search_simple_fulltext'])) { |
|
| 54 | + echo ' |
|
| 53 | 55 | <br><em class="smalltext">', $txt['search_example'], '</em>'; |
| 56 | + } |
|
| 54 | 57 | |
| 55 | 58 | echo ' |
| 56 | 59 | </dd> |
@@ -114,21 +117,23 @@ discard block |
||
| 114 | 117 | <input type="hidden" name="advanced" value="1">'; |
| 115 | 118 | |
| 116 | 119 | // Require an image to be typed to save spamming? |
| 117 | - if ($context['require_verification']) |
|
| 118 | - echo ' |
|
| 120 | + if ($context['require_verification']) { |
|
| 121 | + echo ' |
|
| 119 | 122 | <p> |
| 120 | 123 | <strong>', $txt['verification'], ':</strong> |
| 121 | 124 | ', template_control_verification($context['visual_verification_id'], 'all'), ' |
| 122 | 125 | </p>'; |
| 126 | + } |
|
| 123 | 127 | |
| 124 | 128 | // If $context['search_params']['topic'] is set, that means we're searching just one topic. |
| 125 | - if (!empty($context['search_params']['topic'])) |
|
| 126 | - echo ' |
|
| 129 | + if (!empty($context['search_params']['topic'])) { |
|
| 130 | + echo ' |
|
| 127 | 131 | <p> |
| 128 | 132 | ', $txt['search_specific_topic'], ' "', $context['search_topic']['link'], '". |
| 129 | 133 | </p> |
| 130 | 134 | <input type="hidden" name="topic" value="', $context['search_topic']['id'], '"> |
| 131 | 135 | <input type="submit" name="b_search" value="', $txt['search'], '" class="button">'; |
| 136 | + } |
|
| 132 | 137 | |
| 133 | 138 | echo ' |
| 134 | 139 | </div>'; |
@@ -158,14 +163,15 @@ discard block |
||
| 158 | 163 | |
| 159 | 164 | foreach ($category['boards'] as $board) |
| 160 | 165 | { |
| 161 | - if ($i == $limit) |
|
| 162 | - echo ' |
|
| 166 | + if ($i == $limit) { |
|
| 167 | + echo ' |
|
| 163 | 168 | </ul> |
| 164 | 169 | </li> |
| 165 | 170 | </ul> |
| 166 | 171 | <ul class="ignoreboards floatright"> |
| 167 | 172 | <li class="category"> |
| 168 | 173 | <ul>'; |
| 174 | + } |
|
| 169 | 175 | |
| 170 | 176 | echo ' |
| 171 | 177 | <li class="board"> |
@@ -253,17 +259,19 @@ discard block |
||
| 253 | 259 | <div class="roundframe noup">'; |
| 254 | 260 | |
| 255 | 261 | // Did they make any typos or mistakes, perhaps? |
| 256 | - if (isset($context['did_you_mean'])) |
|
| 257 | - echo ' |
|
| 262 | + if (isset($context['did_you_mean'])) { |
|
| 263 | + echo ' |
|
| 258 | 264 | <p> |
| 259 | 265 | ', $txt['search_did_you_mean'], ' <a href="', $scripturl, '?action=search2;params=', $context['did_you_mean_params'], '">', $context['did_you_mean'], '</a>. |
| 260 | 266 | </p>'; |
| 267 | + } |
|
| 261 | 268 | |
| 262 | - if (!empty($context['search_ignored'])) |
|
| 263 | - echo ' |
|
| 269 | + if (!empty($context['search_ignored'])) { |
|
| 270 | + echo ' |
|
| 264 | 271 | <p> |
| 265 | 272 | ', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), ' |
| 266 | 273 | </p>'; |
| 274 | + } |
|
| 267 | 275 | |
| 268 | 276 | echo ' |
| 269 | 277 | <form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '"> |
@@ -286,10 +294,11 @@ discard block |
||
| 286 | 294 | <input type="hidden" name="sort" value="', !empty($context['search_params']['sort']) ? $context['search_params']['sort'] : 'relevance', '"> |
| 287 | 295 | </div>'; |
| 288 | 296 | |
| 289 | - if (!empty($context['search_params']['brd'])) |
|
| 290 | - foreach ($context['search_params']['brd'] as $board_id) |
|
| 297 | + if (!empty($context['search_params']['brd'])) { |
|
| 298 | + foreach ($context['search_params']['brd'] as $board_id) |
|
| 291 | 299 | echo ' |
| 292 | 300 | <input type="hidden" name="brd[', $board_id, ']" value="', $board_id, '">'; |
| 301 | + } |
|
| 293 | 302 | |
| 294 | 303 | echo ' |
| 295 | 304 | </form> |
@@ -300,18 +309,20 @@ discard block |
||
| 300 | 309 | if ($context['compact']) |
| 301 | 310 | { |
| 302 | 311 | // Quick moderation set to checkboxes? Oh, how fun :/ |
| 303 | - if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) |
|
| 304 | - echo ' |
|
| 312 | + if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) { |
|
| 313 | + echo ' |
|
| 305 | 314 | <form action="', $scripturl, '?action=quickmod" method="post" accept-charset="', $context['character_set'], '" name="topicForm">'; |
| 315 | + } |
|
| 306 | 316 | |
| 307 | 317 | echo ' |
| 308 | 318 | <div class="cat_bar"> |
| 309 | 319 | <h3 class="catbg"> |
| 310 | 320 | <span class="floatright">'; |
| 311 | 321 | |
| 312 | - if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) |
|
| 313 | - echo ' |
|
| 322 | + if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) { |
|
| 323 | + echo ' |
|
| 314 | 324 | <input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');">'; |
| 325 | + } |
|
| 315 | 326 | echo ' |
| 316 | 327 | </span> |
| 317 | 328 | <span class="generic_icons filter"></span> ', $txt['mlist_search_results'], ': ', $context['search_params']['search'], ' |
@@ -319,15 +330,15 @@ discard block |
||
| 319 | 330 | </div>'; |
| 320 | 331 | |
| 321 | 332 | // Was anything even found? |
| 322 | - if (!empty($context['topics'])) |
|
| 323 | - echo ' |
|
| 333 | + if (!empty($context['topics'])) { |
|
| 334 | + echo ' |
|
| 324 | 335 | <div class="pagesection"> |
| 325 | 336 | <span>', $context['page_index'], '</span> |
| 326 | 337 | </div>'; |
| 327 | - |
|
| 328 | - else |
|
| 329 | - echo ' |
|
| 338 | + } else { |
|
| 339 | + echo ' |
|
| 330 | 340 | <div class="roundframe noup">', $txt['find_no_results'], '</div>'; |
| 341 | + } |
|
| 331 | 342 | |
| 332 | 343 | // While we have results to show ... |
| 333 | 344 | while ($topic = $context['get_topics']()) |
@@ -350,31 +361,35 @@ discard block |
||
| 350 | 361 | echo ' |
| 351 | 362 | <span class="floatright">'; |
| 352 | 363 | |
| 353 | - if ($options['display_quick_mod'] == 1) |
|
| 354 | - echo ' |
|
| 364 | + if ($options['display_quick_mod'] == 1) { |
|
| 365 | + echo ' |
|
| 355 | 366 | <input type="checkbox" name="topics[]" value="', $topic['id'], '">'; |
| 356 | - |
|
| 357 | - else |
|
| 367 | + } else |
|
| 358 | 368 | { |
| 359 | - if ($topic['quick_mod']['remove']) |
|
| 360 | - echo ' |
|
| 369 | + if ($topic['quick_mod']['remove']) { |
|
| 370 | + echo ' |
|
| 361 | 371 | <a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>'; |
| 372 | + } |
|
| 362 | 373 | |
| 363 | - if ($topic['quick_mod']['lock']) |
|
| 364 | - echo ' |
|
| 374 | + if ($topic['quick_mod']['lock']) { |
|
| 375 | + echo ' |
|
| 365 | 376 | <a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>'; |
| 377 | + } |
|
| 366 | 378 | |
| 367 | - if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) |
|
| 368 | - echo ' |
|
| 379 | + if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) { |
|
| 380 | + echo ' |
|
| 369 | 381 | <br>'; |
| 382 | + } |
|
| 370 | 383 | |
| 371 | - if ($topic['quick_mod']['sticky']) |
|
| 372 | - echo ' |
|
| 384 | + if ($topic['quick_mod']['sticky']) { |
|
| 385 | + echo ' |
|
| 373 | 386 | <a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>'; |
| 387 | + } |
|
| 374 | 388 | |
| 375 | - if ($topic['quick_mod']['move']) |
|
| 376 | - echo ' |
|
| 389 | + if ($topic['quick_mod']['move']) { |
|
| 390 | + echo ' |
|
| 377 | 391 | <a href="', $scripturl, '?action=movetopic;topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>'; |
| 392 | + } |
|
| 378 | 393 | } |
| 379 | 394 | |
| 380 | 395 | echo ' |
@@ -384,20 +399,22 @@ discard block |
||
| 384 | 399 | echo ' |
| 385 | 400 | </div><!-- .block -->'; |
| 386 | 401 | |
| 387 | - if ($message['body_highlighted'] != '') |
|
| 388 | - echo ' |
|
| 402 | + if ($message['body_highlighted'] != '') { |
|
| 403 | + echo ' |
|
| 389 | 404 | <div class="list_posts double_height">', $message['body_highlighted'], '</div>'; |
| 405 | + } |
|
| 390 | 406 | } |
| 391 | 407 | |
| 392 | 408 | echo ' |
| 393 | 409 | </div><!-- $topic[css_class] -->'; |
| 394 | 410 | } |
| 395 | 411 | |
| 396 | - if (!empty($context['topics'])) |
|
| 397 | - echo ' |
|
| 412 | + if (!empty($context['topics'])) { |
|
| 413 | + echo ' |
|
| 398 | 414 | <div class="pagesection"> |
| 399 | 415 | <span>', $context['page_index'], '</span> |
| 400 | 416 | </div>'; |
| 417 | + } |
|
| 401 | 418 | |
| 402 | 419 | if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics'])) |
| 403 | 420 | { |
@@ -406,17 +423,19 @@ discard block |
||
| 406 | 423 | <select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '> |
| 407 | 424 | <option value="">--------</option>'; |
| 408 | 425 | |
| 409 | - foreach ($context['qmod_actions'] as $qmod_action) |
|
| 410 | - if ($context['can_' . $qmod_action]) |
|
| 426 | + foreach ($context['qmod_actions'] as $qmod_action) { |
|
| 427 | + if ($context['can_' . $qmod_action]) |
|
| 411 | 428 | echo ' |
| 412 | 429 | <option value="' . $qmod_action . '">' . $txt['quick_mod_' . $qmod_action] . '</option>'; |
| 430 | + } |
|
| 413 | 431 | |
| 414 | 432 | echo ' |
| 415 | 433 | </select>'; |
| 416 | 434 | |
| 417 | - if ($context['can_move']) |
|
| 418 | - echo ' |
|
| 435 | + if ($context['can_move']) { |
|
| 436 | + echo ' |
|
| 419 | 437 | <span id="quick_mod_jump_to"></span>'; |
| 438 | + } |
|
| 420 | 439 | |
| 421 | 440 | echo ' |
| 422 | 441 | <input type="hidden" name="redirect_url" value="', $scripturl . '?action=search2;params=' . $context['params'], '"> |
@@ -425,12 +444,12 @@ discard block |
||
| 425 | 444 | } |
| 426 | 445 | |
| 427 | 446 | |
| 428 | - if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics'])) |
|
| 429 | - echo ' |
|
| 447 | + if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics'])) { |
|
| 448 | + echo ' |
|
| 430 | 449 | <input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '"> |
| 431 | 450 | </form>'; |
| 432 | - } |
|
| 433 | - else |
|
| 451 | + } |
|
| 452 | + } else |
|
| 434 | 453 | { |
| 435 | 454 | echo ' |
| 436 | 455 | <div class="cat_bar"> |
@@ -442,9 +461,10 @@ discard block |
||
| 442 | 461 | <span>', $context['page_index'], '</span> |
| 443 | 462 | </div>'; |
| 444 | 463 | |
| 445 | - if (empty($context['topics'])) |
|
| 446 | - echo ' |
|
| 464 | + if (empty($context['topics'])) { |
|
| 465 | + echo ' |
|
| 447 | 466 | <div class="information">(', $txt['search_no_results'], ')</div>'; |
| 467 | + } |
|
| 448 | 468 | |
| 449 | 469 | while ($topic = $context['get_topics']()) |
| 450 | 470 | { |
@@ -461,23 +481,27 @@ discard block |
||
| 461 | 481 | </div> |
| 462 | 482 | <div class="list_posts">', $message['body_highlighted'], '</div>'; |
| 463 | 483 | |
| 464 | - if ($topic['can_reply']) |
|
| 465 | - echo ' |
|
| 484 | + if ($topic['can_reply']) { |
|
| 485 | + echo ' |
|
| 466 | 486 | <ul class="quickbuttons">'; |
| 487 | + } |
|
| 467 | 488 | |
| 468 | 489 | // If they *can* reply? |
| 469 | - if ($topic['can_reply']) |
|
| 470 | - echo ' |
|
| 490 | + if ($topic['can_reply']) { |
|
| 491 | + echo ' |
|
| 471 | 492 | <li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>'; |
| 493 | + } |
|
| 472 | 494 | |
| 473 | 495 | // If they *can* quote? |
| 474 | - if ($topic['can_quote']) |
|
| 475 | - echo ' |
|
| 496 | + if ($topic['can_quote']) { |
|
| 497 | + echo ' |
|
| 476 | 498 | <li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'] . ';quote=' . $message['id'] . '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>'; |
| 499 | + } |
|
| 477 | 500 | |
| 478 | - if ($topic['can_reply']) |
|
| 479 | - echo ' |
|
| 501 | + if ($topic['can_reply']) { |
|
| 502 | + echo ' |
|
| 480 | 503 | </ul>'; |
| 504 | + } |
|
| 481 | 505 | echo ' |
| 482 | 506 | <br class="clear"> |
| 483 | 507 | </div><!-- $topic[css_class] -->'; |
@@ -496,8 +520,8 @@ discard block |
||
| 496 | 520 | <div class="smalltext righttext" id="search_jump_to"></div> |
| 497 | 521 | <script>'; |
| 498 | 522 | |
| 499 | - if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) |
|
| 500 | - echo ' |
|
| 523 | + if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) { |
|
| 524 | + echo ' |
|
| 501 | 525 | if (typeof(window.XMLHttpRequest) != "undefined") |
| 502 | 526 | aJumpTo[aJumpTo.length] = new JumpTo({ |
| 503 | 527 | sContainerId: "quick_mod_jump_to", |
@@ -512,6 +536,7 @@ discard block |
||
| 512 | 536 | bDisabled: true, |
| 513 | 537 | sCustomName: "move_to" |
| 514 | 538 | });'; |
| 539 | + } |
|
| 515 | 540 | |
| 516 | 541 | echo ' |
| 517 | 542 | if (typeof(window.XMLHttpRequest) != "undefined") |
@@ -14,8 +14,9 @@ discard block |
||
| 14 | 14 | * @version 2.1 Beta 4 |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | -if (!defined('SMF')) |
|
| 17 | +if (!defined('SMF')) { |
|
| 18 | 18 | die('No direct access...'); |
| 19 | +} |
|
| 19 | 20 | |
| 20 | 21 | /** |
| 21 | 22 | * Check if the user is who he/she says he is |
@@ -42,12 +43,14 @@ discard block |
||
| 42 | 43 | $refreshTime = isset($_GET['xml']) ? 4200 : 3600; |
| 43 | 44 | |
| 44 | 45 | // Is the security option off? |
| 45 | - if (!empty($modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')])) |
|
| 46 | - return; |
|
| 46 | + if (!empty($modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')])) { |
|
| 47 | + return; |
|
| 48 | + } |
|
| 47 | 49 | |
| 48 | 50 | // Or are they already logged in?, Moderator or admin session is need for this area |
| 49 | - if ((!empty($_SESSION[$type . '_time']) && $_SESSION[$type . '_time'] + $refreshTime >= time()) || (!empty($_SESSION['admin_time']) && $_SESSION['admin_time'] + $refreshTime >= time())) |
|
| 50 | - return; |
|
| 51 | + if ((!empty($_SESSION[$type . '_time']) && $_SESSION[$type . '_time'] + $refreshTime >= time()) || (!empty($_SESSION['admin_time']) && $_SESSION['admin_time'] + $refreshTime >= time())) { |
|
| 52 | + return; |
|
| 53 | + } |
|
| 51 | 54 | |
| 52 | 55 | require_once($sourcedir . '/Subs-Auth.php'); |
| 53 | 56 | |
@@ -55,8 +58,9 @@ discard block |
||
| 55 | 58 | if (isset($_POST[$type . '_pass'])) |
| 56 | 59 | { |
| 57 | 60 | // Check to ensure we're forcing SSL for authentication |
| 58 | - if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) |
|
| 59 | - fatal_lang_error('login_ssl_required'); |
|
| 61 | + if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) { |
|
| 62 | + fatal_lang_error('login_ssl_required'); |
|
| 63 | + } |
|
| 60 | 64 | |
| 61 | 65 | checkSession(); |
| 62 | 66 | |
@@ -72,17 +76,19 @@ discard block |
||
| 72 | 76 | } |
| 73 | 77 | |
| 74 | 78 | // Better be sure to remember the real referer |
| 75 | - if (empty($_SESSION['request_referer'])) |
|
| 76 | - $_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
| 77 | - elseif (empty($_POST)) |
|
| 78 | - unset($_SESSION['request_referer']); |
|
| 79 | + if (empty($_SESSION['request_referer'])) { |
|
| 80 | + $_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
| 81 | + } elseif (empty($_POST)) { |
|
| 82 | + unset($_SESSION['request_referer']); |
|
| 83 | + } |
|
| 79 | 84 | |
| 80 | 85 | // Need to type in a password for that, man. |
| 81 | - if (!isset($_GET['xml'])) |
|
| 82 | - adminLogin($type); |
|
| 83 | - else |
|
| 84 | - return 'session_verify_fail'; |
|
| 85 | -} |
|
| 86 | + if (!isset($_GET['xml'])) { |
|
| 87 | + adminLogin($type); |
|
| 88 | + } else { |
|
| 89 | + return 'session_verify_fail'; |
|
| 90 | + } |
|
| 91 | + } |
|
| 86 | 92 | |
| 87 | 93 | /** |
| 88 | 94 | * Require a user who is logged in. (not a guest.) |
@@ -96,25 +102,30 @@ discard block |
||
| 96 | 102 | global $user_info, $txt, $context, $scripturl, $modSettings; |
| 97 | 103 | |
| 98 | 104 | // Luckily, this person isn't a guest. |
| 99 | - if (!$user_info['is_guest']) |
|
| 100 | - return; |
|
| 105 | + if (!$user_info['is_guest']) { |
|
| 106 | + return; |
|
| 107 | + } |
|
| 101 | 108 | |
| 102 | 109 | // Log what they were trying to do didn't work) |
| 103 | - if (!empty($modSettings['who_enabled'])) |
|
| 104 | - $_GET['error'] = 'guest_login'; |
|
| 110 | + if (!empty($modSettings['who_enabled'])) { |
|
| 111 | + $_GET['error'] = 'guest_login'; |
|
| 112 | + } |
|
| 105 | 113 | writeLog(true); |
| 106 | 114 | |
| 107 | 115 | // Just die. |
| 108 | - if (isset($_REQUEST['xml'])) |
|
| 109 | - obExit(false); |
|
| 116 | + if (isset($_REQUEST['xml'])) { |
|
| 117 | + obExit(false); |
|
| 118 | + } |
|
| 110 | 119 | |
| 111 | 120 | // Attempt to detect if they came from dlattach. |
| 112 | - if (SMF != 'SSI' && empty($context['theme_loaded'])) |
|
| 113 | - loadTheme(); |
|
| 121 | + if (SMF != 'SSI' && empty($context['theme_loaded'])) { |
|
| 122 | + loadTheme(); |
|
| 123 | + } |
|
| 114 | 124 | |
| 115 | 125 | // Never redirect to an attachment |
| 116 | - if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false) |
|
| 117 | - $_SESSION['login_url'] = $_SERVER['REQUEST_URL']; |
|
| 126 | + if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false) { |
|
| 127 | + $_SESSION['login_url'] = $_SERVER['REQUEST_URL']; |
|
| 128 | + } |
|
| 118 | 129 | |
| 119 | 130 | // Load the Login template and language file. |
| 120 | 131 | loadLanguage('Login'); |
@@ -124,8 +135,7 @@ discard block |
||
| 124 | 135 | { |
| 125 | 136 | $_SESSION['login_url'] = $scripturl . '?' . $_SERVER['QUERY_STRING']; |
| 126 | 137 | redirectexit('action=login'); |
| 127 | - } |
|
| 128 | - else |
|
| 138 | + } else |
|
| 129 | 139 | { |
| 130 | 140 | loadTemplate('Login'); |
| 131 | 141 | $context['sub_template'] = 'kick_guest'; |
@@ -155,8 +165,9 @@ discard block |
||
| 155 | 165 | global $sourcedir, $cookiename, $user_settings, $smcFunc; |
| 156 | 166 | |
| 157 | 167 | // You cannot be banned if you are an admin - doesn't help if you log out. |
| 158 | - if ($user_info['is_admin']) |
|
| 159 | - return; |
|
| 168 | + if ($user_info['is_admin']) { |
|
| 169 | + return; |
|
| 170 | + } |
|
| 160 | 171 | |
| 161 | 172 | // Only check the ban every so often. (to reduce load.) |
| 162 | 173 | if ($forceCheck || !isset($_SESSION['ban']) || empty($modSettings['banLastUpdated']) || ($_SESSION['ban']['last_checked'] < $modSettings['banLastUpdated']) || $_SESSION['ban']['id_member'] != $user_info['id'] || $_SESSION['ban']['ip'] != $user_info['ip'] || $_SESSION['ban']['ip2'] != $user_info['ip2'] || (isset($user_info['email'], $_SESSION['ban']['email']) && $_SESSION['ban']['email'] != $user_info['email'])) |
@@ -177,8 +188,9 @@ discard block |
||
| 177 | 188 | // Check both IP addresses. |
| 178 | 189 | foreach (array('ip', 'ip2') as $ip_number) |
| 179 | 190 | { |
| 180 | - if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip']) |
|
| 181 | - continue; |
|
| 191 | + if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip']) { |
|
| 192 | + continue; |
|
| 193 | + } |
|
| 182 | 194 | $ban_query[] = ' {inet:' . $ip_number . '} BETWEEN bi.ip_low and bi.ip_high'; |
| 183 | 195 | $ban_query_vars[$ip_number] = $user_info[$ip_number]; |
| 184 | 196 | // IP was valid, maybe there's also a hostname... |
@@ -228,24 +240,28 @@ discard block |
||
| 228 | 240 | // Store every type of ban that applies to you in your session. |
| 229 | 241 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 230 | 242 | { |
| 231 | - foreach ($restrictions as $restriction) |
|
| 232 | - if (!empty($row[$restriction])) |
|
| 243 | + foreach ($restrictions as $restriction) { |
|
| 244 | + if (!empty($row[$restriction])) |
|
| 233 | 245 | { |
| 234 | 246 | $_SESSION['ban'][$restriction]['reason'] = $row['reason']; |
| 247 | + } |
|
| 235 | 248 | $_SESSION['ban'][$restriction]['ids'][] = $row['id_ban']; |
| 236 | - if (!isset($_SESSION['ban']['expire_time']) || ($_SESSION['ban']['expire_time'] != 0 && ($row['expire_time'] == 0 || $row['expire_time'] > $_SESSION['ban']['expire_time']))) |
|
| 237 | - $_SESSION['ban']['expire_time'] = $row['expire_time']; |
|
| 249 | + if (!isset($_SESSION['ban']['expire_time']) || ($_SESSION['ban']['expire_time'] != 0 && ($row['expire_time'] == 0 || $row['expire_time'] > $_SESSION['ban']['expire_time']))) { |
|
| 250 | + $_SESSION['ban']['expire_time'] = $row['expire_time']; |
|
| 251 | + } |
|
| 238 | 252 | |
| 239 | - if (!$user_info['is_guest'] && $restriction == 'cannot_access' && ($row['id_member'] == $user_info['id'] || $row['email_address'] == $user_info['email'])) |
|
| 240 | - $flag_is_activated = true; |
|
| 253 | + if (!$user_info['is_guest'] && $restriction == 'cannot_access' && ($row['id_member'] == $user_info['id'] || $row['email_address'] == $user_info['email'])) { |
|
| 254 | + $flag_is_activated = true; |
|
| 255 | + } |
|
| 241 | 256 | } |
| 242 | 257 | } |
| 243 | 258 | $smcFunc['db_free_result']($request); |
| 244 | 259 | } |
| 245 | 260 | |
| 246 | 261 | // Mark the cannot_access and cannot_post bans as being 'hit'. |
| 247 | - if (isset($_SESSION['ban']['cannot_access']) || isset($_SESSION['ban']['cannot_post']) || isset($_SESSION['ban']['cannot_login'])) |
|
| 248 | - log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array())); |
|
| 262 | + if (isset($_SESSION['ban']['cannot_access']) || isset($_SESSION['ban']['cannot_post']) || isset($_SESSION['ban']['cannot_login'])) { |
|
| 263 | + log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array())); |
|
| 264 | + } |
|
| 249 | 265 | |
| 250 | 266 | // If for whatever reason the is_activated flag seems wrong, do a little work to clear it up. |
| 251 | 267 | if ($user_info['id'] && (($user_settings['is_activated'] >= 10 && !$flag_is_activated) |
@@ -260,8 +276,9 @@ discard block |
||
| 260 | 276 | if (!isset($_SESSION['ban']['cannot_access']) && !empty($_COOKIE[$cookiename . '_'])) |
| 261 | 277 | { |
| 262 | 278 | $bans = explode(',', $_COOKIE[$cookiename . '_']); |
| 263 | - foreach ($bans as $key => $value) |
|
| 264 | - $bans[$key] = (int) $value; |
|
| 279 | + foreach ($bans as $key => $value) { |
|
| 280 | + $bans[$key] = (int) $value; |
|
| 281 | + } |
|
| 265 | 282 | $request = $smcFunc['db_query']('', ' |
| 266 | 283 | SELECT bi.id_ban, bg.reason |
| 267 | 284 | FROM {db_prefix}ban_items AS bi |
@@ -297,14 +314,15 @@ discard block |
||
| 297 | 314 | if (isset($_SESSION['ban']['cannot_access'])) |
| 298 | 315 | { |
| 299 | 316 | // We don't wanna see you! |
| 300 | - if (!$user_info['is_guest']) |
|
| 301 | - $smcFunc['db_query']('', ' |
|
| 317 | + if (!$user_info['is_guest']) { |
|
| 318 | + $smcFunc['db_query']('', ' |
|
| 302 | 319 | DELETE FROM {db_prefix}log_online |
| 303 | 320 | WHERE id_member = {int:current_member}', |
| 304 | 321 | array( |
| 305 | 322 | 'current_member' => $user_info['id'], |
| 306 | 323 | ) |
| 307 | 324 | ); |
| 325 | + } |
|
| 308 | 326 | |
| 309 | 327 | // 'Log' the user out. Can't have any funny business... (save the name!) |
| 310 | 328 | $old_name = isset($user_info['name']) && $user_info['name'] != '' ? $user_info['name'] : $txt['guest_title']; |
@@ -390,9 +408,10 @@ discard block |
||
| 390 | 408 | } |
| 391 | 409 | |
| 392 | 410 | // Fix up the banning permissions. |
| 393 | - if (isset($user_info['permissions'])) |
|
| 394 | - banPermissions(); |
|
| 395 | -} |
|
| 411 | + if (isset($user_info['permissions'])) { |
|
| 412 | + banPermissions(); |
|
| 413 | + } |
|
| 414 | + } |
|
| 396 | 415 | |
| 397 | 416 | /** |
| 398 | 417 | * Fix permissions according to ban status. |
@@ -403,8 +422,9 @@ discard block |
||
| 403 | 422 | global $user_info, $sourcedir, $modSettings, $context; |
| 404 | 423 | |
| 405 | 424 | // Somehow they got here, at least take away all permissions... |
| 406 | - if (isset($_SESSION['ban']['cannot_access'])) |
|
| 407 | - $user_info['permissions'] = array(); |
|
| 425 | + if (isset($_SESSION['ban']['cannot_access'])) { |
|
| 426 | + $user_info['permissions'] = array(); |
|
| 427 | + } |
|
| 408 | 428 | // Okay, well, you can watch, but don't touch a thing. |
| 409 | 429 | elseif (isset($_SESSION['ban']['cannot_post']) || (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $user_info['warning'])) |
| 410 | 430 | { |
@@ -446,19 +466,20 @@ discard block |
||
| 446 | 466 | call_integration_hook('integrate_warn_permissions', array(&$permission_change)); |
| 447 | 467 | foreach ($permission_change as $old => $new) |
| 448 | 468 | { |
| 449 | - if (!in_array($old, $user_info['permissions'])) |
|
| 450 | - unset($permission_change[$old]); |
|
| 451 | - else |
|
| 452 | - $user_info['permissions'][] = $new; |
|
| 469 | + if (!in_array($old, $user_info['permissions'])) { |
|
| 470 | + unset($permission_change[$old]); |
|
| 471 | + } else { |
|
| 472 | + $user_info['permissions'][] = $new; |
|
| 473 | + } |
|
| 453 | 474 | } |
| 454 | 475 | $user_info['permissions'] = array_diff($user_info['permissions'], array_keys($permission_change)); |
| 455 | 476 | } |
| 456 | 477 | |
| 457 | 478 | // @todo Find a better place to call this? Needs to be after permissions loaded! |
| 458 | 479 | // Finally, some bits we cache in the session because it saves queries. |
| 459 | - if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > $modSettings['settings_updated'] && $_SESSION['mc']['id'] == $user_info['id']) |
|
| 460 | - $user_info['mod_cache'] = $_SESSION['mc']; |
|
| 461 | - else |
|
| 480 | + if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > $modSettings['settings_updated'] && $_SESSION['mc']['id'] == $user_info['id']) { |
|
| 481 | + $user_info['mod_cache'] = $_SESSION['mc']; |
|
| 482 | + } else |
|
| 462 | 483 | { |
| 463 | 484 | require_once($sourcedir . '/Subs-Auth.php'); |
| 464 | 485 | rebuildModCache(); |
@@ -469,14 +490,12 @@ discard block |
||
| 469 | 490 | { |
| 470 | 491 | $context['open_mod_reports'] = $_SESSION['rc']['reports']; |
| 471 | 492 | $context['open_member_reports'] = $_SESSION['rc']['member_reports']; |
| 472 | - } |
|
| 473 | - elseif ($_SESSION['mc']['bq'] != '0=1') |
|
| 493 | + } elseif ($_SESSION['mc']['bq'] != '0=1') |
|
| 474 | 494 | { |
| 475 | 495 | require_once($sourcedir . '/Subs-ReportedContent.php'); |
| 476 | 496 | $context['open_mod_reports'] = recountOpenReports('posts'); |
| 477 | 497 | $context['open_member_reports'] = recountOpenReports('members'); |
| 478 | - } |
|
| 479 | - else |
|
| 498 | + } else |
|
| 480 | 499 | { |
| 481 | 500 | $context['open_mod_reports'] = 0; |
| 482 | 501 | $context['open_member_reports'] = 0; |
@@ -496,8 +515,9 @@ discard block |
||
| 496 | 515 | global $user_info, $smcFunc; |
| 497 | 516 | |
| 498 | 517 | // Don't log web accelerators, it's very confusing... |
| 499 | - if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') |
|
| 500 | - return; |
|
| 518 | + if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') { |
|
| 519 | + return; |
|
| 520 | + } |
|
| 501 | 521 | |
| 502 | 522 | $smcFunc['db_insert']('', |
| 503 | 523 | '{db_prefix}log_banned', |
@@ -507,8 +527,8 @@ discard block |
||
| 507 | 527 | ); |
| 508 | 528 | |
| 509 | 529 | // One extra point for these bans. |
| 510 | - if (!empty($ban_ids)) |
|
| 511 | - $smcFunc['db_query']('', ' |
|
| 530 | + if (!empty($ban_ids)) { |
|
| 531 | + $smcFunc['db_query']('', ' |
|
| 512 | 532 | UPDATE {db_prefix}ban_items |
| 513 | 533 | SET hits = hits + 1 |
| 514 | 534 | WHERE id_ban IN ({array_int:ban_ids})', |
@@ -516,7 +536,8 @@ discard block |
||
| 516 | 536 | 'ban_ids' => $ban_ids, |
| 517 | 537 | ) |
| 518 | 538 | ); |
| 519 | -} |
|
| 539 | + } |
|
| 540 | + } |
|
| 520 | 541 | |
| 521 | 542 | /** |
| 522 | 543 | * Checks if a given email address might be banned. |
@@ -532,8 +553,9 @@ discard block |
||
| 532 | 553 | global $txt, $smcFunc; |
| 533 | 554 | |
| 534 | 555 | // Can't ban an empty email |
| 535 | - if (empty($email) || trim($email) == '') |
|
| 536 | - return; |
|
| 556 | + if (empty($email) || trim($email) == '') { |
|
| 557 | + return; |
|
| 558 | + } |
|
| 537 | 559 | |
| 538 | 560 | // Let's start with the bans based on your IP/hostname/memberID... |
| 539 | 561 | $ban_ids = isset($_SESSION['ban'][$restriction]) ? $_SESSION['ban'][$restriction]['ids'] : array(); |
@@ -606,16 +628,18 @@ discard block |
||
| 606 | 628 | if ($type == 'post') |
| 607 | 629 | { |
| 608 | 630 | $check = isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null); |
| 609 | - if ($check !== $sc) |
|
| 610 | - $error = 'session_timeout'; |
|
| 631 | + if ($check !== $sc) { |
|
| 632 | + $error = 'session_timeout'; |
|
| 633 | + } |
|
| 611 | 634 | } |
| 612 | 635 | |
| 613 | 636 | // How about $_GET['sesc']? |
| 614 | 637 | elseif ($type == 'get') |
| 615 | 638 | { |
| 616 | 639 | $check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : null); |
| 617 | - if ($check !== $sc) |
|
| 618 | - $error = 'session_verify_fail'; |
|
| 640 | + if ($check !== $sc) { |
|
| 641 | + $error = 'session_verify_fail'; |
|
| 642 | + } |
|
| 619 | 643 | } |
| 620 | 644 | |
| 621 | 645 | // Or can it be in either? |
@@ -623,13 +647,15 @@ discard block |
||
| 623 | 647 | { |
| 624 | 648 | $check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : (isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null))); |
| 625 | 649 | |
| 626 | - if ($check !== $sc) |
|
| 627 | - $error = 'session_verify_fail'; |
|
| 650 | + if ($check !== $sc) { |
|
| 651 | + $error = 'session_verify_fail'; |
|
| 652 | + } |
|
| 628 | 653 | } |
| 629 | 654 | |
| 630 | 655 | // Verify that they aren't changing user agents on us - that could be bad. |
| 631 | - if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty($modSettings['disableCheckUA'])) |
|
| 632 | - $error = 'session_verify_fail'; |
|
| 656 | + if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty($modSettings['disableCheckUA'])) { |
|
| 657 | + $error = 'session_verify_fail'; |
|
| 658 | + } |
|
| 633 | 659 | |
| 634 | 660 | // Make sure a page with session check requirement is not being prefetched. |
| 635 | 661 | if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') |
@@ -640,30 +666,35 @@ discard block |
||
| 640 | 666 | } |
| 641 | 667 | |
| 642 | 668 | // Check the referring site - it should be the same server at least! |
| 643 | - if (isset($_SESSION['request_referer'])) |
|
| 644 | - $referrer = $_SESSION['request_referer']; |
|
| 645 | - else |
|
| 646 | - $referrer = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
| 669 | + if (isset($_SESSION['request_referer'])) { |
|
| 670 | + $referrer = $_SESSION['request_referer']; |
|
| 671 | + } else { |
|
| 672 | + $referrer = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array(); |
|
| 673 | + } |
|
| 647 | 674 | if (!empty($referrer['host'])) |
| 648 | 675 | { |
| 649 | - if (strpos($_SERVER['HTTP_HOST'], ':') !== false) |
|
| 650 | - $real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':')); |
|
| 651 | - else |
|
| 652 | - $real_host = $_SERVER['HTTP_HOST']; |
|
| 676 | + if (strpos($_SERVER['HTTP_HOST'], ':') !== false) { |
|
| 677 | + $real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':')); |
|
| 678 | + } else { |
|
| 679 | + $real_host = $_SERVER['HTTP_HOST']; |
|
| 680 | + } |
|
| 653 | 681 | |
| 654 | 682 | $parsed_url = parse_url($boardurl); |
| 655 | 683 | |
| 656 | 684 | // Are global cookies on? If so, let's check them ;). |
| 657 | 685 | if (!empty($modSettings['globalCookies'])) |
| 658 | 686 | { |
| 659 | - if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $parsed_url['host'], $parts) == 1) |
|
| 660 | - $parsed_url['host'] = $parts[1]; |
|
| 687 | + if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $parsed_url['host'], $parts) == 1) { |
|
| 688 | + $parsed_url['host'] = $parts[1]; |
|
| 689 | + } |
|
| 661 | 690 | |
| 662 | - if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts) == 1) |
|
| 663 | - $referrer['host'] = $parts[1]; |
|
| 691 | + if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts) == 1) { |
|
| 692 | + $referrer['host'] = $parts[1]; |
|
| 693 | + } |
|
| 664 | 694 | |
| 665 | - if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts) == 1) |
|
| 666 | - $real_host = $parts[1]; |
|
| 695 | + if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts) == 1) { |
|
| 696 | + $real_host = $parts[1]; |
|
| 697 | + } |
|
| 667 | 698 | } |
| 668 | 699 | |
| 669 | 700 | // Okay: referrer must either match parsed_url or real_host. |
@@ -681,12 +712,14 @@ discard block |
||
| 681 | 712 | $log_error = true; |
| 682 | 713 | } |
| 683 | 714 | |
| 684 | - if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker') |
|
| 685 | - fatal_error('Sound the alarm! It\'s a hacker! Close the castle gates!!', false); |
|
| 715 | + if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker') { |
|
| 716 | + fatal_error('Sound the alarm! It\'s a hacker! Close the castle gates!!', false); |
|
| 717 | + } |
|
| 686 | 718 | |
| 687 | 719 | // Everything is ok, return an empty string. |
| 688 | - if (!isset($error)) |
|
| 689 | - return ''; |
|
| 720 | + if (!isset($error)) { |
|
| 721 | + return ''; |
|
| 722 | + } |
|
| 690 | 723 | // A session error occurred, show the error. |
| 691 | 724 | elseif ($is_fatal) |
| 692 | 725 | { |
@@ -695,13 +728,14 @@ discard block |
||
| 695 | 728 | ob_end_clean(); |
| 696 | 729 | header('HTTP/1.1 403 Forbidden - Session timeout'); |
| 697 | 730 | die; |
| 731 | + } else { |
|
| 732 | + fatal_lang_error($error, isset($log_error) ? 'user' : false); |
|
| 698 | 733 | } |
| 699 | - else |
|
| 700 | - fatal_lang_error($error, isset($log_error) ? 'user' : false); |
|
| 701 | 734 | } |
| 702 | 735 | // A session error occurred, return the error to the calling function. |
| 703 | - else |
|
| 704 | - return $error; |
|
| 736 | + else { |
|
| 737 | + return $error; |
|
| 738 | + } |
|
| 705 | 739 | |
| 706 | 740 | // We really should never fall through here, for very important reasons. Let's make sure. |
| 707 | 741 | trigger_error('Hacking attempt...', E_USER_ERROR); |
@@ -717,10 +751,9 @@ discard block |
||
| 717 | 751 | { |
| 718 | 752 | global $modSettings; |
| 719 | 753 | |
| 720 | - if (isset($_GET['confirm']) && isset($_SESSION['confirm_' . $action]) && md5($_GET['confirm'] . $_SERVER['HTTP_USER_AGENT']) == $_SESSION['confirm_' . $action]) |
|
| 721 | - return true; |
|
| 722 | - |
|
| 723 | - else |
|
| 754 | + if (isset($_GET['confirm']) && isset($_SESSION['confirm_' . $action]) && md5($_GET['confirm'] . $_SERVER['HTTP_USER_AGENT']) == $_SESSION['confirm_' . $action]) { |
|
| 755 | + return true; |
|
| 756 | + } else |
|
| 724 | 757 | { |
| 725 | 758 | $token = md5(mt_rand() . session_id() . (string) microtime() . $modSettings['rand_seed']); |
| 726 | 759 | $_SESSION['confirm_' . $action] = md5($token . $_SERVER['HTTP_USER_AGENT']); |
@@ -771,9 +804,9 @@ discard block |
||
| 771 | 804 | $return = $_SESSION['token'][$type . '-' . $action][3]; |
| 772 | 805 | unset($_SESSION['token'][$type . '-' . $action]); |
| 773 | 806 | return $return; |
| 807 | + } else { |
|
| 808 | + return ''; |
|
| 774 | 809 | } |
| 775 | - else |
|
| 776 | - return ''; |
|
| 777 | 810 | } |
| 778 | 811 | |
| 779 | 812 | // This nasty piece of code validates a token. |
@@ -804,12 +837,14 @@ discard block |
||
| 804 | 837 | fatal_lang_error('token_verify_fail', false); |
| 805 | 838 | } |
| 806 | 839 | // Remove this token as its useless |
| 807 | - else |
|
| 808 | - unset($_SESSION['token'][$type . '-' . $action]); |
|
| 840 | + else { |
|
| 841 | + unset($_SESSION['token'][$type . '-' . $action]); |
|
| 842 | + } |
|
| 809 | 843 | |
| 810 | 844 | // Randomly check if we should remove some older tokens. |
| 811 | - if (mt_rand(0, 138) == 23) |
|
| 812 | - cleanTokens(); |
|
| 845 | + if (mt_rand(0, 138) == 23) { |
|
| 846 | + cleanTokens(); |
|
| 847 | + } |
|
| 813 | 848 | |
| 814 | 849 | return false; |
| 815 | 850 | } |
@@ -824,14 +859,16 @@ discard block |
||
| 824 | 859 | function cleanTokens($complete = false) |
| 825 | 860 | { |
| 826 | 861 | // We appreciate cleaning up after yourselves. |
| 827 | - if (!isset($_SESSION['token'])) |
|
| 828 | - return; |
|
| 862 | + if (!isset($_SESSION['token'])) { |
|
| 863 | + return; |
|
| 864 | + } |
|
| 829 | 865 | |
| 830 | 866 | // Clean up tokens, trying to give enough time still. |
| 831 | - foreach ($_SESSION['token'] as $key => $data) |
|
| 832 | - if ($data[2] + 10800 < time() || $complete) |
|
| 867 | + foreach ($_SESSION['token'] as $key => $data) { |
|
| 868 | + if ($data[2] + 10800 < time() || $complete) |
|
| 833 | 869 | unset($_SESSION['token'][$key]); |
| 834 | -} |
|
| 870 | + } |
|
| 871 | + } |
|
| 835 | 872 | |
| 836 | 873 | /** |
| 837 | 874 | * Check whether a form has been submitted twice. |
@@ -849,37 +886,40 @@ discard block |
||
| 849 | 886 | { |
| 850 | 887 | global $context; |
| 851 | 888 | |
| 852 | - if (!isset($_SESSION['forms'])) |
|
| 853 | - $_SESSION['forms'] = array(); |
|
| 889 | + if (!isset($_SESSION['forms'])) { |
|
| 890 | + $_SESSION['forms'] = array(); |
|
| 891 | + } |
|
| 854 | 892 | |
| 855 | 893 | // Register a form number and store it in the session stack. (use this on the page that has the form.) |
| 856 | 894 | if ($action == 'register') |
| 857 | 895 | { |
| 858 | 896 | $context['form_sequence_number'] = 0; |
| 859 | - while (empty($context['form_sequence_number']) || in_array($context['form_sequence_number'], $_SESSION['forms'])) |
|
| 860 | - $context['form_sequence_number'] = mt_rand(1, 16000000); |
|
| 897 | + while (empty($context['form_sequence_number']) || in_array($context['form_sequence_number'], $_SESSION['forms'])) { |
|
| 898 | + $context['form_sequence_number'] = mt_rand(1, 16000000); |
|
| 899 | + } |
|
| 861 | 900 | } |
| 862 | 901 | // Check whether the submitted number can be found in the session. |
| 863 | 902 | elseif ($action == 'check') |
| 864 | 903 | { |
| 865 | - if (!isset($_REQUEST['seqnum'])) |
|
| 866 | - return true; |
|
| 867 | - elseif (!in_array($_REQUEST['seqnum'], $_SESSION['forms'])) |
|
| 904 | + if (!isset($_REQUEST['seqnum'])) { |
|
| 905 | + return true; |
|
| 906 | + } elseif (!in_array($_REQUEST['seqnum'], $_SESSION['forms'])) |
|
| 868 | 907 | { |
| 869 | 908 | $_SESSION['forms'][] = (int) $_REQUEST['seqnum']; |
| 870 | 909 | return true; |
| 910 | + } elseif ($is_fatal) { |
|
| 911 | + fatal_lang_error('error_form_already_submitted', false); |
|
| 912 | + } else { |
|
| 913 | + return false; |
|
| 871 | 914 | } |
| 872 | - elseif ($is_fatal) |
|
| 873 | - fatal_lang_error('error_form_already_submitted', false); |
|
| 874 | - else |
|
| 875 | - return false; |
|
| 876 | 915 | } |
| 877 | 916 | // Don't check, just free the stack number. |
| 878 | - elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms'])) |
|
| 879 | - $_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum'])); |
|
| 880 | - elseif ($action != 'free') |
|
| 881 | - trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING); |
|
| 882 | -} |
|
| 917 | + elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms'])) { |
|
| 918 | + $_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum'])); |
|
| 919 | + } elseif ($action != 'free') { |
|
| 920 | + trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING); |
|
| 921 | + } |
|
| 922 | + } |
|
| 883 | 923 | |
| 884 | 924 | /** |
| 885 | 925 | * Check the user's permissions. |
@@ -898,16 +938,19 @@ discard block |
||
| 898 | 938 | global $user_info, $smcFunc; |
| 899 | 939 | |
| 900 | 940 | // You're always allowed to do nothing. (unless you're a working man, MR. LAZY :P!) |
| 901 | - if (empty($permission)) |
|
| 902 | - return true; |
|
| 941 | + if (empty($permission)) { |
|
| 942 | + return true; |
|
| 943 | + } |
|
| 903 | 944 | |
| 904 | 945 | // You're never allowed to do something if your data hasn't been loaded yet! |
| 905 | - if (empty($user_info)) |
|
| 906 | - return false; |
|
| 946 | + if (empty($user_info)) { |
|
| 947 | + return false; |
|
| 948 | + } |
|
| 907 | 949 | |
| 908 | 950 | // Administrators are supermen :P. |
| 909 | - if ($user_info['is_admin']) |
|
| 910 | - return true; |
|
| 951 | + if ($user_info['is_admin']) { |
|
| 952 | + return true; |
|
| 953 | + } |
|
| 911 | 954 | |
| 912 | 955 | // Let's ensure this is an array. |
| 913 | 956 | $permission = (array) $permission; |
@@ -915,14 +958,16 @@ discard block |
||
| 915 | 958 | // Are we checking the _current_ board, or some other boards? |
| 916 | 959 | if ($boards === null) |
| 917 | 960 | { |
| 918 | - if (count(array_intersect($permission, $user_info['permissions'])) != 0) |
|
| 919 | - return true; |
|
| 961 | + if (count(array_intersect($permission, $user_info['permissions'])) != 0) { |
|
| 962 | + return true; |
|
| 963 | + } |
|
| 920 | 964 | // You aren't allowed, by default. |
| 921 | - else |
|
| 922 | - return false; |
|
| 965 | + else { |
|
| 966 | + return false; |
|
| 967 | + } |
|
| 968 | + } elseif (!is_array($boards)) { |
|
| 969 | + $boards = array($boards); |
|
| 923 | 970 | } |
| 924 | - elseif (!is_array($boards)) |
|
| 925 | - $boards = array($boards); |
|
| 926 | 971 | |
| 927 | 972 | $request = $smcFunc['db_query']('', ' |
| 928 | 973 | SELECT MIN(bp.add_deny) AS add_deny |
@@ -950,20 +995,23 @@ discard block |
||
| 950 | 995 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 951 | 996 | { |
| 952 | 997 | $result = !empty($row['add_deny']); |
| 953 | - if ($result == true) |
|
| 954 | - break; |
|
| 998 | + if ($result == true) { |
|
| 999 | + break; |
|
| 1000 | + } |
|
| 955 | 1001 | } |
| 956 | 1002 | $smcFunc['db_free_result']($request); |
| 957 | 1003 | return $result; |
| 958 | 1004 | } |
| 959 | 1005 | |
| 960 | 1006 | // Make sure they can do it on all of the boards. |
| 961 | - if ($smcFunc['db_num_rows']($request) != count($boards)) |
|
| 962 | - return false; |
|
| 1007 | + if ($smcFunc['db_num_rows']($request) != count($boards)) { |
|
| 1008 | + return false; |
|
| 1009 | + } |
|
| 963 | 1010 | |
| 964 | 1011 | $result = true; |
| 965 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 966 | - $result &= !empty($row['add_deny']); |
|
| 1012 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1013 | + $result &= !empty($row['add_deny']); |
|
| 1014 | + } |
|
| 967 | 1015 | $smcFunc['db_free_result']($request); |
| 968 | 1016 | |
| 969 | 1017 | // If the query returned 1, they can do it... otherwise, they can't. |
@@ -1030,9 +1078,10 @@ discard block |
||
| 1030 | 1078 | |
| 1031 | 1079 | // If you're doing something on behalf of some "heavy" permissions, validate your session. |
| 1032 | 1080 | // (take out the heavy permissions, and if you can't do anything but those, you need a validated session.) |
| 1033 | - if (!allowedTo(array_diff($permission, $heavy_permissions), $boards)) |
|
| 1034 | - validateSession(); |
|
| 1035 | -} |
|
| 1081 | + if (!allowedTo(array_diff($permission, $heavy_permissions), $boards)) { |
|
| 1082 | + validateSession(); |
|
| 1083 | + } |
|
| 1084 | + } |
|
| 1036 | 1085 | |
| 1037 | 1086 | /** |
| 1038 | 1087 | * Return the boards a user has a certain (board) permission on. (array(0) if all.) |
@@ -1051,8 +1100,9 @@ discard block |
||
| 1051 | 1100 | global $user_info, $smcFunc; |
| 1052 | 1101 | |
| 1053 | 1102 | // Arrays are nice, most of the time. |
| 1054 | - if (!is_array($permissions)) |
|
| 1055 | - $permissions = array($permissions); |
|
| 1103 | + if (!is_array($permissions)) { |
|
| 1104 | + $permissions = array($permissions); |
|
| 1105 | + } |
|
| 1056 | 1106 | |
| 1057 | 1107 | /* |
| 1058 | 1108 | * Set $simple to true to use this function as it were in SMF 2.0.x. |
@@ -1064,13 +1114,14 @@ discard block |
||
| 1064 | 1114 | // Administrators are all powerful, sorry. |
| 1065 | 1115 | if ($user_info['is_admin']) |
| 1066 | 1116 | { |
| 1067 | - if ($simple) |
|
| 1068 | - return array(0); |
|
| 1069 | - else |
|
| 1117 | + if ($simple) { |
|
| 1118 | + return array(0); |
|
| 1119 | + } else |
|
| 1070 | 1120 | { |
| 1071 | 1121 | $boards = array(); |
| 1072 | - foreach ($permissions as $permission) |
|
| 1073 | - $boards[$permission] = array(0); |
|
| 1122 | + foreach ($permissions as $permission) { |
|
| 1123 | + $boards[$permission] = array(0); |
|
| 1124 | + } |
|
| 1074 | 1125 | |
| 1075 | 1126 | return $boards; |
| 1076 | 1127 | } |
@@ -1102,31 +1153,32 @@ discard block |
||
| 1102 | 1153 | { |
| 1103 | 1154 | if ($simple) |
| 1104 | 1155 | { |
| 1105 | - if (empty($row['add_deny'])) |
|
| 1106 | - $deny_boards[] = $row['id_board']; |
|
| 1107 | - else |
|
| 1108 | - $boards[] = $row['id_board']; |
|
| 1109 | - } |
|
| 1110 | - else |
|
| 1156 | + if (empty($row['add_deny'])) { |
|
| 1157 | + $deny_boards[] = $row['id_board']; |
|
| 1158 | + } else { |
|
| 1159 | + $boards[] = $row['id_board']; |
|
| 1160 | + } |
|
| 1161 | + } else |
|
| 1111 | 1162 | { |
| 1112 | - if (empty($row['add_deny'])) |
|
| 1113 | - $deny_boards[$row['permission']][] = $row['id_board']; |
|
| 1114 | - else |
|
| 1115 | - $boards[$row['permission']][] = $row['id_board']; |
|
| 1163 | + if (empty($row['add_deny'])) { |
|
| 1164 | + $deny_boards[$row['permission']][] = $row['id_board']; |
|
| 1165 | + } else { |
|
| 1166 | + $boards[$row['permission']][] = $row['id_board']; |
|
| 1167 | + } |
|
| 1116 | 1168 | } |
| 1117 | 1169 | } |
| 1118 | 1170 | $smcFunc['db_free_result']($request); |
| 1119 | 1171 | |
| 1120 | - if ($simple) |
|
| 1121 | - $boards = array_unique(array_values(array_diff($boards, $deny_boards))); |
|
| 1122 | - else |
|
| 1172 | + if ($simple) { |
|
| 1173 | + $boards = array_unique(array_values(array_diff($boards, $deny_boards))); |
|
| 1174 | + } else |
|
| 1123 | 1175 | { |
| 1124 | 1176 | foreach ($permissions as $permission) |
| 1125 | 1177 | { |
| 1126 | 1178 | // never had it to start with |
| 1127 | - if (empty($boards[$permission])) |
|
| 1128 | - $boards[$permission] = array(); |
|
| 1129 | - else |
|
| 1179 | + if (empty($boards[$permission])) { |
|
| 1180 | + $boards[$permission] = array(); |
|
| 1181 | + } else |
|
| 1130 | 1182 | { |
| 1131 | 1183 | // Or it may have been removed |
| 1132 | 1184 | $deny_boards[$permission] = isset($deny_boards[$permission]) ? $deny_boards[$permission] : array(); |
@@ -1162,10 +1214,11 @@ discard block |
||
| 1162 | 1214 | |
| 1163 | 1215 | |
| 1164 | 1216 | // Moderators are free... |
| 1165 | - if (!allowedTo('moderate_board')) |
|
| 1166 | - $timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime']; |
|
| 1167 | - else |
|
| 1168 | - $timeLimit = 2; |
|
| 1217 | + if (!allowedTo('moderate_board')) { |
|
| 1218 | + $timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime']; |
|
| 1219 | + } else { |
|
| 1220 | + $timeLimit = 2; |
|
| 1221 | + } |
|
| 1169 | 1222 | |
| 1170 | 1223 | call_integration_hook('integrate_spam_protection', array(&$timeOverrides, &$timeLimit)); |
| 1171 | 1224 | |
@@ -1192,8 +1245,9 @@ discard block |
||
| 1192 | 1245 | if ($smcFunc['db_affected_rows']() != 1) |
| 1193 | 1246 | { |
| 1194 | 1247 | // Spammer! You only have to wait a *few* seconds! |
| 1195 | - if (!$only_return_result) |
|
| 1196 | - fatal_lang_error($error_type . '_WaitTime_broken', false, array($timeLimit)); |
|
| 1248 | + if (!$only_return_result) { |
|
| 1249 | + fatal_lang_error($error_type . '_WaitTime_broken', false, array($timeLimit)); |
|
| 1250 | + } |
|
| 1197 | 1251 | |
| 1198 | 1252 | return true; |
| 1199 | 1253 | } |
@@ -1211,11 +1265,13 @@ discard block |
||
| 1211 | 1265 | */ |
| 1212 | 1266 | function secureDirectory($path, $attachments = false) |
| 1213 | 1267 | { |
| 1214 | - if (empty($path)) |
|
| 1215 | - return 'empty_path'; |
|
| 1268 | + if (empty($path)) { |
|
| 1269 | + return 'empty_path'; |
|
| 1270 | + } |
|
| 1216 | 1271 | |
| 1217 | - if (!is_writable($path)) |
|
| 1218 | - return 'path_not_writable'; |
|
| 1272 | + if (!is_writable($path)) { |
|
| 1273 | + return 'path_not_writable'; |
|
| 1274 | + } |
|
| 1219 | 1275 | |
| 1220 | 1276 | $directoryname = basename($path); |
| 1221 | 1277 | |
@@ -1227,9 +1283,9 @@ discard block |
||
| 1227 | 1283 | |
| 1228 | 1284 | RemoveHandler .php .php3 .phtml .cgi .fcgi .pl .fpl .shtml'; |
| 1229 | 1285 | |
| 1230 | - if (file_exists($path . '/.htaccess')) |
|
| 1231 | - $errors[] = 'htaccess_exists'; |
|
| 1232 | - else |
|
| 1286 | + if (file_exists($path . '/.htaccess')) { |
|
| 1287 | + $errors[] = 'htaccess_exists'; |
|
| 1288 | + } else |
|
| 1233 | 1289 | { |
| 1234 | 1290 | $fh = @fopen($path . '/.htaccess', 'w'); |
| 1235 | 1291 | if ($fh) |
@@ -1242,9 +1298,9 @@ discard block |
||
| 1242 | 1298 | $errors[] = 'htaccess_cannot_create_file'; |
| 1243 | 1299 | } |
| 1244 | 1300 | |
| 1245 | - if (file_exists($path . '/index.php')) |
|
| 1246 | - $errors[] = 'index-php_exists'; |
|
| 1247 | - else |
|
| 1301 | + if (file_exists($path . '/index.php')) { |
|
| 1302 | + $errors[] = 'index-php_exists'; |
|
| 1303 | + } else |
|
| 1248 | 1304 | { |
| 1249 | 1305 | $fh = @fopen($path . '/index.php', 'w'); |
| 1250 | 1306 | if ($fh) |
@@ -1272,11 +1328,12 @@ discard block |
||
| 1272 | 1328 | $errors[] = 'index-php_cannot_create_file'; |
| 1273 | 1329 | } |
| 1274 | 1330 | |
| 1275 | - if (!empty($errors)) |
|
| 1276 | - return $errors; |
|
| 1277 | - else |
|
| 1278 | - return true; |
|
| 1279 | -} |
|
| 1331 | + if (!empty($errors)) { |
|
| 1332 | + return $errors; |
|
| 1333 | + } else { |
|
| 1334 | + return true; |
|
| 1335 | + } |
|
| 1336 | + } |
|
| 1280 | 1337 | |
| 1281 | 1338 | /** |
| 1282 | 1339 | * This sets the X-Frame-Options header. |
@@ -1289,14 +1346,16 @@ discard block |
||
| 1289 | 1346 | global $modSettings; |
| 1290 | 1347 | |
| 1291 | 1348 | $option = 'SAMEORIGIN'; |
| 1292 | - if (is_null($override) && !empty($modSettings['frame_security'])) |
|
| 1293 | - $option = $modSettings['frame_security']; |
|
| 1294 | - elseif (in_array($override, array('SAMEORIGIN', 'DENY'))) |
|
| 1295 | - $option = $override; |
|
| 1349 | + if (is_null($override) && !empty($modSettings['frame_security'])) { |
|
| 1350 | + $option = $modSettings['frame_security']; |
|
| 1351 | + } elseif (in_array($override, array('SAMEORIGIN', 'DENY'))) { |
|
| 1352 | + $option = $override; |
|
| 1353 | + } |
|
| 1296 | 1354 | |
| 1297 | 1355 | // Don't bother setting the header if we have disabled it. |
| 1298 | - if ($option == 'DISABLE') |
|
| 1299 | - return; |
|
| 1356 | + if ($option == 'DISABLE') { |
|
| 1357 | + return; |
|
| 1358 | + } |
|
| 1300 | 1359 | |
| 1301 | 1360 | // Finally set it. |
| 1302 | 1361 | header('x-frame-options: ' . $option); |
@@ -51,34 +51,38 @@ discard block |
||
| 51 | 51 | $ignored_members = explode(',', $row['pm_ignore_list']); |
| 52 | 52 | |
| 53 | 53 | // If the user is in group 1 anywhere, they can see everything anyway. |
| 54 | - if (in_array(1, $groups) || count(array_intersect($allowed, $groups)) != 0) |
|
| 55 | - $author = $row['id_member']; |
|
| 54 | + if (in_array(1, $groups) || count(array_intersect($allowed, $groups)) != 0) { |
|
| 55 | + $author = $row['id_member']; |
|
| 56 | + } |
|
| 56 | 57 | } |
| 57 | 58 | $smcFunc['db_free_result']($request); |
| 58 | - } |
|
| 59 | - else |
|
| 59 | + } else |
|
| 60 | 60 | { |
| 61 | 61 | // This isn't something we know natively how to support. Call the hooks, if they're dealing with it, return false, otherwise return the user id. |
| 62 | 62 | $hook_results = call_integration_hook('integrate_find_like_author', array($this->_details['content_type'], $this->_details['content_id'])); |
| 63 | - foreach ($hook_results as $result) |
|
| 64 | - if (!empty($result)) |
|
| 63 | + foreach ($hook_results as $result) { |
|
| 64 | + if (!empty($result)) |
|
| 65 | 65 | { |
| 66 | 66 | $author = $result; |
| 67 | + } |
|
| 67 | 68 | break; |
| 68 | 69 | } |
| 69 | 70 | } |
| 70 | 71 | |
| 71 | 72 | // If we didn't have a member... leave. |
| 72 | - if (empty($author)) |
|
| 73 | - return true; |
|
| 73 | + if (empty($author)) { |
|
| 74 | + return true; |
|
| 75 | + } |
|
| 74 | 76 | |
| 75 | 77 | // If the person who sent the notification is the person whose content it is, do nothing. |
| 76 | - if ($author == $this->_details['sender_id']) |
|
| 77 | - return true; |
|
| 78 | + if ($author == $this->_details['sender_id']) { |
|
| 79 | + return true; |
|
| 80 | + } |
|
| 78 | 81 | |
| 79 | 82 | // If the person who sent the notification is on this person's ignore list, do nothing. |
| 80 | - if (!empty($ignored_members) && in_array($this->_details['sender_id'], $ignored_members)) |
|
| 81 | - return true; |
|
| 83 | + if (!empty($ignored_members) && in_array($this->_details['sender_id'], $ignored_members)) { |
|
| 84 | + return true; |
|
| 85 | + } |
|
| 82 | 86 | |
| 83 | 87 | require_once($sourcedir . '/Subs-Notify.php'); |
| 84 | 88 | $prefs = getNotifyPrefs($author, $this->_details['content_type'] . '_like', true); |
@@ -87,8 +91,9 @@ discard block |
||
| 87 | 91 | // As a result, the value should really just be non empty. |
| 88 | 92 | |
| 89 | 93 | // Check the value. If no value or it's empty, they didn't want alerts, oh well. |
| 90 | - if (empty($prefs[$author][$this->_details['content_type'] . '_like'])) |
|
| 91 | - return true; |
|
| 94 | + if (empty($prefs[$author][$this->_details['content_type'] . '_like'])) { |
|
| 95 | + return true; |
|
| 96 | + } |
|
| 92 | 97 | |
| 93 | 98 | // Don't spam the alerts: if there is an existing unread alert of the |
| 94 | 99 | // requested type for the target user from the sender, don't make a new one. |
@@ -108,8 +113,9 @@ discard block |
||
| 108 | 113 | ) |
| 109 | 114 | ); |
| 110 | 115 | |
| 111 | - if ($smcFunc['db_num_rows']($request) > 0) |
|
| 112 | - return true; |
|
| 116 | + if ($smcFunc['db_num_rows']($request) > 0) { |
|
| 117 | + return true; |
|
| 118 | + } |
|
| 113 | 119 | $smcFunc['db_free_result']($request); |
| 114 | 120 | |
| 115 | 121 | // Issue, update, move on. |
@@ -14,8 +14,9 @@ discard block |
||
| 14 | 14 | * @version 2.1 Beta 4 |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | -if (!defined('SMF')) |
|
| 17 | +if (!defined('SMF')) { |
|
| 18 | 18 | die('No direct access...'); |
| 19 | +} |
|
| 19 | 20 | |
| 20 | 21 | /** |
| 21 | 22 | * Shows a listing of registered members. |
@@ -110,8 +111,9 @@ discard block |
||
| 110 | 111 | |
| 111 | 112 | $context['custom_profile_fields'] = getCustFieldsMList(); |
| 112 | 113 | |
| 113 | - if (!empty($context['custom_profile_fields']['columns'])) |
|
| 114 | - $context['columns'] += $context['custom_profile_fields']['columns']; |
|
| 114 | + if (!empty($context['custom_profile_fields']['columns'])) { |
|
| 115 | + $context['columns'] += $context['custom_profile_fields']['columns']; |
|
| 116 | + } |
|
| 115 | 117 | |
| 116 | 118 | $context['colspan'] = 0; |
| 117 | 119 | $context['disabled_fields'] = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array(); |
@@ -147,12 +149,12 @@ discard block |
||
| 147 | 149 | call_integration_hook('integrate_memberlist_buttons'); |
| 148 | 150 | |
| 149 | 151 | // Jump to the sub action. |
| 150 | - if (isset($subActions[$context['listing_by']])) |
|
| 151 | - call_helper($subActions[$context['listing_by']][1]); |
|
| 152 | - |
|
| 153 | - else |
|
| 154 | - call_helper($subActions['all'][1]); |
|
| 155 | -} |
|
| 152 | + if (isset($subActions[$context['listing_by']])) { |
|
| 153 | + call_helper($subActions[$context['listing_by']][1]); |
|
| 154 | + } else { |
|
| 155 | + call_helper($subActions['all'][1]); |
|
| 156 | + } |
|
| 157 | + } |
|
| 156 | 158 | |
| 157 | 159 | /** |
| 158 | 160 | * List all members, page by page, with sorting. |
@@ -177,8 +179,9 @@ discard block |
||
| 177 | 179 | if ($use_cache) |
| 178 | 180 | { |
| 179 | 181 | // Maybe there's something cached already. |
| 180 | - if (!empty($modSettings['memberlist_cache'])) |
|
| 181 | - $memberlist_cache = $smcFunc['json_decode']($modSettings['memberlist_cache'], true); |
|
| 182 | + if (!empty($modSettings['memberlist_cache'])) { |
|
| 183 | + $memberlist_cache = $smcFunc['json_decode']($modSettings['memberlist_cache'], true); |
|
| 184 | + } |
|
| 182 | 185 | |
| 183 | 186 | // The chunk size for the cached index. |
| 184 | 187 | $cache_step_size = 500; |
@@ -234,13 +237,15 @@ discard block |
||
| 234 | 237 | } |
| 235 | 238 | |
| 236 | 239 | // Set defaults for sort (real_name) and start. (0) |
| 237 | - if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) |
|
| 238 | - $_REQUEST['sort'] = 'real_name'; |
|
| 240 | + if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) { |
|
| 241 | + $_REQUEST['sort'] = 'real_name'; |
|
| 242 | + } |
|
| 239 | 243 | |
| 240 | 244 | if (!is_numeric($_REQUEST['start'])) |
| 241 | 245 | { |
| 242 | - if (preg_match('~^[^\'\\\\/]~' . ($context['utf8'] ? 'u' : ''), $smcFunc['strtolower']($_REQUEST['start']), $match) === 0) |
|
| 243 | - fatal_error('Hacker?', false); |
|
| 246 | + if (preg_match('~^[^\'\\\\/]~' . ($context['utf8'] ? 'u' : ''), $smcFunc['strtolower']($_REQUEST['start']), $match) === 0) { |
|
| 247 | + fatal_error('Hacker?', false); |
|
| 248 | + } |
|
| 244 | 249 | |
| 245 | 250 | $_REQUEST['start'] = $match[0]; |
| 246 | 251 | |
@@ -259,16 +264,18 @@ discard block |
||
| 259 | 264 | } |
| 260 | 265 | |
| 261 | 266 | $context['letter_links'] = ''; |
| 262 | - for ($i = 97; $i < 123; $i++) |
|
| 263 | - $context['letter_links'] .= '<a href="' . $scripturl . '?action=mlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . strtoupper(chr($i)) . '</a> '; |
|
| 267 | + for ($i = 97; $i < 123; $i++) { |
|
| 268 | + $context['letter_links'] .= '<a href="' . $scripturl . '?action=mlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . strtoupper(chr($i)) . '</a> '; |
|
| 269 | + } |
|
| 264 | 270 | |
| 265 | 271 | // Sort out the column information. |
| 266 | 272 | foreach ($context['columns'] as $col => $column_details) |
| 267 | 273 | { |
| 268 | 274 | $context['columns'][$col]['href'] = $scripturl . '?action=mlist;sort=' . $col . ';start=0'; |
| 269 | 275 | |
| 270 | - if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) |
|
| 271 | - $context['columns'][$col]['href'] .= ';desc'; |
|
| 276 | + if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) { |
|
| 277 | + $context['columns'][$col]['href'] .= ';desc'; |
|
| 278 | + } |
|
| 272 | 279 | |
| 273 | 280 | $context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>'; |
| 274 | 281 | $context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col; |
@@ -317,8 +324,9 @@ discard block |
||
| 317 | 324 | elseif ($use_cache && $_REQUEST['sort'] === 'real_name') |
| 318 | 325 | { |
| 319 | 326 | $first_offset = floor(($memberlist_cache['num_members'] - $modSettings['defaultMaxMembers'] - $_REQUEST['start']) / $cache_step_size) * $cache_step_size; |
| 320 | - if ($first_offset < 0) |
|
| 321 | - $first_offset = 0; |
|
| 327 | + if ($first_offset < 0) { |
|
| 328 | + $first_offset = 0; |
|
| 329 | + } |
|
| 322 | 330 | $second_offset = ceil(($memberlist_cache['num_members'] - $_REQUEST['start']) / $cache_step_size) * $cache_step_size; |
| 323 | 331 | |
| 324 | 332 | $where = 'mem.real_name BETWEEN {string:real_name_low} AND {string:real_name_high}'; |
@@ -328,8 +336,9 @@ discard block |
||
| 328 | 336 | } |
| 329 | 337 | |
| 330 | 338 | $custom_fields_qry = ''; |
| 331 | - if (!empty($context['custom_profile_fields']['join'][$_REQUEST['sort']])) |
|
| 332 | - $custom_fields_qry = $context['custom_profile_fields']['join'][$_REQUEST['sort']]; |
|
| 339 | + if (!empty($context['custom_profile_fields']['join'][$_REQUEST['sort']])) { |
|
| 340 | + $custom_fields_qry = $context['custom_profile_fields']['join'][$_REQUEST['sort']]; |
|
| 341 | + } |
|
| 333 | 342 | |
| 334 | 343 | // Select the members from the database. |
| 335 | 344 | $request = $smcFunc['db_query']('', ' |
@@ -399,12 +408,13 @@ discard block |
||
| 399 | 408 | ) |
| 400 | 409 | ); |
| 401 | 410 | $context['custom_search_fields'] = array(); |
| 402 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 403 | - $context['custom_search_fields'][$row['col_name']] = array( |
|
| 411 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 412 | + $context['custom_search_fields'][$row['col_name']] = array( |
|
| 404 | 413 | 'colname' => $row['col_name'], |
| 405 | 414 | 'name' => $row['field_name'], |
| 406 | 415 | 'desc' => $row['field_desc'], |
| 407 | 416 | ); |
| 417 | + } |
|
| 408 | 418 | $smcFunc['db_free_result']($request); |
| 409 | 419 | |
| 410 | 420 | // They're searching.. |
@@ -417,23 +427,27 @@ discard block |
||
| 417 | 427 | $context['old_search_value'] = urlencode($_REQUEST['search']); |
| 418 | 428 | |
| 419 | 429 | // No fields? Use default... |
| 420 | - if (empty($_POST['fields'])) |
|
| 421 | - $_POST['fields'] = array('name'); |
|
| 430 | + if (empty($_POST['fields'])) { |
|
| 431 | + $_POST['fields'] = array('name'); |
|
| 432 | + } |
|
| 422 | 433 | |
| 423 | 434 | // Set defaults for how the results are sorted |
| 424 | - if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) |
|
| 425 | - $_REQUEST['sort'] = 'real_name'; |
|
| 435 | + if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) { |
|
| 436 | + $_REQUEST['sort'] = 'real_name'; |
|
| 437 | + } |
|
| 426 | 438 | |
| 427 | 439 | // Build the column link / sort information. |
| 428 | 440 | foreach ($context['columns'] as $col => $column_details) |
| 429 | 441 | { |
| 430 | 442 | $context['columns'][$col]['href'] = $scripturl . '?action=mlist;sa=search;start=0;sort=' . $col; |
| 431 | 443 | |
| 432 | - if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) |
|
| 433 | - $context['columns'][$col]['href'] .= ';desc'; |
|
| 444 | + if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) { |
|
| 445 | + $context['columns'][$col]['href'] .= ';desc'; |
|
| 446 | + } |
|
| 434 | 447 | |
| 435 | - if (isset($_POST['search']) && isset($_POST['fields'])) |
|
| 436 | - $context['columns'][$col]['href'] .= ';search=' . $_POST['search'] . ';fields=' . implode(',', $_POST['fields']); |
|
| 448 | + if (isset($_POST['search']) && isset($_POST['fields'])) { |
|
| 449 | + $context['columns'][$col]['href'] .= ';search=' . $_POST['search'] . ';fields=' . implode(',', $_POST['fields']); |
|
| 450 | + } |
|
| 437 | 451 | |
| 438 | 452 | $context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>'; |
| 439 | 453 | $context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col; |
@@ -456,8 +470,7 @@ discard block |
||
| 456 | 470 | { |
| 457 | 471 | $fields = allowedTo('moderate_forum') ? array('member_name', 'real_name') : array('real_name'); |
| 458 | 472 | $search_fields[] = 'name'; |
| 459 | - } |
|
| 460 | - else |
|
| 473 | + } else |
|
| 461 | 474 | { |
| 462 | 475 | $fields = array(); |
| 463 | 476 | $search_fields = array(); |
@@ -482,9 +495,10 @@ discard block |
||
| 482 | 495 | $search_fields[] = 'email'; |
| 483 | 496 | } |
| 484 | 497 | |
| 485 | - if ($smcFunc['db_case_sensitive']) |
|
| 486 | - foreach ($fields as $key => $field) |
|
| 498 | + if ($smcFunc['db_case_sensitive']) { |
|
| 499 | + foreach ($fields as $key => $field) |
|
| 487 | 500 | $fields[$key] = 'LOWER(' . $field . ')'; |
| 501 | + } |
|
| 488 | 502 | |
| 489 | 503 | $customJoin = array(); |
| 490 | 504 | $customCount = 10; |
@@ -503,8 +517,9 @@ discard block |
||
| 503 | 517 | } |
| 504 | 518 | |
| 505 | 519 | // No search fields? That means you're trying to hack things |
| 506 | - if (empty($search_fields)) |
|
| 507 | - fatal_lang_error('invalid_search_string', false); |
|
| 520 | + if (empty($search_fields)) { |
|
| 521 | + fatal_lang_error('invalid_search_string', false); |
|
| 522 | + } |
|
| 508 | 523 | |
| 509 | 524 | $query = $_POST['search'] == '' ? '= {string:blank_string}' : ($smcFunc['db_case_sensitive'] ? 'LIKE LOWER({string:search})' : 'LIKE {string:search}'); |
| 510 | 525 | |
@@ -542,8 +557,7 @@ discard block |
||
| 542 | 557 | ); |
| 543 | 558 | printMemberListRows($request); |
| 544 | 559 | $smcFunc['db_free_result']($request); |
| 545 | - } |
|
| 546 | - else |
|
| 560 | + } else |
|
| 547 | 561 | { |
| 548 | 562 | // These are all the possible fields. |
| 549 | 563 | $context['search_fields'] = array( |
@@ -558,14 +572,14 @@ discard block |
||
| 558 | 572 | { |
| 559 | 573 | unset($context['search_fields']['email']); |
| 560 | 574 | $context['search_defaults'] = array('name'); |
| 561 | - } |
|
| 562 | - else |
|
| 575 | + } else |
|
| 563 | 576 | { |
| 564 | 577 | $context['search_defaults'] = array('name', 'email'); |
| 565 | 578 | } |
| 566 | 579 | |
| 567 | - foreach ($context['custom_search_fields'] as $field) |
|
| 568 | - $context['search_fields']['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']); |
|
| 580 | + foreach ($context['custom_search_fields'] as $field) { |
|
| 581 | + $context['search_fields']['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']); |
|
| 582 | + } |
|
| 569 | 583 | |
| 570 | 584 | $context['sub_template'] = 'search'; |
| 571 | 585 | $context['old_search'] = isset($_GET['search']) ? $_GET['search'] : (isset($_POST['search']) ? $smcFunc['htmlspecialchars']($_POST['search']) : ''); |
@@ -607,12 +621,14 @@ discard block |
||
| 607 | 621 | $smcFunc['db_free_result']($result); |
| 608 | 622 | |
| 609 | 623 | // Avoid division by zero... |
| 610 | - if ($most_posts == 0) |
|
| 611 | - $most_posts = 1; |
|
| 624 | + if ($most_posts == 0) { |
|
| 625 | + $most_posts = 1; |
|
| 626 | + } |
|
| 612 | 627 | |
| 613 | 628 | $members = array(); |
| 614 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 615 | - $members[] = $row['id_member']; |
|
| 629 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 630 | + $members[] = $row['id_member']; |
|
| 631 | + } |
|
| 616 | 632 | |
| 617 | 633 | // Load all the members for display. |
| 618 | 634 | loadMemberData($members); |
@@ -620,8 +636,9 @@ discard block |
||
| 620 | 636 | $context['members'] = array(); |
| 621 | 637 | foreach ($members as $member) |
| 622 | 638 | { |
| 623 | - if (!loadMemberContext($member)) |
|
| 624 | - continue; |
|
| 639 | + if (!loadMemberContext($member)) { |
|
| 640 | + continue; |
|
| 641 | + } |
|
| 625 | 642 | |
| 626 | 643 | $context['members'][$member] = $memberContext[$member]; |
| 627 | 644 | $context['members'][$member]['post_percent'] = round(($context['members'][$member]['real_posts'] * 100) / $most_posts); |
@@ -644,26 +661,28 @@ discard block |
||
| 644 | 661 | $fieldOptions = explode(',', $column['options']); |
| 645 | 662 | foreach ($fieldOptions as $k => $v) |
| 646 | 663 | { |
| 647 | - if (empty($currentKey)) |
|
| 648 | - $currentKey = $v === $context['members'][$member]['options'][$key] ? $k : 0; |
|
| 664 | + if (empty($currentKey)) { |
|
| 665 | + $currentKey = $v === $context['members'][$member]['options'][$key] ? $k : 0; |
|
| 666 | + } |
|
| 649 | 667 | } |
| 650 | 668 | } |
| 651 | 669 | |
| 652 | - if ($column['bbc'] && !empty($context['members'][$member]['options'][$key])) |
|
| 653 | - $context['members'][$member]['options'][$key] = strip_tags(parse_bbc($context['members'][$member]['options'][$key])); |
|
| 654 | - |
|
| 655 | - elseif ($column['type'] == 'check') |
|
| 656 | - $context['members'][$member]['options'][$key] = $context['members'][$member]['options'][$key] == 0 ? $txt['no'] : $txt['yes']; |
|
| 670 | + if ($column['bbc'] && !empty($context['members'][$member]['options'][$key])) { |
|
| 671 | + $context['members'][$member]['options'][$key] = strip_tags(parse_bbc($context['members'][$member]['options'][$key])); |
|
| 672 | + } elseif ($column['type'] == 'check') { |
|
| 673 | + $context['members'][$member]['options'][$key] = $context['members'][$member]['options'][$key] == 0 ? $txt['no'] : $txt['yes']; |
|
| 674 | + } |
|
| 657 | 675 | |
| 658 | 676 | // Enclosing the user input within some other text? |
| 659 | - if (!empty($column['enclose'])) |
|
| 660 | - $context['members'][$member]['options'][$key] = strtr($column['enclose'], array( |
|
| 677 | + if (!empty($column['enclose'])) { |
|
| 678 | + $context['members'][$member]['options'][$key] = strtr($column['enclose'], array( |
|
| 661 | 679 | '{SCRIPTURL}' => $scripturl, |
| 662 | 680 | '{IMAGES_URL}' => $settings['images_url'], |
| 663 | 681 | '{DEFAULT_IMAGES_URL}' => $settings['default_images_url'], |
| 664 | 682 | '{INPUT}' => $context['members'][$member]['options'][$key], |
| 665 | 683 | '{KEY}' => $currentKey |
| 666 | 684 | )); |
| 685 | + } |
|
| 667 | 686 | } |
| 668 | 687 | } |
| 669 | 688 | } |
@@ -705,17 +724,17 @@ discard block |
||
| 705 | 724 | ); |
| 706 | 725 | |
| 707 | 726 | // Get the right sort method depending on the cust field type. |
| 708 | - if ($row['field_type'] != 'check') |
|
| 709 | - $cpf['columns'][$row['col_name']]['sort'] = array( |
|
| 727 | + if ($row['field_type'] != 'check') { |
|
| 728 | + $cpf['columns'][$row['col_name']]['sort'] = array( |
|
| 710 | 729 | 'down' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 ASC, COALESCE(t' . $row['col_name'] . '.value, \'\') DESC', |
| 711 | 730 | 'up' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 DESC, COALESCE(t' . $row['col_name'] . '.value, \'\') ASC' |
| 712 | 731 | ); |
| 713 | - |
|
| 714 | - else |
|
| 715 | - $cpf['columns'][$row['col_name']]['sort'] = array( |
|
| 732 | + } else { |
|
| 733 | + $cpf['columns'][$row['col_name']]['sort'] = array( |
|
| 716 | 734 | 'down' => 't' . $row['col_name'] . '.value DESC', |
| 717 | 735 | 'up' => 't' . $row['col_name'] . '.value ASC' |
| 718 | 736 | ); |
| 737 | + } |
|
| 719 | 738 | |
| 720 | 739 | $cpf['join'][$row['col_name']] = 'LEFT JOIN {db_prefix}themes AS t' . $row['col_name'] . ' ON (t' . $row['col_name'] . '.variable = {literal:' . $row['col_name'] . '} AND t' . $row['col_name'] . '.id_theme = 1 AND t' . $row['col_name'] . '.id_member = mem.id_member)'; |
| 721 | 740 | } |
@@ -429,7 +429,7 @@ |
||
| 429 | 429 | */ |
| 430 | 430 | function matchIPtoCIDR($ip_address, $cidr_address) |
| 431 | 431 | { |
| 432 | - list ($cidr_network, $cidr_subnetmask) = preg_split('/', $cidr_address); |
|
| 432 | + list ($cidr_network, $cidr_subnetmask) = preg_split('/', $cidr_address); |
|
| 433 | 433 | |
| 434 | 434 | //v6? |
| 435 | 435 | if ((strpos($cidr_network, ':') !== false)) |
@@ -454,7 +454,7 @@ |
||
| 454 | 454 | break; |
| 455 | 455 | } |
| 456 | 456 | $binMask = str_pad($binMask, 32, '0'); |
| 457 | - $binMask = pack("H*" , $binMask); |
|
| 457 | + $binMask = pack("H*", $binMask); |
|
| 458 | 458 | |
| 459 | 459 | return ($ip_address & $binMask) == $cidr_network; |
| 460 | 460 | } |
@@ -14,8 +14,9 @@ discard block |
||
| 14 | 14 | * @version 2.1 Beta 4 |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | -if (!defined('SMF')) |
|
| 17 | +if (!defined('SMF')) { |
|
| 18 | 18 | die('No direct access...'); |
| 19 | +} |
|
| 19 | 20 | |
| 20 | 21 | /** |
| 21 | 22 | * Clean the request variables - add html entities to GET and slashes if magic_quotes_gpc is Off. |
@@ -44,22 +45,26 @@ discard block |
||
| 44 | 45 | unset($GLOBALS['HTTP_POST_FILES'], $GLOBALS['HTTP_POST_FILES']); |
| 45 | 46 | |
| 46 | 47 | // These keys shouldn't be set...ever. |
| 47 | - if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) |
|
| 48 | - die('Invalid request variable.'); |
|
| 48 | + if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) { |
|
| 49 | + die('Invalid request variable.'); |
|
| 50 | + } |
|
| 49 | 51 | |
| 50 | 52 | // Same goes for numeric keys. |
| 51 | - foreach (array_merge(array_keys($_POST), array_keys($_GET), array_keys($_FILES)) as $key) |
|
| 52 | - if (is_numeric($key)) |
|
| 53 | + foreach (array_merge(array_keys($_POST), array_keys($_GET), array_keys($_FILES)) as $key) { |
|
| 54 | + if (is_numeric($key)) |
|
| 53 | 55 | die('Numeric request keys are invalid.'); |
| 56 | + } |
|
| 54 | 57 | |
| 55 | 58 | // Numeric keys in cookies are less of a problem. Just unset those. |
| 56 | - foreach ($_COOKIE as $key => $value) |
|
| 57 | - if (is_numeric($key)) |
|
| 59 | + foreach ($_COOKIE as $key => $value) { |
|
| 60 | + if (is_numeric($key)) |
|
| 58 | 61 | unset($_COOKIE[$key]); |
| 62 | + } |
|
| 59 | 63 | |
| 60 | 64 | // Get the correct query string. It may be in an environment variable... |
| 61 | - if (!isset($_SERVER['QUERY_STRING'])) |
|
| 62 | - $_SERVER['QUERY_STRING'] = getenv('QUERY_STRING'); |
|
| 65 | + if (!isset($_SERVER['QUERY_STRING'])) { |
|
| 66 | + $_SERVER['QUERY_STRING'] = getenv('QUERY_STRING'); |
|
| 67 | + } |
|
| 63 | 68 | |
| 64 | 69 | // It seems that sticking a URL after the query string is mighty common, well, it's evil - don't. |
| 65 | 70 | if (strpos($_SERVER['QUERY_STRING'], 'http') === 0) |
@@ -83,13 +88,14 @@ discard block |
||
| 83 | 88 | parse_str(preg_replace('/&(\w+)(?=&|$)/', '&$1=', strtr($_SERVER['QUERY_STRING'], array(';?' => '&', ';' => '&', '%00' => '', "\0" => ''))), $_GET); |
| 84 | 89 | |
| 85 | 90 | // Magic quotes still applies with parse_str - so clean it up. |
| 86 | - if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) |
|
| 87 | - $_GET = $removeMagicQuoteFunction($_GET); |
|
| 88 | - } |
|
| 89 | - elseif (strpos(ini_get('arg_separator.input'), ';') !== false) |
|
| 91 | + if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) { |
|
| 92 | + $_GET = $removeMagicQuoteFunction($_GET); |
|
| 93 | + } |
|
| 94 | + } elseif (strpos(ini_get('arg_separator.input'), ';') !== false) |
|
| 90 | 95 | { |
| 91 | - if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) |
|
| 92 | - $_GET = $removeMagicQuoteFunction($_GET); |
|
| 96 | + if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) { |
|
| 97 | + $_GET = $removeMagicQuoteFunction($_GET); |
|
| 98 | + } |
|
| 93 | 99 | |
| 94 | 100 | // Search engines will send action=profile%3Bu=1, which confuses PHP. |
| 95 | 101 | foreach ($_GET as $k => $v) |
@@ -102,8 +108,9 @@ discard block |
||
| 102 | 108 | for ($i = 1, $n = count($temp); $i < $n; $i++) |
| 103 | 109 | { |
| 104 | 110 | @list ($key, $val) = @explode('=', $temp[$i], 2); |
| 105 | - if (!isset($_GET[$key])) |
|
| 106 | - $_GET[$key] = $val; |
|
| 111 | + if (!isset($_GET[$key])) { |
|
| 112 | + $_GET[$key] = $val; |
|
| 113 | + } |
|
| 107 | 114 | } |
| 108 | 115 | } |
| 109 | 116 | |
@@ -120,18 +127,20 @@ discard block |
||
| 120 | 127 | if (!empty($_SERVER['REQUEST_URI'])) |
| 121 | 128 | { |
| 122 | 129 | // Remove the .html, assuming there is one. |
| 123 | - if (substr($_SERVER['REQUEST_URI'], strrpos($_SERVER['REQUEST_URI'], '.'), 4) == '.htm') |
|
| 124 | - $request = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], '.')); |
|
| 125 | - else |
|
| 126 | - $request = $_SERVER['REQUEST_URI']; |
|
| 130 | + if (substr($_SERVER['REQUEST_URI'], strrpos($_SERVER['REQUEST_URI'], '.'), 4) == '.htm') { |
|
| 131 | + $request = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], '.')); |
|
| 132 | + } else { |
|
| 133 | + $request = $_SERVER['REQUEST_URI']; |
|
| 134 | + } |
|
| 127 | 135 | |
| 128 | 136 | // @todo smflib. |
| 129 | 137 | // Replace 'index.php/a,b,c/d/e,f' with 'a=b,c&d=&e=f' and parse it into $_GET. |
| 130 | 138 | if (strpos($request, basename($scripturl) . '/') !== false) |
| 131 | 139 | { |
| 132 | 140 | parse_str(substr(preg_replace('/&(\w+)(?=&|$)/', '&$1=', strtr(preg_replace('~/([^,/]+),~', '/$1=', substr($request, strpos($request, basename($scripturl)) + strlen(basename($scripturl)))), '/', '&')), 1), $temp); |
| 133 | - if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) |
|
| 134 | - $temp = $removeMagicQuoteFunction($temp); |
|
| 141 | + if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) { |
|
| 142 | + $temp = $removeMagicQuoteFunction($temp); |
|
| 143 | + } |
|
| 135 | 144 | $_GET += $temp; |
| 136 | 145 | } |
| 137 | 146 | } |
@@ -142,9 +151,10 @@ discard block |
||
| 142 | 151 | $_ENV = $removeMagicQuoteFunction($_ENV); |
| 143 | 152 | $_POST = $removeMagicQuoteFunction($_POST); |
| 144 | 153 | $_COOKIE = $removeMagicQuoteFunction($_COOKIE); |
| 145 | - foreach ($_FILES as $k => $dummy) |
|
| 146 | - if (isset($_FILES[$k]['name'])) |
|
| 154 | + foreach ($_FILES as $k => $dummy) { |
|
| 155 | + if (isset($_FILES[$k]['name'])) |
|
| 147 | 156 | $_FILES[$k]['name'] = $removeMagicQuoteFunction($_FILES[$k]['name']); |
| 157 | + } |
|
| 148 | 158 | } |
| 149 | 159 | |
| 150 | 160 | // Add entities to GET. This is kinda like the slashes on everything else. |
@@ -160,11 +170,13 @@ discard block |
||
| 160 | 170 | $_REQUEST['board'] = (string) $_REQUEST['board']; |
| 161 | 171 | |
| 162 | 172 | // If there's a slash in it, we've got a start value! (old, compatible links.) |
| 163 | - if (strpos($_REQUEST['board'], '/') !== false) |
|
| 164 | - list ($_REQUEST['board'], $_REQUEST['start']) = explode('/', $_REQUEST['board']); |
|
| 173 | + if (strpos($_REQUEST['board'], '/') !== false) { |
|
| 174 | + list ($_REQUEST['board'], $_REQUEST['start']) = explode('/', $_REQUEST['board']); |
|
| 175 | + } |
|
| 165 | 176 | // Same idea, but dots. This is the currently used format - ?board=1.0... |
| 166 | - elseif (strpos($_REQUEST['board'], '.') !== false) |
|
| 167 | - list ($_REQUEST['board'], $_REQUEST['start']) = explode('.', $_REQUEST['board']); |
|
| 177 | + elseif (strpos($_REQUEST['board'], '.') !== false) { |
|
| 178 | + list ($_REQUEST['board'], $_REQUEST['start']) = explode('.', $_REQUEST['board']); |
|
| 179 | + } |
|
| 168 | 180 | // Now make absolutely sure it's a number. |
| 169 | 181 | $board = (int) $_REQUEST['board']; |
| 170 | 182 | $_REQUEST['start'] = isset($_REQUEST['start']) ? (int) $_REQUEST['start'] : 0; |
@@ -173,12 +185,14 @@ discard block |
||
| 173 | 185 | $_GET['board'] = $board; |
| 174 | 186 | } |
| 175 | 187 | // Well, $board is going to be a number no matter what. |
| 176 | - else |
|
| 177 | - $board = 0; |
|
| 188 | + else { |
|
| 189 | + $board = 0; |
|
| 190 | + } |
|
| 178 | 191 | |
| 179 | 192 | // If there's a threadid, it's probably an old YaBB SE link. Flow with it. |
| 180 | - if (isset($_REQUEST['threadid']) && !isset($_REQUEST['topic'])) |
|
| 181 | - $_REQUEST['topic'] = $_REQUEST['threadid']; |
|
| 193 | + if (isset($_REQUEST['threadid']) && !isset($_REQUEST['topic'])) { |
|
| 194 | + $_REQUEST['topic'] = $_REQUEST['threadid']; |
|
| 195 | + } |
|
| 182 | 196 | |
| 183 | 197 | // We've got topic! |
| 184 | 198 | if (isset($_REQUEST['topic'])) |
@@ -187,11 +201,13 @@ discard block |
||
| 187 | 201 | $_REQUEST['topic'] = (string) $_REQUEST['topic']; |
| 188 | 202 | |
| 189 | 203 | // Slash means old, beta style, formatting. That's okay though, the link should still work. |
| 190 | - if (strpos($_REQUEST['topic'], '/') !== false) |
|
| 191 | - list ($_REQUEST['topic'], $_REQUEST['start']) = explode('/', $_REQUEST['topic']); |
|
| 204 | + if (strpos($_REQUEST['topic'], '/') !== false) { |
|
| 205 | + list ($_REQUEST['topic'], $_REQUEST['start']) = explode('/', $_REQUEST['topic']); |
|
| 206 | + } |
|
| 192 | 207 | // Dots are useful and fun ;). This is ?topic=1.15. |
| 193 | - elseif (strpos($_REQUEST['topic'], '.') !== false) |
|
| 194 | - list ($_REQUEST['topic'], $_REQUEST['start']) = explode('.', $_REQUEST['topic']); |
|
| 208 | + elseif (strpos($_REQUEST['topic'], '.') !== false) { |
|
| 209 | + list ($_REQUEST['topic'], $_REQUEST['start']) = explode('.', $_REQUEST['topic']); |
|
| 210 | + } |
|
| 195 | 211 | |
| 196 | 212 | // Topic should always be an integer |
| 197 | 213 | $topic = $_GET['topic'] = $_REQUEST['topic'] = (int) $_REQUEST['topic']; |
@@ -225,21 +241,25 @@ discard block |
||
| 225 | 241 | $_REQUEST['start'] = $timestamp === 0 ? 0 : 'from' . $timestamp; |
| 226 | 242 | } |
| 227 | 243 | // ... or something invalid, in which case we reset it to 0. |
| 228 | - else |
|
| 229 | - $_REQUEST['start'] = 0; |
|
| 244 | + else { |
|
| 245 | + $_REQUEST['start'] = 0; |
|
| 246 | + } |
|
| 247 | + } else { |
|
| 248 | + $topic = 0; |
|
| 230 | 249 | } |
| 231 | - else |
|
| 232 | - $topic = 0; |
|
| 233 | 250 | |
| 234 | 251 | // There should be a $_REQUEST['start'], some at least. If you need to default to other than 0, use $_GET['start']. |
| 235 | - if (empty($_REQUEST['start']) || $_REQUEST['start'] < 0 || (int) $_REQUEST['start'] > 2147473647) |
|
| 236 | - $_REQUEST['start'] = 0; |
|
| 252 | + if (empty($_REQUEST['start']) || $_REQUEST['start'] < 0 || (int) $_REQUEST['start'] > 2147473647) { |
|
| 253 | + $_REQUEST['start'] = 0; |
|
| 254 | + } |
|
| 237 | 255 | |
| 238 | 256 | // The action needs to be a string and not an array or anything else |
| 239 | - if (isset($_REQUEST['action'])) |
|
| 240 | - $_REQUEST['action'] = (string) $_REQUEST['action']; |
|
| 241 | - if (isset($_GET['action'])) |
|
| 242 | - $_GET['action'] = (string) $_GET['action']; |
|
| 257 | + if (isset($_REQUEST['action'])) { |
|
| 258 | + $_REQUEST['action'] = (string) $_REQUEST['action']; |
|
| 259 | + } |
|
| 260 | + if (isset($_GET['action'])) { |
|
| 261 | + $_GET['action'] = (string) $_GET['action']; |
|
| 262 | + } |
|
| 243 | 263 | |
| 244 | 264 | // Some mail providers like to encode semicolons in activation URLs... |
| 245 | 265 | if (!empty($_REQUEST['action']) && substr($_SERVER['QUERY_STRING'], 0, 18) == 'action=activate%3b') |
@@ -265,29 +285,33 @@ discard block |
||
| 265 | 285 | $_SERVER['BAN_CHECK_IP'] = $_SERVER['REMOTE_ADDR']; |
| 266 | 286 | |
| 267 | 287 | // If we haven't specified how to handle Reverse Proxy IP headers, lets do what we always used to do. |
| 268 | - if (!isset($modSettings['proxy_ip_header'])) |
|
| 269 | - $modSettings['proxy_ip_header'] = 'autodetect'; |
|
| 288 | + if (!isset($modSettings['proxy_ip_header'])) { |
|
| 289 | + $modSettings['proxy_ip_header'] = 'autodetect'; |
|
| 290 | + } |
|
| 270 | 291 | |
| 271 | 292 | // Which headers are we going to check for Reverse Proxy IP headers? |
| 272 | - if ($modSettings['proxy_ip_header'] == 'disabled') |
|
| 273 | - $reverseIPheaders = array(); |
|
| 274 | - elseif ($modSettings['proxy_ip_header'] == 'autodetect') |
|
| 275 | - $reverseIPheaders = array('HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP'); |
|
| 276 | - else |
|
| 277 | - $reverseIPheaders = array($modSettings['proxy_ip_header']); |
|
| 293 | + if ($modSettings['proxy_ip_header'] == 'disabled') { |
|
| 294 | + $reverseIPheaders = array(); |
|
| 295 | + } elseif ($modSettings['proxy_ip_header'] == 'autodetect') { |
|
| 296 | + $reverseIPheaders = array('HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP'); |
|
| 297 | + } else { |
|
| 298 | + $reverseIPheaders = array($modSettings['proxy_ip_header']); |
|
| 299 | + } |
|
| 278 | 300 | |
| 279 | 301 | // Find the user's IP address. (but don't let it give you 'unknown'!) |
| 280 | 302 | foreach ($reverseIPheaders as $proxyIPheader) |
| 281 | 303 | { |
| 282 | 304 | // Ignore if this is not set. |
| 283 | - if (!isset($_SERVER[$proxyIPheader])) |
|
| 284 | - continue; |
|
| 305 | + if (!isset($_SERVER[$proxyIPheader])) { |
|
| 306 | + continue; |
|
| 307 | + } |
|
| 285 | 308 | |
| 286 | 309 | if (!empty($modSettings['proxy_ip_servers'])) |
| 287 | 310 | { |
| 288 | - foreach (explode(',', $modSettings['proxy_ip_servers']) as $proxy) |
|
| 289 | - if ($proxy == $_SERVER['REMOTE_ADDR'] || matchIPtoCIDR($_SERVER['REMOTE_ADDR'], $proxy)) |
|
| 311 | + foreach (explode(',', $modSettings['proxy_ip_servers']) as $proxy) { |
|
| 312 | + if ($proxy == $_SERVER['REMOTE_ADDR'] || matchIPtoCIDR($_SERVER['REMOTE_ADDR'], $proxy)) |
|
| 290 | 313 | continue; |
| 314 | + } |
|
| 291 | 315 | } |
| 292 | 316 | |
| 293 | 317 | // If there are commas, get the last one.. probably. |
@@ -307,8 +331,9 @@ discard block |
||
| 307 | 331 | |
| 308 | 332 | // Just incase we have a legacy IPv4 address. |
| 309 | 333 | // @ TODO: Convert to IPv6. |
| 310 | - if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) |
|
| 311 | - continue; |
|
| 334 | + if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) { |
|
| 335 | + continue; |
|
| 336 | + } |
|
| 312 | 337 | } |
| 313 | 338 | |
| 314 | 339 | continue; |
@@ -320,36 +345,40 @@ discard block |
||
| 320 | 345 | } |
| 321 | 346 | } |
| 322 | 347 | // Otherwise just use the only one. |
| 323 | - elseif (preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER[$proxyIPheader]) == 0 || preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER['REMOTE_ADDR']) != 0) |
|
| 324 | - $_SERVER['BAN_CHECK_IP'] = $_SERVER[$proxyIPheader]; |
|
| 325 | - elseif (!isValidIPv6($_SERVER[$proxyIPheader]) || preg_match('~::ffff:\d+\.\d+\.\d+\.\d+~', $_SERVER[$proxyIPheader]) !== 0) |
|
| 348 | + elseif (preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER[$proxyIPheader]) == 0 || preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER['REMOTE_ADDR']) != 0) { |
|
| 349 | + $_SERVER['BAN_CHECK_IP'] = $_SERVER[$proxyIPheader]; |
|
| 350 | + } elseif (!isValidIPv6($_SERVER[$proxyIPheader]) || preg_match('~::ffff:\d+\.\d+\.\d+\.\d+~', $_SERVER[$proxyIPheader]) !== 0) |
|
| 326 | 351 | { |
| 327 | 352 | $_SERVER[$proxyIPheader] = preg_replace('~^::ffff:(\d+\.\d+\.\d+\.\d+)~', '\1', $_SERVER[$proxyIPheader]); |
| 328 | 353 | |
| 329 | 354 | // Just incase we have a legacy IPv4 address. |
| 330 | 355 | // @ TODO: Convert to IPv6. |
| 331 | - if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) |
|
| 332 | - continue; |
|
| 356 | + if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) { |
|
| 357 | + continue; |
|
| 358 | + } |
|
| 333 | 359 | } |
| 334 | 360 | } |
| 335 | 361 | |
| 336 | 362 | // Make sure we know the URL of the current request. |
| 337 | - if (empty($_SERVER['REQUEST_URI'])) |
|
| 338 | - $_SERVER['REQUEST_URL'] = $scripturl . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''); |
|
| 339 | - elseif (preg_match('~^([^/]+//[^/]+)~', $scripturl, $match) == 1) |
|
| 340 | - $_SERVER['REQUEST_URL'] = $match[1] . $_SERVER['REQUEST_URI']; |
|
| 341 | - else |
|
| 342 | - $_SERVER['REQUEST_URL'] = $_SERVER['REQUEST_URI']; |
|
| 363 | + if (empty($_SERVER['REQUEST_URI'])) { |
|
| 364 | + $_SERVER['REQUEST_URL'] = $scripturl . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''); |
|
| 365 | + } elseif (preg_match('~^([^/]+//[^/]+)~', $scripturl, $match) == 1) { |
|
| 366 | + $_SERVER['REQUEST_URL'] = $match[1] . $_SERVER['REQUEST_URI']; |
|
| 367 | + } else { |
|
| 368 | + $_SERVER['REQUEST_URL'] = $_SERVER['REQUEST_URI']; |
|
| 369 | + } |
|
| 343 | 370 | |
| 344 | 371 | // And make sure HTTP_USER_AGENT is set. |
| 345 | 372 | $_SERVER['HTTP_USER_AGENT'] = isset($_SERVER['HTTP_USER_AGENT']) ? (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($smcFunc['db_unescape_string']($_SERVER['HTTP_USER_AGENT']), ENT_QUOTES) : htmlspecialchars($smcFunc['db_unescape_string']($_SERVER['HTTP_USER_AGENT']), ENT_QUOTES)) : ''; |
| 346 | 373 | |
| 347 | 374 | // Some final checking. |
| 348 | - if (!isValidIP($_SERVER['BAN_CHECK_IP'])) |
|
| 349 | - $_SERVER['BAN_CHECK_IP'] = ''; |
|
| 350 | - if ($_SERVER['REMOTE_ADDR'] == 'unknown') |
|
| 351 | - $_SERVER['REMOTE_ADDR'] = ''; |
|
| 352 | -} |
|
| 375 | + if (!isValidIP($_SERVER['BAN_CHECK_IP'])) { |
|
| 376 | + $_SERVER['BAN_CHECK_IP'] = ''; |
|
| 377 | + } |
|
| 378 | + if ($_SERVER['REMOTE_ADDR'] == 'unknown') { |
|
| 379 | + $_SERVER['REMOTE_ADDR'] = ''; |
|
| 380 | + } |
|
| 381 | + } |
|
| 353 | 382 | |
| 354 | 383 | /** |
| 355 | 384 | * Validates a IPv6 address. returns true if it is ipv6. |
@@ -360,8 +389,9 @@ discard block |
||
| 360 | 389 | function isValidIPv6($ip) |
| 361 | 390 | { |
| 362 | 391 | //looking for : |
| 363 | - if (strpos($ip, ':') === false) |
|
| 364 | - return false; |
|
| 392 | + if (strpos($ip, ':') === false) { |
|
| 393 | + return false; |
|
| 394 | + } |
|
| 365 | 395 | |
| 366 | 396 | //check valid address |
| 367 | 397 | return filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6); |
@@ -379,8 +409,9 @@ discard block |
||
| 379 | 409 | static $converted = array(); |
| 380 | 410 | |
| 381 | 411 | // Check if we have done this already. |
| 382 | - if (isset($converted[$addr])) |
|
| 383 | - return $converted[$addr]; |
|
| 412 | + if (isset($converted[$addr])) { |
|
| 413 | + return $converted[$addr]; |
|
| 414 | + } |
|
| 384 | 415 | |
| 385 | 416 | // Check if there are segments missing, insert if necessary. |
| 386 | 417 | if (strpos($addr, '::') !== false) |
@@ -390,18 +421,20 @@ discard block |
||
| 390 | 421 | $part[1] = explode(':', $part[1]); |
| 391 | 422 | $missing = array(); |
| 392 | 423 | |
| 393 | - for ($i = 0; $i < (8 - (count($part[0]) + count($part[1]))); $i++) |
|
| 394 | - array_push($missing, '0000'); |
|
| 424 | + for ($i = 0; $i < (8 - (count($part[0]) + count($part[1]))); $i++) { |
|
| 425 | + array_push($missing, '0000'); |
|
| 426 | + } |
|
| 395 | 427 | |
| 396 | 428 | $part = array_merge($part[0], $missing, $part[1]); |
| 429 | + } else { |
|
| 430 | + $part = explode(':', $addr); |
|
| 397 | 431 | } |
| 398 | - else |
|
| 399 | - $part = explode(':', $addr); |
|
| 400 | 432 | |
| 401 | 433 | // Pad each segment until it has 4 digits. |
| 402 | - foreach ($part as &$p) |
|
| 403 | - while (strlen($p) < 4) |
|
| 434 | + foreach ($part as &$p) { |
|
| 435 | + while (strlen($p) < 4) |
|
| 404 | 436 | $p = '0' . $p; |
| 437 | + } |
|
| 405 | 438 | |
| 406 | 439 | unset($p); |
| 407 | 440 | |
@@ -412,11 +445,12 @@ discard block |
||
| 412 | 445 | $converted[$addr] = $result; |
| 413 | 446 | |
| 414 | 447 | // Quick check to make sure the length is as expected. |
| 415 | - if (!$strict_check || strlen($result) == 39) |
|
| 416 | - return $result; |
|
| 417 | - else |
|
| 418 | - return false; |
|
| 419 | -} |
|
| 448 | + if (!$strict_check || strlen($result) == 39) { |
|
| 449 | + return $result; |
|
| 450 | + } else { |
|
| 451 | + return false; |
|
| 452 | + } |
|
| 453 | + } |
|
| 420 | 454 | |
| 421 | 455 | |
| 422 | 456 | /** |
@@ -434,8 +468,9 @@ discard block |
||
| 434 | 468 | //v6? |
| 435 | 469 | if ((strpos($cidr_network, ':') !== false)) |
| 436 | 470 | { |
| 437 | - if (!filter_var($ip_address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) || !filter_var($cidr_network, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) |
|
| 438 | - return false; |
|
| 471 | + if (!filter_var($ip_address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) || !filter_var($cidr_network, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) { |
|
| 472 | + return false; |
|
| 473 | + } |
|
| 439 | 474 | |
| 440 | 475 | $ip_address = inet_pton($ip_address); |
| 441 | 476 | $cidr_network = inet_pton($cidr_network); |
@@ -457,10 +492,10 @@ discard block |
||
| 457 | 492 | $binMask = pack("H*" , $binMask); |
| 458 | 493 | |
| 459 | 494 | return ($ip_address & $binMask) == $cidr_network; |
| 495 | + } else { |
|
| 496 | + return (ip2long($ip_address) & (~((1 << (32 - $cidr_subnetmask)) - 1))) == ip2long($cidr_network); |
|
| 497 | + } |
|
| 460 | 498 | } |
| 461 | - else |
|
| 462 | - return (ip2long($ip_address) & (~((1 << (32 - $cidr_subnetmask)) - 1))) == ip2long($cidr_network); |
|
| 463 | -} |
|
| 464 | 499 | |
| 465 | 500 | /** |
| 466 | 501 | * Adds slashes to the array/variable. |
@@ -476,15 +511,17 @@ discard block |
||
| 476 | 511 | { |
| 477 | 512 | global $smcFunc; |
| 478 | 513 | |
| 479 | - if (!is_array($var)) |
|
| 480 | - return $smcFunc['db_escape_string']($var); |
|
| 514 | + if (!is_array($var)) { |
|
| 515 | + return $smcFunc['db_escape_string']($var); |
|
| 516 | + } |
|
| 481 | 517 | |
| 482 | 518 | // Reindex the array with slashes. |
| 483 | 519 | $new_var = array(); |
| 484 | 520 | |
| 485 | 521 | // Add slashes to every element, even the indexes! |
| 486 | - foreach ($var as $k => $v) |
|
| 487 | - $new_var[$smcFunc['db_escape_string']($k)] = escapestring__recursive($v); |
|
| 522 | + foreach ($var as $k => $v) { |
|
| 523 | + $new_var[$smcFunc['db_escape_string']($k)] = escapestring__recursive($v); |
|
| 524 | + } |
|
| 488 | 525 | |
| 489 | 526 | return $new_var; |
| 490 | 527 | } |
@@ -504,12 +541,14 @@ discard block |
||
| 504 | 541 | { |
| 505 | 542 | global $smcFunc; |
| 506 | 543 | |
| 507 | - if (!is_array($var)) |
|
| 508 | - return isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($var, ENT_QUOTES) : htmlspecialchars($var, ENT_QUOTES); |
|
| 544 | + if (!is_array($var)) { |
|
| 545 | + return isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($var, ENT_QUOTES) : htmlspecialchars($var, ENT_QUOTES); |
|
| 546 | + } |
|
| 509 | 547 | |
| 510 | 548 | // Add the htmlspecialchars to every element. |
| 511 | - foreach ($var as $k => $v) |
|
| 512 | - $var[$k] = $level > 25 ? null : htmlspecialchars__recursive($v, $level + 1); |
|
| 549 | + foreach ($var as $k => $v) { |
|
| 550 | + $var[$k] = $level > 25 ? null : htmlspecialchars__recursive($v, $level + 1); |
|
| 551 | + } |
|
| 513 | 552 | |
| 514 | 553 | return $var; |
| 515 | 554 | } |
@@ -527,15 +566,17 @@ discard block |
||
| 527 | 566 | */ |
| 528 | 567 | function urldecode__recursive($var, $level = 0) |
| 529 | 568 | { |
| 530 | - if (!is_array($var)) |
|
| 531 | - return urldecode($var); |
|
| 569 | + if (!is_array($var)) { |
|
| 570 | + return urldecode($var); |
|
| 571 | + } |
|
| 532 | 572 | |
| 533 | 573 | // Reindex the array... |
| 534 | 574 | $new_var = array(); |
| 535 | 575 | |
| 536 | 576 | // Add the htmlspecialchars to every element. |
| 537 | - foreach ($var as $k => $v) |
|
| 538 | - $new_var[urldecode($k)] = $level > 25 ? null : urldecode__recursive($v, $level + 1); |
|
| 577 | + foreach ($var as $k => $v) { |
|
| 578 | + $new_var[urldecode($k)] = $level > 25 ? null : urldecode__recursive($v, $level + 1); |
|
| 579 | + } |
|
| 539 | 580 | |
| 540 | 581 | return $new_var; |
| 541 | 582 | } |
@@ -553,15 +594,17 @@ discard block |
||
| 553 | 594 | { |
| 554 | 595 | global $smcFunc; |
| 555 | 596 | |
| 556 | - if (!is_array($var)) |
|
| 557 | - return $smcFunc['db_unescape_string']($var); |
|
| 597 | + if (!is_array($var)) { |
|
| 598 | + return $smcFunc['db_unescape_string']($var); |
|
| 599 | + } |
|
| 558 | 600 | |
| 559 | 601 | // Reindex the array without slashes, this time. |
| 560 | 602 | $new_var = array(); |
| 561 | 603 | |
| 562 | 604 | // Strip the slashes from every element. |
| 563 | - foreach ($var as $k => $v) |
|
| 564 | - $new_var[$smcFunc['db_unescape_string']($k)] = unescapestring__recursive($v); |
|
| 605 | + foreach ($var as $k => $v) { |
|
| 606 | + $new_var[$smcFunc['db_unescape_string']($k)] = unescapestring__recursive($v); |
|
| 607 | + } |
|
| 565 | 608 | |
| 566 | 609 | return $new_var; |
| 567 | 610 | } |
@@ -579,15 +622,17 @@ discard block |
||
| 579 | 622 | */ |
| 580 | 623 | function stripslashes__recursive($var, $level = 0) |
| 581 | 624 | { |
| 582 | - if (!is_array($var)) |
|
| 583 | - return stripslashes($var); |
|
| 625 | + if (!is_array($var)) { |
|
| 626 | + return stripslashes($var); |
|
| 627 | + } |
|
| 584 | 628 | |
| 585 | 629 | // Reindex the array without slashes, this time. |
| 586 | 630 | $new_var = array(); |
| 587 | 631 | |
| 588 | 632 | // Strip the slashes from every element. |
| 589 | - foreach ($var as $k => $v) |
|
| 590 | - $new_var[stripslashes($k)] = $level > 25 ? null : stripslashes__recursive($v, $level + 1); |
|
| 633 | + foreach ($var as $k => $v) { |
|
| 634 | + $new_var[stripslashes($k)] = $level > 25 ? null : stripslashes__recursive($v, $level + 1); |
|
| 635 | + } |
|
| 591 | 636 | |
| 592 | 637 | return $new_var; |
| 593 | 638 | } |
@@ -608,12 +653,14 @@ discard block |
||
| 608 | 653 | global $smcFunc; |
| 609 | 654 | |
| 610 | 655 | // Remove spaces (32), tabs (9), returns (13, 10, and 11), nulls (0), and hard spaces. (160) |
| 611 | - if (!is_array($var)) |
|
| 612 | - return isset($smcFunc) ? $smcFunc['htmltrim']($var) : trim($var, ' ' . "\t\n\r\x0B" . '\0' . "\xA0"); |
|
| 656 | + if (!is_array($var)) { |
|
| 657 | + return isset($smcFunc) ? $smcFunc['htmltrim']($var) : trim($var, ' ' . "\t\n\r\x0B" . '\0' . "\xA0"); |
|
| 658 | + } |
|
| 613 | 659 | |
| 614 | 660 | // Go through all the elements and remove the whitespace. |
| 615 | - foreach ($var as $k => $v) |
|
| 616 | - $var[$k] = $level > 25 ? null : htmltrim__recursive($v, $level + 1); |
|
| 661 | + foreach ($var as $k => $v) { |
|
| 662 | + $var[$k] = $level > 25 ? null : htmltrim__recursive($v, $level + 1); |
|
| 663 | + } |
|
| 617 | 664 | |
| 618 | 665 | return $var; |
| 619 | 666 | } |
@@ -678,30 +725,37 @@ discard block |
||
| 678 | 725 | global $scripturl, $modSettings, $context; |
| 679 | 726 | |
| 680 | 727 | // If $scripturl is set to nothing, or the SID is not defined (SSI?) just quit. |
| 681 | - if ($scripturl == '' || !defined('SID')) |
|
| 682 | - return $buffer; |
|
| 728 | + if ($scripturl == '' || !defined('SID')) { |
|
| 729 | + return $buffer; |
|
| 730 | + } |
|
| 683 | 731 | |
| 684 | 732 | // Do nothing if the session is cookied, or they are a crawler - guests are caught by redirectexit(). This doesn't work below PHP 4.3.0, because it makes the output buffer bigger. |
| 685 | 733 | // @todo smflib |
| 686 | - if (empty($_COOKIE) && SID != '' && !isBrowser('possibly_robot')) |
|
| 687 | - $buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', '"' . $scripturl . '?' . SID . '&', $buffer); |
|
| 734 | + if (empty($_COOKIE) && SID != '' && !isBrowser('possibly_robot')) { |
|
| 735 | + $buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', '"' . $scripturl . '?' . SID . '&', $buffer); |
|
| 736 | + } |
|
| 688 | 737 | // Debugging templates, are we? |
| 689 | - elseif (isset($_GET['debug'])) |
|
| 690 | - $buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '\\??/', '"' . $scripturl . '?debug;', $buffer); |
|
| 738 | + elseif (isset($_GET['debug'])) { |
|
| 739 | + $buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '\\??/', '"' . $scripturl . '?debug;', $buffer); |
|
| 740 | + } |
|
| 691 | 741 | |
| 692 | 742 | // This should work even in 4.2.x, just not CGI without cgi.fix_pathinfo. |
| 693 | 743 | if (!empty($modSettings['queryless_urls']) && (!$context['server']['is_cgi'] || ini_get('cgi.fix_pathinfo') == 1 || @get_cfg_var('cgi.fix_pathinfo') == 1) && ($context['server']['is_apache'] || $context['server']['is_lighttpd'] || $context['server']['is_litespeed'])) |
| 694 | 744 | { |
| 695 | 745 | // Let's do something special for session ids! |
| 696 | - if (defined('SID') && SID != '') |
|
| 697 | - $buffer = preg_replace_callback('~"' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&))((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m) |
|
| 746 | + if (defined('SID') && SID != '') { |
|
| 747 | + $buffer = preg_replace_callback('~"' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&))((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m) |
|
| 698 | 748 | { |
| 699 | - global $scripturl; return '"' . $scripturl . "/" . strtr("$m[1]", '&;=', '//,') . ".html?" . SID . (isset($m[2]) ? $m[2] : "") . '"'; |
|
| 749 | + global $scripturl; |
|
| 750 | + } |
|
| 751 | + return '"' . $scripturl . "/" . strtr("$m[1]", '&;=', '//,') . ".html?" . SID . (isset($m[2]) ? $m[2] : "") . '"'; |
|
| 700 | 752 | }, $buffer); |
| 701 | - else |
|
| 702 | - $buffer = preg_replace_callback('~"' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m) |
|
| 753 | + else { |
|
| 754 | + $buffer = preg_replace_callback('~"' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m) |
|
| 703 | 755 | { |
| 704 | - global $scripturl; return '"' . $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? $m[2] : "") . '"'; |
|
| 756 | + global $scripturl; |
|
| 757 | + } |
|
| 758 | + return '"' . $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? $m[2] : "") . '"'; |
|
| 705 | 759 | }, $buffer); |
| 706 | 760 | } |
| 707 | 761 | |
@@ -13,8 +13,9 @@ discard block |
||
| 13 | 13 | * @version 2.1 Beta 4 |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | -if (!defined('SMF')) |
|
| 16 | +if (!defined('SMF')) { |
|
| 17 | 17 | die('No direct access...'); |
| 18 | +} |
|
| 18 | 19 | |
| 19 | 20 | /** |
| 20 | 21 | * Scheduled tasks management dispatcher. This function checks permissions and delegates |
@@ -41,10 +42,11 @@ discard block |
||
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | 44 | // We need to find what's the action. |
| 44 | - if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) |
|
| 45 | - $context['sub_action'] = $_REQUEST['sa']; |
|
| 46 | - else |
|
| 47 | - $context['sub_action'] = 'tasks'; |
|
| 45 | + if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) { |
|
| 46 | + $context['sub_action'] = $_REQUEST['sa']; |
|
| 47 | + } else { |
|
| 48 | + $context['sub_action'] = 'tasks'; |
|
| 49 | + } |
|
| 48 | 50 | |
| 49 | 51 | // Now for the lovely tabs. That we all love. |
| 50 | 52 | $context[$context['admin_menu_name']]['tab_data'] = array( |
@@ -94,9 +96,10 @@ discard block |
||
| 94 | 96 | |
| 95 | 97 | // Enable and disable as required. |
| 96 | 98 | $enablers = array(0); |
| 97 | - foreach ($_POST['enable_task'] as $id => $enabled) |
|
| 98 | - if ($enabled) |
|
| 99 | + foreach ($_POST['enable_task'] as $id => $enabled) { |
|
| 100 | + if ($enabled) |
|
| 99 | 101 | $enablers[] = (int) $id; |
| 102 | + } |
|
| 100 | 103 | |
| 101 | 104 | // Do the update! |
| 102 | 105 | $smcFunc['db_query']('', ' |
@@ -134,8 +137,9 @@ discard block |
||
| 134 | 137 | |
| 135 | 138 | // Lets figure out which ones they want to run. |
| 136 | 139 | $tasks = array(); |
| 137 | - foreach ($_POST['run_task'] as $task => $dummy) |
|
| 138 | - $tasks[] = (int) $task; |
|
| 140 | + foreach ($_POST['run_task'] as $task => $dummy) { |
|
| 141 | + $tasks[] = (int) $task; |
|
| 142 | + } |
|
| 139 | 143 | |
| 140 | 144 | // Load up the tasks. |
| 141 | 145 | $request = $smcFunc['db_query']('', ' |
@@ -155,36 +159,41 @@ discard block |
||
| 155 | 159 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 156 | 160 | { |
| 157 | 161 | // What kind of task are we handling? |
| 158 | - if (!empty($row['callable'])) |
|
| 159 | - $task_string = $row['callable']; |
|
| 162 | + if (!empty($row['callable'])) { |
|
| 163 | + $task_string = $row['callable']; |
|
| 164 | + } |
|
| 160 | 165 | |
| 161 | 166 | // Default SMF task or old mods? |
| 162 | - elseif (function_exists('scheduled_' . $row['task'])) |
|
| 163 | - $task_string = 'scheduled_' . $row['task']; |
|
| 167 | + elseif (function_exists('scheduled_' . $row['task'])) { |
|
| 168 | + $task_string = 'scheduled_' . $row['task']; |
|
| 169 | + } |
|
| 164 | 170 | |
| 165 | 171 | // One last resource, the task name. |
| 166 | - elseif (!empty($row['task'])) |
|
| 167 | - $task_string = $row['task']; |
|
| 172 | + elseif (!empty($row['task'])) { |
|
| 173 | + $task_string = $row['task']; |
|
| 174 | + } |
|
| 168 | 175 | |
| 169 | 176 | $start_time = microtime(); |
| 170 | 177 | // The functions got to exist for us to use it. |
| 171 | - if (empty($task_string)) |
|
| 172 | - continue; |
|
| 178 | + if (empty($task_string)) { |
|
| 179 | + continue; |
|
| 180 | + } |
|
| 173 | 181 | |
| 174 | 182 | // Try to stop a timeout, this would be bad... |
| 175 | 183 | @set_time_limit(300); |
| 176 | - if (function_exists('apache_reset_timeout')) |
|
| 177 | - @apache_reset_timeout(); |
|
| 184 | + if (function_exists('apache_reset_timeout')) { |
|
| 185 | + @apache_reset_timeout(); |
|
| 186 | + } |
|
| 178 | 187 | |
| 179 | 188 | // Get the callable. |
| 180 | 189 | $callable_task = call_helper($task_string, true); |
| 181 | 190 | |
| 182 | 191 | // Perform the task. |
| 183 | - if (!empty($callable_task)) |
|
| 184 | - $completed = call_user_func($callable_task); |
|
| 185 | - |
|
| 186 | - else |
|
| 187 | - $completed = false; |
|
| 192 | + if (!empty($callable_task)) { |
|
| 193 | + $completed = call_user_func($callable_task); |
|
| 194 | + } else { |
|
| 195 | + $completed = false; |
|
| 196 | + } |
|
| 188 | 197 | |
| 189 | 198 | // Log that we did it ;) |
| 190 | 199 | if ($completed) |
@@ -201,8 +210,9 @@ discard block |
||
| 201 | 210 | $smcFunc['db_free_result']($request); |
| 202 | 211 | |
| 203 | 212 | // If we had any errors, push them to session so we can pick them up next time to tell the user. |
| 204 | - if (!empty($context['scheduled_errors'])) |
|
| 205 | - $_SESSION['st_error'] = $context['scheduled_errors']; |
|
| 213 | + if (!empty($context['scheduled_errors'])) { |
|
| 214 | + $_SESSION['st_error'] = $context['scheduled_errors']; |
|
| 215 | + } |
|
| 206 | 216 | |
| 207 | 217 | redirectexit('action=admin;area=scheduledtasks;done'); |
| 208 | 218 | } |
@@ -374,8 +384,9 @@ discard block |
||
| 374 | 384 | $context['server_time'] = timeformat(time(), false, 'server'); |
| 375 | 385 | |
| 376 | 386 | // Cleaning... |
| 377 | - if (!isset($_GET['tid'])) |
|
| 378 | - fatal_lang_error('no_access', false); |
|
| 387 | + if (!isset($_GET['tid'])) { |
|
| 388 | + fatal_lang_error('no_access', false); |
|
| 389 | + } |
|
| 379 | 390 | $_GET['tid'] = (int) $_GET['tid']; |
| 380 | 391 | |
| 381 | 392 | // Saving? |
@@ -391,10 +402,12 @@ discard block |
||
| 391 | 402 | preg_match('~(\d{1,2}):(\d{1,2})~', $_POST['offset'], $matches); |
| 392 | 403 | |
| 393 | 404 | // If a half is empty then assume zero offset! |
| 394 | - if (!isset($matches[2]) || $matches[2] > 59) |
|
| 395 | - $matches[2] = 0; |
|
| 396 | - if (!isset($matches[1]) || $matches[1] > 23) |
|
| 397 | - $matches[1] = 0; |
|
| 405 | + if (!isset($matches[2]) || $matches[2] > 59) { |
|
| 406 | + $matches[2] = 0; |
|
| 407 | + } |
|
| 408 | + if (!isset($matches[1]) || $matches[1] > 23) { |
|
| 409 | + $matches[1] = 0; |
|
| 410 | + } |
|
| 398 | 411 | |
| 399 | 412 | // Now the offset is easy; easy peasy - except we need to offset by a few hours... |
| 400 | 413 | $offset = $matches[1] * 3600 + $matches[2] * 60 - date('Z'); |
@@ -404,8 +417,9 @@ discard block |
||
| 404 | 417 | $unit = in_array(substr($_POST['unit'], 0, 1), array('m', 'h', 'd', 'w')) ? substr($_POST['unit'], 0, 1) : 'd'; |
| 405 | 418 | |
| 406 | 419 | // Don't allow one minute intervals. |
| 407 | - if ($interval == 1 && $unit == 'm') |
|
| 408 | - $interval = 2; |
|
| 420 | + if ($interval == 1 && $unit == 'm') { |
|
| 421 | + $interval = 2; |
|
| 422 | + } |
|
| 409 | 423 | |
| 410 | 424 | // Is it disabled? |
| 411 | 425 | $disabled = !isset($_POST['enabled']) ? 1 : 0; |
@@ -443,8 +457,9 @@ discard block |
||
| 443 | 457 | ); |
| 444 | 458 | |
| 445 | 459 | // Should never, ever, happen! |
| 446 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
| 447 | - fatal_lang_error('no_access', false); |
|
| 460 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
| 461 | + fatal_lang_error('no_access', false); |
|
| 462 | + } |
|
| 448 | 463 | |
| 449 | 464 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 450 | 465 | { |
@@ -602,13 +617,14 @@ discard block |
||
| 602 | 617 | ) |
| 603 | 618 | ); |
| 604 | 619 | $log_entries = array(); |
| 605 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 606 | - $log_entries[] = array( |
|
| 620 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 621 | + $log_entries[] = array( |
|
| 607 | 622 | 'id' => $row['id_log'], |
| 608 | 623 | 'name' => isset($txt['scheduled_task_' . $row['task']]) ? $txt['scheduled_task_' . $row['task']] : $row['task'], |
| 609 | 624 | 'time_run' => $row['time_run'], |
| 610 | 625 | 'time_taken' => $row['time_taken'], |
| 611 | 626 | ); |
| 627 | + } |
|
| 612 | 628 | $smcFunc['db_free_result']($request); |
| 613 | 629 | |
| 614 | 630 | return $log_entries; |
@@ -649,8 +665,9 @@ discard block |
||
| 649 | 665 | |
| 650 | 666 | call_integration_hook('integrate_scheduled_tasks_settings', array(&$config_vars)); |
| 651 | 667 | |
| 652 | - if ($return_config) |
|
| 653 | - return $config_vars; |
|
| 668 | + if ($return_config) { |
|
| 669 | + return $config_vars; |
|
| 670 | + } |
|
| 654 | 671 | |
| 655 | 672 | // Set up the template. |
| 656 | 673 | $context['page_title'] = $txt['scheduled_tasks_settings']; |
@@ -15,8 +15,9 @@ discard block |
||
| 15 | 15 | * @version 2.1 Beta 4 |
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | -if (!defined('SMF')) |
|
| 18 | +if (!defined('SMF')) { |
|
| 19 | 19 | die('No direct access...'); |
| 20 | +} |
|
| 20 | 21 | |
| 21 | 22 | /** |
| 22 | 23 | * Begin the registration process. |
@@ -29,19 +30,23 @@ discard block |
||
| 29 | 30 | global $language, $scripturl, $smcFunc, $sourcedir, $cur_profile; |
| 30 | 31 | |
| 31 | 32 | // Is this an incoming AJAX check? |
| 32 | - if (isset($_GET['sa']) && $_GET['sa'] == 'usernamecheck') |
|
| 33 | - return RegisterCheckUsername(); |
|
| 33 | + if (isset($_GET['sa']) && $_GET['sa'] == 'usernamecheck') { |
|
| 34 | + return RegisterCheckUsername(); |
|
| 35 | + } |
|
| 34 | 36 | |
| 35 | 37 | // Check if the administrator has it disabled. |
| 36 | - if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == '3') |
|
| 37 | - fatal_lang_error('registration_disabled', false); |
|
| 38 | + if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == '3') { |
|
| 39 | + fatal_lang_error('registration_disabled', false); |
|
| 40 | + } |
|
| 38 | 41 | |
| 39 | 42 | // If this user is an admin - redirect them to the admin registration page. |
| 40 | - if (allowedTo('moderate_forum') && !$user_info['is_guest']) |
|
| 41 | - redirectexit('action=admin;area=regcenter;sa=register'); |
|
| 43 | + if (allowedTo('moderate_forum') && !$user_info['is_guest']) { |
|
| 44 | + redirectexit('action=admin;area=regcenter;sa=register'); |
|
| 45 | + } |
|
| 42 | 46 | // You are not a guest, so you are a member - and members don't get to register twice! |
| 43 | - elseif (empty($user_info['is_guest'])) |
|
| 44 | - redirectexit(); |
|
| 47 | + elseif (empty($user_info['is_guest'])) { |
|
| 48 | + redirectexit(); |
|
| 49 | + } |
|
| 45 | 50 | |
| 46 | 51 | loadLanguage('Login'); |
| 47 | 52 | loadTemplate('Register'); |
@@ -82,16 +87,18 @@ discard block |
||
| 82 | 87 | } |
| 83 | 88 | } |
| 84 | 89 | // Make sure they don't squeeze through without agreeing. |
| 85 | - elseif ($current_step > 1 && $context['require_agreement'] && !$context['registration_passed_agreement']) |
|
| 86 | - $current_step = 1; |
|
| 90 | + elseif ($current_step > 1 && $context['require_agreement'] && !$context['registration_passed_agreement']) { |
|
| 91 | + $current_step = 1; |
|
| 92 | + } |
|
| 87 | 93 | |
| 88 | 94 | // Show the user the right form. |
| 89 | 95 | $context['sub_template'] = $current_step == 1 ? 'registration_agreement' : 'registration_form'; |
| 90 | 96 | $context['page_title'] = $current_step == 1 ? $txt['registration_agreement'] : $txt['registration_form']; |
| 91 | 97 | |
| 92 | 98 | // Kinda need this. |
| 93 | - if ($context['sub_template'] == 'registration_form') |
|
| 94 | - loadJavaScriptFile('register.js', array('defer' => false, 'minimize' => true), 'smf_register'); |
|
| 99 | + if ($context['sub_template'] == 'registration_form') { |
|
| 100 | + loadJavaScriptFile('register.js', array('defer' => false, 'minimize' => true), 'smf_register'); |
|
| 101 | + } |
|
| 95 | 102 | |
| 96 | 103 | // Add the register chain to the link tree. |
| 97 | 104 | $context['linktree'][] = array( |
@@ -100,24 +107,26 @@ discard block |
||
| 100 | 107 | ); |
| 101 | 108 | |
| 102 | 109 | // Prepare the time gate! Do it like so, in case later steps want to reset the limit for any reason, but make sure the time is the current one. |
| 103 | - if (!isset($_SESSION['register'])) |
|
| 104 | - $_SESSION['register'] = array( |
|
| 110 | + if (!isset($_SESSION['register'])) { |
|
| 111 | + $_SESSION['register'] = array( |
|
| 105 | 112 | 'timenow' => time(), |
| 106 | 113 | 'limit' => 10, // minimum number of seconds required on this page for registration |
| 107 | 114 | ); |
| 108 | - else |
|
| 109 | - $_SESSION['register']['timenow'] = time(); |
|
| 115 | + } else { |
|
| 116 | + $_SESSION['register']['timenow'] = time(); |
|
| 117 | + } |
|
| 110 | 118 | |
| 111 | 119 | // If you have to agree to the agreement, it needs to be fetched from the file. |
| 112 | 120 | if ($context['require_agreement']) |
| 113 | 121 | { |
| 114 | 122 | // Have we got a localized one? |
| 115 | - if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt')) |
|
| 116 | - $context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']); |
|
| 117 | - elseif (file_exists($boarddir . '/agreement.txt')) |
|
| 118 | - $context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement'); |
|
| 119 | - else |
|
| 120 | - $context['agreement'] = ''; |
|
| 123 | + if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt')) { |
|
| 124 | + $context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']); |
|
| 125 | + } elseif (file_exists($boarddir . '/agreement.txt')) { |
|
| 126 | + $context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement'); |
|
| 127 | + } else { |
|
| 128 | + $context['agreement'] = ''; |
|
| 129 | + } |
|
| 121 | 130 | |
| 122 | 131 | // Nothing to show, lets disable registration and inform the admin of this error |
| 123 | 132 | if (empty($context['agreement'])) |
@@ -133,8 +142,9 @@ discard block |
||
| 133 | 142 | $selectedLanguage = empty($_SESSION['language']) ? $language : $_SESSION['language']; |
| 134 | 143 | |
| 135 | 144 | // Do we have any languages? |
| 136 | - if (empty($context['languages'])) |
|
| 137 | - getLanguages(); |
|
| 145 | + if (empty($context['languages'])) { |
|
| 146 | + getLanguages(); |
|
| 147 | + } |
|
| 138 | 148 | |
| 139 | 149 | // Try to find our selected language. |
| 140 | 150 | foreach ($context['languages'] as $key => $lang) |
@@ -142,8 +152,9 @@ discard block |
||
| 142 | 152 | $context['languages'][$key]['name'] = strtr($lang['name'], array('-utf8' => '')); |
| 143 | 153 | |
| 144 | 154 | // Found it! |
| 145 | - if ($selectedLanguage == $lang['filename']) |
|
| 146 | - $context['languages'][$key]['selected'] = true; |
|
| 155 | + if ($selectedLanguage == $lang['filename']) { |
|
| 156 | + $context['languages'][$key]['selected'] = true; |
|
| 157 | + } |
|
| 147 | 158 | } |
| 148 | 159 | } |
| 149 | 160 | |
@@ -170,16 +181,19 @@ discard block |
||
| 170 | 181 | if (in_array('website', $reg_fields)) |
| 171 | 182 | { |
| 172 | 183 | unset($reg_fields['website']); |
| 173 | - if (isset($_POST['website_title'])) |
|
| 174 | - $cur_profile['website_title'] = $smcFunc['htmlspecialchars']($_POST['website_title']); |
|
| 175 | - if (isset($_POST['website_url'])) |
|
| 176 | - $cur_profile['website_url'] = $smcFunc['htmlspecialchars']($_POST['website_url']); |
|
| 184 | + if (isset($_POST['website_title'])) { |
|
| 185 | + $cur_profile['website_title'] = $smcFunc['htmlspecialchars']($_POST['website_title']); |
|
| 186 | + } |
|
| 187 | + if (isset($_POST['website_url'])) { |
|
| 188 | + $cur_profile['website_url'] = $smcFunc['htmlspecialchars']($_POST['website_url']); |
|
| 189 | + } |
|
| 177 | 190 | } |
| 178 | 191 | |
| 179 | 192 | // We might have had some submissions on this front - go check. |
| 180 | - foreach ($reg_fields as $field) |
|
| 181 | - if (isset($_POST[$field])) |
|
| 193 | + foreach ($reg_fields as $field) { |
|
| 194 | + if (isset($_POST[$field])) |
|
| 182 | 195 | $cur_profile[$field] = $smcFunc['htmlspecialchars']($_POST[$field]); |
| 196 | + } |
|
| 183 | 197 | |
| 184 | 198 | // Load all the fields in question. |
| 185 | 199 | setupProfileContext($reg_fields); |
@@ -196,8 +210,9 @@ discard block |
||
| 196 | 210 | $context['visual_verification_id'] = $verificationOptions['id']; |
| 197 | 211 | } |
| 198 | 212 | // Otherwise we have nothing to show. |
| 199 | - else |
|
| 200 | - $context['visual_verification'] = false; |
|
| 213 | + else { |
|
| 214 | + $context['visual_verification'] = false; |
|
| 215 | + } |
|
| 201 | 216 | |
| 202 | 217 | |
| 203 | 218 | $context += array( |
@@ -208,8 +223,9 @@ discard block |
||
| 208 | 223 | |
| 209 | 224 | // Were there any errors? |
| 210 | 225 | $context['registration_errors'] = array(); |
| 211 | - if (!empty($reg_errors)) |
|
| 212 | - $context['registration_errors'] = $reg_errors; |
|
| 226 | + if (!empty($reg_errors)) { |
|
| 227 | + $context['registration_errors'] = $reg_errors; |
|
| 228 | + } |
|
| 213 | 229 | |
| 214 | 230 | createToken('register'); |
| 215 | 231 | } |
@@ -226,27 +242,32 @@ discard block |
||
| 226 | 242 | validateToken('register'); |
| 227 | 243 | |
| 228 | 244 | // Check to ensure we're forcing SSL for authentication |
| 229 | - if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) |
|
| 230 | - fatal_lang_error('register_ssl_required'); |
|
| 245 | + if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) { |
|
| 246 | + fatal_lang_error('register_ssl_required'); |
|
| 247 | + } |
|
| 231 | 248 | |
| 232 | 249 | // Start collecting together any errors. |
| 233 | 250 | $reg_errors = array(); |
| 234 | 251 | |
| 235 | 252 | // You can't register if it's disabled. |
| 236 | - if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3) |
|
| 237 | - fatal_lang_error('registration_disabled', false); |
|
| 253 | + if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3) { |
|
| 254 | + fatal_lang_error('registration_disabled', false); |
|
| 255 | + } |
|
| 238 | 256 | |
| 239 | 257 | // Well, if you don't agree, you can't register. |
| 240 | - if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed'])) |
|
| 241 | - redirectexit(); |
|
| 258 | + if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed'])) { |
|
| 259 | + redirectexit(); |
|
| 260 | + } |
|
| 242 | 261 | |
| 243 | 262 | // Make sure they came from *somewhere*, have a session. |
| 244 | - if (!isset($_SESSION['old_url'])) |
|
| 245 | - redirectexit('action=signup'); |
|
| 263 | + if (!isset($_SESSION['old_url'])) { |
|
| 264 | + redirectexit('action=signup'); |
|
| 265 | + } |
|
| 246 | 266 | |
| 247 | 267 | // If we don't require an agreement, we need a extra check for coppa. |
| 248 | - if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge'])) |
|
| 249 | - $_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']); |
|
| 268 | + if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge'])) { |
|
| 269 | + $_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']); |
|
| 270 | + } |
|
| 250 | 271 | // Are they under age, and under age users are banned? |
| 251 | 272 | if (!empty($modSettings['coppaAge']) && empty($modSettings['coppaType']) && empty($_SESSION['skip_coppa'])) |
| 252 | 273 | { |
@@ -255,8 +276,9 @@ discard block |
||
| 255 | 276 | } |
| 256 | 277 | |
| 257 | 278 | // Check the time gate for miscreants. First make sure they came from somewhere that actually set it up. |
| 258 | - if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit'])) |
|
| 259 | - redirectexit('action=signup'); |
|
| 279 | + if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit'])) { |
|
| 280 | + redirectexit('action=signup'); |
|
| 281 | + } |
|
| 260 | 282 | // Failing that, check the time on it. |
| 261 | 283 | if (time() - $_SESSION['register']['timenow'] < $_SESSION['register']['limit']) |
| 262 | 284 | { |
@@ -276,8 +298,9 @@ discard block |
||
| 276 | 298 | if (is_array($context['visual_verification'])) |
| 277 | 299 | { |
| 278 | 300 | loadLanguage('Errors'); |
| 279 | - foreach ($context['visual_verification'] as $error) |
|
| 280 | - $reg_errors[] = $txt['error_' . $error]; |
|
| 301 | + foreach ($context['visual_verification'] as $error) { |
|
| 302 | + $reg_errors[] = $txt['error_' . $error]; |
|
| 303 | + } |
|
| 281 | 304 | } |
| 282 | 305 | } |
| 283 | 306 | |
@@ -286,14 +309,16 @@ discard block |
||
| 286 | 309 | if (!is_array($_POST[$key])) |
| 287 | 310 | { |
| 288 | 311 | // For UTF-8, replace any kind of space with a normal space, and remove any kind of control character (incl. "\n" and "\r"), then trim. |
| 289 | - if ($context['utf8']) |
|
| 290 | - $_POST[$key] = $smcFunc['htmltrim'](preg_replace(array('~\p{Z}+~u', '~\p{C}+~u'), array(' ', ''), $_POST[$key])); |
|
| 312 | + if ($context['utf8']) { |
|
| 313 | + $_POST[$key] = $smcFunc['htmltrim'](preg_replace(array('~\p{Z}+~u', '~\p{C}+~u'), array(' ', ''), $_POST[$key])); |
|
| 314 | + } |
|
| 291 | 315 | // Otherwise, just remove "\n" and "\r", then trim. |
| 292 | - else |
|
| 293 | - $_POST[$key] = $smcFunc['htmltrim'](str_replace(array("\n", "\r"), '', $_POST[$key])); |
|
| 316 | + else { |
|
| 317 | + $_POST[$key] = $smcFunc['htmltrim'](str_replace(array("\n", "\r"), '', $_POST[$key])); |
|
| 318 | + } |
|
| 319 | + } else { |
|
| 320 | + $_POST[$key] = htmltrim__recursive($_POST[$key]); |
|
| 294 | 321 | } |
| 295 | - else |
|
| 296 | - $_POST[$key] = htmltrim__recursive($_POST[$key]); |
|
| 297 | 322 | } |
| 298 | 323 | |
| 299 | 324 | // Collect all extra registration fields someone might have filled in. |
@@ -328,13 +353,15 @@ discard block |
||
| 328 | 353 | $possible_strings = array_merge(array('website_url', 'website_title'), $possible_strings); |
| 329 | 354 | |
| 330 | 355 | // Make sure their website URL is squeaky clean |
| 331 | - if (isset($_POST['website_url'])) |
|
| 332 | - $_POST['website_url'] = (string) validate_iri(sanitize_iri($_POST['website_url'])); |
|
| 356 | + if (isset($_POST['website_url'])) { |
|
| 357 | + $_POST['website_url'] = (string) validate_iri(sanitize_iri($_POST['website_url'])); |
|
| 358 | + } |
|
| 333 | 359 | } |
| 334 | 360 | } |
| 335 | 361 | |
| 336 | - if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '') |
|
| 337 | - $_POST['secret_answer'] = md5($_POST['secret_answer']); |
|
| 362 | + if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '') { |
|
| 363 | + $_POST['secret_answer'] = md5($_POST['secret_answer']); |
|
| 364 | + } |
|
| 338 | 365 | |
| 339 | 366 | // Needed for isReservedName() and registerMember(). |
| 340 | 367 | require_once($sourcedir . '/Subs-Members.php'); |
@@ -343,8 +370,9 @@ discard block |
||
| 343 | 370 | if (isset($_POST['real_name'])) |
| 344 | 371 | { |
| 345 | 372 | // Are you already allowed to edit the displayed name? |
| 346 | - if (allowedTo('profile_displayed_name') || allowedTo('moderate_forum')) |
|
| 347 | - $canEditDisplayName = true; |
|
| 373 | + if (allowedTo('profile_displayed_name') || allowedTo('moderate_forum')) { |
|
| 374 | + $canEditDisplayName = true; |
|
| 375 | + } |
|
| 348 | 376 | |
| 349 | 377 | // If you are a guest, will you be allowed to once you register? |
| 350 | 378 | else |
@@ -363,32 +391,37 @@ discard block |
||
| 363 | 391 | } |
| 364 | 392 | |
| 365 | 393 | // Only set it if you can and if we are sure it is good |
| 366 | - if ($canEditDisplayName && $smcFunc['htmltrim']($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60) |
|
| 367 | - $possible_strings[] = 'real_name'; |
|
| 394 | + if ($canEditDisplayName && $smcFunc['htmltrim']($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60) { |
|
| 395 | + $possible_strings[] = 'real_name'; |
|
| 396 | + } |
|
| 368 | 397 | } |
| 369 | 398 | |
| 370 | 399 | // Handle a string as a birthdate... |
| 371 | - if (isset($_POST['birthdate']) && $_POST['birthdate'] != '') |
|
| 372 | - $_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate'])); |
|
| 400 | + if (isset($_POST['birthdate']) && $_POST['birthdate'] != '') { |
|
| 401 | + $_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate'])); |
|
| 402 | + } |
|
| 373 | 403 | // Or birthdate parts... |
| 374 | - elseif (!empty($_POST['bday1']) && !empty($_POST['bday2'])) |
|
| 375 | - $_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']); |
|
| 404 | + elseif (!empty($_POST['bday1']) && !empty($_POST['bday2'])) { |
|
| 405 | + $_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']); |
|
| 406 | + } |
|
| 376 | 407 | |
| 377 | 408 | // Validate the passed language file. |
| 378 | 409 | if (isset($_POST['lngfile']) && !empty($modSettings['userLanguage'])) |
| 379 | 410 | { |
| 380 | 411 | // Do we have any languages? |
| 381 | - if (empty($context['languages'])) |
|
| 382 | - getLanguages(); |
|
| 412 | + if (empty($context['languages'])) { |
|
| 413 | + getLanguages(); |
|
| 414 | + } |
|
| 383 | 415 | |
| 384 | 416 | // Did we find it? |
| 385 | - if (isset($context['languages'][$_POST['lngfile']])) |
|
| 386 | - $_SESSION['language'] = $_POST['lngfile']; |
|
| 387 | - else |
|
| 417 | + if (isset($context['languages'][$_POST['lngfile']])) { |
|
| 418 | + $_SESSION['language'] = $_POST['lngfile']; |
|
| 419 | + } else { |
|
| 420 | + unset($_POST['lngfile']); |
|
| 421 | + } |
|
| 422 | + } else { |
|
| 388 | 423 | unset($_POST['lngfile']); |
| 389 | 424 | } |
| 390 | - else |
|
| 391 | - unset($_POST['lngfile']); |
|
| 392 | 425 | |
| 393 | 426 | // Set the options needed for registration. |
| 394 | 427 | $regOptions = array( |
@@ -408,22 +441,27 @@ discard block |
||
| 408 | 441 | ); |
| 409 | 442 | |
| 410 | 443 | // Include the additional options that might have been filled in. |
| 411 | - foreach ($possible_strings as $var) |
|
| 412 | - if (isset($_POST[$var])) |
|
| 444 | + foreach ($possible_strings as $var) { |
|
| 445 | + if (isset($_POST[$var])) |
|
| 413 | 446 | $regOptions['extra_register_vars'][$var] = $smcFunc['htmlspecialchars']($_POST[$var], ENT_QUOTES); |
| 414 | - foreach ($possible_ints as $var) |
|
| 415 | - if (isset($_POST[$var])) |
|
| 447 | + } |
|
| 448 | + foreach ($possible_ints as $var) { |
|
| 449 | + if (isset($_POST[$var])) |
|
| 416 | 450 | $regOptions['extra_register_vars'][$var] = (int) $_POST[$var]; |
| 417 | - foreach ($possible_floats as $var) |
|
| 418 | - if (isset($_POST[$var])) |
|
| 451 | + } |
|
| 452 | + foreach ($possible_floats as $var) { |
|
| 453 | + if (isset($_POST[$var])) |
|
| 419 | 454 | $regOptions['extra_register_vars'][$var] = (float) $_POST[$var]; |
| 420 | - foreach ($possible_bools as $var) |
|
| 421 | - if (isset($_POST[$var])) |
|
| 455 | + } |
|
| 456 | + foreach ($possible_bools as $var) { |
|
| 457 | + if (isset($_POST[$var])) |
|
| 422 | 458 | $regOptions['extra_register_vars'][$var] = empty($_POST[$var]) ? 0 : 1; |
| 459 | + } |
|
| 423 | 460 | |
| 424 | 461 | // Registration options are always default options... |
| 425 | - if (isset($_POST['default_options'])) |
|
| 426 | - $_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options']; |
|
| 462 | + if (isset($_POST['default_options'])) { |
|
| 463 | + $_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options']; |
|
| 464 | + } |
|
| 427 | 465 | $regOptions['theme_vars'] = isset($_POST['options']) && is_array($_POST['options']) ? $_POST['options'] : array(); |
| 428 | 466 | |
| 429 | 467 | // Make sure they are clean, dammit! |
@@ -443,12 +481,14 @@ discard block |
||
| 443 | 481 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 444 | 482 | { |
| 445 | 483 | // Don't allow overriding of the theme variables. |
| 446 | - if (isset($regOptions['theme_vars'][$row['col_name']])) |
|
| 447 | - unset($regOptions['theme_vars'][$row['col_name']]); |
|
| 484 | + if (isset($regOptions['theme_vars'][$row['col_name']])) { |
|
| 485 | + unset($regOptions['theme_vars'][$row['col_name']]); |
|
| 486 | + } |
|
| 448 | 487 | |
| 449 | 488 | // Not actually showing it then? |
| 450 | - if (!$row['show_reg']) |
|
| 451 | - continue; |
|
| 489 | + if (!$row['show_reg']) { |
|
| 490 | + continue; |
|
| 491 | + } |
|
| 452 | 492 | |
| 453 | 493 | // Prepare the value! |
| 454 | 494 | $value = isset($_POST['customfield'][$row['col_name']]) ? trim($_POST['customfield'][$row['col_name']]) : ''; |
@@ -457,24 +497,27 @@ discard block |
||
| 457 | 497 | if (!in_array($row['field_type'], array('check', 'select', 'radio'))) |
| 458 | 498 | { |
| 459 | 499 | // Is it too long? |
| 460 | - if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value)) |
|
| 461 | - $custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length'])); |
|
| 500 | + if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value)) { |
|
| 501 | + $custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length'])); |
|
| 502 | + } |
|
| 462 | 503 | |
| 463 | 504 | // Any masks to apply? |
| 464 | 505 | if ($row['field_type'] == 'text' && !empty($row['mask']) && $row['mask'] != 'none') |
| 465 | 506 | { |
| 466 | - if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255)) |
|
| 467 | - $custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name'])); |
|
| 468 | - elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value)) |
|
| 469 | - $custom_field_errors[] = array('custom_field_not_number', array($row['field_name'])); |
|
| 470 | - elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0) |
|
| 471 | - $custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name'])); |
|
| 507 | + if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255)) { |
|
| 508 | + $custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name'])); |
|
| 509 | + } elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value)) { |
|
| 510 | + $custom_field_errors[] = array('custom_field_not_number', array($row['field_name'])); |
|
| 511 | + } elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0) { |
|
| 512 | + $custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name'])); |
|
| 513 | + } |
|
| 472 | 514 | } |
| 473 | 515 | } |
| 474 | 516 | |
| 475 | 517 | // Is this required but not there? |
| 476 | - if (trim($value) == '' && $row['show_reg'] > 1) |
|
| 477 | - $custom_field_errors[] = array('custom_field_empty', array($row['field_name'])); |
|
| 518 | + if (trim($value) == '' && $row['show_reg'] > 1) { |
|
| 519 | + $custom_field_errors[] = array('custom_field_empty', array($row['field_name'])); |
|
| 520 | + } |
|
| 478 | 521 | } |
| 479 | 522 | $smcFunc['db_free_result']($request); |
| 480 | 523 | |
@@ -482,8 +525,9 @@ discard block |
||
| 482 | 525 | if (!empty($custom_field_errors)) |
| 483 | 526 | { |
| 484 | 527 | loadLanguage('Errors'); |
| 485 | - foreach ($custom_field_errors as $error) |
|
| 486 | - $reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]); |
|
| 528 | + foreach ($custom_field_errors as $error) { |
|
| 529 | + $reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]); |
|
| 530 | + } |
|
| 487 | 531 | } |
| 488 | 532 | |
| 489 | 533 | // Lets check for other errors before trying to register the member. |
@@ -528,8 +572,9 @@ discard block |
||
| 528 | 572 | } |
| 529 | 573 | |
| 530 | 574 | // If COPPA has been selected then things get complicated, setup the template. |
| 531 | - if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa'])) |
|
| 532 | - redirectexit('action=coppa;member=' . $memberID); |
|
| 575 | + if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa'])) { |
|
| 576 | + redirectexit('action=coppa;member=' . $memberID); |
|
| 577 | + } |
|
| 533 | 578 | // Basic template variable setup. |
| 534 | 579 | elseif (!empty($modSettings['registration_method'])) |
| 535 | 580 | { |
@@ -541,8 +586,7 @@ discard block |
||
| 541 | 586 | 'sub_template' => 'after', |
| 542 | 587 | 'description' => $modSettings['registration_method'] == 2 ? $txt['approval_after_registration'] : $txt['activate_after_registration'] |
| 543 | 588 | ); |
| 544 | - } |
|
| 545 | - else |
|
| 589 | + } else |
|
| 546 | 590 | { |
| 547 | 591 | call_integration_hook('integrate_activate', array($regOptions['username'])); |
| 548 | 592 | |
@@ -562,16 +606,18 @@ discard block |
||
| 562 | 606 | global $context, $txt, $modSettings, $scripturl, $sourcedir, $smcFunc, $language, $user_info; |
| 563 | 607 | |
| 564 | 608 | // Logged in users should not bother to activate their accounts |
| 565 | - if (!empty($user_info['id'])) |
|
| 566 | - redirectexit(); |
|
| 609 | + if (!empty($user_info['id'])) { |
|
| 610 | + redirectexit(); |
|
| 611 | + } |
|
| 567 | 612 | |
| 568 | 613 | loadLanguage('Login'); |
| 569 | 614 | loadTemplate('Login'); |
| 570 | 615 | |
| 571 | 616 | if (empty($_REQUEST['u']) && empty($_POST['user'])) |
| 572 | 617 | { |
| 573 | - if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3') |
|
| 574 | - fatal_lang_error('no_access', false); |
|
| 618 | + if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3') { |
|
| 619 | + fatal_lang_error('no_access', false); |
|
| 620 | + } |
|
| 575 | 621 | |
| 576 | 622 | $context['member_id'] = 0; |
| 577 | 623 | $context['sub_template'] = 'resend'; |
@@ -611,11 +657,13 @@ discard block |
||
| 611 | 657 | // Change their email address? (they probably tried a fake one first :P.) |
| 612 | 658 | if (isset($_POST['new_email'], $_REQUEST['passwd']) && hash_password($row['member_name'], $_REQUEST['passwd']) == $row['passwd'] && ($row['is_activated'] == 0 || $row['is_activated'] == 2)) |
| 613 | 659 | { |
| 614 | - if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3) |
|
| 615 | - fatal_lang_error('no_access', false); |
|
| 660 | + if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3) { |
|
| 661 | + fatal_lang_error('no_access', false); |
|
| 662 | + } |
|
| 616 | 663 | |
| 617 | - if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL)) |
|
| 618 | - fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false); |
|
| 664 | + if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL)) { |
|
| 665 | + fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false); |
|
| 666 | + } |
|
| 619 | 667 | |
| 620 | 668 | // Make sure their email isn't banned. |
| 621 | 669 | isBannedEmail($_POST['new_email'], 'cannot_register', $txt['ban_register_prohibited']); |
@@ -631,8 +679,9 @@ discard block |
||
| 631 | 679 | ) |
| 632 | 680 | ); |
| 633 | 681 | |
| 634 | - if ($smcFunc['db_num_rows']($request) != 0) |
|
| 635 | - fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email']))); |
|
| 682 | + if ($smcFunc['db_num_rows']($request) != 0) { |
|
| 683 | + fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email']))); |
|
| 684 | + } |
|
| 636 | 685 | $smcFunc['db_free_result']($request); |
| 637 | 686 | |
| 638 | 687 | updateMemberData($row['id_member'], array('email_address' => $_POST['new_email'])); |
@@ -670,9 +719,9 @@ discard block |
||
| 670 | 719 | // Quit if this code is not right. |
| 671 | 720 | if (empty($_REQUEST['code']) || $row['validation_code'] != $_REQUEST['code']) |
| 672 | 721 | { |
| 673 | - if (!empty($row['is_activated'])) |
|
| 674 | - fatal_lang_error('already_activated', false); |
|
| 675 | - elseif ($row['validation_code'] == '') |
|
| 722 | + if (!empty($row['is_activated'])) { |
|
| 723 | + fatal_lang_error('already_activated', false); |
|
| 724 | + } elseif ($row['validation_code'] == '') |
|
| 676 | 725 | { |
| 677 | 726 | loadLanguage('Profile'); |
| 678 | 727 | fatal_error(sprintf($txt['registration_not_approved'], $scripturl . '?action=activate;user=' . $row['member_name']), false); |
@@ -722,8 +771,9 @@ discard block |
||
| 722 | 771 | loadTemplate('Register'); |
| 723 | 772 | |
| 724 | 773 | // No User ID?? |
| 725 | - if (!isset($_GET['member'])) |
|
| 726 | - fatal_lang_error('no_access', false); |
|
| 774 | + if (!isset($_GET['member'])) { |
|
| 775 | + fatal_lang_error('no_access', false); |
|
| 776 | + } |
|
| 727 | 777 | |
| 728 | 778 | // Get the user details... |
| 729 | 779 | $request = $smcFunc['db_query']('', ' |
@@ -736,8 +786,9 @@ discard block |
||
| 736 | 786 | 'is_coppa' => 5, |
| 737 | 787 | ) |
| 738 | 788 | ); |
| 739 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
| 740 | - fatal_lang_error('no_access', false); |
|
| 789 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
| 790 | + fatal_lang_error('no_access', false); |
|
| 791 | + } |
|
| 741 | 792 | list ($username) = $smcFunc['db_fetch_row']($request); |
| 742 | 793 | $smcFunc['db_free_result']($request); |
| 743 | 794 | |
@@ -775,8 +826,7 @@ discard block |
||
| 775 | 826 | echo $data; |
| 776 | 827 | obExit(false); |
| 777 | 828 | } |
| 778 | - } |
|
| 779 | - else |
|
| 829 | + } else |
|
| 780 | 830 | { |
| 781 | 831 | $context += array( |
| 782 | 832 | 'page_title' => $txt['coppa_title'], |
@@ -829,8 +879,9 @@ discard block |
||
| 829 | 879 | { |
| 830 | 880 | require_once($sourcedir . '/Subs-Graphics.php'); |
| 831 | 881 | |
| 832 | - if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code)) |
|
| 833 | - header('HTTP/1.1 400 Bad Request'); |
|
| 882 | + if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code)) { |
|
| 883 | + header('HTTP/1.1 400 Bad Request'); |
|
| 884 | + } |
|
| 834 | 885 | |
| 835 | 886 | // Otherwise just show a pre-defined letter. |
| 836 | 887 | elseif (isset($_REQUEST['letter'])) |
@@ -848,14 +899,13 @@ discard block |
||
| 848 | 899 | header('content-type: image/gif'); |
| 849 | 900 | die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B"); |
| 850 | 901 | } |
| 851 | - } |
|
| 852 | - |
|
| 853 | - elseif ($_REQUEST['format'] === '.wav') |
|
| 902 | + } elseif ($_REQUEST['format'] === '.wav') |
|
| 854 | 903 | { |
| 855 | 904 | require_once($sourcedir . '/Subs-Sound.php'); |
| 856 | 905 | |
| 857 | - if (!createWaveFile($code)) |
|
| 858 | - header('HTTP/1.1 400 Bad Request'); |
|
| 906 | + if (!createWaveFile($code)) { |
|
| 907 | + header('HTTP/1.1 400 Bad Request'); |
|
| 908 | + } |
|
| 859 | 909 | } |
| 860 | 910 | |
| 861 | 911 | // We all die one day... |
@@ -28,14 +28,15 @@ discard block |
||
| 28 | 28 | <div id="confirm_buttons">'; |
| 29 | 29 | |
| 30 | 30 | // Age restriction in effect? |
| 31 | - if ($context['show_coppa']) |
|
| 32 | - echo ' |
|
| 31 | + if ($context['show_coppa']) { |
|
| 32 | + echo ' |
|
| 33 | 33 | <input type="submit" name="accept_agreement" value="', $context['coppa_agree_above'], '" class="button"><br> |
| 34 | 34 | <br> |
| 35 | 35 | <input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button">'; |
| 36 | - else |
|
| 37 | - echo ' |
|
| 36 | + } else { |
|
| 37 | + echo ' |
|
| 38 | 38 | <input type="submit" name="accept_agreement" value="', $txt['agreement_agree'], '" class="button">'; |
| 39 | + } |
|
| 39 | 40 | |
| 40 | 41 | echo ' |
| 41 | 42 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> |
@@ -78,9 +79,10 @@ discard block |
||
| 78 | 79 | <ul>'; |
| 79 | 80 | |
| 80 | 81 | // Cycle through each error and display an error message. |
| 81 | - foreach ($context['registration_errors'] as $error) |
|
| 82 | - echo ' |
|
| 82 | + foreach ($context['registration_errors'] as $error) { |
|
| 83 | + echo ' |
|
| 83 | 84 | <li>', $error, '</li>'; |
| 85 | + } |
|
| 84 | 86 | |
| 85 | 87 | echo ' |
| 86 | 88 | </ul> |
@@ -149,14 +151,15 @@ discard block |
||
| 149 | 151 | echo ' |
| 150 | 152 | <dl class="register_form">'; |
| 151 | 153 | |
| 152 | - foreach ($context['custom_fields'] as $field) |
|
| 153 | - if ($field['show_reg'] > 1) |
|
| 154 | + foreach ($context['custom_fields'] as $field) { |
|
| 155 | + if ($field['show_reg'] > 1) |
|
| 154 | 156 | echo ' |
| 155 | 157 | <dt> |
| 156 | 158 | <strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong> |
| 157 | 159 | <span class="smalltext">', $field['desc'], '</span> |
| 158 | 160 | </dt> |
| 159 | 161 | <dd>', str_replace('name="', 'tabindex="' . $context['tabindex']++ . '" name="', $field['input_html']), '</dd>'; |
| 162 | + } |
|
| 160 | 163 | |
| 161 | 164 | echo ' |
| 162 | 165 | </dl>'; |
@@ -167,14 +170,15 @@ discard block |
||
| 167 | 170 | </div><!-- .roundframe -->'; |
| 168 | 171 | |
| 169 | 172 | // If we have either of these, show the extra group. |
| 170 | - if (!empty($context['profile_fields']) || !empty($context['custom_fields'])) |
|
| 171 | - echo ' |
|
| 173 | + if (!empty($context['profile_fields']) || !empty($context['custom_fields'])) { |
|
| 174 | + echo ' |
|
| 172 | 175 | <div class="title_bar title_top"> |
| 173 | 176 | <h3 class="titlebg">', $txt['additional_information'], '</h3> |
| 174 | 177 | </div> |
| 175 | 178 | <div class="roundframe noup"> |
| 176 | 179 | <fieldset> |
| 177 | 180 | <dl class="register_form" id="custom_group">'; |
| 181 | + } |
|
| 178 | 182 | |
| 179 | 183 | if (!empty($context['profile_fields'])) |
| 180 | 184 | { |
@@ -188,41 +192,45 @@ discard block |
||
| 188 | 192 | $callback_func = 'template_profile_' . $field['callback_func']; |
| 189 | 193 | $callback_func(); |
| 190 | 194 | } |
| 191 | - } |
|
| 192 | - else |
|
| 195 | + } else |
|
| 193 | 196 | { |
| 194 | 197 | echo ' |
| 195 | 198 | <dt> |
| 196 | 199 | <strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['label'], ':</strong>'; |
| 197 | 200 | |
| 198 | 201 | // Does it have any subtext to show? |
| 199 | - if (!empty($field['subtext'])) |
|
| 200 | - echo ' |
|
| 202 | + if (!empty($field['subtext'])) { |
|
| 203 | + echo ' |
|
| 201 | 204 | <span class="smalltext">', $field['subtext'], '</span>'; |
| 205 | + } |
|
| 202 | 206 | |
| 203 | 207 | echo ' |
| 204 | 208 | </dt> |
| 205 | 209 | <dd>'; |
| 206 | 210 | |
| 207 | 211 | // Want to put something infront of the box? |
| 208 | - if (!empty($field['preinput'])) |
|
| 209 | - echo ' |
|
| 212 | + if (!empty($field['preinput'])) { |
|
| 213 | + echo ' |
|
| 210 | 214 | ', $field['preinput']; |
| 215 | + } |
|
| 211 | 216 | |
| 212 | 217 | // What type of data are we showing? |
| 213 | - if ($field['type'] == 'label') |
|
| 214 | - echo ' |
|
| 218 | + if ($field['type'] == 'label') { |
|
| 219 | + echo ' |
|
| 215 | 220 | ', $field['value']; |
| 221 | + } |
|
| 216 | 222 | |
| 217 | 223 | // Maybe it's a text box - very likely! |
| 218 | - elseif (in_array($field['type'], array('int', 'float', 'text', 'password', 'url'))) |
|
| 219 | - echo ' |
|
| 224 | + elseif (in_array($field['type'], array('int', 'float', 'text', 'password', 'url'))) { |
|
| 225 | + echo ' |
|
| 220 | 226 | <input type="', $field['type'] == 'password' ? 'password' : 'text', '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" tabindex="', $context['tabindex']++, '" ', $field['input_attr'], '>'; |
| 227 | + } |
|
| 221 | 228 | |
| 222 | 229 | // You "checking" me out? ;) |
| 223 | - elseif ($field['type'] == 'check') |
|
| 224 | - echo ' |
|
| 230 | + elseif ($field['type'] == 'check') { |
|
| 231 | + echo ' |
|
| 225 | 232 | <input type="hidden" name="', $key, '" value="0"><input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" tabindex="', $context['tabindex']++, '" ', $field['input_attr'], '>'; |
| 233 | + } |
|
| 226 | 234 | |
| 227 | 235 | // Always fun - select boxes! |
| 228 | 236 | elseif ($field['type'] == 'select') |
@@ -233,14 +241,16 @@ discard block |
||
| 233 | 241 | if (isset($field['options'])) |
| 234 | 242 | { |
| 235 | 243 | // Is this some code to generate the options? |
| 236 | - if (!is_array($field['options'])) |
|
| 237 | - $field['options'] = eval($field['options']); |
|
| 244 | + if (!is_array($field['options'])) { |
|
| 245 | + $field['options'] = eval($field['options']); |
|
| 246 | + } |
|
| 238 | 247 | |
| 239 | 248 | // Assuming we now have some! |
| 240 | - if (is_array($field['options'])) |
|
| 241 | - foreach ($field['options'] as $value => $name) |
|
| 249 | + if (is_array($field['options'])) { |
|
| 250 | + foreach ($field['options'] as $value => $name) |
|
| 242 | 251 | echo ' |
| 243 | 252 | <option', is_numeric($value) ? ' value="" disabled' : ' value="' . $value . '"', $value === $field['value'] ? ' selected' : '', '>', $name, '</option>'; |
| 253 | + } |
|
| 244 | 254 | } |
| 245 | 255 | |
| 246 | 256 | echo ' |
@@ -248,9 +258,10 @@ discard block |
||
| 248 | 258 | } |
| 249 | 259 | |
| 250 | 260 | // Something to end with? |
| 251 | - if (!empty($field['postinput'])) |
|
| 252 | - echo ' |
|
| 261 | + if (!empty($field['postinput'])) { |
|
| 262 | + echo ' |
|
| 253 | 263 | ', $field['postinput']; |
| 264 | + } |
|
| 254 | 265 | |
| 255 | 266 | echo ' |
| 256 | 267 | </dd>'; |
@@ -261,25 +272,27 @@ discard block |
||
| 261 | 272 | // Are there any custom fields? |
| 262 | 273 | if (!empty($context['custom_fields'])) |
| 263 | 274 | { |
| 264 | - foreach ($context['custom_fields'] as $field) |
|
| 265 | - if ($field['show_reg'] < 2) |
|
| 275 | + foreach ($context['custom_fields'] as $field) { |
|
| 276 | + if ($field['show_reg'] < 2) |
|
| 266 | 277 | echo ' |
| 267 | 278 | <dt> |
| 268 | 279 | <strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong> |
| 269 | 280 | <span class="smalltext">', $field['desc'], '</span> |
| 270 | 281 | </dt> |
| 271 | 282 | <dd>', $field['input_html'], '</dd>'; |
| 283 | + } |
|
| 272 | 284 | } |
| 273 | 285 | |
| 274 | 286 | // If we have either of these, close the list like a proper gent. |
| 275 | - if (!empty($context['profile_fields']) || !empty($context['custom_fields'])) |
|
| 276 | - echo ' |
|
| 287 | + if (!empty($context['profile_fields']) || !empty($context['custom_fields'])) { |
|
| 288 | + echo ' |
|
| 277 | 289 | </dl> |
| 278 | 290 | </fieldset> |
| 279 | 291 | </div><!-- .roundframe -->'; |
| 292 | + } |
|
| 280 | 293 | |
| 281 | - if ($context['visual_verification']) |
|
| 282 | - echo ' |
|
| 294 | + if ($context['visual_verification']) { |
|
| 295 | + echo ' |
|
| 283 | 296 | <div class="title_bar title_top"> |
| 284 | 297 | <h3 class="titlebg">', $txt['verification'], '</h3> |
| 285 | 298 | </div> |
@@ -288,19 +301,21 @@ discard block |
||
| 288 | 301 | ', template_control_verification($context['visual_verification_id'], 'all'), ' |
| 289 | 302 | </fieldset> |
| 290 | 303 | </div>'; |
| 304 | + } |
|
| 291 | 305 | |
| 292 | 306 | echo ' |
| 293 | 307 | <div id="confirm_buttons" class="flow_auto">'; |
| 294 | 308 | |
| 295 | 309 | // Age restriction in effect? |
| 296 | - if (!$context['require_agreement'] && $context['show_coppa']) |
|
| 297 | - echo ' |
|
| 310 | + if (!$context['require_agreement'] && $context['show_coppa']) { |
|
| 311 | + echo ' |
|
| 298 | 312 | <input type="submit" name="accept_agreement" value="', $context['coppa_agree_above'], '" class="button"><br> |
| 299 | 313 | <br> |
| 300 | 314 | <input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button">'; |
| 301 | - else |
|
| 302 | - echo ' |
|
| 315 | + } else { |
|
| 316 | + echo ' |
|
| 303 | 317 | <input type="submit" name="regSubmit" value="', $txt['register'], '" tabindex="', $context['tabindex']++, '" class="button">'; |
| 318 | + } |
|
| 304 | 319 | |
| 305 | 320 | echo ' |
| 306 | 321 | </div> |
@@ -362,25 +377,28 @@ discard block |
||
| 362 | 377 | <p>', $context['coppa']['many_options'] ? $txt['coppa_send_to_two_options'] : $txt['coppa_send_to_one_option'], '</p>'; |
| 363 | 378 | |
| 364 | 379 | // Can they send by post? |
| 365 | - if (!empty($context['coppa']['post'])) |
|
| 366 | - echo ' |
|
| 380 | + if (!empty($context['coppa']['post'])) { |
|
| 381 | + echo ' |
|
| 367 | 382 | <h4>1) ', $txt['coppa_send_by_post'], '</h4> |
| 368 | 383 | <div class="coppa_contact"> |
| 369 | 384 | ', $context['coppa']['post'], ' |
| 370 | 385 | </div>'; |
| 386 | + } |
|
| 371 | 387 | |
| 372 | 388 | // Can they send by fax?? |
| 373 | - if (!empty($context['coppa']['fax'])) |
|
| 374 | - echo ' |
|
| 389 | + if (!empty($context['coppa']['fax'])) { |
|
| 390 | + echo ' |
|
| 375 | 391 | <h4>', !empty($context['coppa']['post']) ? '2' : '1', ') ', $txt['coppa_send_by_fax'], '</h4> |
| 376 | 392 | <div class="coppa_contact"> |
| 377 | 393 | ', $context['coppa']['fax'], ' |
| 378 | 394 | </div>'; |
| 395 | + } |
|
| 379 | 396 | |
| 380 | 397 | // Offer an alternative Phone Number? |
| 381 | - if ($context['coppa']['phone']) |
|
| 382 | - echo ' |
|
| 398 | + if ($context['coppa']['phone']) { |
|
| 399 | + echo ' |
|
| 383 | 400 | <p>', $context['coppa']['phone'], '</p>'; |
| 401 | + } |
|
| 384 | 402 | |
| 385 | 403 | echo ' |
| 386 | 404 | </div><!-- #coppa -->'; |
@@ -445,19 +463,20 @@ discard block |
||
| 445 | 463 | <body style="margin: 1ex;"> |
| 446 | 464 | <div class="windowbg description" style="text-align: center;">'; |
| 447 | 465 | |
| 448 | - if (isBrowser('is_ie') || isBrowser('is_ie11')) |
|
| 449 | - echo ' |
|
| 466 | + if (isBrowser('is_ie') || isBrowser('is_ie11')) { |
|
| 467 | + echo ' |
|
| 450 | 468 | <object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95" type="audio/x-wav"> |
| 451 | 469 | <param name="AutoStart" value="1"> |
| 452 | 470 | <param name="FileName" value="', $context['verification_sound_href'], '"> |
| 453 | 471 | </object>'; |
| 454 | - else |
|
| 455 | - echo ' |
|
| 472 | + } else { |
|
| 473 | + echo ' |
|
| 456 | 474 | <audio src="', $context['verification_sound_href'], '" controls> |
| 457 | 475 | <object type="audio/x-wav" data="', $context['verification_sound_href'], '"> |
| 458 | 476 | <a href="', $context['verification_sound_href'], '" rel="nofollow">', $context['verification_sound_href'], '</a> |
| 459 | 477 | </object> |
| 460 | 478 | </audio>'; |
| 479 | + } |
|
| 461 | 480 | |
| 462 | 481 | echo ' |
| 463 | 482 | <br> |
@@ -485,11 +504,12 @@ discard block |
||
| 485 | 504 | </div> |
| 486 | 505 | <div id="register_screen" class="windowbg2 noup">'; |
| 487 | 506 | |
| 488 | - if (!empty($context['registration_done'])) |
|
| 489 | - echo ' |
|
| 507 | + if (!empty($context['registration_done'])) { |
|
| 508 | + echo ' |
|
| 490 | 509 | <div class="infobox"> |
| 491 | 510 | ', $context['registration_done'], ' |
| 492 | 511 | </div>'; |
| 512 | + } |
|
| 493 | 513 | |
| 494 | 514 | echo ' |
| 495 | 515 | <dl class="register_form" id="admin_register_form"> |
@@ -525,9 +545,10 @@ discard block |
||
| 525 | 545 | <dd> |
| 526 | 546 | <select name="group" id="group_select" tabindex="', $context['tabindex']++, '">'; |
| 527 | 547 | |
| 528 | - foreach ($context['member_groups'] as $id => $name) |
|
| 529 | - echo ' |
|
| 548 | + foreach ($context['member_groups'] as $id => $name) { |
|
| 549 | + echo ' |
|
| 530 | 550 | <option value="', $id, '">', $name, '</option>'; |
| 551 | + } |
|
| 531 | 552 | |
| 532 | 553 | echo ' |
| 533 | 554 | </select> |
@@ -535,8 +556,8 @@ discard block |
||
| 535 | 556 | } |
| 536 | 557 | |
| 537 | 558 | // If there is any field marked as required, show it here! |
| 538 | - if (!empty($context['custom_fields_required']) && !empty($context['custom_fields'])) |
|
| 539 | - foreach ($context['custom_fields'] as $field) |
|
| 559 | + if (!empty($context['custom_fields_required']) && !empty($context['custom_fields'])) { |
|
| 560 | + foreach ($context['custom_fields'] as $field) |
|
| 540 | 561 | if ($field['show_reg'] > 1) |
| 541 | 562 | echo ' |
| 542 | 563 | <dt> |
@@ -546,6 +567,7 @@ discard block |
||
| 546 | 567 | <dd> |
| 547 | 568 | ', str_replace('name="', 'tabindex="' . $context['tabindex']++ . '" name="', $field['input_html']), ' |
| 548 | 569 | </dd>'; |
| 570 | + } |
|
| 549 | 571 | |
| 550 | 572 | echo ' |
| 551 | 573 | <dt> |
@@ -582,13 +604,13 @@ discard block |
||
| 582 | 604 | { |
| 583 | 605 | global $context, $scripturl, $txt; |
| 584 | 606 | |
| 585 | - if (!empty($context['saved_successful'])) |
|
| 586 | - echo ' |
|
| 607 | + if (!empty($context['saved_successful'])) { |
|
| 608 | + echo ' |
|
| 587 | 609 | <div class="infobox">', $txt['settings_saved'], '</div>'; |
| 588 | - |
|
| 589 | - elseif (!empty($context['could_not_save'])) |
|
| 590 | - echo ' |
|
| 610 | + } elseif (!empty($context['could_not_save'])) { |
|
| 611 | + echo ' |
|
| 591 | 612 | <div class="errorbox">', $txt['admin_agreement_not_saved'], '</div>'; |
| 613 | + } |
|
| 592 | 614 | |
| 593 | 615 | // Just a big box to edit the text file ;) |
| 594 | 616 | echo ' |
@@ -598,9 +620,10 @@ discard block |
||
| 598 | 620 | </div>'; |
| 599 | 621 | |
| 600 | 622 | // Warning for if the file isn't writable. |
| 601 | - if (!empty($context['warning'])) |
|
| 602 | - echo ' |
|
| 623 | + if (!empty($context['warning'])) { |
|
| 624 | + echo ' |
|
| 603 | 625 | <p class="error">', $context['warning'], '</p>'; |
| 626 | + } |
|
| 604 | 627 | |
| 605 | 628 | echo ' |
| 606 | 629 | <div class="windowbg2 noup" id="registration_agreement">'; |
@@ -617,9 +640,10 @@ discard block |
||
| 617 | 640 | <strong>', $txt['admin_agreement_select_language'], ':</strong> |
| 618 | 641 | <select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();" tabindex="', $context['tabindex']++, '">'; |
| 619 | 642 | |
| 620 | - foreach ($context['editable_agreements'] as $file => $name) |
|
| 621 | - echo ' |
|
| 643 | + foreach ($context['editable_agreements'] as $file => $name) { |
|
| 644 | + echo ' |
|
| 622 | 645 | <option value="', $file, '"', $context['current_agreement'] == $file ? ' selected' : '', '>', $name, '</option>'; |
| 646 | + } |
|
| 623 | 647 | |
| 624 | 648 | echo ' |
| 625 | 649 | </select> |
@@ -659,9 +683,10 @@ discard block |
||
| 659 | 683 | { |
| 660 | 684 | global $context, $scripturl, $txt; |
| 661 | 685 | |
| 662 | - if (!empty($context['saved_successful'])) |
|
| 663 | - echo ' |
|
| 686 | + if (!empty($context['saved_successful'])) { |
|
| 687 | + echo ' |
|
| 664 | 688 | <div class="infobox">', $txt['settings_saved'], '</div>'; |
| 689 | + } |
|
| 665 | 690 | |
| 666 | 691 | echo ' |
| 667 | 692 | <form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '"> |
