dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO: Standard Norm

Browse Source
This commit is contained in:
PrestaEdit
2013-01-18 00:08:38 +01:00
parent 30c516619d
commit dcfcda4ae2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminLoginController.php
+2 -2
View File
@@ -139,7 +139,7 @@ class AdminLoginControllerCore extends AdminController
{ {
// Find employee // Find employee
$this->context->employee = new Employee(); $this->context->employee = new Employee();
$is_employee_loaded = $this->context->employee->getByemail($email, $passwd); $is_employee_loaded = $this->context->employee->getByEmail($email, $passwd);
$employee_associated_shop = $this->context->employee->getAssociatedShops(); $employee_associated_shop = $this->context->employee->getAssociatedShops();
if (!$is_employee_loaded) if (!$is_employee_loaded)
{ {
@@ -193,7 +193,7 @@ class AdminLoginControllerCore extends AdminController
else else
{ {
$employee = new Employee(); $employee = new Employee();
if (!$employee->getByemail($email) || !$employee) if (!$employee->getByEmail($email) || !$employee)
$this->errors[] = Tools::displayError('This account does not exist'); $this->errors[] = Tools::displayError('This account does not exist');
elseif ((strtotime($employee->last_passwd_gen.'+'.Configuration::get('PS_PASSWD_TIME_BACK').' minutes') - time()) > 0) elseif ((strtotime($employee->last_passwd_gen.'+'.Configuration::get('PS_PASSWD_TIME_BACK').' minutes') - time()) > 0)
$this->errors[] = sprintf( $this->errors[] = sprintf(