Commit Graph

8 Commits

Author SHA1 Message Date
Keith Uplinger cbcbb5e34a Merge remote-tracking branch 'upstream/keith_email' into email_change_notification
Conflicts:
	html/user/am_set_info.php
	html/user/edit_email_form.php
	html/user/recover_email.php
2018-05-08 08:28:54 -05:00
Keith Uplinger 2905e50dfe Cleaned up text within email recovery pages.
Also, removed excessive code and added an else statement for cleanup
2018-05-07 22:54:28 -05:00
David Anderson d0fcd1e729 Various tweaks to Keith's changes.
Keith, call me if you want to discuss any of these.
2018-05-07 16:15:51 -07:00
Keith Uplinger aaf866ebb0 Delete token for email recovery. 2018-05-01 21:30:50 -05:00
Keith Uplinger 3011ccf8db Fixed a typo in recover_email.php as well as not require the user to be logged in when trying to reset email address. 2018-05-01 12:51:27 -05:00
Keith Uplinger 79b169cd73 Fixed email changes so that database_hash is used instead of simple encryption. Also, fixed the logout issue when recovering your email address. 2018-04-24 14:22:13 -05:00
Keith Uplinger 50a8756f3a Changed to fix datbase update error on recover_email.php.
Prevented user on change email form page to actually do anything if within 7 days of previous email change.

Added more text to email about recovering email address.
2018-04-24 12:56:26 -05:00
Keith Uplinger 6602dcf5f5 Renamed to recover_email.php from reset_email_addr.php 2018-04-24 12:01:28 -05:00