X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FLoginController.php;h=a6c7b46707130f7a98ab13d17358913346f55254;hb=8e7d8e39a2ee5801a2f68b95cdc0e84b55da1019;hp=96d485a02d4a94b264f2ccca11ce96f9916d93c0;hpb=190fd621df4920c56a422c03663874cddaa67d64;p=syj.git

diff --git a/application/controllers/LoginController.php b/application/controllers/LoginController.php
index 96d485a..a6c7b46 100644
--- a/application/controllers/LoginController.php
+++ b/application/controllers/LoginController.php
@@ -7,10 +7,10 @@ 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/utils.js');
         $this->view->headScript()->appendFile('js/login.js');
-        $this->view->headLink()->appendStylesheet('css/generic.css');
-        $this->view->headLink()->appendStylesheet('css/login.css');
+        $this->view->headLink()->appendStylesheet('css/generic.css', 'all');
+        $this->view->headLink()->appendStylesheet('css/login.css', 'all');
     }
 
     public function loginAction() {
@@ -51,12 +51,12 @@ 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
-
+        $this->_helper->SyjSession->login($userid);
+        $user = $this->_helper->SyjSession->user();
 
         if ($httprequest) {
             $api = $this->_helper->SyjApi->setCode(200);
+            $data = array('pseudo' => $user->pseudo);
 
             $login_geom_id = $formData['login_geom_id'];
             if ($login_geom_id) {
@@ -65,22 +65,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 === $userid);
             } 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->SyjSession->logout();
         $this->redirect();
     }