diff --git a/app/Http/Admin/Controllers/SessionController.php b/app/Http/Admin/Controllers/SessionController.php index e554bf05..85d09e53 100644 --- a/app/Http/Admin/Controllers/SessionController.php +++ b/app/Http/Admin/Controllers/SessionController.php @@ -34,15 +34,13 @@ class SessionController extends \Phalcon\Mvc\Controller return $this->response->redirect(['for' => 'admin.index']); } - $sessionService = new SessionService(); - - $captcha = $sessionService->getSettings('captcha'); - if ($this->request->isPost()) { $this->checkHttpReferer(); $this->checkCsrfToken(); + $sessionService = new SessionService(); + $sessionService->login(); $location = $this->url->get(['for' => 'admin.index']); @@ -54,7 +52,6 @@ class SessionController extends \Phalcon\Mvc\Controller $this->view->pick('public/login'); $this->view->setVar('app_info', $appInfo); - $this->view->setVar('captcha', $captcha); } /** diff --git a/app/Http/Admin/Views/public/login.volt b/app/Http/Admin/Views/public/login.volt index b4c31fec..df649e74 100644 --- a/app/Http/Admin/Views/public/login.volt +++ b/app/Http/Admin/Views/public/login.volt @@ -2,9 +2,6 @@ {% block content %} - {% set disabled_submit = captcha.enabled == 1 ? 'disabled="disabled"' : '' %} - {% set disabled_class = captcha.enabled == 1 ? 'layui-btn-disabled' : '' %} -