X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=ac315581eafbc29eb300c65cbba1a7c9c908b835;hb=05ce9238adfa982746bfc6211b240fd24526af09;hp=589c71b49390d59d7d3068c912bbeb209aa8ed13;hpb=190fd621df4920c56a422c03663874cddaa67d64;p=syj.git

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 589c71b..ac31558 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -10,10 +10,7 @@ class IdxController extends Zend_Controller_Action
         $this->view->headScript()->appendFile('js/ModifiablePath.js');
         $this->view->headScript()->appendFile('js/prototype.js');
         $this->view->headScript()->appendFile('js/simplebox.js');
-        $this->view->headScript()->appendFile('js/closebtn.js');
-        $this->view->headScript()->appendFile('js/deck.js');
-        $this->view->headScript()->appendFile('js/ajaxize.js');
-        $this->view->headScript()->appendFile('js/message.js');
+        $this->view->headScript()->appendFile('js/utils.js');
         $this->view->headScript()->appendFile('js/syj.js');
         $this->view->headLink()->appendStylesheet('css/openlayers/style.css');
         $this->view->headLink()->appendStylesheet('css/generic.css');
@@ -57,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;