Skip to content

Commit

Permalink
Patch for #1763
Browse files Browse the repository at this point in the history
  • Loading branch information
abrookbanks committed Oct 16, 2017
1 parent af84c96 commit 1477f92
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions classes/admin.class.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public function logout($redirect = '') {
*/ */
public function passwordReset($email, $validation, $password) { public function passwordReset($email, $validation, $password) {
if ($GLOBALS['session']->has('recover_login') && filter_var($email, FILTER_VALIDATE_EMAIL) && strlen($validation) == $this->_validate_key_len && !empty($password['new']) && !empty($password['confirm']) && ($password['new'] === $password['confirm'])) { if ($GLOBALS['session']->has('recover_login') && filter_var($email, FILTER_VALIDATE_EMAIL) && strlen($validation) == $this->_validate_key_len && !empty($password['new']) && !empty($password['confirm']) && ($password['new'] === $password['confirm'])) {
if (($check = $GLOBALS['db']->select('CubeCart_admin_users', array('admin_id', 'username'), array('email' => $email, 'verify' => $validation, 'status' => '1'))) !== false) { if (($check = $GLOBALS['db']->select('CubeCart_admin_users', array('admin_id', 'username'), "`email` = '$email' AND `verify` = '$validation' AND `status` = 1")) !== false) {


// Remove any blocks // Remove any blocks
$GLOBALS['db']->delete('CubeCart_blocker', array('username' => $email)); $GLOBALS['db']->delete('CubeCart_blocker', array('username' => $email));
Expand Down Expand Up @@ -194,7 +194,7 @@ public function passwordReset($email, $validation, $password) {
*/ */
public function passwordRequest($username, $email) { public function passwordRequest($username, $email) {
if (!empty($username) && !empty($email) && filter_var($email, FILTER_VALIDATE_EMAIL)) { if (!empty($username) && !empty($email) && filter_var($email, FILTER_VALIDATE_EMAIL)) {
if (($check = $GLOBALS['db']->select('CubeCart_admin_users', array('admin_id', 'email', 'language', 'name'), array('username' => $username, 'email' => $email, 'status' => '1'))) !== false) { if (($check = $GLOBALS['db']->select('CubeCart_admin_users', array('admin_id', 'email', 'language', 'name'), "`username` = '$username' AND `email` = '$email' AND `status` = 1")) !== false) {
// Generate validation key // Generate validation key
$validation = randomString($this->_validate_key_len); $validation = randomString($this->_validate_key_len);
if ($GLOBALS['db']->update('CubeCart_admin_users', array('verify' => $validation), array('admin_id' => (int)$check[0]['admin_id']))) { if ($GLOBALS['db']->update('CubeCart_admin_users', array('verify' => $validation), array('admin_id' => (int)$check[0]['admin_id']))) {
Expand Down

0 comments on commit 1477f92

Please sign in to comment.