mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

rework some messages and do some space cleanup

Browse Source
This commit is contained in:
Ian
2014-11-02 15:06:34 +01:00
parent a22f0ec65e
commit 6631c516f8
1 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
include/functions_images.inc.php
View File

@ -660,7 +660,7 @@ function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumb
if ($fdim[0] > $size['width'] && $fdim[1] > $size['height']) { if ($fdim[0] > $size['width'] && $fdim[1] > $size['height']) {
$r = $size; $r = $size;
} else { } else {
return array(0,0); // Do not create any thumb, if image is smaller than defined sizes return array(0,0); // do not create any thumb, if image is smaller than defined sizes
} }
} else { } else {
$calc = serendipity_calculate_aspect_size($fdim[0], $fdim[1], $size, $serendipity['thumbConstraint']); $calc = serendipity_calculate_aspect_size($fdim[0], $fdim[1], $size, $serendipity['thumbConstraint']);
@ -671,9 +671,9 @@ function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumb
$cmd = escapeshellcmd($serendipity['convert']) . ' -antialias -flatten -scale '. serendipity_escapeshellarg($newSize) .' '. serendipity_escapeshellarg($infile . '[0]') . ' ' . serendipity_escapeshellarg($outfile . '.png'); $cmd = escapeshellcmd($serendipity['convert']) . ' -antialias -flatten -scale '. serendipity_escapeshellarg($newSize) .' '. serendipity_escapeshellarg($infile . '[0]') . ' ' . serendipity_escapeshellarg($outfile . '.png');
} else { } else {
if (!$force_resize && serendipity_ini_bool(ini_get('safe_mode')) === false) { if (!$force_resize && serendipity_ini_bool(ini_get('safe_mode')) === false) {
$newSize .= '>'; // Tell imagemagick to not enlarge small images, only works if safe_mode is off (safe_mode turns > in to \>) $newSize .= '>'; // tell imagemagick to not enlarge small images, only works if safe_mode is off (safe_mode turns > in to \>)
} }
if (!$serendipity['imagemagick_nobang']) $newSize .= '!'; // Force the first run image geometry exactly to given sizes, if there were rounding differences (see https://github.com/s9y/Serendipity/commit/94881ba4c0e3bdd4b5fac510e93977e239171c1c and comments) if (!$serendipity['imagemagick_nobang']) $newSize .= '!'; // force the first run image geometry exactly to given sizes, if there were rounding differences (see https://github.com/s9y/Serendipity/commit/94881ba4c0e3bdd4b5fac510e93977e239171c1c and comments)
$cmd = escapeshellcmd($serendipity['convert'] . ' ' . $serendipity['imagemagick_thumb_parameters']) . ' -antialias -resize ' . serendipity_escapeshellarg($newSize) . ' ' . serendipity_escapeshellarg($infile) .' '. serendipity_escapeshellarg($outfile); $cmd = escapeshellcmd($serendipity['convert'] . ' ' . $serendipity['imagemagick_thumb_parameters']) . ' -antialias -resize ' . serendipity_escapeshellarg($newSize) . ' ' . serendipity_escapeshellarg($infile) .' '. serendipity_escapeshellarg($outfile);
} }
exec($cmd, $output, $result); exec($cmd, $output, $result);
@ -1803,13 +1803,15 @@ function serendipity_killPath($basedir, $directory = '', $forceDelete = false) {
} }
} }
echo '<strong>';
if ($serious && !empty($directory) && !preg_match('@^.?/?$@', $directory) && @rmdir($basedir . $directory)) { if ($serious && !empty($directory) && !preg_match('@^.?/?$@', $directory) && @rmdir($basedir . $directory)) {
echo '<span class="msg_success"><span class="icon-ok-circled"></span> <strong>';
printf(DIRECTORY_DELETE_SUCCESS . $n, $directory); printf(DIRECTORY_DELETE_SUCCESS . $n, $directory);
echo "</strong></span>\n";
} else { } else {
echo '<span class="msg_error"><span class="icon-attention"></span> <strong>';
printf(DIRECTORY_DELETE_FAILED . $n, $directory); printf(DIRECTORY_DELETE_FAILED . $n, $directory);
echo "</strong></span>\n";
} }
echo '</strong>';
} }
return true; return true;
@ -2675,7 +2677,7 @@ function serendipity_parsePropertyForm() {
} }
$array = array( $array = array(
'image_id' => $serendipity['POST']['mediaProperties'][0]['image_id'], 'image_id' => $serendipity['POST']['mediaProperties'][0]['image_id'],
); );
return $array; return $array;
@ -2763,13 +2765,12 @@ function serendipity_prepareMedia(&$file, $url = '') {
$full_perm = serendipity_checkPermission('adminImagesMaintainOthers'); $full_perm = serendipity_checkPermission('adminImagesMaintainOthers');
} }
$sThumbSource = serendipity_getThumbNailPath($file['path'], $file['name'], $file['extension'], $file['thumbnail_name']); $sThumbSource = serendipity_getThumbNailPath($file['path'], $file['name'], $file['extension'], $file['thumbnail_name']);
if (! $file['hotlink']) { if (! $file['hotlink']) {
$file['full_thumb'] = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $sThumbSource; $file['full_thumb'] = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $sThumbSource;
$file['full_thumbHTTP'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $sThumbSource; $file['full_thumbHTTP'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $sThumbSource;
} }
$file['url'] = $url; $file['url'] = $url;
if ($file['hotlink']) { if ($file['hotlink']) {
@ -3149,33 +3150,33 @@ function &serendipity_getMetaData($file, &$info) {
); );
static $xmpPatterns = array( static $xmpPatterns = array(
'tiff:Orientation' => array('type' => 'or', 'name' => 'Orientation'), 'tiff:Orientation' => array('type' => 'or', 'name' => 'Orientation'),
'tiff:XResolution' => array('type' => 'math', 'name' => 'XResolution'), 'tiff:XResolution' => array('type' => 'math', 'name' => 'XResolution'),
'tiff:YResolution' => array('type' => 'math', 'name' => 'YResolution'), 'tiff:YResolution' => array('type' => 'math', 'name' => 'YResolution'),
'tiff:Make' => array('type' => 'text', 'name' => 'CameraMaker'), 'tiff:Make' => array('type' => 'text', 'name' => 'CameraMaker'),
'tiff:Model' => array('type' => 'text', 'name' => 'CameraModel'), 'tiff:Model' => array('type' => 'text', 'name' => 'CameraModel'),
'xap:ModifyDate' => array('type' => 'date', 'name' => 'DateModified'), 'xap:ModifyDate' => array('type' => 'date', 'name' => 'DateModified'),
'xap:CreatorTool' => array('type' => 'text', 'name' => 'Software'), 'xap:CreatorTool' => array('type' => 'text', 'name' => 'Software'),
'xap:CreateDate' => array('type' => 'date', 'name' => 'DateCreated'), 'xap:CreateDate' => array('type' => 'date', 'name' => 'DateCreated'),
'xap:MetadataDate' => array('type' => 'date', 'name' => 'DateMetadata'), 'xap:MetadataDate' => array('type' => 'date', 'name' => 'DateMetadata'),
'exif:ExposureTime' => array('type' => 'math', 'name' => 'ExposureTime'), 'exif:ExposureTime' => array('type' => 'math', 'name' => 'ExposureTime'),
'exif:ApertureValue' => array('type' => 'math', 'name' => 'ApertureValue'), 'exif:ApertureValue' => array('type' => 'math', 'name' => 'ApertureValue'),
'exif:MaxApertureValue' => array('type' => 'math', 'name' => 'MaxApertureValue'), 'exif:MaxApertureValue' => array('type' => 'math', 'name' => 'MaxApertureValue'),
'exif:ISOSpeedRatings' => array('type' => 'text', 'name' => 'ISOSpeedRatings'), 'exif:ISOSpeedRatings' => array('type' => 'text', 'name' => 'ISOSpeedRatings'),
'exif:DateTimeOriginal' => array('type' => 'date', 'name' => 'DateCreated'), 'exif:DateTimeOriginal' => array('type' => 'date', 'name' => 'DateCreated'),
'exif:MeteringMode' => array('type' => 'text', 'name' => 'MeteringMode'), 'exif:MeteringMode' => array('type' => 'text', 'name' => 'MeteringMode'),
'exif:FNumber' => array('type' => 'math', 'name' => 'FNumber'), 'exif:FNumber' => array('type' => 'math', 'name' => 'FNumber'),
'exif:ExposureProgram' => array('type' => 'text', 'name' => 'ExposureProgram'), 'exif:ExposureProgram' => array('type' => 'text', 'name' => 'ExposureProgram'),
'exif:FocalLength' => array('type' => 'math', 'name' => 'FocalLength'), 'exif:FocalLength' => array('type' => 'math', 'name' => 'FocalLength'),
'exif:WhiteBalance' => array('type' => 'text', 'name' => 'WhiteBalance'), 'exif:WhiteBalance' => array('type' => 'text', 'name' => 'WhiteBalance'),
'exif:DigitalZoomRatio' => array('type' => 'math', 'name' => 'DigitalZoomRatio'), 'exif:DigitalZoomRatio' => array('type' => 'math', 'name' => 'DigitalZoomRatio'),
'exif:FocalLengthIn35mmFilm' => array('type' => 'text', 'name' => 'FocalLengthIn35mmFilm'), 'exif:FocalLengthIn35mmFilm' => array('type' => 'text', 'name' => 'FocalLengthIn35mmFilm'),
'exif:Fired' => array('type' => 'text', 'name' => 'FlashFired'), 'exif:Fired' => array('type' => 'text', 'name' => 'FlashFired'),
'exif:RedEyeMode' => array('type' => 'text', 'name' => 'RedEyeMode'), 'exif:RedEyeMode' => array('type' => 'text', 'name' => 'RedEyeMode'),
'dc:title' => array('type' => 'rdf', 'name' => 'Title'), 'dc:title' => array('type' => 'rdf', 'name' => 'Title'),
'dc:creator' => array('type' => 'rdf', 'name' => 'Creator'), 'dc:creator' => array('type' => 'rdf', 'name' => 'Creator'),
); );
$ret = array(); $ret = array();
@ -3301,7 +3302,9 @@ function serendipity_checkMediaSize($file) {
if (!empty($serendipity['maxFileSize'])) { if (!empty($serendipity['maxFileSize'])) {
if (filesize($file) > $serendipity['maxFileSize']) { if (filesize($file) > $serendipity['maxFileSize']) {
echo '<span class="msg_error"><span class="icon-attention"></span> ';
printf(MEDIA_UPLOAD_SIZEERROR . '<br />', (int)$serendipity['maxFileSize']); printf(MEDIA_UPLOAD_SIZEERROR . '<br />', (int)$serendipity['maxFileSize']);
echo "</span>\n";
return false; return false;
} }
} }
@ -3314,14 +3317,18 @@ function serendipity_checkMediaSize($file) {
if (!empty($serendipity['maxImgWidth'])) { if (!empty($serendipity['maxImgWidth'])) {
if ($dim[0] > $serendipity['maxImgWidth']) { if ($dim[0] > $serendipity['maxImgWidth']) {
echo '<span class="msg_error"><span class="icon-attention"></span> ';
printf(MEDIA_UPLOAD_DIMERROR . '<br />', (int)$serendipity['maxImgWidth'], (int)$serendipity['maxImgHeight']); printf(MEDIA_UPLOAD_DIMERROR . '<br />', (int)$serendipity['maxImgWidth'], (int)$serendipity['maxImgHeight']);
echo "</span>\n";
return false; return false;
} }
} }
if (!empty($serendipity['maxImgHeight'])) { if (!empty($serendipity['maxImgHeight'])) {
if ($dim[1] > $serendipity['maxImgHeight']) { if ($dim[1] > $serendipity['maxImgHeight']) {
echo '<span class="msg_error"><span class="icon-attention"></span> ';
printf(MEDIA_UPLOAD_DIMERROR . '<br />', (int)$serendipity['maxImgWidth'], (int)$serendipity['maxImgHeight']); printf(MEDIA_UPLOAD_DIMERROR . '<br />', (int)$serendipity['maxImgWidth'], (int)$serendipity['maxImgHeight']);
echo "</span>\n";
return false; return false;
} }
} }
@ -3350,27 +3357,27 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
if (!is_dir($real_oldDir)) { if (!is_dir($real_oldDir)) {
echo '<span class="msg_error"><span class="icon-attention"></span> '; echo '<span class="msg_error"><span class="icon-attention"></span> ';
printf(ERROR_FILE_NOT_EXISTS, '<span class="block_level">' . $oldDir . '</span>'); printf(ERROR_FILE_NOT_EXISTS, '<span class="block_level">' . $oldDir . '</span>');
echo '</span>'; echo "</span>\n";
return false; return false;
} }
if (is_dir($real_newDir)) { if (is_dir($real_newDir)) {
echo '<span class="msg_error"><span class="icon-attention"></span> '; echo '<span class="msg_error"><span class="icon-attention"></span> ';
printf(ERROR_FILE_EXISTS, '<span class="block_level">' . $newDir . '</span>'); printf(ERROR_FILE_EXISTS, '<span class="block_level">' . $newDir . '</span>');
echo '</span>'; echo "</span>\n";
return false; return false;
} }
if (!rename($real_oldDir, $real_newDir)) { if (!rename($real_oldDir, $real_newDir)) {
echo '<span class="msg_error"><span class="icon-attention"></span> '; echo '<span class="msg_error"><span class="icon-attention"></span> ';
printf(MEDIA_DIRECTORY_MOVE_ERROR, '<span class="block_level">' . $newDir . '</span>'); printf(MEDIA_DIRECTORY_MOVE_ERROR, '<span class="block_level">' . $newDir . '</span>');
echo '</span>'; echo "</span>\n";
return false; return false;
} }
echo '<span class="msg_success"><span class="icon-ok-circled"></span> '; echo '<span class="msg_success"><span class="icon-ok-circled"></span> ';
printf(MEDIA_DIRECTORY_MOVED, '<span class="block_level">' . $newDir . '</span>'); printf(MEDIA_DIRECTORY_MOVED, '<span class="block_level">' . $newDir . '</span>');
echo '</span>'; echo "</span>\n";
$dirs = serendipity_db_query("SELECT id, path $dirs = serendipity_db_query("SELECT id, path
FROM {$serendipity['dbPrefix']}images FROM {$serendipity['dbPrefix']}images
@ -3406,7 +3413,9 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
if ($type == 'file') { if ($type == 'file') {
if (serendipity_isActiveFile(basename($newDir))) { if (serendipity_isActiveFile(basename($newDir))) {
echo '<span class="msg_error"><span class="icon-attention"></span> ';
printf(ERROR_FILE_FORBIDDEN, htmlspecialchars($newDir)); printf(ERROR_FILE_FORBIDDEN, htmlspecialchars($newDir));
echo "</span>\n";
return false; return false;
} }