Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add try catch

Browse Source
This commit is contained in:
ldestailleur
2025-09-26 01:56:19 +02:00
parent f65903d006
commit 75438c60c7
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
htdocs/core/class/dolgeoip.class.php
View File

@@ -58,31 +58,36 @@ class DolGeoIP
*/ */
public function __construct($type, $datfile) public function __construct($type, $datfile)
{ {
global $conf;
$geoipversion = '2'; // 'php', or geoip version '2' $geoipversion = '2'; // 'php', or geoip version '2'
if (getDolGlobalString('GEOIP_VERSION')) { if (getDolGlobalString('GEOIP_VERSION')) {
$geoipversion = getDolGlobalString('GEOIP_VERSION'); $geoipversion = getDolGlobalString('GEOIP_VERSION');
} }
if ($type == 'country') { try {
// geoip may have been already included with PEAR if ($type == 'country') {
if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name'))) { // geoip may have been already included with PEAR
if (function_exists('stream_wrapper_restore')) { if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name'))) {
stream_wrapper_restore('phar'); if (function_exists('stream_wrapper_restore')) {
stream_wrapper_restore('phar');
}
include_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
} }
include_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar'; } elseif ($type == 'city') {
} // geoip may have been already included with PEAR
} elseif ($type == 'city') { if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name'))) {
// geoip may have been already included with PEAR if (function_exists('stream_wrapper_restore')) {
if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name'))) { stream_wrapper_restore('phar');
if (function_exists('stream_wrapper_restore')) { }
stream_wrapper_restore('phar'); include_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
} }
include_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar'; } else {
print 'ErrorBadParameterInConstructor';
return;
} }
} else { } catch (Exception $e) {
print 'ErrorBadParameterInConstructor'; $this->error = $e->getMessage();
$this->errorlabel = 'Exception '.$this->error;
dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
return; return;
} }