Skip to content

Fixed map image preview error #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed map image preview error #330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 38 additions & 39 deletions share/server/core/classes/CoreModOverview.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,9 @@ public function getFileType($imgPath) {
private function createThumbnail($imgPath, $thumbPath) {
global $CORE;
if($CORE->checkVarFolderWriteable(TRUE) && $CORE->checkExisting($imgPath, TRUE)) {
// 0: width, 1:height, 2:type
$imgSize = getimagesize($imgPath);
$strFileType = '';

switch($imgSize[2]) {
case 1:
$image = imagecreatefromgif($imgPath);
Expand All @@ -324,29 +323,29 @@ private function createThumbnail($imgPath, $thumbPath) {
throw new NagVisException(l('onlyPngOrJpgImages'));
break;
}

// Size of source images
list($bgWidth, $bgHeight) = $imgSize;

// Target size
$thumbResWidth = 200;
$thumbResHeight = 150;

if($bgWidth > $bgHeight) {
// Calculate size
$thumbWidth = $thumbResWidth;
$thumbHeight = $bgHeight / ($bgWidth / $thumbWidth);

$thumbHeight = (int) round($bgHeight / ($bgWidth / $thumbWidth));
// Calculate offset
$thumbX = 0;
$thumbY = ($thumbResHeight - $thumbHeight) / 2;
$thumbY = (int) round(($thumbResHeight - $thumbHeight) / 2);
} elseif($bgHeight > $bgWidth) {
// Calculate size
$thumbHeight = $thumbResHeight;
$thumbWidth = $bgWidth / ($bgHeight / $thumbResHeight);

$thumbWidth = (int) round($bgWidth / ($bgHeight / $thumbResHeight));
// Calculate offset
$thumbX = ($thumbResWidth - $thumbWidth) / 2;
$thumbX = (int) round(($thumbResWidth - $thumbWidth) / 2);
$thumbY = 0;
} else {
// Calculate size
Expand All @@ -360,38 +359,38 @@ private function createThumbnail($imgPath, $thumbPath) {
$thumbHeight = $thumbResHeight;
$thumbWidth = $thumbResHeight;
}

// Calculate offset
$thumbX = ($thumbResWidth - $thumbWidth) / 2;
$thumbY = ($thumbResHeight - $thumbHeight) / 2;
$thumbX = (int) round(($thumbResWidth - $thumbWidth) / 2);
$thumbY = (int) round(($thumbResHeight - $thumbHeight) / 2);
}

$thumb = imagecreatetruecolor($thumbResWidth, $thumbResHeight);

imagefill($thumb, 0, 0, imagecolorallocate($thumb, 255, 255, 254));
imagecolortransparent($thumb, imagecolorallocate($thumb, 255, 255, 254));

imagecopyresampled($thumb, $image, $thumbX, $thumbY, 0, 0, $thumbWidth, $thumbHeight, $bgWidth, $bgHeight);

switch($imgSize[2]) {
case 1:
imagegif($thumb, $thumbPath);
break;
case 2:
imagejpeg($thumb, $thumbPath);
break;
case 3:
imagepng($thumb, $thumbPath);
break;
default:
throw new NagVisException(l('onlyPngOrJpgImages'));
break;
}

return $thumbPath;
} else {
return '';
}
imagefill($thumb, 0, 0, imagecolorallocate($thumb, 255, 255, 254));
imagecolortransparent($thumb, imagecolorallocate($thumb, 255, 255, 254));

imagecopyresampled($thumb, $image, $thumbX, $thumbY, 0, 0, $thumbWidth, $thumbHeight, $bgWidth, $bgHeight);

switch ($imgSize[2]) {
case 1:
imagegif($thumb, $thumbPath);
break;
case 2:
imagejpeg($thumb, $thumbPath);
break;
case 3:
imagepng($thumb, $thumbPath);
break;
default:
throw new NagVisException(l('onlyPngOrJpgImages'));
break;
}

return $thumbPath;
} else {
return '';
}
}
}
?>