From: garvinhicking Date: Wed, 16 Apr 2008 10:11:12 +0000 (+0000) Subject: Revert patch, this should IMHO not go into the maint 1.3 branch. X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8a16b4530818ae64bcf0e19fc229aa575661c657;p=s9y.git Revert patch, this should IMHO not go into the maint 1.3 branch. --- diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php index 791a1f7..fe9e876 100644 --- a/include/admin/images.inc.php +++ b/include/admin/images.inc.php @@ -47,33 +47,6 @@ switch ($serendipity['GET']['adminAction']) { case 'sync': if (!serendipity_checkPermission('adminImagesSync')) { - echo '
' . PERM_DENIED . '
'; - break; - } - - // Make the form to actually do sync with deleting or not - $n = "\n"; - $warning = preg_replace('#\\\n#', '
', WARNING_THIS_BLAHBLAH); - echo '
' . $warning . '
'; - echo '
' . $n; - echo '

' . $n . '

' . $n; - echo ' ' . SYNC_OPTION_LEGEND . '' . $n; - echo ' ' .$n; - echo '
' . $n; - echo ' ' . $n; - echo '
' . $n; - echo ' ' . $n; - echo '
' . $n; - echo '
' . $n . '

' . $n; - echo ' ' . $n; - echo ' ' . ABORT_NOW . '' . $n; - echo '
'; - break; - - case 'doSync': - // I don't know how it could've changed, but let's be safe. - if (!serendipity_checkPermission('adminImagesSync')) { - echo '
' . PERM_DENIED . '
'; break; } @@ -85,19 +58,7 @@ switch ($serendipity['GET']['adminAction']) { echo '

' . SYNCING . '


'; flush(); - $deleteThumbs = false; - if (isset($serendipity['POST']['deleteThumbs'])) { - switch ($serendipity['POST']['deleteThumbs']) - { - case 'yes': - $deleteThumbs = true; - break; - case 'check': - $deleteThumbs = 'checksize'; - break; - } - } - $i = serendipity_syncThumbs($deleteThumbs); + $i = serendipity_syncThumbs(); printf(SYNC_DONE, $i); echo '

' . RESIZING . '


'; diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php index a8e3150..2841fb8 100644 --- a/include/functions_images.inc.php +++ b/include/functions_images.inc.php @@ -643,19 +643,15 @@ function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumb } else { if ($serendipity['magick'] !== true) { if (is_array($size)) { - // The caller wants a thumbnail with a specific size $r = serendipity_resize_image_gd($infile, $outfile, $size['width'], $size['height']); } else { - // The caller wants a thumbnail constrained in the dimension set by config - $calc = serendipity_calculate_aspect_size($fdim[0], $fdim[1], $size, $serendipity['thumbConstraint']); - $r = serendipity_resize_image_gd($infile, $outfile, $calc[0], $calc[1]); + $r = serendipity_resize_image_gd($infile, $outfile, $size); } } else { if (is_array($size)) { $r = $size; } else { - $calc = serendipity_calculate_aspect_size($fdim[0], $fdim[1], $size, $serendipity['thumbConstraint']); - $r = array('width' => $calc[0], 'height' => $calc[1]); + $r = array('width' => $size, 'height' => $size); } $newSize = $r['width'] . 'x' . $r['height']; if ($fdim['mime'] == 'application/pdf') { @@ -792,7 +788,6 @@ function serendipity_generateThumbs() { $i=0; $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(0, 0, $total); - $msg_printed = false; foreach ($serendipity['imageList'] AS $k => $file) { $is_image = serendipity_isImage($file); @@ -813,37 +808,25 @@ function serendipity_generateThumbs() { $oldThumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension']; $newThumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension']; - $sThumb = $file['path'] . $file['name'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension']; $fdim = @getimagesize($ffull); if (!file_exists($oldThumb) && !file_exists($newThumb) && ($fdim[0] > $serendipity['thumbSize'] || $fdim[1] > $serendipity['thumbSize'])) { $returnsize = serendipity_makeThumbnail($file['name'] . '.' . $file['extension'], $file['path']); if ($returnsize !== false ) { - // Only print the resize message the first time - if (!$msg_printed) { - printf(RESIZE_BLAHBLAH, THUMBNAIL_SHORT); - echo "\n" . '