From af138fa6311ac686ec7f256788eb2a07784ac215 Mon Sep 17 00:00:00 2001
From: rub <rub@piwigo.org>
Date: Mon, 4 Dec 2006 22:08:35 +0000
Subject: Fixed Issue ID 0000593: *.jpeg support in PWG

git-svn-id: http://piwigo.org/svn/trunk@1635 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/images/daily_stats.img.php   | 2 +-
 admin/images/global_stats.img.php  | 2 +-
 admin/images/monthly_stats.img.php | 2 +-
 admin/thumbnail.php                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'admin')

diff --git a/admin/images/daily_stats.img.php b/admin/images/daily_stats.img.php
index 89a28e000..e5d320e86 100644
--- a/admin/images/daily_stats.img.php
+++ b/admin/images/daily_stats.img.php
@@ -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);
diff --git a/admin/images/global_stats.img.php b/admin/images/global_stats.img.php
index 99124f939..557067e42 100644
--- a/admin/images/global_stats.img.php
+++ b/admin/images/global_stats.img.php
@@ -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);
diff --git a/admin/images/monthly_stats.img.php b/admin/images/monthly_stats.img.php
index 3a3c0e143..5ad3b0f55 100644
--- a/admin/images/monthly_stats.img.php
+++ b/admin/images/monthly_stats.img.php
@@ -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);
diff --git a/admin/thumbnail.php b/admin/thumbnail.php
index 594125a84..543b589cc 100644
--- a/admin/thumbnail.php
+++ b/admin/thumbnail.php
@@ -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);
   }
-- 
cgit v1.2.3