}
if (!empty($_REQUEST['passwordRequest'])) { //|| (strpos($_REQUEST['username'], '@') < 1)) {
-
- return $this->passwordRequest($_REQUEST['passwordRequest']);
-
- }
-
+ return $this->passwordRequest($_REQUEST['passwordRequest']);
+ }
+
+ if (!empty($_REQUEST['ResetPassword'])) {
+ if (empty($_REQUEST['id']) ||
+ empty($_REQUEST['ts']) ||
+ empty($_REQUEST['key']) ||
+ empty($_REQUEST['password1']) ||
+ empty($_REQUEST['password2']) ||
+ ($_REQUEST['password1'] != $_REQUEST['password2'])
+ ) {
+ $this->jerr("Invalid request to reset password");
+ }
+
+ $this->resetPassword($_REQUEST['id'], $_REQUEST['ts'], $_REQUEST['key'], $_REQUEST['password1'] );
+ }
+
+
+ if (!empty($_REQUEST['_verifyCheckSum'])) {
+ if (empty($_REQUEST['id']) ||
+ empty($_REQUEST['ts']) ||
+ empty($_REQUEST['key'])
+
+ ) {
+ $this->jerr("Invalid request to reset password");
+ }
+
+ $this->verifyCheckSum($_REQUEST['id'], $_REQUEST['ts'], $_REQUEST['key']);
+ }
+
+ // this is 'classic' change password...
if (!empty($_REQUEST['changePassword'])) {
return $this->changePassword($_REQUEST);
}
$this->rcpts = $u->getEmailFrom();
- $mailer = $core_email->toMailer($this, false);
+ $mailer = $cm->toMailer($this, false);
if (is_a($mailer,'PEAR_Error') ) {
$this->addEvent('SYSERR',false, $mailer->getMessage());
$this->jerr($mailer->getMessage());
}
- function changePassword($r)
- {
- $au = $this->getAuthUser();
+ function verifyResetPassword($id,$t, $key)
+ {
+ $au = $this->getAuthUser();
if ($au) {
- $uu = clone($au);
- $au->setPassword($r['passwd1']);
- $au->update($uu);
- $this->addEvent("CHANGEPASS", $au);
- $this->jok($au);
+ $this->jerr( "Already Logged in - no need to use Password Reset");
}
- // not logged in -> need to validate
- if (empty($r['passwordReset'])) {
- $this->jerr("invalid request");
+
+ $u = DB_DataObject::factory('core_person');
+ //$u->company_id = $this->company->id;
+ $u->active = 1;
+ if (!$u->get($id) || !strlen($u->passwd)) {
+ $this->jerr("Password reset link is not valid (id)");
}
- // same code as reset pasword
-
- $bits = explode('/', $r['passwordReset']);
- //print_R($bits);
-
- $res= $this->resetPassword(@$bits[0],@$bits[1],@$bits[2]);
-
- if ($res !== false) {
- $this->jerr($res);
+
+ // validate key..
+ if ($key != $u->genPassKey($t)) {
+ $this->jerr("Password reset link is not valid ($key)");
+ }
+
+ if ($t < strtotime("NOW - 1 DAY")) {
+ $this->jerr("Password reset link has expired");
}
- // key is correct.. let's change password...
+ return true;
+
+
+
+ }
+
+
+ function resetPassword($id,$t, $key, $newpass )
+ {
- $u = DB_DataObject::factory('core_person');
+ $au = $this->getAuthUser();
+ if ($au) {
+ $this->jerr( "Already Logged in - no need to use Password Reset");
+ }
+ $u = DB_DataObject::factory('core_person');
//$u->company_id = $this->company->id;
- $u->whereAdd('LENGTH(passwd) > 1');
$u->active = 1;
- if (!$u->get($bits[0])) {
- $this->jerr("invalid id"); // should not happen!!!!
+ if (!$u->get($id) || !strlen($u->passwd)) {
+ $this->jerr("Password reset link is not valid (id)");
+ }
+
+ // validate key..
+ if ($key != $u->genPassKey($t)) {
+ $this->jerr("Password reset link is not valid ($key)");
}
+
+ if ($t < strtotime("NOW - 1 DAY")) {
+ $this->jerr("Password reset link has expired");
+ }
+
$uu = clone($u);
- $u->setPassword($r['passwd1']);
+ $u->no_reset_sent = 0;
+ if ($newpass != false) {
+ $u->setPassword($newpass);
+ }
$u->update($uu);
$u->login();
- $this->addEvent("CHANGEPASS", $u);
- $this->jok($u);
+ $this->jok("Password has been Updated");
+ }
+
+
+ function changePassword($r)
+ {
+ $au = $this->getAuthUser();
+ if (!$au) {
+ $this->jerr("Password change attempted when not logged in");
+ }
+ $uu = clone($au);
+ $au->setPassword($r['passwd1']);
+ $au->update($uu);
+ $this->addEvent("CHANGEPASS", $au);
+ $this->jok($au);
+
}
function ip_checking()