lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix try fix function not found of qodana

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-11 17:06:23 +01:00
parent 62d3348471
commit 2eb054a170
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/api/index.php
View File

@ -389,13 +389,13 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
$usecompression = (empty($conf->global->API_DISABLE_COMPRESSION) && !empty($_SERVER['HTTP_ACCEPT_ENCODING'])); $usecompression = (empty($conf->global->API_DISABLE_COMPRESSION) && !empty($_SERVER['HTTP_ACCEPT_ENCODING']));
$foundonealgorithm = 0; $foundonealgorithm = 0;
if ($usecompression) { if ($usecompression) {
if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress')) { if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && function_exists('brotli_compress')) {
$foundonealgorithm++; $foundonealgorithm++;
} }
if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && is_callable('bzcompress')) { if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && function_exists('bzcompress')) {
$foundonealgorithm++; $foundonealgorithm++;
} }
if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && is_callable('gzencode')) { if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('gzencode')) {
$foundonealgorithm++; $foundonealgorithm++;
} }
if (!$foundonealgorithm) { if (!$foundonealgorithm) {
@ -413,13 +413,13 @@ $result = $api->r->handle();
if (Luracast\Restler\Defaults::$returnResponse) { if (Luracast\Restler\Defaults::$returnResponse) {
// We try to compress the data received data // We try to compress the data received data
if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress') && defined('BROTLI_TEXT')) { if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && function_exists('brotli_compress') && defined('BROTLI_TEXT')) {
header('Content-Encoding: br'); header('Content-Encoding: br');
$result = brotli_compress($result, 11, constant('BROTLI_TEXT')); $result = brotli_compress($result, 11, constant('BROTLI_TEXT'));
} elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && is_callable('bzcompress')) { } elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && function_exists('bzcompress')) {
header('Content-Encoding: bz'); header('Content-Encoding: bz');
$result = bzcompress($result, 9); $result = bzcompress($result, 9);
} elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && is_callable('gzencode')) { } elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('gzencode')) {
header('Content-Encoding: gzip'); header('Content-Encoding: gzip');
$result = gzencode($result, 9); $result = gzencode($result, 9);
} else { } else {

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

@ -144,10 +144,12 @@ class DolGeoIP
return ''; return '';
} }
} else { } else {
if (!function_exists('geoip_country_code_by_addr_v6')) { if (function_exists('geoip_country_code_by_addr_v6')) {
return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
} elseif (function_exists('geoip_country_code_by_name_v6')) {
return strtolower(geoip_country_code_by_name_v6($this->gi, $ip)); return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));
} }
return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip)); return '';
} }
} }
} }

6
htdocs/core/class/translate.class.php
View File

@ -932,8 +932,10 @@ class Translate
$fonc = 'numberwords'; $fonc = 'numberwords';
if (file_exists($newdir.'/functions_'.$fonc.'.lib.php')) { if (file_exists($newdir.'/functions_'.$fonc.'.lib.php')) {
include_once $newdir.'/functions_'.$fonc.'.lib.php'; include_once $newdir.'/functions_'.$fonc.'.lib.php';
$newnumber = numberwords_getLabelFromNumber($this, $number, $isamount); if (function_exists('numberwords_getLabelFromNumber')) {
break; $newnumber = numberwords_getLabelFromNumber($this, $number, $isamount);
break;
}
} }
} }

6
htdocs/core/lib/files.lib.php
View File

@ -2058,13 +2058,13 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
dol_syslog("dol_compress_file mode=".$mode." inputfile=".$inputfile." outputfile=".$outputfile); dol_syslog("dol_compress_file mode=".$mode." inputfile=".$inputfile." outputfile=".$outputfile);
$data = implode("", file(dol_osencode($inputfile))); $data = implode("", file(dol_osencode($inputfile)));
if ($mode == 'gz') { if ($mode == 'gz' && function_exists('gzencode')) {
$foundhandler = 1; $foundhandler = 1;
$compressdata = gzencode($data, 9); $compressdata = gzencode($data, 9);
} elseif ($mode == 'bz') { } elseif ($mode == 'bz' && function_exists('bzcompress')) {
$foundhandler = 1; $foundhandler = 1;
$compressdata = bzcompress($data, 9); $compressdata = bzcompress($data, 9);
} elseif ($mode == 'zstd') { } elseif ($mode == 'zstd' && function_exists('zstd_compress')) {
$foundhandler = 1; $foundhandler = 1;
$compressdata = zstd_compress($data, 9); $compressdata = zstd_compress($data, 9);
} elseif ($mode == 'zip') { } elseif ($mode == 'zip') {