diff --git a/application/admin/controller/general/Profile.php b/application/admin/controller/general/Profile.php index 47c4ff2..eb84684 100644 --- a/application/admin/controller/general/Profile.php +++ b/application/admin/controller/general/Profile.php @@ -59,13 +59,13 @@ class Profile extends Backend // if (!Validate::is($params['email'], "email")) { // $this->error(__("Please input correct email")); // } -// if (isset($params['password'])) { -// if (!Validate::is($params['password'], "/^[\S]{6,30}$/")) { -// $this->error(__("Please input correct password")); -// } -// $params['salt'] = Random::alnum(); -// $params['password'] = md5(md5($params['password']) . $params['salt']); -// } + if (isset($params['password'])) { + if (!Validate::is($params['password'], "/^[\S]{6,30}$/")) { + $this->error(__("Please input correct password")); + } + $params['salt'] = Random::alnum(); + $params['password'] = md5(md5($params['password']) . $params['salt']); + } // $exist = Admin::where('email', $params['email'])->where('id', '<>', $this->auth->id)->find(); // if ($exist) { // $this->error(__("Email already exists")); @@ -73,7 +73,7 @@ class Profile extends Backend if ($params) { $admin = Session::get('admin')?Session::get('admin'):Session::get('member'); if(!$admin){ - $this->redirect('index/register', [], 302); + $this->redirect('index/login', [], 302); } $admin = Admin::get($admin['id']); diff --git a/application/admin/controller/qingdong/department/Staff.php b/application/admin/controller/qingdong/department/Staff.php index e7eb8be..8b6c33e 100644 --- a/application/admin/controller/qingdong/department/Staff.php +++ b/application/admin/controller/qingdong/department/Staff.php @@ -173,7 +173,6 @@ class Staff extends Base { } Db::commit(); }catch (Exception $e){ - var_dump($e); Db::rollback(); $this->error($e->getMessage()); } diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php index 0c6d0b8..64de757 100644 --- a/application/admin/library/Auth.php +++ b/application/admin/library/Auth.php @@ -156,7 +156,6 @@ class Auth extends \fast\Auth { $admin = Admin::get(intval($this->id)); if ($admin) { - var_dump(111122222); $admin->token = ''; $admin->save(); } diff --git a/application/admin/view/general/profile/index.html b/application/admin/view/general/profile/index.html index a1c8e4c..d5240f5 100644 --- a/application/admin/view/general/profile/index.html +++ b/application/admin/view/general/profile/index.html @@ -75,10 +75,10 @@ - - - - +