X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/eb0b3bfa4cd74ee9e425c54868a30d8859e694cd..5fd8f5aa2770a8193a36de20462c710bb00a0222:/website/deletable.php?ds=sidebyside

diff --git a/website/deletable.php b/website/deletable.php
old mode 100755
new mode 100644
index 1866f890..ac4294ba
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,21 +1,26 @@
 <?php
-    require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
-    require_once(CONST_BasePath.'/lib/init-website.php');
-    require_once(CONST_BasePath.'/lib/log.php');
-    require_once(CONST_BasePath.'/lib/output.php');
-    ini_set('memory_limit', '200M');
 
-    $sOutputFormat = 'html';
+require_once(CONST_BasePath.'/lib/init-website.php');
+require_once(CONST_BasePath.'/lib/log.php');
+require_once(CONST_BasePath.'/lib/output.php');
+ini_set('memory_limit', '200M');
 
-    $oDB =& getDB();
+$sOutputFormat = 'html';
 
-    $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 = chksql($oDB->getAll($sSQL), "Could not get list of deleted OSM elements.");
+$oDB = new Nominatim\DB();
+$oDB->connect();
+
+$sSQL = 'select placex.place_id, country_code,';
+$sSQL .= " name->'name' as name, i.* from placex, import_polygon_delete i";
+$sSQL .= ' where placex.osm_id = i.osm_id and placex.osm_type = i.osm_type';
+$sSQL .= ' and placex.class = i.class and placex.type = i.type';
+$aPolygons = $oDB->getAll($sSQL, null, 'Could not get list of deleted OSM elements.');
+
+if (CONST_Debug) {
+    var_dump($aPolygons);
+    exit;
+}
 
-    if (CONST_DEBUG) {
-        var_dump($aPolygons);
-        exit;
-    }
 ?>
 <!DOCTYPE html>
 <html>
@@ -66,30 +71,32 @@ table td {
 
 <table>
 <?php
-    if (!$aPolygons) exit;
-    echo "<tr>";
-//var_dump($aPolygons[0]);
-    foreach ($aPolygons[0] as $sCol => $sVal) {
-        echo "<th>".$sCol."</th>";
-    }
-    echo "</tr>";
-    foreach ($aPolygons as $aRow) {
-        echo "<tr>";
-        foreach ($aRow as $sCol => $sVal) {
-            switch ($sCol) {
-                case 'osm_id':
-                    echo '<td>'.osmLink($aRow).'</td>';
-                    break;
-                case 'place_id':
-                    echo '<td>'.detailsLink($aRow).'</td>';
-                    break;
-                default:
-                    echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
-                    break;
-            }
+
+if (!$aPolygons) exit;
+echo '<tr>';
+// var_dump($aPolygons[0]);
+foreach ($aPolygons[0] as $sCol => $sVal) {
+    echo '<th>'.$sCol.'</th>';
+}
+echo '</tr>';
+foreach ($aPolygons as $aRow) {
+    echo '<tr>';
+    foreach ($aRow as $sCol => $sVal) {
+        switch ($sCol) {
+            case 'osm_id':
+                echo '<td>'.osmLink($aRow).'</td>';
+                break;
+            case 'place_id':
+                echo '<td>'.detailsLink($aRow).'</td>';
+                break;
+            default:
+                echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
+                break;
         }
-        echo "</tr>";
     }
+    echo '</tr>';
+}
+
 ?>
 </table>
 

".$sCol."
'.osmLink($aRow).'	'.detailsLink($aRow).'	".($sVal?$sVal:' ')."
'.$sCol.'
'.osmLink($aRow).'	'.detailsLink($aRow).'	'.($sVal?$sVal:' ').'