From 32a5e3444dc0cfc1c8045586b4582494853a647c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 27 Dec 2010 15:45:28 +0300
Subject: [PATCH] rename USE_CURL_FOR_ICONS to USE_CURL

---
 config.php-dist  | 4 ++--
 functions.php    | 6 +++---
 sanity_check.php | 8 ++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/config.php-dist b/config.php-dist
index 5027f78d0..df12d8f9d 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -71,8 +71,8 @@
 	define('CHECK_FOR_NEW_VERSION', true);
 	// Check for new versions of tt-rss automatically.
 
-	define('USE_CURL_FOR_ICONS', false);
-	// Fetch favicons using CURL, useful if your PHP has disabled remote fopen()
+	define('USE_CURL', false);
+	// Use CURL to fetch remote data instead of PHP built-in fopen()
 
 	define('DIGEST_ENABLE', true);
 	// Global option to enable daily digests. Also toggles the ability of users
diff --git a/functions.php b/functions.php
index 4d8e632cb..84738ddb8 100644
--- a/functions.php
+++ b/functions.php
@@ -371,7 +371,7 @@
 	}
 
 	function fetch_file_contents($url, $type = false) {
-		if (USE_CURL_FOR_ICONS) {
+		if (USE_CURL) {
 			$ch = curl_init($url);
 
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
@@ -435,7 +435,7 @@
 			$favicon_url = rewrite_relative_url($url, "/favicon.ico");
 
 		// Run a test to see if what we have attempted to get actually exists.
-		if(USE_CURL_FOR_ICONS || url_validate($favicon_url)) {
+		if(USE_CURL || url_validate($favicon_url)) {
 			return $favicon_url;
 		} else {
 			return false;
@@ -755,7 +755,7 @@
 			$icon_url = substr($icon_url, 0, 250);
 
 			if ($icon_url && $orig_icon_url != $icon_url) { 
-				if (USE_CURL_FOR_ICONS || url_validate($icon_url)) {
+				if (USE_CURL || url_validate($icon_url)) {
 					db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'");
 				}
 			}
diff --git a/sanity_check.php b/sanity_check.php
index a33b7c19e..567be65ee 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -41,8 +41,8 @@
 		exit;
 	}
 
-	if (USE_CURL_FOR_ICONS && ! function_exists("curl_init")) {
-		print "<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP 
+	if (USE_CURL && ! function_exists("curl_init")) {
+		print "<b>Fatal Error</b>: You have enabled USE_CURL, but your PHP 
 			doesn't seem to support CURL functions.";
 		exit;
 	} 
@@ -138,6 +138,10 @@
 		$err_msg = "php.ini: Safe mode is not supported. If you wish to continue, remove this test from sanity_check.php and proceeed at your own risk. Please note that your bug reports will not be accepted or reviewed.";
 	}
 
+	if (defined('USE_CURL_FOR_ICONS')) {
+		$err_msg = "config: USE_CURL_FOR_ICONS has been renamed to USE_CURL.";
+	}
+
 	if ($err_msg) {
 		print "<b>Fatal Error</b>: $err_msg\n";
 		exit;