Merge pull request #1502 from Alkarex/Favicon1.2.0

Update to version 1.2 of Favicon library

1 files changed, 9 insertions, 30 deletions

diff --git a/lib/favicons.php b/lib/favicons.php
index d8c97964e..d8baba342 100644
--- a/lib/favicons.php
+++ b/lib/favicons.php
@@ -1,43 +1,22 @@
 <?php
 
-include(LIB_PATH . '/Favicon/Favicon.php');
+include(LIB_PATH . '/Favicon/FaviconDLType.php');
 include(LIB_PATH . '/Favicon/DataAccess.php');
+include(LIB_PATH . '/Favicon/Favicon.php');
 
 $favicons_dir = DATA_PATH . '/favicons/';
 $default_favicon = PUBLIC_PATH . '/themes/icons/default_favicon.ico';
 
 function download_favicon($website, $dest) {
-	global $favicons_dir, $default_favicon;
+	global $default_favicon;
 
 	syslog(LOG_INFO, 'FreshRSS Favicon discovery GET ' . $website);
 	$favicon_getter = new \Favicon\Favicon();
-	$favicon_getter->setCacheDir($favicons_dir);
-	$favicon_url = $favicon_getter->get($website);
-
-	if ($favicon_url === false) {
-		return @copy($default_favicon, $dest);
-	}
-
-	syslog(LOG_INFO, 'FreshRSS Favicon GET ' . $favicon_url);
-	$c = curl_init($favicon_url);
-	curl_setopt($c, CURLOPT_HEADER, false);
-	curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
-	curl_setopt($c, CURLOPT_BINARYTRANSFER, true);
-	curl_setopt($c, CURLOPT_USERAGENT, 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')');
-	$img_raw = curl_exec($c);
-	$status_code = curl_getinfo($c, CURLINFO_HTTP_CODE);
-	curl_close($c);
-
-	if ($status_code === 200) {
-		$file = fopen($dest, 'w');
-		if ($file !== false) {
-			fwrite($file, $img_raw);
-			fclose($file);
-			return true;
-		}
-	} else {
-		syslog(LOG_WARNING, 'FreshRSS Favicon GET ' . $favicon_url . ' error ' . $status_code);
-	}
+	$tmpPath = realpath(TMP_PATH);
+	$favicon_getter->setCacheDir($tmpPath);
+	$favicon_getter->setCacheTimeout(-1);
+	$favicon_path = $favicon_getter->get($website, \Favicon\FaviconDLType::DL_FILE_PATH);
 
-	return false;
+	return ($favicon_path != false && @rename($tmpPath . '/' . $favicon_path, $dest)) ||
+		@copy($default_favicon, $dest);
 }