X-Git-Url: https://dev.renevier.net/?p=syj.git;a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=ac315581eafbc29eb300c65cbba1a7c9c908b835;hp=e606ebc260efd54f53422dd57c73c4fb5e08f1e5;hb=05ce9238adfa982746bfc6211b240fd24526af09;hpb=011d9f73366efb4ce530b8b6da72055025419527 diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php index e606ebc..ac31558 100644 --- a/application/controllers/IdxController.php +++ b/application/controllers/IdxController.php @@ -54,31 +54,21 @@ class IdxController extends Zend_Controller_Action $this->view->loginform = $loginform; $this->view->userform = $userform; $this->view->newpwdform = $newpwdform; + $this->view->loggedUser = $this->_helper->SyjSession->user(); } protected function _jsLoggedInfo(Syj_Model_Path $path = null) { $loggedinfo = new phptojs\JsObject('gLoggedInfo', array('connections' => 0)); - $sessionStorage = Zend_Auth::getInstance()->getStorage(); - $sessionData = $sessionStorage->read(); - - if ($sessionStorage->isEmpty()) { - $loggedinfo->logged = false; + $user = $this->_helper->SyjSession->user(); + if ($user) { + $loggedinfo->logged = true; } else { - $userMapper = new Syj_Model_UserMapper(); - $obj = new Syj_Model_User(); - if ($userMapper->find($sessionData['user'], $obj)) { - $loggedinfo->logged = true; - } else { - // non existent user - Zend_Session::start(); - Zend_Session::destroy(); - $loggedinfo->logged = false; - } + $loggedinfo->logged = false; } if (isset($path)) { - if ($path->owner->id == $sessionData['user']) { + if ($user and $path->owner->id == $user->id) { $loggedinfo->isowner = true; } else { $loggedinfo->isowner = false;