From 07a9faf851e3b887899564f854c9933bb0b99140 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 8 Apr 2017 17:52:53 +0200
Subject: Check for fileinfo

https://github.com/FreshRSS/FreshRSS/issues/1402
https://github.com/FreshRSS/FreshRSS/issues/1461
---
 lib/Favicon/Favicon.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/Favicon/Favicon.php b/lib/Favicon/Favicon.php
index 8571a1b95..4ee42ebbc 100644
--- a/lib/Favicon/Favicon.php
+++ b/lib/Favicon/Favicon.php
@@ -179,7 +179,7 @@ class Favicon
         // Sometimes people lie, so check the status.
         // And sometimes, it's not even an image. Sneaky bastards!
         // If cacheDir isn't writable, that's not our problem
-        if ($favicon && is_writable($this->cacheDir) && !$this->checkImageMType($favicon)) {
+        if ($favicon && is_writable($this->cacheDir) && extension_loaded('fileinfo') && !$this->checkImageMType($favicon)) {
             $favicon = false;
         }
 
-- 
cgit v1.2.3


From fe494e000b37bb45ec3eb73f6ddb880fe613f64d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 8 Apr 2017 18:03:52 +0200
Subject: try/catch for finfo_open

---
 CHANGELOG.md            |  1 +
 lib/Favicon/Favicon.php | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de9f2cc5d..e8a15ad1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 * Bug fixing
 	* Fix SQL uniqueness bug with PostgreSQL [#1476](https://github.com/FreshRSS/FreshRSS/pull/1476)
 		* (Require manual update for existing installations)
+	* Do not require PHP extension `fileinfo` for favicons [#1461](https://github.com/FreshRSS/FreshRSS/issues/1461)
 	* Fix UI lowest subscription popup hidden [#1479](https://github.com/FreshRSS/FreshRSS/issues/1479)
 * I18n
 	* Improve English [#1465](https://github.com/FreshRSS/FreshRSS/pull/1465)
diff --git a/lib/Favicon/Favicon.php b/lib/Favicon/Favicon.php
index 4ee42ebbc..85d2ef19b 100644
--- a/lib/Favicon/Favicon.php
+++ b/lib/Favicon/Favicon.php
@@ -229,10 +229,14 @@ class Favicon
         $fileContent = $this->dataAccess->retrieveUrl($url);
         $this->dataAccess->saveCache($tmpFile, $fileContent);
         
-        $finfo = finfo_open(FILEINFO_MIME_TYPE);
-        $isImage = strpos(finfo_file($finfo, $tmpFile), 'image') !== false;
-        finfo_close($finfo);
-        
+        $isImage = true;
+        try {
+            $finfo = finfo_open(FILEINFO_MIME_TYPE);
+            $isImage = strpos(finfo_file($finfo, $tmpFile), 'image') !== false;
+            finfo_close($finfo);
+        } catch (Exception $e) {
+        }
+
         unlink($tmpFile);
         
         return $isImage;
-- 
cgit v1.2.3


From a542ab8fff7cd13ef54f5585f029b6c1d2244351 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 8 Apr 2017 18:12:12 +0200
Subject: Make fileinfo extension optional

---
 app/install.php     | 2 +-
 lib/lib_install.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/app/install.php b/app/install.php
index f598f6528..ebfffa47d 100644
--- a/app/install.php
+++ b/app/install.php
@@ -465,7 +465,7 @@ function printStep1() {
 	<?php if ($res['fileinfo'] == 'ok') { ?>
 	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.fileinfo.ok'); ?></p>
 	<?php } else { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.fileinfo.nok'); ?></p>
+	<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.fileinfo.nok'); ?></p>
 	<?php } ?>
 
 	<?php if ($res['data'] == 'ok') { ?>
diff --git a/lib/lib_install.php b/lib/lib_install.php
index 76871c98a..c625a670a 100644
--- a/lib/lib_install.php
+++ b/lib/lib_install.php
@@ -67,7 +67,7 @@ function checkRequirements($dbType = '') {
 		'favicons' => $favicons ? 'ok' : 'ko',
 		'http_referer' => $http_referer ? 'ok' : 'ko',
 		'message' => $message ?: 'ok',
-		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $fileinfo && $dom && $xml &&
+		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $dom && $xml &&
 		         $data && $cache && $users && $favicons && $http_referer && $message == '' ?
 		         'ok' : 'ko'
 	);
-- 
cgit v1.2.3