X-Git-Url: https://dev.renevier.net/gitweb.cgi?a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=91606e61ebeb7e93898f2e23b69b931f2986037a;hb=d2d165910aacef01961120326452e616f53991f2;hp=b7d36839f01499feadc193250114259723cfc00e;hpb=c1aeb7538786d8c9f3b3337c0b71e21ef89d9c77;p=syj.git

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index b7d3683..91606e6 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -1,5 +1,5 @@
 <?php
-/*  This file is part of Syj, Copyright (c) 2010 Arnaud Renevier,
+/*  This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier,
     and is published under the AGPL license. */
 
 class IdxController extends Zend_Controller_Action
@@ -75,7 +75,7 @@ class IdxController extends Zend_Controller_Action
         $this->view->headTitle($title);
         $this->view->headMeta()->appendName('description', $this->view->translate('website to share routes'));
 
-        $this->view->loggedUser = $this->_helper->SyjSession->user();
+        $this->view->loggedUser = $this->_helper->SyjUserManager->current();
     }
 
     protected function _initForms() {
@@ -107,7 +107,7 @@ class IdxController extends Zend_Controller_Action
 
         $this->view->headTitle("Show your journey");
         $this->view->headMeta()->appendName('description', $this->view->translate('website to share routes'));
-        $this->view->loggedUser = $this->_helper->SyjSession->user();
+        $this->view->loggedUser = $this->_helper->SyjUserManager->current();
         $this->_helper->ViewRenderer->setViewScriptPathSpec(':controller/index.:suffix');
 
         $error = $this->_getParam('error_handler');
@@ -125,7 +125,7 @@ class IdxController extends Zend_Controller_Action
     protected function _jsLoggedInfo(Syj_Model_Path $path = null) {
         $loggedinfo = new phptojs\JsObject('gLoggedInfo', array('connections' => 0));
 
-        $user = $this->_helper->SyjSession->user();
+        $user = $this->_helper->SyjUserManager->current();
         if ($user) {
             $loggedinfo->logged = true;
         } else {
@@ -180,7 +180,7 @@ class IdxController extends Zend_Controller_Action
             'unsavedConfirmExit' => __("You have an unsaved route"),
             'notEmptyField' => __("Value is required"),
             'noResult' => __("no result"),
-            'dragFileError' => __("could not analyze file content"),
+            'uploadFileError' => __("could not analyze file content"),
             );
     }