<?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
$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() {
$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');
if ($error->exception instanceof Syj_Exception_ToolargeGeomUpload) {
$maxsize = $this->_bytesToString(min($this->_strToBytes(ini_get('upload_max_filesize')),
$this->_strToBytes(ini_get('upload_max_filesize'))));
- $this->view->errorMsg = $this->view->translate('File too large. File size must not exceed %s', $maxsize);
+ $errorMsg = __('File too large. File size must not exceed %s', $maxsize);
} else if ($error->exception instanceof Syj_Exception_InvalidGeomUpload) {
- $this->view->errorMsg = $this->view->translate("Invalid file");
+ if ($error->exception->getMessage() === 'uniquepath') {
+ $errorMsg = __("similar path seems to already exist. Please do not create two exactly identical paths");
+ } else {
+ $errorMsg = __("Invalid file");
+ }
}
+ $this->view->errorMsg = $errorMsg;
}
}
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 {
'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"),
);
}