X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Ffunctions.php;h=764dea10eccee68ebaef8e765e4c0bd0442cb80c;hb=8ef0ca2fa66ba9110d410dc85c6ed84c85d58cc9;hp=2e76f157beebe60e131dfac680cf71b52003f6ef;hpb=df13793f1cbd42c1298fc0be2d829c2dd290d5a5;p=tt-rss.git

diff --git a/include/functions.php b/include/functions.php
index 2e76f157..764dea10 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 125);
+	define('SCHEMA_VERSION', 126);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
@@ -10,6 +10,7 @@
 	$fetch_last_error = false;
 	$fetch_last_error_code = false;
 	$fetch_last_content_type = false;
+	$fetch_last_error_content = false; // curl only for the time being
 	$fetch_curl_used = false;
 	$suppress_debugging = false;
 
@@ -63,10 +64,14 @@
 	function get_translations() {
 		$tr = array(
 					"auto"  => "Detect automatically",
+					"ar_SA" => "العربيّة (Arabic)",
+					"da_DA" => "Dansk",
 					"ca_CA" => "Català",
 					"cs_CZ" => "Česky",
 					"en_US" => "English",
-					"es_ES" => "Español",
+					"el_GR" => "Ελληνικά",
+					"es_ES" => "Español (España)",
+					"es_LA" => "Español",
 					"de_DE" => "Deutsch",
 					"fr_FR" => "Français",
 					"hu_HU" => "Magyar (Hungarian)",
@@ -345,6 +350,7 @@
 
 		global $fetch_last_error;
 		global $fetch_last_error_code;
+		global $fetch_last_error_content;
 		global $fetch_last_content_type;
 		global $fetch_curl_used;
 
@@ -354,7 +360,7 @@
 
 			$fetch_curl_used = true;
 
-			if (ini_get("safe_mode") || ini_get("open_basedir")) {
+			if (ini_get("safe_mode") || ini_get("open_basedir") || defined("FORCE_GETURL")) {
 				$new_url = geturl($url);
 				if (!$new_url) {
 				    // geturl has already populated $fetch_last_error
@@ -427,6 +433,7 @@
 				} else {
 					$fetch_last_error = "HTTP Code: $http_code";
 				}
+				$fetch_last_error_content = $contents;
 				curl_close($ch);
 				return false;
 			}
@@ -1200,7 +1207,7 @@
 							SET unread = false, last_read = NOW() WHERE ref_id IN
 								(SELECT id FROM
 									(SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
-										AND owner_uid = $owner_uid AND unread = true AND $date_qpart AND $match_part) as tmp)");
+										AND owner_uid = $owner_uid AND score >= 0 AND unread = true AND $date_qpart AND $match_part) as tmp)");
 					}
 
 					if ($feed == -4) {
@@ -1703,18 +1710,6 @@
 			$url = key($feedUrls);
 		}
 
-		/* libxml_use_internal_errors(true);
-		$doc = new DOMDocument();
-		$doc->loadXML($contents);
-		$error = libxml_get_last_error();
-		libxml_clear_errors();
-
-		if ($error) {
-			$error_message = format_libxml_error($error);
-
-			return array("code" => 6, "message" => $error_message);
-		} */
-
 		if ($cat_id == "0" || !$cat_id) {
 			$cat_qpart = "NULL";
 		} else {
@@ -1969,8 +1964,6 @@
 	function getFeedTitle($id, $cat = false) {
 		if ($cat) {
 			return getCategoryTitle($id);
-		} else if ($id == 0) {
-			return __("All feeds");
 		} else if ($id == -1) {
 			return __("Starred articles");
 		} else if ($id == -2) {