From 128e09cd5db316c5e97e4c137f6d85fa51fb1f0d Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Thu, 23 May 2013 11:10:17 +0200 Subject: [PATCH] initial work on password reset, not working fully yet --- public/include/classes/user.class.php | 61 ++++++++++++++++++--- public/include/pages/password.inc.php | 9 +++ public/include/pages/password/reset.inc.php | 15 +++++ public/templates/mmcFE/global/login.tpl | 2 +- public/templates/mmcFE/password/default.tpl | 8 +++ 5 files changed, 85 insertions(+), 10 deletions(-) create mode 100644 public/include/pages/password.inc.php create mode 100644 public/include/pages/password/reset.inc.php create mode 100644 public/templates/mmcFE/password/default.tpl diff --git a/public/include/classes/user.class.php b/public/include/classes/user.class.php index e33b8c7c..3ec72546 100644 --- a/public/include/classes/user.class.php +++ b/public/include/classes/user.class.php @@ -11,10 +11,11 @@ class User { private $user = array(); private $tableAccountBalance = 'accountBalance'; - public function __construct($debug, $mysqli, $salt) { + public function __construct($debug, $mysqli, $salt, $config) { $this->debug = $debug; $this->mysqli = $mysqli; $this->salt = $salt; + $this->config = $config; $this->debug->append("Instantiated User class", 2); } @@ -34,6 +35,23 @@ class User { return $this->getSingle($username, 'id', 'username', 's'); } + public function getUserEmail($username) { + return $this->getSingle($username, 'email', 'username', 's'); + } + + public function getUserToken($id) { + return $this->getSingle($id, 'token', 'id'); + } + + public function setUserToken($id) { + $field = array( + 'name' => 'token', + 'type' => 's', + 'value' => hash('sha256', $id.time().$this->salt) + ); + return $this->updateSingle($id, $field); + } + /** * Check user login * @param username string Username @@ -142,15 +160,12 @@ class User { * @param field string Field to update * @return bool **/ - private function updateSingle($userID, $field) { + private function updateSingle($id, $field) { $this->debug->append("STA " . __METHOD__, 4); - $stmt = $this->mysqli->prepare("UPDATE $this->table SET " . $field['name'] . " = ? WHERE userId = ? LIMIT 1"); - if ($this->checkStmt($stmt)) { - $stmt->bind_param($field['type'].'i', $field['value'], $userID); - $stmt->execute(); - $stmt->close(); + $stmt = $this->mysqli->prepare("UPDATE $this->table SET " . $field['name'] . " = ? WHERE id = ? LIMIT 1"); + if ($this->checkStmt($stmt) && $stmt->bind_param($field['type'].'i', $field['value'], $id) && $stmt->execute()) return true; - } + $this->debug->append("Unable to update " . $field['name'] . " with " . $field['value'] . " for ID $id"); return false; } @@ -306,6 +321,34 @@ class User { } return false; } + + public function resetPassword($username) { + $this->debug->append("STA " . __METHOD__, 4); + // Fetch the users mail address + if (!$email = $this->getUserEmail($username)) { + $this->setErrorMessage("Unable to find a mail address for user $username"); + return false; + } + if (!$this->setUserToken($this->getUserId($username))) { + $this->setErrorMessage("Unable to setup token for password reset"); + return false; + } + // Send password reset link + if (!$token = $this->getUserToken($this->getUserId($username))) { + $this->setErrorMessage("Unable fetch token for password reset"); + return false; + } + $subject = "[" . $this->config['website']['name'] . "] Password Reset Request"; + $header = "From: " . $this->config['website']['email']; + $message = "Please follow the link to reset your password\n\n" . $this->config['website']['url']['password_reset'] . "/index.php?page=password&action=change&token=$token"; + if (mail($email, 'Password Reset Request', $message)) { + return true; + } else { + $this->setErrorMessage("Unable to send mail to your address"); + return false; + } + return false; + } } -$user = new User($debug, $mysqli, SALT); +$user = new User($debug, $mysqli, SALT, $config); diff --git a/public/include/pages/password.inc.php b/public/include/pages/password.inc.php new file mode 100644 index 00000000..aecab054 --- /dev/null +++ b/public/include/pages/password.inc.php @@ -0,0 +1,9 @@ +assign("CONTENT", "default.tpl"); +?> diff --git a/public/include/pages/password/reset.inc.php b/public/include/pages/password/reset.inc.php new file mode 100644 index 00000000..532eb67c --- /dev/null +++ b/public/include/pages/password/reset.inc.php @@ -0,0 +1,15 @@ +resetPassword($_POST['username'])) { + $_SESSION['POPUP'][] = array('CONTENT' => 'Please check your mail account to finish your password reset'); +} else { + $_SESSION['POPUP'][] = array('CONTENT' => $user->getError(), 'TYPE' => 'errormsg'); +} + +// Tempalte specifics, user default template by parent page +$smarty->assign("CONTENT", "../default.tpl"); +?> diff --git a/public/templates/mmcFE/global/login.tpl b/public/templates/mmcFE/global/login.tpl index 0247c665..d411d39a 100644 --- a/public/templates/mmcFE/global/login.tpl +++ b/public/templates/mmcFE/global/login.tpl @@ -4,5 +4,5 @@

-

Forgot your password?

+

Forgot your password?

{include file="global/block_footer.tpl"} diff --git a/public/templates/mmcFE/password/default.tpl b/public/templates/mmcFE/password/default.tpl new file mode 100644 index 00000000..35b4a0eb --- /dev/null +++ b/public/templates/mmcFE/password/default.tpl @@ -0,0 +1,8 @@ +{include file="global/block_header.tpl" BLOCK_HEADER="Reset Password" BLOCK_STYLE="clear:none;"} +
+ + +

If you have an email set for your account, enter your username to get your password reset

+

+
+{include file="global/block_footer.tpl"}