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

Fix phpcs

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-03 22:52:20 +01:00
parent 7a2d5de239
commit 9878eddd75
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/lib/images.lib.php
View File

@ -324,7 +324,7 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
{ {
if (function_exists('exif_read_data') ) { if (function_exists('exif_read_data') ) {
$exif = exif_read_data($fileSource); $exif = exif_read_data($fileSource);
if($exif && isset($exif['Orientation'])) { if ($exif && isset($exif['Orientation'])) {
$infoImg = getimagesize($fileSource); // Get image infos $infoImg = getimagesize($fileSource); // Get image infos
@ -438,12 +438,12 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING); dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING);
return 'ErrorBadImageFormat'; return 'ErrorBadImageFormat';
} }
elseif(!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1){ elseif(!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
// Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0) // Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
dol_syslog('Wrong value for parameter maxWidth', LOG_ERR); dol_syslog('Wrong value for parameter maxWidth', LOG_ERR);
return 'Error: Wrong value for parameter maxWidth'; return 'Error: Wrong value for parameter maxWidth';
} }
elseif(!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1){ elseif(!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {
// Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0) // Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
dol_syslog('Wrong value for parameter maxHeight', LOG_ERR); dol_syslog('Wrong value for parameter maxHeight', LOG_ERR);
return 'Error: Wrong value for parameter maxHeight'; return 'Error: Wrong value for parameter maxHeight';
@ -457,7 +457,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
$exif = exif_read_data($filetoread); $exif = exif_read_data($filetoread);
$ort= false; $ort= false;
if($exif && !empty($exif['Orientation'])){ if ($exif && !empty($exif['Orientation'])) {
$ort = $exif['Orientation']; $ort = $exif['Orientation'];
} }
@ -536,8 +536,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
return 0; return 0;
} }
$exifAngle = false; $exifAngle = false;
if($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)){ if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) {
switch($ort) switch($ort)
{ {
case 3: // 180 rotate left case 3: // 180 rotate left