@@ -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 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'], '"> |
@@ -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), 'smf_register'); |
|
| 99 | + if ($context['sub_template'] == 'registration_form') { |
|
| 100 | + loadJavaScriptFile('register.js', array('defer' => false), '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 | |
@@ -167,9 +178,10 @@ discard block |
||
| 167 | 178 | $reg_fields = explode(',', $modSettings['registration_fields']); |
| 168 | 179 | |
| 169 | 180 | // We might have had some submissions on this front - go check. |
| 170 | - foreach ($reg_fields as $field) |
|
| 171 | - if (isset($_POST[$field])) |
|
| 181 | + foreach ($reg_fields as $field) { |
|
| 182 | + if (isset($_POST[$field])) |
|
| 172 | 183 | $cur_profile[$field] = $smcFunc['htmlspecialchars']($_POST[$field]); |
| 184 | + } |
|
| 173 | 185 | |
| 174 | 186 | // Load all the fields in question. |
| 175 | 187 | setupProfileContext($reg_fields); |
@@ -186,8 +198,9 @@ discard block |
||
| 186 | 198 | $context['visual_verification_id'] = $verificationOptions['id']; |
| 187 | 199 | } |
| 188 | 200 | // Otherwise we have nothing to show. |
| 189 | - else |
|
| 190 | - $context['visual_verification'] = false; |
|
| 201 | + else { |
|
| 202 | + $context['visual_verification'] = false; |
|
| 203 | + } |
|
| 191 | 204 | |
| 192 | 205 | |
| 193 | 206 | $context += array( |
@@ -198,8 +211,9 @@ discard block |
||
| 198 | 211 | |
| 199 | 212 | // Were there any errors? |
| 200 | 213 | $context['registration_errors'] = array(); |
| 201 | - if (!empty($reg_errors)) |
|
| 202 | - $context['registration_errors'] = $reg_errors; |
|
| 214 | + if (!empty($reg_errors)) { |
|
| 215 | + $context['registration_errors'] = $reg_errors; |
|
| 216 | + } |
|
| 203 | 217 | |
| 204 | 218 | createToken('register'); |
| 205 | 219 | } |
@@ -216,27 +230,32 @@ discard block |
||
| 216 | 230 | validateToken('register'); |
| 217 | 231 | |
| 218 | 232 | // Check to ensure we're forcing SSL for authentication |
| 219 | - if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) |
|
| 220 | - fatal_lang_error('register_ssl_required'); |
|
| 233 | + if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) { |
|
| 234 | + fatal_lang_error('register_ssl_required'); |
|
| 235 | + } |
|
| 221 | 236 | |
| 222 | 237 | // Start collecting together any errors. |
| 223 | 238 | $reg_errors = array(); |
| 224 | 239 | |
| 225 | 240 | // You can't register if it's disabled. |
| 226 | - if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3) |
|
| 227 | - fatal_lang_error('registration_disabled', false); |
|
| 241 | + if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3) { |
|
| 242 | + fatal_lang_error('registration_disabled', false); |
|
| 243 | + } |
|
| 228 | 244 | |
| 229 | 245 | // Well, if you don't agree, you can't register. |
| 230 | - if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed'])) |
|
| 231 | - redirectexit(); |
|
| 246 | + if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed'])) { |
|
| 247 | + redirectexit(); |
|
| 248 | + } |
|
| 232 | 249 | |
| 233 | 250 | // Make sure they came from *somewhere*, have a session. |
| 234 | - if (!isset($_SESSION['old_url'])) |
|
| 235 | - redirectexit('action=signup'); |
|
| 251 | + if (!isset($_SESSION['old_url'])) { |
|
| 252 | + redirectexit('action=signup'); |
|
| 253 | + } |
|
| 236 | 254 | |
| 237 | 255 | // If we don't require an agreement, we need a extra check for coppa. |
| 238 | - if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge'])) |
|
| 239 | - $_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']); |
|
| 256 | + if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge'])) { |
|
| 257 | + $_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']); |
|
| 258 | + } |
|
| 240 | 259 | // Are they under age, and under age users are banned? |
| 241 | 260 | if (!empty($modSettings['coppaAge']) && empty($modSettings['coppaType']) && empty($_SESSION['skip_coppa'])) |
| 242 | 261 | { |
@@ -245,8 +264,9 @@ discard block |
||
| 245 | 264 | } |
| 246 | 265 | |
| 247 | 266 | // Check the time gate for miscreants. First make sure they came from somewhere that actually set it up. |
| 248 | - if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit'])) |
|
| 249 | - redirectexit('action=signup'); |
|
| 267 | + if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit'])) { |
|
| 268 | + redirectexit('action=signup'); |
|
| 269 | + } |
|
| 250 | 270 | // Failing that, check the time on it. |
| 251 | 271 | if (time() - $_SESSION['register']['timenow'] < $_SESSION['register']['limit']) |
| 252 | 272 | { |
@@ -266,15 +286,17 @@ discard block |
||
| 266 | 286 | if (is_array($context['visual_verification'])) |
| 267 | 287 | { |
| 268 | 288 | loadLanguage('Errors'); |
| 269 | - foreach ($context['visual_verification'] as $error) |
|
| 270 | - $reg_errors[] = $txt['error_' . $error]; |
|
| 289 | + foreach ($context['visual_verification'] as $error) { |
|
| 290 | + $reg_errors[] = $txt['error_' . $error]; |
|
| 291 | + } |
|
| 271 | 292 | } |
| 272 | 293 | } |
| 273 | 294 | |
| 274 | 295 | foreach ($_POST as $key => $value) |
| 275 | 296 | { |
| 276 | - if (!is_array($_POST[$key])) |
|
| 277 | - $_POST[$key] = htmltrim__recursive(str_replace(array("\n", "\r"), '', $_POST[$key])); |
|
| 297 | + if (!is_array($_POST[$key])) { |
|
| 298 | + $_POST[$key] = htmltrim__recursive(str_replace(array("\n", "\r"), '', $_POST[$key])); |
|
| 299 | + } |
|
| 278 | 300 | } |
| 279 | 301 | |
| 280 | 302 | // Collect all extra registration fields someone might have filled in. |
@@ -304,12 +326,14 @@ discard block |
||
| 304 | 326 | $reg_fields = explode(',', $modSettings['registration_fields']); |
| 305 | 327 | |
| 306 | 328 | // Website is a little different |
| 307 | - if (in_array('website', $reg_fields)) |
|
| 308 | - $possible_strings = array_merge(array('website_url', 'website_title'), $possible_strings); |
|
| 329 | + if (in_array('website', $reg_fields)) { |
|
| 330 | + $possible_strings = array_merge(array('website_url', 'website_title'), $possible_strings); |
|
| 331 | + } |
|
| 309 | 332 | } |
| 310 | 333 | |
| 311 | - if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '') |
|
| 312 | - $_POST['secret_answer'] = md5($_POST['secret_answer']); |
|
| 334 | + if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '') { |
|
| 335 | + $_POST['secret_answer'] = md5($_POST['secret_answer']); |
|
| 336 | + } |
|
| 313 | 337 | |
| 314 | 338 | // Needed for isReservedName() and registerMember(). |
| 315 | 339 | require_once($sourcedir . '/Subs-Members.php'); |
@@ -318,8 +342,9 @@ discard block |
||
| 318 | 342 | if (isset($_POST['real_name'])) |
| 319 | 343 | { |
| 320 | 344 | // Are you already allowed to edit the displayed name? |
| 321 | - if (allowedTo('profile_displayed_name') || allowedTo('moderate_forum')) |
|
| 322 | - $canEditDisplayName = true; |
|
| 345 | + if (allowedTo('profile_displayed_name') || allowedTo('moderate_forum')) { |
|
| 346 | + $canEditDisplayName = true; |
|
| 347 | + } |
|
| 323 | 348 | |
| 324 | 349 | // If you are a guest, will you be allowed to once you register? |
| 325 | 350 | else |
@@ -343,33 +368,38 @@ discard block |
||
| 343 | 368 | $_POST['real_name'] = trim(preg_replace('~[\t\n\r \x0B\0' . ($context['utf8'] ? '\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}' : '\x00-\x08\x0B\x0C\x0E-\x19\xA0') . ']+~' . ($context['utf8'] ? 'u' : ''), ' ', $_POST['real_name'])); |
| 344 | 369 | |
| 345 | 370 | // Only set it if we are sure it is good |
| 346 | - if (trim($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60) |
|
| 347 | - $possible_strings[] = 'real_name'; |
|
| 371 | + if (trim($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60) { |
|
| 372 | + $possible_strings[] = 'real_name'; |
|
| 373 | + } |
|
| 348 | 374 | } |
| 349 | 375 | } |
| 350 | 376 | |
| 351 | 377 | // Handle a string as a birthdate... |
| 352 | - if (isset($_POST['birthdate']) && $_POST['birthdate'] != '') |
|
| 353 | - $_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate'])); |
|
| 378 | + if (isset($_POST['birthdate']) && $_POST['birthdate'] != '') { |
|
| 379 | + $_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate'])); |
|
| 380 | + } |
|
| 354 | 381 | // Or birthdate parts... |
| 355 | - elseif (!empty($_POST['bday1']) && !empty($_POST['bday2'])) |
|
| 356 | - $_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']); |
|
| 382 | + elseif (!empty($_POST['bday1']) && !empty($_POST['bday2'])) { |
|
| 383 | + $_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']); |
|
| 384 | + } |
|
| 357 | 385 | |
| 358 | 386 | // Validate the passed language file. |
| 359 | 387 | if (isset($_POST['lngfile']) && !empty($modSettings['userLanguage'])) |
| 360 | 388 | { |
| 361 | 389 | // Do we have any languages? |
| 362 | - if (empty($context['languages'])) |
|
| 363 | - getLanguages(); |
|
| 390 | + if (empty($context['languages'])) { |
|
| 391 | + getLanguages(); |
|
| 392 | + } |
|
| 364 | 393 | |
| 365 | 394 | // Did we find it? |
| 366 | - if (isset($context['languages'][$_POST['lngfile']])) |
|
| 367 | - $_SESSION['language'] = $_POST['lngfile']; |
|
| 368 | - else |
|
| 395 | + if (isset($context['languages'][$_POST['lngfile']])) { |
|
| 396 | + $_SESSION['language'] = $_POST['lngfile']; |
|
| 397 | + } else { |
|
| 398 | + unset($_POST['lngfile']); |
|
| 399 | + } |
|
| 400 | + } else { |
|
| 369 | 401 | unset($_POST['lngfile']); |
| 370 | 402 | } |
| 371 | - else |
|
| 372 | - unset($_POST['lngfile']); |
|
| 373 | 403 | |
| 374 | 404 | // Set the options needed for registration. |
| 375 | 405 | $regOptions = array( |
@@ -389,22 +419,27 @@ discard block |
||
| 389 | 419 | ); |
| 390 | 420 | |
| 391 | 421 | // Include the additional options that might have been filled in. |
| 392 | - foreach ($possible_strings as $var) |
|
| 393 | - if (isset($_POST[$var])) |
|
| 422 | + foreach ($possible_strings as $var) { |
|
| 423 | + if (isset($_POST[$var])) |
|
| 394 | 424 | $regOptions['extra_register_vars'][$var] = $smcFunc['htmlspecialchars']($_POST[$var], ENT_QUOTES); |
| 395 | - foreach ($possible_ints as $var) |
|
| 396 | - if (isset($_POST[$var])) |
|
| 425 | + } |
|
| 426 | + foreach ($possible_ints as $var) { |
|
| 427 | + if (isset($_POST[$var])) |
|
| 397 | 428 | $regOptions['extra_register_vars'][$var] = (int) $_POST[$var]; |
| 398 | - foreach ($possible_floats as $var) |
|
| 399 | - if (isset($_POST[$var])) |
|
| 429 | + } |
|
| 430 | + foreach ($possible_floats as $var) { |
|
| 431 | + if (isset($_POST[$var])) |
|
| 400 | 432 | $regOptions['extra_register_vars'][$var] = (float) $_POST[$var]; |
| 401 | - foreach ($possible_bools as $var) |
|
| 402 | - if (isset($_POST[$var])) |
|
| 433 | + } |
|
| 434 | + foreach ($possible_bools as $var) { |
|
| 435 | + if (isset($_POST[$var])) |
|
| 403 | 436 | $regOptions['extra_register_vars'][$var] = empty($_POST[$var]) ? 0 : 1; |
| 437 | + } |
|
| 404 | 438 | |
| 405 | 439 | // Registration options are always default options... |
| 406 | - if (isset($_POST['default_options'])) |
|
| 407 | - $_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options']; |
|
| 440 | + if (isset($_POST['default_options'])) { |
|
| 441 | + $_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options']; |
|
| 442 | + } |
|
| 408 | 443 | $regOptions['theme_vars'] = isset($_POST['options']) && is_array($_POST['options']) ? $_POST['options'] : array(); |
| 409 | 444 | |
| 410 | 445 | // Make sure they are clean, dammit! |
@@ -424,12 +459,14 @@ discard block |
||
| 424 | 459 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 425 | 460 | { |
| 426 | 461 | // Don't allow overriding of the theme variables. |
| 427 | - if (isset($regOptions['theme_vars'][$row['col_name']])) |
|
| 428 | - unset($regOptions['theme_vars'][$row['col_name']]); |
|
| 462 | + if (isset($regOptions['theme_vars'][$row['col_name']])) { |
|
| 463 | + unset($regOptions['theme_vars'][$row['col_name']]); |
|
| 464 | + } |
|
| 429 | 465 | |
| 430 | 466 | // Not actually showing it then? |
| 431 | - if (!$row['show_reg']) |
|
| 432 | - continue; |
|
| 467 | + if (!$row['show_reg']) { |
|
| 468 | + continue; |
|
| 469 | + } |
|
| 433 | 470 | |
| 434 | 471 | // Prepare the value! |
| 435 | 472 | $value = isset($_POST['customfield'][$row['col_name']]) ? trim($_POST['customfield'][$row['col_name']]) : ''; |
@@ -438,24 +475,27 @@ discard block |
||
| 438 | 475 | if (!in_array($row['field_type'], array('check', 'select', 'radio'))) |
| 439 | 476 | { |
| 440 | 477 | // Is it too long? |
| 441 | - if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value)) |
|
| 442 | - $custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length'])); |
|
| 478 | + if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value)) { |
|
| 479 | + $custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length'])); |
|
| 480 | + } |
|
| 443 | 481 | |
| 444 | 482 | // Any masks to apply? |
| 445 | 483 | if ($row['field_type'] == 'text' && !empty($row['mask']) && $row['mask'] != 'none') |
| 446 | 484 | { |
| 447 | - if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255)) |
|
| 448 | - $custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name'])); |
|
| 449 | - elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value)) |
|
| 450 | - $custom_field_errors[] = array('custom_field_not_number', array($row['field_name'])); |
|
| 451 | - elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0) |
|
| 452 | - $custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name'])); |
|
| 485 | + if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255)) { |
|
| 486 | + $custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name'])); |
|
| 487 | + } elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value)) { |
|
| 488 | + $custom_field_errors[] = array('custom_field_not_number', array($row['field_name'])); |
|
| 489 | + } elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0) { |
|
| 490 | + $custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name'])); |
|
| 491 | + } |
|
| 453 | 492 | } |
| 454 | 493 | } |
| 455 | 494 | |
| 456 | 495 | // Is this required but not there? |
| 457 | - if (trim($value) == '' && $row['show_reg'] > 1) |
|
| 458 | - $custom_field_errors[] = array('custom_field_empty', array($row['field_name'])); |
|
| 496 | + if (trim($value) == '' && $row['show_reg'] > 1) { |
|
| 497 | + $custom_field_errors[] = array('custom_field_empty', array($row['field_name'])); |
|
| 498 | + } |
|
| 459 | 499 | } |
| 460 | 500 | $smcFunc['db_free_result']($request); |
| 461 | 501 | |
@@ -463,8 +503,9 @@ discard block |
||
| 463 | 503 | if (!empty($custom_field_errors)) |
| 464 | 504 | { |
| 465 | 505 | loadLanguage('Errors'); |
| 466 | - foreach ($custom_field_errors as $error) |
|
| 467 | - $reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]); |
|
| 506 | + foreach ($custom_field_errors as $error) { |
|
| 507 | + $reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]); |
|
| 508 | + } |
|
| 468 | 509 | } |
| 469 | 510 | |
| 470 | 511 | // Lets check for other errors before trying to register the member. |
@@ -509,8 +550,9 @@ discard block |
||
| 509 | 550 | } |
| 510 | 551 | |
| 511 | 552 | // If COPPA has been selected then things get complicated, setup the template. |
| 512 | - if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa'])) |
|
| 513 | - redirectexit('action=coppa;member=' . $memberID); |
|
| 553 | + if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa'])) { |
|
| 554 | + redirectexit('action=coppa;member=' . $memberID); |
|
| 555 | + } |
|
| 514 | 556 | // Basic template variable setup. |
| 515 | 557 | elseif (!empty($modSettings['registration_method'])) |
| 516 | 558 | { |
@@ -522,8 +564,7 @@ discard block |
||
| 522 | 564 | 'sub_template' => 'after', |
| 523 | 565 | 'description' => $modSettings['registration_method'] == 2 ? $txt['approval_after_registration'] : $txt['activate_after_registration'] |
| 524 | 566 | ); |
| 525 | - } |
|
| 526 | - else |
|
| 567 | + } else |
|
| 527 | 568 | { |
| 528 | 569 | call_integration_hook('integrate_activate', array($regOptions['username'])); |
| 529 | 570 | |
@@ -543,16 +584,18 @@ discard block |
||
| 543 | 584 | global $context, $txt, $modSettings, $scripturl, $sourcedir, $smcFunc, $language, $user_info; |
| 544 | 585 | |
| 545 | 586 | // Logged in users should not bother to activate their accounts |
| 546 | - if (!empty($user_info['id'])) |
|
| 547 | - redirectexit(); |
|
| 587 | + if (!empty($user_info['id'])) { |
|
| 588 | + redirectexit(); |
|
| 589 | + } |
|
| 548 | 590 | |
| 549 | 591 | loadLanguage('Login'); |
| 550 | 592 | loadTemplate('Login'); |
| 551 | 593 | |
| 552 | 594 | if (empty($_REQUEST['u']) && empty($_POST['user'])) |
| 553 | 595 | { |
| 554 | - if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3') |
|
| 555 | - fatal_lang_error('no_access', false); |
|
| 596 | + if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3') { |
|
| 597 | + fatal_lang_error('no_access', false); |
|
| 598 | + } |
|
| 556 | 599 | |
| 557 | 600 | $context['member_id'] = 0; |
| 558 | 601 | $context['sub_template'] = 'resend'; |
@@ -592,11 +635,13 @@ discard block |
||
| 592 | 635 | // Change their email address? (they probably tried a fake one first :P.) |
| 593 | 636 | if (isset($_POST['new_email'], $_REQUEST['passwd']) && hash_password($row['member_name'], $_REQUEST['passwd']) == $row['passwd'] && ($row['is_activated'] == 0 || $row['is_activated'] == 2)) |
| 594 | 637 | { |
| 595 | - if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3) |
|
| 596 | - fatal_lang_error('no_access', false); |
|
| 638 | + if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3) { |
|
| 639 | + fatal_lang_error('no_access', false); |
|
| 640 | + } |
|
| 597 | 641 | |
| 598 | - if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL)) |
|
| 599 | - fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false); |
|
| 642 | + if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL)) { |
|
| 643 | + fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false); |
|
| 644 | + } |
|
| 600 | 645 | |
| 601 | 646 | // Make sure their email isn't banned. |
| 602 | 647 | isBannedEmail($_POST['new_email'], 'cannot_register', $txt['ban_register_prohibited']); |
@@ -612,8 +657,9 @@ discard block |
||
| 612 | 657 | ) |
| 613 | 658 | ); |
| 614 | 659 | |
| 615 | - if ($smcFunc['db_num_rows']($request) != 0) |
|
| 616 | - fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email']))); |
|
| 660 | + if ($smcFunc['db_num_rows']($request) != 0) { |
|
| 661 | + fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email']))); |
|
| 662 | + } |
|
| 617 | 663 | $smcFunc['db_free_result']($request); |
| 618 | 664 | |
| 619 | 665 | updateMemberData($row['id_member'], array('email_address' => $_POST['new_email'])); |
@@ -651,9 +697,9 @@ discard block |
||
| 651 | 697 | // Quit if this code is not right. |
| 652 | 698 | if (empty($_REQUEST['code']) || $row['validation_code'] != $_REQUEST['code']) |
| 653 | 699 | { |
| 654 | - if (!empty($row['is_activated'])) |
|
| 655 | - fatal_lang_error('already_activated', false); |
|
| 656 | - elseif ($row['validation_code'] == '') |
|
| 700 | + if (!empty($row['is_activated'])) { |
|
| 701 | + fatal_lang_error('already_activated', false); |
|
| 702 | + } elseif ($row['validation_code'] == '') |
|
| 657 | 703 | { |
| 658 | 704 | loadLanguage('Profile'); |
| 659 | 705 | fatal_error(sprintf($txt['registration_not_approved'], $scripturl . '?action=activate;user=' . $row['member_name']), false); |
@@ -703,8 +749,9 @@ discard block |
||
| 703 | 749 | loadTemplate('Register'); |
| 704 | 750 | |
| 705 | 751 | // No User ID?? |
| 706 | - if (!isset($_GET['member'])) |
|
| 707 | - fatal_lang_error('no_access', false); |
|
| 752 | + if (!isset($_GET['member'])) { |
|
| 753 | + fatal_lang_error('no_access', false); |
|
| 754 | + } |
|
| 708 | 755 | |
| 709 | 756 | // Get the user details... |
| 710 | 757 | $request = $smcFunc['db_query']('', ' |
@@ -717,8 +764,9 @@ discard block |
||
| 717 | 764 | 'is_coppa' => 5, |
| 718 | 765 | ) |
| 719 | 766 | ); |
| 720 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
| 721 | - fatal_lang_error('no_access', false); |
|
| 767 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
| 768 | + fatal_lang_error('no_access', false); |
|
| 769 | + } |
|
| 722 | 770 | list ($username) = $smcFunc['db_fetch_row']($request); |
| 723 | 771 | $smcFunc['db_free_result']($request); |
| 724 | 772 | |
@@ -756,8 +804,7 @@ discard block |
||
| 756 | 804 | echo $data; |
| 757 | 805 | obExit(false); |
| 758 | 806 | } |
| 759 | - } |
|
| 760 | - else |
|
| 807 | + } else |
|
| 761 | 808 | { |
| 762 | 809 | $context += array( |
| 763 | 810 | 'page_title' => $txt['coppa_title'], |
@@ -810,8 +857,9 @@ discard block |
||
| 810 | 857 | { |
| 811 | 858 | require_once($sourcedir . '/Subs-Graphics.php'); |
| 812 | 859 | |
| 813 | - if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code)) |
|
| 814 | - header('HTTP/1.1 400 Bad Request'); |
|
| 860 | + if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code)) { |
|
| 861 | + header('HTTP/1.1 400 Bad Request'); |
|
| 862 | + } |
|
| 815 | 863 | |
| 816 | 864 | // Otherwise just show a pre-defined letter. |
| 817 | 865 | elseif (isset($_REQUEST['letter'])) |
@@ -829,14 +877,13 @@ discard block |
||
| 829 | 877 | header('Content-Type: image/gif'); |
| 830 | 878 | 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"); |
| 831 | 879 | } |
| 832 | - } |
|
| 833 | - |
|
| 834 | - elseif ($_REQUEST['format'] === '.wav') |
|
| 880 | + } elseif ($_REQUEST['format'] === '.wav') |
|
| 835 | 881 | { |
| 836 | 882 | require_once($sourcedir . '/Subs-Sound.php'); |
| 837 | 883 | |
| 838 | - if (!createWaveFile($code)) |
|
| 839 | - header('HTTP/1.1 400 Bad Request'); |
|
| 884 | + if (!createWaveFile($code)) { |
|
| 885 | + header('HTTP/1.1 400 Bad Request'); |
|
| 886 | + } |
|
| 840 | 887 | } |
| 841 | 888 | |
| 842 | 889 | // We all die one day... |