X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9712decefed0d5a25a636e8f807d30050b1a7b95..d643ca8dee1d1371b3128129f416fc2e99912b7b:/website/polygons.php

diff --git a/website/polygons.php b/website/polygons.php
old mode 100755
new mode 100644
index 4c1401ef..29fc5c27
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -1,6 +1,5 @@
 <?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');
@@ -13,12 +12,13 @@ $iDays = $oParams->getInt('days', false);
 $bReduced = $oParams->getBool('reduced', false);
 $sClass = $oParams->getString('class', false);
 
-$oDB =& getDB();
+$oDB = new Nominatim\DB();
+$oDB->connect();
 
-$iTotalBroken = (int) chksql($oDB->getOne('select count(*) from import_polygon_error'));
+$iTotalBroken = (int) $oDB->getOne('select count(*) from import_polygon_error');
 
 $aPolygons = array();
-while ($iTotalBroken && !sizeof($aPolygons)) {
+while ($iTotalBroken && empty($aPolygons)) {
     $sSQL = 'select osm_type as "type",osm_id as "id",class as "key",type as "value",name->\'name\' as "name",';
     $sSQL .= 'country_code as "country",errormessage as "error message",updated';
     $sSQL .= ' from import_polygon_error';
@@ -32,12 +32,12 @@ while ($iTotalBroken && !sizeof($aPolygons)) {
     if ($bReduced) $aWhere[] = "errormessage like 'Area reduced%'";
     if ($sClass) $sWhere[] = "class = '".pg_escape_string($sClass)."'";
 
-    if (sizeof($aWhere)) {
+    if (!empty($aWhere)) {
         $sSQL .= ' where '.join(' and ', $aWhere);
     }
 
     $sSQL .= ' order by updated desc limit 1000';
-    $aPolygons = chksql($oDB->getAll($sSQL));
+    $aPolygons = $oDB->getAll($sSQL);
 }
 
 if (CONST_Debug) {
@@ -120,7 +120,7 @@ foreach ($aPolygons as $aRow) {
                 }
                 break;
             case 'id':
-                echo '<td>'.osmLink($aRow).'</td>';
+                echo '<td>'.osmLink(array('osm_type' => $aRow['type'], 'osm_id' => $aRow['id'])).'</td>';
                 break;
             default:
                 echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';