X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=d3c4bcb20238c6f7727d6b1392cdb806fb3f4664;hb=ecc2a5e8ea444b4a0f2384355e4fa21c6571ab2e;hp=ac315581eafbc29eb300c65cbba1a7c9c908b835;hpb=05ce9238adfa982746bfc6211b240fd24526af09;p=syj.git

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index ac31558..d3c4bcb 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -20,7 +20,7 @@ class IdxController extends Zend_Controller_Action
     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'));
@@ -35,13 +35,15 @@ class IdxController extends Zend_Controller_Action
                     throw new Syj_Exception_NotFound('Not Found', 404);
                 }
             }
+            $geomform->setAction('path/' . (string)$path->id . '/update');
             $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);
             $loginform->login_geom_id->setValue((string)$path->id);
+            $jsgeom = new phptojs\JsObject('gInitialGeom', array('data' => (string) $path->geom));
+            $this->view->headScript()->prependScript((string) $jsgeom);
         } 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";
@@ -68,14 +70,13 @@ class IdxController extends Zend_Controller_Action
         }
 
         if (isset($path)) {
-            if ($user and $path->owner->id == $user->id) {
-                $loggedinfo->isowner = true;
-            } else {
-                $loggedinfo->isowner = false;
+            $loggedinfo->iscreator = $path->isCreator($user);
+            if ($path->creator) {
+                $loggedinfo->creatorname = $this->view->escape((string)$path->creator->pseudo);
             }
-            $loggedinfo->ownername = $this->view->escape((string)$path->owner->pseudo);
+            $loggedinfo->pathid = (string)$path->id;
         } else {
-            $loggedinfo->isowner = true;
+            $loggedinfo->iscreator = true;
         }
 
         $this->view->headScript()->prependScript((string) $loggedinfo);
@@ -85,7 +86,7 @@ class IdxController extends Zend_Controller_Action
         $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"),
@@ -93,21 +94,24 @@ 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 <a href='http://openstreetmap.org/'>OpenStreetMap</a>")
+            'osmAttribution' => __("Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"),
+            'pseudoChecking' => __("checking availibilty"),
+            'availablePseudo' => __("available pseudo"),
+            'unavailablePseudo' => __("unavailable pseudo"),
+            'editAction' => __("edit"),
+            'createAction' => __("create"),
+            'cloneAction' => __("duplicate"),
+            'unsavedConfirmExit' => __("You have an unsaved route"),
             );
     }