Changeset 1635


Ignore:
Timestamp:
Dec 4, 2006, 11:08:35 PM (17 years ago)
Author:
rub
Message:

Fixed Issue ID 0000593: *.jpeg support in PWG

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/images/daily_stats.img.php

    r1072 r1635  
    117117  ImagePNG($image);
    118118}
    119 else if ($outputFormat == "jpg")
     119else if (in_array($outputFormat, array("jpg", "jpeg")))
    120120{
    121121  header("Content-type: image/jpeg");

  • trunk/admin/images/global_stats.img.php

    r1072 r1635  
    117117  ImagePNG($image);
    118118}
    119 else if ($outputFormat == "jpg")
     119else if (in_array($outputFormat, array("jpg", "jpeg")))
    120120{
    121121  header("Content-type: image/jpeg");

  • trunk/admin/images/monthly_stats.img.php

    r1072 r1635  
    117117  ImagePNG($image);
    118118}
    119 else if ($outputFormat == "jpg")
     119else if (in_array($outputFormat, array("jpg", "jpeg")))
    120120{
    121121  header("Content-type: image/jpeg");

  • trunk/admin/thumbnail.php

    r1631 r1635  
    5252  $extension = get_extension($filename);
    5353
    54   if ($extension == 'jpg' or $extension == 'JPG')
     54  if (in_array($extension, array('jpg', 'JPG', 'jpeg', 'JPEG')))
    5555  {
    5656    $srcImage = @imagecreatefromjpeg($path);

  • trunk/include/config_default.inc.php

    r1617 r1635  
    7373
    7474// file_ext : file extensions (case sensitive) authorized
    75 $conf['file_ext'] = array('jpg','JPG','png','PNG','gif','GIF','mpg','zip',
     75$conf['file_ext'] = array('jpg','JPG','jpeg','JPEG',
     76                          'png','PNG','gif','GIF','mpg','zip',
    7677                          'avi','mp3','ogg');
    7778
    7879// picture_ext : file extensions for picture file, must be a subset of
    7980// file_ext
    80 $conf['picture_ext'] = array('jpg','JPG','png','PNG','gif','GIF');
     81$conf['picture_ext'] = array('jpg','JPG','jpeg','JPEG',
     82                             'png','PNG','gif','GIF');
    8183
    8284// top_number : number of element to display for "best rated" and "most

  • trunk/tools/create_listing_file.php

    r1546 r1635  
    3535// $conf['file_ext'] lists all extensions (case insensitive) allowed for
    3636// your PhpWebGallery installation
    37 $conf['file_ext'] = array('jpg','JPG','png','PNG','gif','GIF','mpg','zip',
     37$conf['file_ext'] = array('jpg','JPG','jpeg','JPEG',
     38                          'png','PNG','gif','GIF','mpg','zip',
    3839                          'avi','mp3','ogg');
    3940
    4041// $conf['picture_ext'] must be a subset of $conf['file_ext']
    41 $conf['picture_ext'] = array('jpg','JPG','png','PNG','gif','GIF');
     42$conf['picture_ext'] = array('jpg','JPG','jpeg','JPEG',
     43                             'png','PNG','gif','GIF');
    4244
    4345// $conf['version'] is used to verify the compatibility of the generated
Note: See TracChangeset for help on using the changeset viewer.