X-Git-Url: https://dev.renevier.net/gitweb.cgi?a=blobdiff_plain;f=application%2Fcontrollers%2FGeomController.php;h=b01837c8c50c218e20cb452c59ffc6ff3bebe4dc;hb=38d6d087c394c73df4b980f3ac7bb07951f253e0;hp=0c399fedd89684f989e17bb860b4e62222117351;hpb=1f6105289a49079809c2a4677b561bc82c62db88;p=syj.git
diff --git a/application/controllers/GeomController.php b/application/controllers/GeomController.php
index 0c399fe..b01837c 100644
--- a/application/controllers/GeomController.php
+++ b/application/controllers/GeomController.php
@@ -28,12 +28,14 @@ class GeomController extends Zend_Controller_Action
}
if (!$pathMapper->find($idx, $path)) {
- if ($pathMapper->hasexisted($idx)) {
- $api->setCode(410);
- } else {
- $api->setCode(404);
+ if (!$pathMapper->findByTitle($idx, $path)) {
+ if ($pathMapper->hasexisted($idx)) {
+ $api->setCode(410);
+ } else {
+ $api->setCode(404);
+ }
+ return;
}
- return;
}
switch ($ext) {
@@ -56,9 +58,11 @@ class GeomController extends Zend_Controller_Action
$data .= '';
$data .= '';
if ($path->creator) {
- $data .= '' . htmlspecialchars($path->creator->pseudo) . '';
+ $data .= ''
+ . htmlspecialchars($path->creator->pseudo, ENT_COMPAT, "UTF-8")
+ . '';
}
- $data .= '' . htmlspecialchars($path->displayTitle) . '';
+ $data .= '' . htmlspecialchars($path->displayTitle, ENT_COMPAT, "UTF-8") . '';
$data .= $path->geom->toKML();
$data .= '';
$data .= '';
@@ -72,15 +76,15 @@ class GeomController extends Zend_Controller_Action
$data .= '';
$data .= '';
if ($path->creator) {
- $data .= '' . htmlspecialchars($path->creator->pseudo) . '';
+ $data .= '' . htmlspecialchars($path->creator->pseudo, ENT_COMPAT, "UTF-8") . '';
}
- $data .= '' . htmlspecialchars($path->displayTitle) . '';
+ $data .= '' . htmlspecialchars($path->displayTitle, ENT_COMPAT, "UTF-8") . '';
$data .= $path->geom->toGPX();
$data .= '';
$data .= '';
$api = $this->_helper->SyjApi;
- $api->setCheckIfNoneMatch(true)->setContentType('application/octet-stream')->setBody($data);
+ $api->setCheckIfNoneMatch(true)->setContentType('application/gpx+xml')->setBody($data);
}
protected function json(Syj_Model_Path $path) {