X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=997be3d5abbde3d8e62782972efe25cb63296aa9;hb=refs%2Fheads%2Fmaster;hp=b7d36839f01499feadc193250114259723cfc00e;hpb=c1aeb7538786d8c9f3b3337c0b71e21ef89d9c77;p=syj.git
diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index b7d3683..997be3d 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -1,5 +1,5 @@
_helper->SyjMedias->addScripts('idx');
- $this->view->headLink()->appendStylesheet('css/olstyle.css', "all");
- $this->view->headLink()->appendStylesheet('css/generic.css', "all");
- $this->view->headLink()->appendStylesheet('css/syj.css', "all");
+ $this->_helper->SyjMedias->addStyleSheets('idx');
+ $this->view->headMeta()->appendName('viewport', 'width=640');
}
public function rawmode(Syj_Model_Path $path) {
$this->_helper->SyjReset->resetPlaceHolders();
$this->_helper->SyjMedias->addScripts('rawidx');
+ $this->_helper->SyjMedias->addStyleSheets('rawidx');
- $this->view->headLink()->appendStylesheet('css/generic.css', 'all');
- $this->view->headLink()->appendStylesheet('css/syjraw.css', 'all');
$this->view->headTitle($path->displayTitle);
$this->_jsRawLocaleStrings();
@@ -61,6 +59,7 @@ class IdxController extends Zend_Controller_Action
$this->view->headScript()->prependScript((string) $jsgeom);
$this->view->loginform->login_geom_id->setValue((string)$path->id);
$this->view->geomform->geom_title->setValue($path->title);
+ $this->view->profileActive = $this->_hasAltiProfile($path);
} else {
$this->_setInitialPos();
$title = "Show your journey";
@@ -75,7 +74,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 +106,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');
@@ -115,17 +114,18 @@ class IdxController extends Zend_Controller_Action
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");
+ $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 {
@@ -145,6 +145,7 @@ class IdxController extends Zend_Controller_Action
protected function _jsRawLocaleStrings() {
$this->view->jslocales = array(
'osmAttribution' => __("Map by OpenStreetMap"),
+ 'mapquestAttribution' => __("Map by MapQuest, OpenStreetMap and contributors, CC-BY-SA"),
);
}
@@ -153,7 +154,6 @@ class IdxController extends Zend_Controller_Action
'saveSuccess' => __("save took place successfully"),
'requestError' => __("server did not understood request. That's probably caused by a bug in SYJ"),
'gonePathError' => __("route not referenced on the server. It has probably been deleted."),
- 'uniquePathError' => __("similar path seems to already exist. Please do not create two exactly identical paths"),
'notReachedError' => __("server could not be reached"),
'serverError' => __("there was a server error"),
'unknownError' => __("there was an unknown error"),
@@ -171,6 +171,7 @@ class IdxController extends Zend_Controller_Action
'canResubmit' => __("Now, you can retry to save"),
'routeBy' => __("route by"),
'osmAttribution' => __("Map by OpenStreetMap"),
+ 'mapquestAttribution' => __("Map by MapQuest, OpenStreetMap and contributors, CC-BY-SA"),
'pseudoChecking' => __("checking availibilty"),
'availablePseudo' => __("available pseudo"),
'unavailablePseudo' => __("unavailable pseudo"),
@@ -180,7 +181,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"),
);
}
@@ -215,4 +216,30 @@ class IdxController extends Zend_Controller_Action
return round($size) . $sizes[$c];
}
+ private function _hasAltiProfile($path) {
+ if (!extension_loaded('gd')) {
+ return false;
+ }
+ $cachefile = $path->getProfileCache('small');
+ if (file_exists($cachefile)) {
+ return filesize($cachefile) != 0;
+ }
+
+ try {
+ $service = $this->_helper->SyjAltiService->service();
+ } catch(Exception $e) {
+ return false;
+ }
+
+ try {
+ $path->getAltiProfile($service, 2 / 100);
+ return true;
+ } catch(Syj_Exception_NotImplemented $e) {
+ @touch($cachefile);
+ return false;
+ } catch(Exception $e) {
+ return false;
+ }
+ }
+
}