X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=caad6a1595bb51f09562d3e5698640973a013f69;hb=a64d41557a62ec6051d7fa08d1ba941e089aa5c2;hp=1e149fd429949f0c7a06f4ec9b314c99e408d2e1;hpb=9efd079d59d269811abc4c551b2f39ab2e6a05fb;p=syj.git

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 1e149fd..caad6a1 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -10,11 +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/highlight.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');
@@ -58,38 +54,26 @@ 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']) {
-                $loggedinfo->isowner = true;
-            } else {
-                $loggedinfo->isowner = false;
+            $loggedinfo->iscreator = $path->isCreator($user);
+            if ($path->creator) {
+                $loggedinfo->creatorname = $this->view->escape((string)$path->creator->pseudo);
             }
-            $loggedinfo->ownername = $this->view->escape((string)$path->owner->pseudo);
         } else {
-            $loggedinfo->isowner = true;
+            $loggedinfo->iscreator = true;
         }
 
         $this->view->headScript()->prependScript((string) $loggedinfo);
@@ -107,8 +91,6 @@ class IdxController extends Zend_Controller_Action
             'userEmptyWarn' => __("you must enter a login name"),
             'loginSuccess' => __("Login correct"),
             'loginFailure' => __("Wrong login/password"),
-            'loginNeeded' => __("You need to login before retrying to save"),
-            'cookiesNeeded' => __("You need to have cookies enabled to login to SYJ"),
             'passwordEmptyWarn' => __("you must enter a password"),
             'passwordNoMatchWarn' => __("Password do not match"),
             'acceptTermsofuseWarn' => __("You must accept terms of use"),