move deletable and polygons into default website

diff --git a/utils/setup.php b/utils/setup.php
index 8cbb29781729d46bdee0d9f5407389ef845453d3..3fe5a7abec3594f4e455443a23f3e3e1d87c4358 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -568,6 +568,8 @@
                @symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php');
                @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php');
                @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/index.php');
                @symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php');
                @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php');
                @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/index.php');

+               @symlink(CONST_BasePath.'/website/deletable.php', $sTargetDir.'/deletable.php');
+               @symlink(CONST_BasePath.'/website/polygons.php', $sTargetDir.'/polygons.php');

                @symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images');
                @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
                @symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
                @symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images');
                @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
                @symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');

diff --git a/website/deletable.php b/website/deletable.php
index 8d3fa823409415685acc5502e7c152acd05b4041..4e2e623c3c43a8f2834bd4bf9cb55dc5f009913b 100755 (executable)
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -9,11 +9,10 @@
 
        $sSQL = "select placex.place_id, calculated_country_code as country_code, name->'name' as name, i.* from placex, import_polygon_delete i where placex.osm_id = i.osm_id and placex.osm_type = i.osm_type and placex.class = i.class and placex.type = i.type";
        $aPolygons = $oDB->getAll($sSQL);
 
        $sSQL = "select placex.place_id, calculated_country_code as country_code, name->'name' as name, i.* from placex, import_polygon_delete i where placex.osm_id = i.osm_id and placex.osm_type = i.osm_type and placex.class = i.class and placex.type = i.type";
        $aPolygons = $oDB->getAll($sSQL);

-    if (PEAR::isError($aPolygons))
-    {
-         failInternalError("Could not get small viewbox.", $sSQL, $aPolygons);
-    }
-
+       if (PEAR::isError($aPolygons))
+       {
+               failInternalError("Could not get list of deleted OSM elements.", $sSQL, $aPolygons);
+       }

 
 //var_dump($aPolygons);
 ?>
 
 //var_dump($aPolygons);
 ?>