X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=997be3d5abbde3d8e62782972efe25cb63296aa9;hb=refs%2Fheads%2Fmaster;hp=790c8c766348edd0f88205b23670ee96db772c3d;hpb=ab004bfb8716d3d3a5def0404447a1b0236e3e61;p=syj.git
diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 790c8c7..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();
@@ -33,14 +31,11 @@ class IdxController extends Zend_Controller_Action
}
public function indexAction() {
- $url = $this->getRequest()->getUserParam('url');
-
- $geomform = new Syj_Form_Geom(array('name' => 'geomform'));
- $loginform = new Syj_Form_Login(array('name' => 'loginform', 'action' => 'login'));
- $userform = new Syj_Form_User(array('name' => 'userform', 'action' => 'user'));
- $newpwdform = new Syj_Form_Newpwd(array('name' => 'newpwdform', 'action' => 'newpwd'));
+ $this->_initForms();
+ $url = $this->getRequest()->getUserParam('url');
if (isset($url)) {
+ $this->view->geomform->setAction("");
$pathMapper = new Syj_Model_PathMapper();
$path = new Syj_Model_Path();
if (!$pathMapper->findByUrl($url, $path)) {
@@ -62,21 +57,11 @@ class IdxController extends Zend_Controller_Action
$this->view->path = $path;
$jsgeom = new phptojs\JsObject('gInitialGeom', array('data' => (string) $path->geom));
$this->view->headScript()->prependScript((string) $jsgeom);
- $loginform->login_geom_id->setValue((string)$path->id);
- $geomform->geom_title->setValue($path->title);
+ $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 {
- $geomform->setAction('path');
-
- $lat = $this->getRequest()->getQuery('lat');
- $lon = $this->getRequest()->getQuery('lon');
- $zoom = $this->getRequest()->getQuery('zoom');
- if (is_numeric ($lat) and is_numeric ($lon) and is_numeric ($zoom)) {
- $initialpos = array('lat' => (float)$lat, 'lon' => (float)$lon, 'zoom' => (int)$zoom);
- } else {
- $initialpos = $this->_helper->syjGeoip($this->getRequest()->getClientIp(true));
- }
-
- $this->view->headScript()->prependScript((string) new phptojs\JsObject('gInitialPos', $initialpos));
+ $this->_setInitialPos();
$title = "Show your journey";
}
@@ -88,17 +73,59 @@ class IdxController extends Zend_Controller_Action
}
$this->view->headTitle($title);
$this->view->headMeta()->appendName('description', $this->view->translate('website to share routes'));
- $this->view->geomform = $geomform;
- $this->view->loginform = $loginform;
- $this->view->userform = $userform;
- $this->view->newpwdform = $newpwdform;
- $this->view->loggedUser = $this->_helper->SyjSession->user();
+
+ $this->view->loggedUser = $this->_helper->SyjUserManager->current();
+ }
+
+ protected function _initForms() {
+ $this->view->geomform = new Syj_Form_Geom(array('name' => 'geomform', 'action' => 'path'));
+ $this->view->loginform = new Syj_Form_Login(array('name' => 'loginform', 'action' => 'login'));
+ $this->view->userform = new Syj_Form_User(array('name' => 'userform', 'action' => 'user'));
+ $this->view->newpwdform = new Syj_Form_Newpwd(array('name' => 'newpwdform', 'action' => 'newpwd'));
+ }
+
+ protected function _setInitialPos() {
+ $lat = $this->getRequest()->getQuery('lat');
+ $lon = $this->getRequest()->getQuery('lon');
+ $zoom = $this->getRequest()->getQuery('zoom');
+ if (is_numeric ($lat) and is_numeric ($lon) and is_numeric ($zoom)) {
+ $initialpos = array('lat' => (float)$lat, 'lon' => (float)$lon, 'zoom' => (int)$zoom);
+ } else {
+ $initialpos = $this->_helper->syjGeoip($this->getRequest()->getClientIp(true));
+ }
+ $this->view->headScript()->prependScript((string) new phptojs\JsObject('gInitialPos', $initialpos));
+ }
+
+ public function errorAction() {
+ Zend_Controller_Front::getInstance()->getRequest()->setRequestUri($this->_request->getBaseUrl());
+ $this->_initForms();
+ $this->_setInitialPos();
+
+ $this->_jsLoggedInfo(null);
+ $this->_jsLocaleStrings();
+
+ $this->view->headTitle("Show your journey");
+ $this->view->headMeta()->appendName('description', $this->view->translate('website to share routes'));
+ $this->view->loggedUser = $this->_helper->SyjUserManager->current();
+ $this->_helper->ViewRenderer->setViewScriptPathSpec(':controller/index.:suffix');
+
+ $error = $this->_getParam('error_handler');
+ if ($error) {
+ 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'))));
+ $errorMsg = __('File too large. File size must not exceed %s', $maxsize);
+ } else if ($error->exception instanceof Syj_Exception_InvalidGeomUpload) {
+ $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 {
@@ -118,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"),
);
}
@@ -126,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"),
@@ -144,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"),
@@ -153,8 +181,65 @@ 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"),
);
}
+ private function _strToBytes($value) {
+ $value = trim($value);
+ if (is_numeric($value)) {
+ return (integer) $value;
+ }
+ $last = strtolower($value[strlen($value)-1]);
+ $value = (int)$value;
+ switch ($last) {
+ case 'k' :
+ $value *= 1024;
+ break;
+ case 'm' :
+ $value *= 1024 * 1024;
+ break;
+ case 'g' :
+ $value *= 1024 * 1024 * 1024;
+ break;
+ default :
+ break;
+ }
+ return $value;
+ }
+
+ private function _bytesToString($size) {
+ $sizes = array('B', 'kB', 'MB', 'GB');
+ for ($c=0; $c < (count ($sizes) - 1) && $size >= 1024; $c++) {
+ $size = $size / 1024;
+ }
+ 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;
+ }
+ }
+
}