Merge pull request #4061 from marcosgdf/bug-3231

FIX #3231 [Members] Public subscription page displays GeoIP error
This commit is contained in:
Laurent Destailleur 2015-11-21 17:58:29 +01:00
commit 7bde781206

View File

@ -58,18 +58,15 @@ class DolGeoIP
// Here, function exists (embedded into PHP or exists because we made include)
if (empty($type) || empty($datfile))
{
//dol_syslog("DolGeoIP::DolGeoIP parameter datafile not defined", LOG_ERR);
$this->errorlabel='DolGeoIP constructor was called with no datafile parameter';
//dol_print_error('','DolGeoIP constructor was called with no datafile parameter');
print $this->errorlabel;
$this->errorlabel='Constructor was called with no datafile parameter';
dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
return 0;
}
if (! file_exists($datfile) || ! is_readable($datfile))
{
//dol_syslog("DolGeoIP::DolGeoIP datafile ".$datfile." can not be read", LOG_ERR);
$this->error='ErrorGeoIPClassNotInitialized';
$this->errorlabel="Datafile ".$datfile." not found";
print $this->errorlabel; // To be sure to understand when it fails on screens
dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
return 0;
}