Merge remote-tracking branch 'upstream/master'

diff --combined website/reverse.php
index 3f062f46bff8b870eaff8a4194cb0990dea89f24,93cb58771cd3ad68df10ab6ec50798e4102bd77d..d70a11e9e2a1a0f3639711f9522273a5865bab5a
--- 1/website/reverse.php
--- 2/website/reverse.php
+++ b/website/reverse.php
@@@ -6,6 -6,18 +6,6 @@@
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
  
 -      if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
 -      {
 -              $fLoadAvg = getLoadAverage();
 -              if ($fLoadAvg > 2) sleep(60);
 -              if ($fLoadAvg > 4) sleep(120);
 -              if ($fLoadAvg > 6)
 -              {
 -                      echo "Bulk User: Temporary block due to high server load\n";
 -                      exit;
 -              }
 -      }
 -
        $oDB =& getDB();
        ini_set('memory_limit', '200M');
  
@@@ -33,10 -45,8 +33,8 @@@
                $oPlaceLookup->setOSMID($_GET['osm_type'], $_GET['osm_id']);
  
                $aPlace = $oPlaceLookup->lookup();
- 
-               //if (!$iPlaceID) $sError = 'OSM ID Not Found';
        }
-       else
+       else if (isset($_GET['lat']) && isset($_GET['lon']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lat']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lon']))
        {
                $oReverseGeocode = new ReverseGeocode($oDB);
                $oReverseGeocode->setLanguagePreference($aLangPrefOrder);
@@@ -47,9 -57,11 +45,13 @@@
  
                $aPlace = $oReverseGeocode->lookup();
        }
+       else
+       {
+               $aPlace = null;
+       }
  
 +      logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
 +
        if (CONST_Debug) exit;
  
        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');