X-Git-Url: https://dev.renevier.net/gitweb.cgi?a=blobdiff_plain;f=application%2Fcontrollers%2FErrorController.php;h=486c24a948aef9138291d49a3ba910f2f5e2bc39;hb=c1aeb7538786d8c9f3b3337c0b71e21ef89d9c77;hp=fed3945cbd7dbf89322fb1604c1278f70d0f157f;hpb=8e7d8e39a2ee5801a2f68b95cdc0e84b55da1019;p=syj.git

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index fed3945..486c24a 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -41,8 +41,13 @@ class ErrorController extends Zend_Controller_Action
             $log->crit($this->view->message, $error->exception);
         }
 
-        if ($error_code != 404 and $error_code != 410 and $error->request->isXmlHttpRequest()) {
+        if ($error_code == 400 and $error->request->isXmlHttpRequest()) {
             return $this->_helper->json(array('message' => $error->exception->getMessage()));
+        } else if ($error->exception instanceof Syj_Exception_InvalidGeomUpload) {
+            // invalid file upload: we will redirect to main page
+            $this->_helper->SyjReset->resetPlaceHolders();
+            $this->_request->setControllerName('idx')->setActionName('error')->setDispatched(false);
+            return;
         }
 
         // conditionally display exceptions