From f6db158cf9c08d72436d97c3f2a310b2670fa37b Mon Sep 17 00:00:00 2001
From: SecretR <secretr@e107.org>
Date: Sat, 19 Sep 2015 19:18:39 +0300
Subject: [PATCH] EXIF extension required and detected on install

---
 e107_languages/English/lan_installer.php |  4 ++--
 install.php                              | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/e107_languages/English/lan_installer.php b/e107_languages/English/lan_installer.php
index 29f1e7ef7..0f8cbd3b6 100644
--- a/e107_languages/English/lan_installer.php
+++ b/e107_languages/English/lan_installer.php
@@ -69,13 +69,13 @@ define("LANINS_044", "Successfully created database.");
 define("LANINS_045", "Please click on the button to proceed to next stage.");
 define("LANINS_046", "5");
 define("LANINS_047", "Administrator Details");
-// define("LANINS_048", "Go Back To Last Step");
+define("LANINS_048", "EXIF extension");
 define("LANINS_049", "The two passwords you entered are not the same. Please go back and try again.");
 define("LANINS_050", "XML Extension");
 define("LANINS_051", "Installed");
 define("LANINS_052", "Not Installed");
 define("LANINS_053", "e107 v2.x requires the PHP XML Extension to be installed. Please contact your host or read the information at [x] before continuing");
-// define("LANINS_054", " before continuing");
+define("LANINS_054", "e107 v2.x requires the PHP EXIF Extension to be installed. Please contact your host or read the information at [x] before continuing");
 define("LANINS_055", "Install Confirmation");
 define("LANINS_056", "6");
 define("LANINS_057", " e107 now has all the information it needs to complete the installation.
diff --git a/install.php b/install.php
index a7f142577..0816a21d3 100644
--- a/install.php
+++ b/install.php
@@ -816,6 +816,16 @@ class e_install
 			$xml_installed = true;
 		}
 
+		if(!function_exists('exif_imagetype'))
+		{
+			$exif_installed = false;
+		}
+		else
+		{
+			$exif_installed = true;
+		}
+		$exifExtensionLink = "<a href='http://php.net/manual/en/book.exif.php'>php.net</a>";
+
 		$php_version = phpversion();
 		if(version_compare($php_version, MIN_PHP_VERSION, ">="))
 		{
@@ -839,6 +849,7 @@ class e_install
 		$permColor	= ($perms_pass == true) ? "text-success" : "text-error";
 		$PHPColor 	= ($version_fail == false) ? "text-success" : "text-error";
 		$xmlColor	= ($xml_installed == true) ? "text-success" : "text-error";
+		$exifColor	= ($exif_installed == true) ? "text-success" : "text-error";
 		$mysqlColor	= ($mysql_pass == true) ? "text-success" : "text-error";
 
 		$xmlExtensionLink = "<a href='http://php.net/manual/en/ref.xml.php'>php.net</a>";
@@ -868,6 +879,11 @@ class e_install
 					<td>".($xml_installed ? LANINS_051 : LANINS_052)."</td>
 					<td class='{$xmlColor}'>".($xml_installed ? "<i class='glyphicon glyphicon-ok'></i> ".LANINS_017 : str_replace("[x]",$xmlExtensionLink, LANINS_053) )."</td>
 				</tr>
+				<tr>
+					<td>".LANINS_048."</td>
+					<td>".($exif_installed ? LANINS_051 : LANINS_052)."</td>
+					<td class='{$exifColor}'>".($exif_installed ? "<i class='glyphicon glyphicon-ok'></i> ".LANINS_017 : str_replace("[x]", $exifExtensionLink, LANINS_054) )."</td>
+				</tr>
 			</table>\n";
 		$this->finish_form();
 		$this->template->SetTag("stage_content", $output.$e_forms->return_form());