Merge branch 'master' of https://github.com/JamesHeinrich/phpThumb

JamesHeinrich · Jan 9, 2023 · 6c642aa · 6c642aa
2 parents 3db137e + efa0bf6
commit 6c642aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/phpthumb.class.php b/phpthumb.class.php
@@ -380,7 +380,7 @@ public function setSourceImageResource($gdimg) {
 	public function setParameter($param, $value) {
 		if ($param == 'src') {
 			$this->setSourceFilename($this->ResolveFilenameToAbsolute($value));
-		} elseif (@is_array($this->$param)) {
+		} elseif (isset($this->$param) && is_array($this->$param)) {
 			if (is_array($value)) {
 				foreach ($value as $arraykey => $arrayvalue) {
 					array_push($this->$param, $arrayvalue);
@@ -3731,7 +3731,7 @@ public function SetCacheFilename() {
 		} elseif (!$this->config_cache_source_filemtime_ignore_remote && preg_match('#^(f|ht)tps?\://#i', $this->src)) {
 			$this->cache_filename .= '_dat'. (int) phpthumb_functions::filedate_remote($this->src);
 		} elseif (!$this->config_cache_source_filemtime_ignore_local && $this->src && !$this->rawImageData) {
-			$this->cache_filename .= '_dat'. (int) (@filemtime($this->sourceFilename));
+			$this->cache_filename .= '_dat'. (int) (file_exists($this->sourceFilename) ? filemtime($this->sourceFilename) : 0);
 		}
 
 		$this->cache_filename .= '.'.strtolower($this->thumbnailFormat);

diff --git a/phpthumb.functions.php b/phpthumb.functions.php
@@ -173,7 +173,7 @@ public static function exif_info() {
 
 
 	public static function ImageTypeToMIMEtype($imagetype) {
-		if (function_exists('image_type_to_mime_type') && ($imagetype >= 1) && ($imagetype <= 18)) {
+		if (function_exists('image_type_to_mime_type') && ($imagetype >= 1) && ($imagetype <= 19)) {
 			// PHP v4.3.0+
 			return image_type_to_mime_type($imagetype);
 		}
@@ -196,6 +196,7 @@ public static function ImageTypeToMIMEtype($imagetype) {
 			16 => 'image/xbm',                     // IMAGETYPE_XBM
 			17 => 'image/x-icon',                  // IMAGETYPE_ICO
 			18 => 'image/webp',                    // IMAGETYPE_WEBP
+			19 => 'image/avif',                    // IMAGETYPE_AVIF
 
 			'gif'  => 'image/gif',                 // IMAGETYPE_GIF
 			'jpg'  => 'image/jpeg',                // IMAGETYPE_JPEG
@@ -204,6 +205,7 @@ public static function ImageTypeToMIMEtype($imagetype) {
 			'bmp'  => 'image/bmp',                 // IMAGETYPE_BMP
 			'ico'  => 'image/x-icon',              // IMAGETYPE_ICO
 			'webp' => 'image/webp',                // IMAGETYPE_WEBP
+			'avif' => 'image/avif',                // IMAGETYPE_AVIF
 		);
 
 		return (isset($image_type_to_mime_type[$imagetype]) ? $image_type_to_mime_type[$imagetype] : false);
@@ -1047,8 +1049,8 @@ function preg_quote($string, $delimiter='\\') {
 if (!function_exists('file_get_contents')) {
 	// included in PHP v4.3.0+
 	function file_get_contents($filename) {
-		if (preg_match('#^(f|ht)tp\://#i', $filename)) {
-			return SafeURLread($filename, $error);
+		if (preg_match('#^(ftp|https?)\://#i', $filename)) {
+			return phpthumb_functions::SafeURLread($filename, $error);
 		}
 		if ($fp = @fopen($filename, 'rb')) {
 			$rawData = '';