1
0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 01:19:44 +01:00

Bugfix: login link after resetting of password was ignoring e_SIGNUP. (customsignup.php). Also changed the layout of the response slightly, to really spell-out the login info and help to avoid recurring problems associated with human errors.

This commit is contained in:
CaMer0n 2007-12-13 01:01:35 +00:00
parent b48d291f18
commit 57563fb703
2 changed files with 15 additions and 9 deletions

View File

@ -4,9 +4,9 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_fpw.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:34:39 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2007-12-13 01:01:35 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
define("PAGE_NAME", "Password Reset");
@ -33,8 +33,8 @@ define("LAN_FPW4","A request has already been sent to reset this password, if yo
define("LAN_FPW5","A request to reset your password for");
define("LAN_FPW6","An email has been sent to you with a link that will allow you to reset your password.");
define("LAN_FPW7","This is not a valid link to reset your password.<br />Please contact the site administrator for more details.");
define("LAN_FPW8","The password for username");
define("LAN_FPW9","has been successfully changed.<br /><br />The new password is:");
define("LAN_FPW8","Your password has been changed successfully.");
define("LAN_FPW9","The new password is:");
define("LAN_FPW10","Please");
define("LAN_FPW11","log in now");
define("LAN_FPW12","and immediately change your password, for security purposes.");

14
fpw.php
View File

@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/fpw.php,v $
| $Revision: 1.2 $
| $Date: 2007-01-17 13:38:24 $
| $Author: mrpete $
| $Revision: 1.3 $
| $Date: 2007-12-13 01:01:35 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
require_once("class2.php");
@ -81,7 +81,12 @@ if (e_QUERY) {
cookie($pref['cookie_name'], "", (time()-2592000));
$_SESSION[$pref['cookie_name']] = "";
$txt = LAN_FPW8." {$username} ".LAN_FPW9." {$newpw}<br /><br />".LAN_FPW10." <a href='".e_BASE."login.php'>".LAN_FPW11."</a> ".LAN_FPW12;
$txt = "<div>".LAN_FPW8."<br /><br />
<table style='width:70%'>
<tr><td>".LAN_218."</td><td style='font-weight:bold'>{$username}</td></tr>
<tr><td>".LAN_FPW9."</td><td style='font-weight:bold'>{$newpw}</td></tr>
</table>
<br /><br />".LAN_FPW10." <a href='".e_LOGIN."'>".LAN_FPW11."</a> ".LAN_FPW12."</div>";
fpw_error($txt);
} else {
@ -134,6 +139,7 @@ if (isset($_POST['pwsubmit'])) {
//Set timestamp two days ahead so it doesn't get auto-deleted
$sql->db_Insert("tmp", "'pwreset',{$deltime},'{$user_name}{$fpw_sep}{$rcode}'");
if (sendemail($_POST['email'], "".LAN_09."".SITENAME, $message)) {
$text = "<div style='text-align:center'>".LAN_FPW6."</div>";
} else {