X-Git-Url: https://dev.renevier.net/gitweb.cgi?a=blobdiff_plain;f=application%2Fcontrollers%2FLoginController.php;h=490ca673ad2bbc9a56e7bfaad24a2bf63be2ef9f;hb=9595d8b7134bd616b9326d24ee245bfacd106354;hp=f5e89b8d81a4f5d1a5ef3419957d6b7ceb63d44a;hpb=1f6105289a49079809c2a4677b561bc82c62db88;p=syj.git

diff --git a/application/controllers/LoginController.php b/application/controllers/LoginController.php
index f5e89b8..490ca67 100644
--- a/application/controllers/LoginController.php
+++ b/application/controllers/LoginController.php
@@ -32,15 +32,9 @@ class LoginController extends Zend_Controller_Action
         }
 
         /* form has been filled */
-
-        $adapter = Zend_Db_Table_Abstract::getDefaultAdapter();
-        $authAdapter = new Zend_Auth_Adapter_DbTable($adapter, 'users', 'pseudo', 'password');
-        $authAdapter->setIdentity($formData['login_user'])
-                ->setCredential(sha1($formData['login_password']));
-
-        $auth = Zend_Auth::getInstance();
-        $result = $auth->authenticate($authAdapter);
-        if (!$result->isValid()) {
+        if (!$this->_helper->SyjUserManager->validate($formData['login_user'],
+                                                     sha1($formData['login_password']),
+                                                     $formData['login_rememberme'])) {
             if ($httprequest) {
                 throw new Syj_Exception_Forbidden();
             } else {
@@ -49,9 +43,7 @@ class LoginController extends Zend_Controller_Action
             }
         }
 
-        $userid = $authAdapter->getResultRowObject('id')->id;
-        $this->_helper->SyjSession->login($userid);
-        $user = $this->_helper->SyjSession->user();
+        $user = $this->_helper->SyjUserManager->current();
 
         if ($httprequest) {
             $api = $this->_helper->SyjApi->setCode(200);
@@ -64,7 +56,7 @@ class LoginController extends Zend_Controller_Action
                 if (!$pathMapper->find((int)$login_geom_id, $path)) {
                     throw new Syj_Exception_Request();
                 }
-                $data['iscreator'] = ($path->creator->id === $userid);
+                $data['iscreator'] = ($path->creator->id === $user->id);
             } else {
                 $data['iscreator'] = true;
             }
@@ -75,7 +67,7 @@ class LoginController extends Zend_Controller_Action
     }
 
     public function logoutAction() {
-        $this->_helper->SyjSession->logout();
+        $this->_helper->SyjUserManager->logout();
         $this->redirect();
     }