Refactor
This commit is contained in:
parent
697b801653
commit
a82420b171
2 changed files with 27 additions and 17 deletions
|
@ -61,19 +61,23 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) {
|
|||
* Password reset
|
||||
*/
|
||||
$user = $database
|
||||
->query('SELECT * FROM `users`
|
||||
->query(
|
||||
'SELECT * FROM `users`
|
||||
WHERE `email` = "' . $_GET['password-reset'] . '"
|
||||
AND `password_reset_token` = "' . $_GET['token'] . '";')
|
||||
AND `password_reset_token` = "' . $_GET['token'] . '";'
|
||||
)
|
||||
->fetch();
|
||||
|
||||
if ($user) {
|
||||
if (false !== $user) {
|
||||
if (time() > $user['password_reset_valid_until']) {
|
||||
$database
|
||||
->query('UPDATE `users`
|
||||
->query(
|
||||
'UPDATE `users`
|
||||
SET `password` = "' . User::generatePassword($_POST['password']) . '",
|
||||
`password_reset_token` = NULL,
|
||||
`password_reset_valid_until` = NULL
|
||||
WHERE `id` = ' . $user['id'] . ';');
|
||||
WHERE `id` = ' . $user['id'] . ';'
|
||||
);
|
||||
|
||||
$page->messages[] = Page::success(
|
||||
'Password has been successfully reset for <strong>' . $_GET['password-reset'] . '</strong>.',
|
||||
|
@ -90,7 +94,8 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) {
|
|||
* Register
|
||||
*/
|
||||
if (0 === count($users)) {
|
||||
$database->query('INSERT INTO `users`
|
||||
$database->query(
|
||||
'INSERT INTO `users`
|
||||
(
|
||||
`email`,
|
||||
`password`,
|
||||
|
@ -100,7 +105,8 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) {
|
|||
"' . User::generatePassword($_POST['password']) . '",
|
||||
100
|
||||
)
|
||||
;');
|
||||
;'
|
||||
);
|
||||
$userRegistered = true;
|
||||
} else {
|
||||
if (in_array($_POST['email'], $emails)) {
|
||||
|
@ -109,7 +115,8 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) {
|
|||
__('Invalid email address')
|
||||
);
|
||||
} else {
|
||||
$database->query('INSERT INTO `users`
|
||||
$database->query(
|
||||
'INSERT INTO `users`
|
||||
(
|
||||
`email`,
|
||||
`password`
|
||||
|
@ -117,7 +124,8 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) {
|
|||
"' . $_POST['email'] . '",
|
||||
"' . User::generatePassword($_POST['password']) . '"
|
||||
)
|
||||
;');
|
||||
;'
|
||||
);
|
||||
$userRegistered = true;
|
||||
|
||||
$page->messages[] = Page::success(__('Your account was successfully created.'), __('Success'));
|
||||
|
@ -133,7 +141,8 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) {
|
|||
$wishlistName = __('My hopes and dreams');
|
||||
|
||||
$database
|
||||
->query('INSERT INTO `wishlists`
|
||||
->query(
|
||||
'INSERT INTO `wishlists`
|
||||
(
|
||||
`user`,
|
||||
`name`,
|
||||
|
@ -143,7 +152,8 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) {
|
|||
"' . $wishlistName . '",
|
||||
"' . sha1(time() . $userID . $wishlistName) . '"
|
||||
)
|
||||
;');
|
||||
;'
|
||||
);
|
||||
}
|
||||
} else {
|
||||
$page->messages[] = Page::error(
|
||||
|
|
Loading…
Reference in a new issue