X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FLoginController.php;h=490ca673ad2bbc9a56e7bfaad24a2bf63be2ef9f;hb=9595d8b7134bd616b9326d24ee245bfacd106354;hp=07bb40b874b484c90a20e239eb0b59ccf7127210;hpb=9efd079d59d269811abc4c551b2f39ab2e6a05fb;p=syj.git

diff --git a/application/controllers/LoginController.php b/application/controllers/LoginController.php
index 07bb40b..490ca67 100644
--- a/application/controllers/LoginController.php
+++ b/application/controllers/LoginController.php
@@ -1,17 +1,15 @@
 <?php
-/*  This file is part of Syj, Copyright (c) 2010 Arnaud Renevier,
+/*  This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier,
     and is published under the AGPL license. */
 
 class LoginController extends Zend_Controller_Action
 {
     public function init() {
         $this->view->headTitle($this->view->translate("login"));
-        $this->view->headScript()->appendFile('js/prototype.js');
-        $this->view->headScript()->appendFile('js/forms.js');
-        $this->view->headScript()->appendFile('js/highlight.js');
-        $this->view->headScript()->appendFile('js/login.js');
-        $this->view->headLink()->appendStylesheet('css/generic.css');
-        $this->view->headLink()->appendStylesheet('css/login.css');
+        $this->_helper->SyjMedias->addScripts('login');
+        $this->view->headLink()->appendStylesheet('css/generic.css', 'all');
+        $this->view->headLink()->appendStylesheet('css/form.css', 'all');
+        $this->view->headLink()->appendStylesheet('css/login.css', 'all');
     }
 
     public function loginAction() {
@@ -34,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 {
@@ -51,13 +43,11 @@ class LoginController extends Zend_Controller_Action
             }
         }
 
-        $userid = $authAdapter->getResultRowObject('id')->id;
-        $auth->getStorage()->write(array('user' => $userid));
-        Zend_Session::rememberMe(); // zend default expiration delay is 2 weeks. Ok, use that value
-
+        $user = $this->_helper->SyjUserManager->current();
 
         if ($httprequest) {
             $api = $this->_helper->SyjApi->setCode(200);
+            $data = array('pseudo' => $user->pseudo);
 
             $login_geom_id = $formData['login_geom_id'];
             if ($login_geom_id) {
@@ -66,22 +56,18 @@ class LoginController extends Zend_Controller_Action
                 if (!$pathMapper->find((int)$login_geom_id, $path)) {
                     throw new Syj_Exception_Request();
                 }
-                if ($path->owner->id === $userid) {
-                    $api->setBody("1"); // owner of displayed geometry
-                } else {
-                    $api->setBody("0");
-                }
+                $data['iscreator'] = ($path->creator->id === $user->id);
             } else {
-                $api->setBody("1"); // no geometry displayed: owner of the (future) geometry
+                $data['iscreator'] = true;
             }
+            $api->setBodyJson($data);
         } else {
             $this->redirect();
         }
     }
 
     public function logoutAction() {
-        Zend_Session::start();
-        Zend_Session::destroy();
+        $this->_helper->SyjUserManager->logout();
         $this->redirect();
     }