From ed0badfae3e74a3fbd9b269b91db221e85238122 Mon Sep 17 00:00:00 2001
From: Hani Rouatbi <lamjed001@gmail.com>
Date: Sun, 11 Jun 2023 19:39:03 +0100
Subject: [PATCH] Update watermark.php

---
 includes/up_helpers/watermark.php | 64 +++++++++++++++++--------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/includes/up_helpers/watermark.php b/includes/up_helpers/watermark.php
index 691ed9f..e393c71 100755
--- a/includes/up_helpers/watermark.php
+++ b/includes/up_helpers/watermark.php
@@ -44,12 +44,12 @@ function helper_watermark($name, $ext)
     if (file_exists(dirname(__FILE__) . '/../../images/watermark.png'))
     {
         $logo_path= dirname(__FILE__) . '/../../images/watermark.png';
-        $src_logo = imagecreatefrompng($logo_path);
+        $src_logo = @imagecreatefrompng($logo_path);
     }
     elseif (file_exists(dirname(__FILE__) . '/../../images/watermark.gif'))
     {
         $logo_path= dirname(__FILE__) . '/../../images/watermark.gif';
-        $src_logo = imagecreatefromgif($logo_path);
+        $src_logo = @imagecreatefromgif($logo_path);
     }
 
     //no watermark pic
@@ -64,40 +64,46 @@ function helper_watermark($name, $ext)
         helper_watermark_imagick($name, $ext, $logo_path);
         return;
     }
+	
+	//now, lets work and detect our image extension
+	list($bwidth, $bheight, $src_img_type) = getimagesize($name);
+	
+	$src_img = false;
+    
+    switch ($src_img_type)
+    {
+        case IMAGETYPE_GIF:
+            //$src_img = imagecreatefromgif($name);
+            return;
 
-    //now, lets work and detect our image extension
-    if (strpos($ext, 'jp') !== false)
-    {
-        $src_img = @imagecreatefromjpeg($name);
-    }
-    elseif (strpos($ext, 'png') !== false)
-    {
-        $src_img = @imagecreatefrompng($name);
-    }
-    elseif (strpos($ext, 'gif') !== false)
-    {
-        return;
-    //        $src_img = @imagecreatefromgif($name);
-    }
-    elseif (strpos($ext, 'bmp') !== false)
-    {
-        if (! defined('BMP_CLASS_INCLUDED'))
-        {
-            include dirname(__file__) . '/BMP.php';
-            define('BMP_CLASS_INCLUDED', true);
-        }
+            break;
 
-        $src_img = imagecreatefrombmp($name);
+        case IMAGETYPE_JPEG:
+            $src_img = imagecreatefromjpeg($name);
+
+            break;
+
+        case IMAGETYPE_PNG:
+            $src_img = imagecreatefrompng($name);
+
+            break;
+
+        case IMAGETYPE_BMP:
+            if (! function_exists('imagecreatefrombmp'))
+            {
+                include dirname(__file__) . '/BMP.php';
+            }
+
+            $src_img = imagecreatefrombmp($name);
+
+            break;
     }
-    else
+
+    if (! $src_img)
     {
         return;
     }
 
-    //detect width, height for the image
-    $bwidth  = @imagesx($src_img);
-    $bheight = @imagesy($src_img);
-
     //detect width, height for the watermark image
     $lwidth  = @imagesx($src_logo);
     $lheight = @imagesy($src_logo);