use chksql everywhere in lib/

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index 5b269fc0755ce395a7259fcb98610ad60d2baf34..495db2b40e668277fd18ceb92bfbc10cba5c923f 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -4,13 +4,14 @@
        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(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');

 
        $sOutputFormat = 'html';
        /*
           $fLoadAvg = getLoadAverage();
           if ($fLoadAvg > 3)
           {
 
        $sOutputFormat = 'html';
        /*
           $fLoadAvg = getLoadAverage();
           if ($fLoadAvg > 3)
           {

-          echo "Page temporarily blocked due to high server load\n";F
+          echo "Page temporarily blocked due to high server load\n";

           exit;
           }
         */
           exit;
           }
         */


@@ -21,15 +22,18 @@
        $aLangPrefOrder = getPreferredLanguages();
        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
        $aLangPrefOrder = getPreferredLanguages();
        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 

-       if (isset($_GET['osmtype']) && isset($_GET['osmid']) && (int)$_GET['osmid'] && ($_GET['osmtype'] == 'N' || $_GET['osmtype'] == 'W' || $_GET['osmtype'] == 'R'))
+       $sPlaceId = getParamString('place_id');
+       $sOsmType = getParamSet('osmtype', array('N', 'W', 'R'));
+       $iOsmId = getParamInt('osmid', -1);
+       if ($sOsmType && $iOsmId > 0)

        {
        {

-               $_GET['place_id'] = $oDB->getOne("select place_id from placex where osm_type = '".$_GET['osmtype']."' and osm_id = ".(int)$_GET['osmid']." order by type = 'postcode' asc");
+               $sPlaceId = chksql($oDB->getOne("select place_id from placex where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by type = 'postcode' asc"));

 
                // Be nice about our error messages for broken geometry
 
 
                // Be nice about our error messages for broken geometry
 

-               if (!$_GET['place_id'])
+               if (!$sPlaceId)

                {
                {

-                       $aPointDetails = $oDB->getRow("select osm_type, osm_id, errormessage, class, type, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ST_AsText(prevgeometry) as prevgeom, ST_AsText(newgeometry) as newgeom from import_polygon_error where osm_type = '".$_GET['osmtype']."' and osm_id = ".(int)$_GET['osmid']." order by updated desc limit 1");
+                       $aPointDetails = chksql($oDB->getRow("select osm_type, osm_id, errormessage, class, type, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ST_AsText(prevgeometry) as prevgeom, ST_AsText(newgeometry) as newgeom from import_polygon_error where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by updated desc limit 1"));

                        if (!PEAR::isError($aPointDetails) && $aPointDetails) {
                                if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches))
                                {
                        if (!PEAR::isError($aPointDetails) && $aPointDetails) {
                                if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches))
                                {


@@ -48,25 +52,24 @@
        }
 
 
        }
 
 

-       if (!isset($_GET['place_id']))
+       if (!$sPlaceId) userError("Please select a place id");
+
+       $iPlaceID = (int)$sPlaceId;
+
+       if (CONST_Use_US_Tiger_Data)

        {
        {

-               echo "Please select a place id";
-               exit;
+               $iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID));
+               if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;

        }
 
        }
 

-       $iPlaceID = (int)$_GET['place_id'];
-
-       $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID);
-       if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
-       $iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID);
-       if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
+       if (CONST_Use_Aux_Location_data)
+       {
+               $iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID));
+               if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
+       }

 
        $hLog = logStart($oDB, 'details', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 
        $hLog = logStart($oDB, 'details', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 

-       // Make sure the point we are reporting on is fully indexed
-       //$sSQL = "UPDATE placex set indexed = true where indexed = false and place_id = $iPlaceID";
-       //$oDB->query($sSQL);
-

        // Get the details for this point
        $sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, calculated_country_code as country_code, importance, wikipedia,";
        $sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') as indexed_date, parent_place_id, rank_address, rank_search, get_searchrank_label(rank_search) as rank_search_label, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ";
        // Get the details for this point
        $sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, calculated_country_code as country_code, importance, wikipedia,";
        $sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') as indexed_date, parent_place_id, rank_address, rank_search, get_searchrank_label(rank_search) as rank_search_label, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ";


@@ -76,11 +79,8 @@
        $sSQL .= " case when importance = 0 OR importance IS NULL then 0.75-(rank_search::float/40) else importance end as calculated_importance, ";
        $sSQL .= " ST_AsText(CASE WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ELSE geometry END) as outlinestring";
        $sSQL .= " from placex where place_id = $iPlaceID";
        $sSQL .= " case when importance = 0 OR importance IS NULL then 0.75-(rank_search::float/40) else importance end as calculated_importance, ";
        $sSQL .= " ST_AsText(CASE WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ELSE geometry END) as outlinestring";
        $sSQL .= " from placex where place_id = $iPlaceID";

-       $aPointDetails = $oDB->getRow($sSQL);
-       if (PEAR::IsError($aPointDetails))
-       {
-               failInternalError("Could not get details of place object.", $sSQL, $aPointDetails);
-       }
+       $aPointDetails = chksql($oDB->getRow($sSQL),
+                               "Could not get details of place object.");

        $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
 
        $aClassType = getClassTypesWithImportance();
        $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
 
        $aClassType = getClassTypesWithImportance();


@@ -132,7 +132,7 @@
 
        $aPlaceSearchNameKeywords = false;
        $aPlaceSearchAddressKeywords = false;
 
        $aPlaceSearchNameKeywords = false;
        $aPlaceSearchAddressKeywords = false;

-       if (isset($_GET['keywords']) && $_GET['keywords'])
+       if (getParamBool('keywords'))

        {
                $sSQL = "select * from search_name where place_id = $iPlaceID";
                $aPlaceSearchName = $oDB->getRow($sSQL);
        {
                $sSQL = "select * from search_name where place_id = $iPlaceID";
                $aPlaceSearchName = $oDB->getRow($sSQL);


@@ -162,10 +162,9 @@
 
        if ($sOutputFormat=='html')
        {
 
        if ($sOutputFormat=='html')
        {

-               $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
+               $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));

                $sTileURL = CONST_Map_Tile_URL;
                $sTileAttribution = CONST_Map_Tile_Attribution;
        }
 
                $sTileURL = CONST_Map_Tile_URL;
                $sTileAttribution = CONST_Map_Tile_Attribution;
        }
 

-       

        include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');
        include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');