Changeset 723
- Timestamp:
- 11/11/08 03:28:44 (2 months ago)
- Location:
- fluxbb/branches/fluxbb-1.3-dev/upload
- Files:
-
- 2 modified
-
lang/English/login.php (modified) (2 diffs)
-
login.php (modified) (20 diffs)
Legend:
- Unmodified
- Added
- Removed
-
fluxbb/branches/fluxbb-1.3-dev/upload/lang/English/login.php
r588 r723 7 7 'Login' => 'Login', 8 8 'Login info' => 'Login to %s', 9 'Username' => 'Username:', 10 'Password' => 'Password:', 11 'Remember me' => 'Remember me:', 12 'E-mail address' => 'E-mail address:', 13 'E-mail address help' => 'Enter the e-mail address set in your profile.', 9 'Username' => 'Username', 10 'Password' => 'Password', 11 'Remember me' => 'Remember me', 12 'E-mail address' => 'E-mail address', 14 13 'Login errors' => '<strong>Warning!</strong> The following errors must be corrected before you can login:', 15 14 'Wrong user/pass' => 'Incorrect username and/or password.', … … 19 18 'Invalid e-mail' => 'The e-mail address you entered is invalid.', 20 19 'Login options' => 'Do you need to %1$s or obtain a %2$s before you login?', 21 ' Obtain pass' => 'new password',22 ' register' => 'register',20 'Forgot password' => 'Forgotten your password?', 21 'Register now' => 'Need to register?', 23 22 'Submit password request' => 'Submit request', 24 23 'Email flood' => 'This account has already requested a new password in the past %s seconds. Please wait a while before requesting a new password again.', 25 24 'New password request' => 'New password request', 26 25 'New password errors' => '<strong>Warning!</strong> The following errors must be corrected before a new password can be sent:', 27 'New password info' => '<strong>Important!</strong> An e-mail will be sent to the specifiedaddress with instructions on how to change your password.',26 'New password help' => 'Enter the address stored in your profile. An e-mail will be sent to this address with instructions on how to change your password.', 28 27 'Forget mail' => 'An e-mail has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at %s.', 29 'Remember me' => 'Remember me:',30 28 'Persistent login' => 'Log me in automatically each time I visit.', 31 29 'Reset cancel redirect' => 'Password reset cancelled. Redirecting âŠ', -
fluxbb/branches/fluxbb-1.3-dev/upload/login.php
r641 r723 30 30 // Check for use of incorrect URLs 31 31 confirm_current_url(forum_link($forum_url['login'])); 32 32 33 33 $form_username = forum_trim($_POST['req_username']); 34 34 $form_password = forum_trim($_POST['req_password']); … … 128 128 exit; 129 129 } 130 130 131 131 // Check for use of incorrect URLs 132 132 confirm_current_url(forum_link($forum_url['logout'], array($forum_user['id'], isset($_GET['csrf_token']) ? $_GET['csrf_token'] : ''))); … … 178 178 if (!$forum_user['is_guest']) 179 179 header('Location: '.forum_link($forum_url['index'])); 180 180 181 181 // Check for use of incorrect URLs 182 182 confirm_current_url(forum_link($forum_url['request_password'])); … … 189 189 if (isset($_POST['cancel'])) 190 190 redirect(forum_link($forum_url['index']), $lang_login['Reset cancel redirect']); 191 191 192 192 if (!defined('FORUM_EMAIL_FUNCTIONS_LOADED')) 193 193 require FORUM_ROOT.'include/email.php'; … … 269 269 270 270 // Setup form 271 $forum_page[' group_count'] = $forum_page['item_count'] = $forum_page['fld_count'] = 0;271 $forum_page['fld_count'] = 0; 272 272 $forum_page['form_action'] = forum_link($forum_url['request_password']); 273 273 … … 278 278 ); 279 279 280 // Setup main heading 281 $forum_page['main_hd'] = end($forum_page['crumbs']); 282 280 283 ($hook = get_hook('li_forgot_pass_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; 281 284 … … 289 292 290 293 ?> 291 <div class=" main-content main-frm">292 <div class=" ct-box info-box">293 <p class="important"><?php echo $lang_login['New password info'] ?></p>294 </div> 294 <div class="content"> 295 <div class="section section-1 datafrm"> 296 <form id="afocus" class="frm-form" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>"> 297 295 298 <?php 296 299 … … 305 308 306 309 ?> 307 <div class="ct-box error-box"> 308 <h2 class="warn"><?php echo $lang_login['New password errors'] ?></h2> 309 <ul class="error-list"> 310 <?php echo implode("\n\t\t\t\t", $forum_page['errors'])."\n" ?> 311 </ul> 312 </div> 313 <?php 314 315 } 316 317 ?> 318 <div id="req-msg" class="req-warn ct-box error-box"> 319 <p class="important"><?php printf($lang_common['Required warn'], '<em>'.$lang_common['Required'].'</em>') ?></p> 320 </div> 321 <form id="afocus" class="frm-form" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>"> 310 <div class="error-box"> 311 <h2 class="warn"><?php echo $lang_login['New password errors'] ?></h2> 312 <ul class="error-list"> 313 <?php echo implode("\n\t\t\t\t", $forum_page['errors'])."\n" ?> 314 </ul> 315 </div> 316 <?php 317 318 } 319 320 ?> 321 <div id="req-msg" class="req-warn error-box"> 322 <p class="important"><?php printf($lang_common['Required warn'], '<em>'.$lang_common['Required'].'</em>') ?></p> 323 </div> 322 324 <div class="hidden"> 323 325 <input type="hidden" name="form_sent" value="1" /> … … 325 327 </div> 326 328 <?php ($hook = get_hook('li_forgot_pass_pre_group')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 327 <div class="frm-group group<?php echo ++$forum_page['group_count'] ?>">329 <div class="frm-group frm-group-1"> 328 330 <?php ($hook = get_hook('li_forgot_pass_pre_email')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 329 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">331 <div class="sf-set frm-set frm-set-1"> 330 332 <div class="sf-box text required"> 331 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_login['E-mail address'] ?> <em><?php echo $lang_common['Required'] ?></em></span> < small><?php echo $lang_login['E-mail addresshelp'] ?></small></label><br />333 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_login['E-mail address'] ?> <em><?php echo $lang_common['Required'] ?></em></span> <br /><small><?php echo $lang_login['New password help'] ?></small></label><br /> 332 334 <span class="fld-input"><input id="fld<?php echo $forum_page['fld_count'] ?>" type="text" name="req_email" value="<?php echo isset($_POST['req_email']) ? forum_htmlencode($_POST['req_email']) : '' ?>" size="35" maxlength="80" /></span> 333 335 </div> … … 337 339 <?php ($hook = get_hook('li_forgot_pass_group_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 338 340 <div class="frm-buttons"> 339 <span class="submit"><input type="submit" name="request_pass" value="<?php echo $lang_login['Submit password request'] ?>" /></span> 340 <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span> 341 <p><span class="submit"><input type="submit" name="request_pass" value="<?php echo $lang_login['Submit password request'] ?>" /></span> <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span></p> 341 342 </div> 342 343 </form> 344 </div> 343 345 </div> 344 346 <?php … … 347 349 348 350 $tpl_temp = forum_trim(ob_get_contents()); 349 $tpl_main = str_replace('<!-- forum_main -->', $tpl_temp, $tpl_main);351 $tpl_main = str_replace('<!-- forum_main_content -->', $tpl_temp, $tpl_main); 350 352 ob_end_clean(); 351 353 // END SUBST - <!-- forum_main --> … … 361 363 362 364 // Setup form 363 $forum_page[' group_count'] = $forum_page['item_count'] = $forum_page['fld_count'] = 0;365 $forum_page['fld_count'] = 0; 364 366 $forum_page['form_action'] = forum_link($forum_url['login']); 365 367 … … 376 378 ); 377 379 380 // Setup main heading 381 $forum_page['main_hd'] = end($forum_page['crumbs']); 382 378 383 ($hook = get_hook('li_login_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; 379 384 … … 387 392 388 393 ?> 389 <div class=" main-content main-frm">390 <div class=" content-head">391 <p class="hn"><?php printf($lang_login['Login options'], '<a href="'.forum_link($forum_url['register']).'">'.$lang_login['register'].'</a>', '<a href="'.forum_link($forum_url['request_password']).'">'.$lang_login['Obtain pass'].'</a>') ?></p>392 </div> 394 <div class="content"> 395 <div class="section section-1 datafrm"> 396 <form id="afocus" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>"> 397 393 398 <?php 394 399 … … 403 408 404 409 ?> 405 <div class="ct-boxerror-box">406 <h2 class="warn"><?php echo $lang_login['Login errors'] ?></h2>407 <ul class="error-list">408 <?php echo implode("\n\t\t\t\t", $forum_page['errors'])."\n" ?>409 </ul>410 </div>410 <div class="error-box"> 411 <h2 class="warn"><?php echo $lang_login['Login errors'] ?></h2> 412 <ul class="error-list"> 413 <?php echo implode("\n\t\t\t\t", $forum_page['errors'])."\n" ?> 414 </ul> 415 </div> 411 416 <?php 412 417 … … 414 419 415 420 ?> 416 <div id="req-msg" class="req-warn ct-box error-box"> 417 <p class="important"><?php printf($lang_common['Required warn'], '<em>'.$lang_common['Required'].'</em>') ?></p> 418 </div> 419 <form id="afocus" class="frm-form" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>"> 421 <div id="req-msg" class="req-warn error-box"> 422 <p class="important"><?php printf($lang_common['Required warn'], '<span><em>'.$lang_common['Required'].'</em></span>') ?></p> 423 </div> 420 424 <div class="hidden"> 421 425 <?php echo implode("\n\t\t\t\t", $forum_page['hidden_fields'])."\n" ?> 422 426 </div> 423 427 <?php ($hook = get_hook('li_login_pre_login_group')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 424 <div class="frm-group group<?php echo ++$forum_page['group_count'] ?>">428 <div class="frm-group frm-group-1"> 425 429 <?php ($hook = get_hook('li_login_pre_username')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 426 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">430 <div class="sf-set frm-set frm-set-1"> 427 431 <div class="sf-box text required"> 428 432 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_login['Username'] ?> <em><?php echo $lang_common['Required'] ?></em></span></label><br /> … … 431 435 </div> 432 436 <?php ($hook = get_hook('li_login_pre_pass')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 433 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">437 <div class="sf-set frm-set"> 434 438 <div class="sf-box text required"> 435 439 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_login['Password'] ?> <em><?php echo $lang_common['Required'] ?></em></span></label><br /> … … 438 442 </div> 439 443 <?php ($hook = get_hook('li_login_pre_remember_me_checkbox')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 440 <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">444 <div class="sf-set frm-set"> 441 445 <div class="sf-box checkbox"> 442 446 <span class="fld-input"><input type="checkbox" id="fld<?php echo ++$forum_page['fld_count'] ?>" name="save_pass" value="1" /></span> 443 <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_login['Remember me'] ?></span> < ?php echo $lang_login['Persistent login'] ?></label>447 <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_login['Remember me'] ?></span> <br /><small><?php echo $lang_login['Persistent login'] ?></small></label> 444 448 </div> 445 449 </div> … … 448 452 <?php ($hook = get_hook('li_login_group_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?> 449 453 <div class="frm-buttons"> 450 < span class="submit"><input type="submit" name="login" value="<?php echo $lang_login['Login'] ?>" /></span>454 <p><span class="submit"><input type="submit" name="login" value="<?php echo $lang_login['Login'] ?>" /></span> <?php echo '<span><a href="'.forum_link($forum_url['register']).'">'.$lang_login['Register now'].'</a></span> <span><a href="'.forum_link($forum_url['request_password']).'">'.$lang_login['Forgot password'].'</a></span>' ?></p> 451 455 </div> 452 456 </form> 457 </div> 453 458 </div> 454 459 <?php … … 457 462 458 463 $tpl_temp = forum_trim(ob_get_contents()); 459 $tpl_main = str_replace('<!-- forum_main -->', $tpl_temp, $tpl_main);464 $tpl_main = str_replace('<!-- forum_main_content -->', $tpl_temp, $tpl_main); 460 465 ob_end_clean(); 461 466 // END SUBST - <!-- forum_main -->
