adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-04 17:02:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Issue ID 0000593: *.jpeg support in PWG

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@1635 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2006-12-04 22:08:35 +00:00
parent 7638575de3
commit af138fa631
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/images/daily_stats.img.php
+1 -1
View File
@@ -116,7 +116,7 @@ if ($outputFormat == "png")
header("Content-type: image/png");
ImagePNG($image);
}
else if ($outputFormat == "jpg")
else if (in_array($outputFormat, array("jpg", "jpeg")))
{
header("Content-type: image/jpeg");
Imagejpeg($image);
admin/images/global_stats.img.php
+1 -1
View File
@@ -116,7 +116,7 @@ if ($outputFormat == "png")
header("Content-type: image/png");
ImagePNG($image);
}
else if ($outputFormat == "jpg")
else if (in_array($outputFormat, array("jpg", "jpeg")))
{
header("Content-type: image/jpeg");
Imagejpeg($image);
admin/images/monthly_stats.img.php
+1 -1
View File
@@ -116,7 +116,7 @@ if ($outputFormat == "png")
header("Content-type: image/png");
ImagePNG($image);
}
else if ($outputFormat == "jpg")
else if (in_array($outputFormat, array("jpg", "jpeg")))
{
header("Content-type: image/jpeg");
Imagejpeg($image);
admin/thumbnail.php
+1 -1
View File
@@ -51,7 +51,7 @@ function RatioResizeImg($path, $newWidth, $newHeight, $tn_ext)
// extension of the picture filename
$extension = get_extension($filename);
if ($extension == 'jpg' or $extension == 'JPG')
if (in_array($extension, array('jpg', 'JPG', 'jpeg', 'JPEG')))
{
$srcImage = @imagecreatefromjpeg($path);
}
include/config_default.inc.php
+4 -2
View File
@@ -72,12 +72,14 @@ $conf['order_by'] = ' ORDER BY date_available DESC, file ASC, id ASC';
$conf['slideshow_period'] = 4;
// file_ext : file extensions (case sensitive) authorized
$conf['file_ext'] = array('jpg','JPG','png','PNG','gif','GIF','mpg','zip',
$conf['file_ext'] = array('jpg','JPG','jpeg','JPEG',
'png','PNG','gif','GIF','mpg','zip',
'avi','mp3','ogg');
// picture_ext : file extensions for picture file, must be a subset of
// file_ext
$conf['picture_ext'] = array('jpg','JPG','png','PNG','gif','GIF');
$conf['picture_ext'] = array('jpg','JPG','jpeg','JPEG',
'png','PNG','gif','GIF');
// top_number : number of element to display for "best rated" and "most
// visited" categories
tools/create_listing_file.php
+4 -2
View File
@@ -34,11 +34,13 @@ $conf['prefix_thumbnail'] = 'TN-';
// $conf['file_ext'] lists all extensions (case insensitive) allowed for
// your PhpWebGallery installation
$conf['file_ext'] = array('jpg','JPG','png','PNG','gif','GIF','mpg','zip',
$conf['file_ext'] = array('jpg','JPG','jpeg','JPEG',
'png','PNG','gif','GIF','mpg','zip',
'avi','mp3','ogg');
// $conf['picture_ext'] must be a subset of $conf['file_ext']
$conf['picture_ext'] = array('jpg','JPG','png','PNG','gif','GIF');
$conf['picture_ext'] = array('jpg','JPG','jpeg','JPEG',
'png','PNG','gif','GIF');
// $conf['version'] is used to verify the compatibility of the generated
// listing.xml file and the PhpWebGallery version you're running