use cookies instead of session to manage login

[syj.git] / application / controllers / PathController.php

diff --git a/application/controllers/PathController.php b/application/controllers/PathController.php
index bb969e82c8ed6b15888a6cf9de01adc0510c7a4e..7d7ae6af8cd2bb843fa707195671bd627a876f3b 100644 (file)
--- a/application/controllers/PathController.php
+++ b/application/controllers/PathController.php
@@ -1,5 +1,5 @@
 <?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 PathController extends Zend_Controller_Action
@@ -8,7 +8,7 @@ class PathController extends Zend_Controller_Action
         $formData = $this->_helper->SyjPostData->getPostData('Syj_Form_Geom');
         $path = new Syj_Model_Path();
 
-        $user = $this->_helper->SyjSession->user();
+        $user = $this->_helper->SyjUserManager->current();
         if (!$user and !$formData["geom_accept"]) {
             throw new Syj_Exception_Request();
         }
@@ -16,8 +16,14 @@ class PathController extends Zend_Controller_Action
         $path->creatorIp = $this->getRequest()->getClientIp(true);
 
         $this->save($path, $formData);
-        $data = array('redirect' => "idx/" . (string)$path->id);
-        $this->_helper->SyjApi->setCode(201)->setBodyJson($data);
+
+        $redirecturl = "idx/" . (string)$path->id;
+        if ($this->getRequest()->isXmlHttpRequest()) {
+            $data = array('redirect' => $redirecturl);
+            $this->_helper->SyjApi->setCode(201)->setBodyJson($data);
+        } else {
+            $this->_helper->SyjApi->setRedirect($redirecturl, 303);
+        }
     }
 
     public function updateAction() {
@@ -46,7 +52,7 @@ class PathController extends Zend_Controller_Action
             }
         }
 
-        $user = $this->_helper->SyjSession->user();
+        $user = $this->_helper->SyjUserManager->current();
         if (!$path->isCreator($user)) {
             throw new Syj_Exception_Forbidden();
         }
@@ -55,12 +61,22 @@ class PathController extends Zend_Controller_Action
 
     public function save(Syj_Model_Path $path, $formData) {
         /* setting geom property */
-        $decoder = new gisconverter\WKT();
-        try {
-            $geom = $decoder->geomFromText($formData["geom_data"]);
-        } catch (gisconverter\CustomException $e) {
-            throw new Syj_Exception_Request();
+        $geom = null;
+        foreach (array("WKT", "KML", "GPX", "geoJSON") as $dectype) {
+            $classname = 'gisconverter\\' . $dectype;
+            $decoder = new $classname();
+            try {
+                $geom = $decoder->geomFromText($formData["geom_data"]);
+            } catch (Exception $e) {
+            }
+            if ($geom) {
+                break;
+            }
         }
+        if (!$geom) {
+            throw new Syj_Exception_InvalidGeomUpload();
+        }
+
         if ($geom::name != "LineString") {
             throw new Syj_Exception_Request();
         }