X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Ffunctions.php;h=769c27af9f13040c415c667df7ff351b7cc3d415;hb=9fd581336e3044425c3d2d915ee81c8c5741d226;hp=344e3e1ea10715d8166447616d6ca58c74930dec;hpb=1f16ede01d9025641f1ea153482bf61ef956daa1;p=tt-rss.git

diff --git a/include/functions.php b/include/functions.php
index 344e3e1e..769c27af 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,6 +64,7 @@
 	function get_translations() {
 		$tr = array(
 					"auto"  => "Detect automatically",
+					"ar_SA" => "العربيّة (Arabic)",
 					"da_DA" => "Dansk",
 					"ca_CA" => "Català",
 					"cs_CZ" => "Česky",
@@ -348,16 +350,21 @@
 
 		global $fetch_last_error;
 		global $fetch_last_error_code;
+		global $fetch_last_error_content;
 		global $fetch_last_content_type;
 		global $fetch_curl_used;
 
+		$url = ltrim($url, ' ');
 		$url = str_replace(' ', '%20', $url);
 
+		if (strpos($url, "//") === 0)
+			$url = 'http:' . $url;
+
 		if (!defined('NO_CURL') && function_exists('curl_init')) {
 
 			$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
@@ -399,10 +406,6 @@
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query);
 			}
 
-			if ((OPENSSL_VERSION_NUMBER >= 0x0090808f) && (OPENSSL_VERSION_NUMBER < 0x10000000)) {
-				curl_setopt($ch, CURLOPT_SSLVERSION, 3);
-			}
-
 			if ($login && $pass)
 				curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
 
@@ -430,6 +433,7 @@
 				} else {
 					$fetch_last_error = "HTTP Code: $http_code";
 				}
+				$fetch_last_error_content = $contents;
 				curl_close($ch);
 				return false;
 			}
@@ -1203,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) {
@@ -1706,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 {
@@ -1972,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) {