Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / deletable.php

diff --git a/website/deletable.php b/website/deletable.php
old mode 100755 (executable)
new mode 100644 (file)
index 531bdad..ac4294b
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,6 +1,5 @@
 <?php
 
 <?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');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/output.php');


@@ -8,13 +7,14 @@ ini_set('memory_limit', '200M');
 
 $sOutputFormat = 'html';
 
 
 $sOutputFormat = 'html';
 

-$oDB =& getDB();
+$oDB = new Nominatim\DB();
+$oDB->connect();

 
 

-$sSQL = "select placex.place_id, calculated_country_code as country_code,";
+$sSQL = 'select placex.place_id, country_code,';

 $sSQL .= " name->'name' as name, i.* from placex, import_polygon_delete i";
 $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 = chksql($oDB->getAll($sSQL), "Could not get list of deleted OSM elements.");
+$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);
 
 if (CONST_Debug) {
     var_dump($aPolygons);


@@ -73,14 +73,14 @@ table td {
 <?php
 
 if (!$aPolygons) exit;
 <?php
 
 if (!$aPolygons) exit;

-echo "<tr>";
+echo '<tr>';

 // var_dump($aPolygons[0]);
 foreach ($aPolygons[0] as $sCol => $sVal) {
 // var_dump($aPolygons[0]);
 foreach ($aPolygons[0] as $sCol => $sVal) {

-    echo "<th>".$sCol."</th>";
+    echo '<th>'.$sCol.'</th>';

 }
 }

-echo "</tr>";
+echo '</tr>';

 foreach ($aPolygons as $aRow) {
 foreach ($aPolygons as $aRow) {

-    echo "<tr>";
+    echo '<tr>';

     foreach ($aRow as $sCol => $sVal) {
         switch ($sCol) {
             case 'osm_id':
     foreach ($aRow as $sCol => $sVal) {
         switch ($sCol) {
             case 'osm_id':


@@ -90,11 +90,11 @@ foreach ($aPolygons as $aRow) {
                 echo '<td>'.detailsLink($aRow).'</td>';
                 break;
             default:
                 echo '<td>'.detailsLink($aRow).'</td>';
                 break;
             default:

-                echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
+                echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';

                 break;
         }
     }
                 break;
         }
     }

-    echo "</tr>";
+    echo '</tr>';

 }
 
 ?>
 }
 
 ?>