X-Git-Url: https://dev.renevier.net/gitweb.cgi?a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=10506dab3aee3a286a16bea8439ddcc6e03b52a9;hb=900d1254794c9dcd434c9fb13beac6bc1e9a6ab9;hp=1e149fd429949f0c7a06f4ec9b314c99e408d2e1;hpb=9efd079d59d269811abc4c551b2f39ab2e6a05fb;p=syj.git
diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 1e149fd..10506da 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -10,21 +10,38 @@ 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');
- $this->view->headLink()->appendStylesheet('css/syj.css');
+ $this->view->headLink()->appendStylesheet('css/openlayers/style.css', "all");
+ $this->view->headLink()->appendStylesheet('css/generic.css', "all");
+ $this->view->headLink()->appendStylesheet('css/syj.css', "all");
+ }
+
+ public function rawmode(Syj_Model_Path $path) {
+ $this->_helper->SyjReset->resetPlaceHolders();
+
+ $this->view->headLink()->appendStylesheet('css/generic.css', 'all');
+ $this->view->headLink()->appendStylesheet('css/syjraw.css', 'all');
+ $this->view->headScript()->appendFile('js/OpenLayers.js');
+ $this->view->headScript()->appendFile('js/syjraw.js');
+ $this->view->headTitle($path->displayTitle);
+
+ $this->_jsRawLocaleStrings();
+ if ($path->creator) {
+ $this->view->jslocales['geomAttribution'] =
+ $this->view->translate('route by %s', (string)$path->creator->pseudo);
+ }
+ $jsgeom = new phptojs\JsObject('gInitialGeom', array('data' => (string) $path->geom));
+ $this->view->headScript()->prependScript((string) $jsgeom);
+
+ $this->view->rawmode = true;
+ $this->_helper->ViewRenderer->setViewScriptPathSpec(':controller/raw.:suffix');
}
public function indexAction() {
$url = $this->getRequest()->getUserParam('url');
- $geomform = new Syj_Form_Geom(array('name' => 'geomform', 'action' => 'path'));
+ $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'));
@@ -34,18 +51,27 @@ class IdxController extends Zend_Controller_Action
$path = new Syj_Model_Path();
if (!$pathMapper->findByUrl($url, $path)) {
if (is_numeric($url) and $pathMapper->hasexisted($url)) {
+ $this->view->message = $this->view->translate("route has been deleted");
throw new Syj_Exception_NotFound('Gone', 410);
} else {
+ $this->view->message = $this->view->translate("route does not exist");
throw new Syj_Exception_NotFound('Not Found', 404);
}
}
+
+ if ($this->getRequest()->getQuery('format') == 'raw') {
+ $this->rawmode($path);
+ return;
+ }
+
$title = $path->displayTitle;
$this->view->path = $path;
- $geomform->geom_title->setValue($path->title);
- $geomform->geom_data->setValue((string)$path->geom);
- $geomform->geom_id->setValue((string)$path->id);
+ $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);
} else {
+ $geomform->setAction('path');
$extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($this->getRequest()->getClientIp(true)));
$this->view->headScript()->prependScript((string) $extent);
$title = "Show your journey";
@@ -53,53 +79,49 @@ class IdxController extends Zend_Controller_Action
$this->_jsLoggedInfo(isset($url) ? $path: null);
$this->_jsLocaleStrings();
+ if (isset ($url) and $path->creator) {
+ $this->view->jslocales['geomAttribution'] =
+ $this->view->translate('route by %s', (string)$path->creator->pseudo);
+ }
$this->view->headTitle($title);
$this->view->geomform = $geomform;
$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->ownername = $this->view->escape((string)$path->owner->pseudo);
+ $loggedinfo->iscreator = $path->isCreator($user);
+ $loggedinfo->pathid = (string)$path->id;
} else {
- $loggedinfo->isowner = true;
+ $loggedinfo->iscreator = true;
}
$this->view->headScript()->prependScript((string) $loggedinfo);
}
+ protected function _jsRawLocaleStrings() {
+ $this->view->jslocales = array(
+ 'osmAttribution' => __("Map by OpenStreetMap"),
+ );
+ }
+
protected function _jsLocaleStrings() {
$this->view->jslocales = array(
'saveSuccess' => __("save took place successfully"),
'requestError' => __("server did not understood request. That's probably caused by a bug in SYJ"),
- 'UnreferencedError' => __("path did not exist in the server. May be it has been already deleted"),
+ '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"),
@@ -107,21 +129,26 @@ 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"),
'emailEmptyWarn' => __("you must enter an email"),
'emailInvalidWarn' => __("invalid email"),
- 'invalidPseudo' => __("pseudo must only contain letters, digits, dots or underscores"),
- 'uniqueUserError' => __("unavailable pseudo"),
'uniqueEmailError' => __("an user is already registered with this email"),
'userSuccess' => __("Account created"),
'newpwdSuccess' => __("A link to reset your password has been emailed to you"),
'canResubmit' => __("Now, you can retry to save"),
'routeBy' => __("route by"),
- 'osmAttribution' => __("Map by OpenStreetMap")
+ 'osmAttribution' => __("Map by OpenStreetMap"),
+ 'pseudoChecking' => __("checking availibilty"),
+ 'availablePseudo' => __("available pseudo"),
+ 'unavailablePseudo' => __("unavailable pseudo"),
+ 'editAction' => __("edit"),
+ 'createAction' => __("create"),
+ 'cloneAction' => __("duplicate"),
+ 'unsavedConfirmExit' => __("You have an unsaved route"),
+ 'notEmptyField' => __("Value is required"),
+ 'noResult' => __("no result"),
);
}