X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FLoginController.php;h=495c27c408b38939ddc861047cd75be9ca0c5d3f;hb=a64d41557a62ec6051d7fa08d1ba941e089aa5c2;hp=96d485a02d4a94b264f2ccca11ce96f9916d93c0;hpb=190fd621df4920c56a422c03663874cddaa67d64;p=syj.git diff --git a/application/controllers/LoginController.php b/application/controllers/LoginController.php index 96d485a..495c27c 100644 --- a/application/controllers/LoginController.php +++ b/application/controllers/LoginController.php @@ -7,7 +7,7 @@ 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'); @@ -51,9 +51,7 @@ 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); if ($httprequest) { $api = $this->_helper->SyjApi->setCode(200); @@ -65,13 +63,13 @@ 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 + if ($path->creator->id === $userid) { + $api->setBody("1"); // creator of displayed geometry } else { $api->setBody("0"); } } else { - $api->setBody("1"); // no geometry displayed: owner of the (future) geometry + $api->setBody("1"); // no geometry displayed: creator of the (future) geometry } } else { $this->redirect(); @@ -79,8 +77,7 @@ class LoginController extends Zend_Controller_Action } public function logoutAction() { - Zend_Session::start(); - Zend_Session::destroy(); + $this->_helper->SyjSession->logout(); $this->redirect(); }