mikuli.cz

commit 73f9cf18447cf75a53b15bf67bc8bade59f6bc14
parent 864ce8ab442a27f7448e965ba5d71c9c0ac8714b
Author: markseu <mark2011@mayberg.se>
Date:   Tue, 18 Nov 2014 16:35:20 +0100

Better image detection (for Søren Peter)

Diffstat:
M
README.md
 | 
4
++--
M
system/core/core.php
 | 
12
++++++------

2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-Yellow 0.4.9
-============
+Yellow 0.4.10
+=============
 Yellow is for people who make websites. [Visit website](http://datenstrom.se/yellow).
 
 [![Status](https://travis-ci.org/markseu/yellowcms.svg)](https://travis-ci.org/markseu/yellowcms)
diff --git a/system/core/core.php b/system/core/core.php
@@ -5,7 +5,7 @@
 // Yellow main class
 class Yellow
 {
-	const Version = "0.4.9";
+	const Version = "0.4.10";
 	var $page;				//current page
 	var $pages;				//pages from file system
 	var $config;			//configuration
@@ -2200,7 +2200,7 @@ class YellowToolbox
 		$fileHandle = @fopen($fileName, "rb");
 		if($fileHandle)
 		{
-			if(substru($fileName, -3) == "png")
+			if(substru(strtoloweru($fileName), -3) == "png")
 			{
 				$dataSignature = fread($fileHandle, 8);
 				$dataHeader = fread($fileHandle, 16);
@@ -2210,14 +2210,14 @@ class YellowToolbox
 					$height = (ord($dataHeader[14])<<8) + ord($dataHeader[15]);
 					$type = "png";
 				}
-			} else if(substru($fileName, -3) == "jpg") {
+			} else if(substru(strtoloweru($fileName), -3) == "jpg") {
 				$dataBufferSizeMax = filesize($fileName);
 				$dataBufferSize = min($dataBufferSizeMax, 4096);
 				$dataBuffer = fread($fileHandle, $dataBufferSize);
-				$dataSignature = substrb($dataBuffer, 0, 11);
-				if(!feof($fileHandle) && $dataSignature=="\xff\xd8\xff\xe0\x00\x10JFIF\0")
+				$dataSignature = substrb($dataBuffer, 0, 4);
+				if(!feof($fileHandle) && ($dataSignature=="\xff\xd8\xff\xe0" || $dataSignature=="\xff\xd8\xff\xe1"))
 				{
-					for($pos=20; $pos+8<$dataBufferSize; $pos+=$length)
+					for($pos=2; $pos+8<$dataBufferSize; $pos+=$length)
 					{
 						if($dataBuffer[$pos] != "\xff") break;
 						if($dataBuffer[$pos+1]=="\xc0" || $dataBuffer[$pos+1]=="\xc2")