X-Git-Url: https://dev.renevier.net/gitweb.cgi?p=syp.git;a=blobdiff_plain;f=items.php;h=3efed088d44e5138c7ebd9f3eb3467ef877c6206;hp=f816cfbeb25f1f8b060779ea105bef8afed77095;hb=fc2dd35ebd3dd2905f7ee24f6622d8dabd32b715;hpb=7282fabcfef34ef95b8c6bd414f34d77037451e1
diff --git a/items.php b/items.php
index f816cfb..3efed08 100644
--- a/items.php
+++ b/items.php
@@ -2,12 +2,14 @@
/* Copyright (c) 2009 Arnaud Renevier, Inc, published under the modified BSD
license. */
-require ("./inc/settings.php");
-require ("./inc/errors.php");
-require ("./inc/db/mysql.php");
+require_once ("./inc/settings.php");
+require_once ("./inc/utils.php");
+require_once ("./inc/db/mysql.php");
function main ($features) {
+ header("Cache-control: no-cache");
+
echo '
@@ -17,34 +19,42 @@ function main ($features) {
printf (' %s', SITETITLE);
}
foreach ($features as $feature) {
+ $id = $feature->id;
$title = htmlspecialchars ($feature->title, ENT_QUOTES);
$description = htmlspecialchars ($feature->description, ENT_QUOTES);
- if (strpos ($feature->imgurl, "http://") === 0) {
- $imgurl = "http://" . rawurlencode (substr($feature->imgurl, 7));
- } else if (strpos ($feature->imgurl, "https://") === 0) {
- $imgurl = "https://" . rawurlencode (substr ($feature->imgurl, 8));
- } else {
- $imgurl = rawurlencode ($feature->imgurl);
- }
- $imgurl = str_replace ('%2F', '/', $imgurl);
+ $imgurl = ($feature->imgpath ?
+ full_url_from_filename ($feature->imgpath)
+ : "");
$lon = $feature->lon;
$lat = $feature->lat;
$alt = (strlen ($title) > 60) ?
(substr ($title, 0, 57) . '...') :
$title;
+ if ($imgurl) {
+ $imgurlHTML = sprintf ('', $alt, $imgurl);
+ } else {
+ $imgurlHTML = "";
+ }
+
+ if ($description) {
+ $descriptionHTML = sprintf ('%s
', $description) ;
+ } else {
+ $descriptionHTML = "";
+ }
+
printf ('
-
+
%s
%s
-
+ %s
+ %s
]]>
%s,%s
-', $title, $description, $alt, $imgurl, $lon, $lat);
+', $id, $title, $descriptionHTML, $imgurlHTML, $lon, $lat);
}
echo'
@@ -55,7 +65,7 @@ try {
$connection->connect (DBHOST, DBUSER, DBPWD, DBNAME, DBPREFIX);
$features = $connection->listfeatures ();
} catch (Exception $e) {
- server_error ();
+ exit ("server error");
}
header ("Content-type: application/vnd.google-earth.kml+xml");
main ($features);