Merge pull request torne#1 from gothfox/master

Update from original

Author: whyparkc

.gitignore

@@ -2,13 +2,13 @@
 *~
 *.DS_Store
 #*
-lib/floIcon.php
 .idea/*
 config.php
 feed-icons/*
 cache/*/*
 lock/*
 tags
+plugins/fever
 cache/htmlpurifier/*/*ser
 lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/*/*ser
 web.config

README.md

@@ -4,12 +4,25 @@ Tiny Tiny RSS
 Web-based news feed aggregator, designed to allow you to read news from 
 any location, while feeling as close to a real desktop application as possible.
 
-http://tt-rss.org
+http://tt-rss.org (http://mirror.tt-rss.org)
 
-Licensed under GNU GPL version 2
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Copyright (c) 2005 Andrew Dolgov (unless explicitly stated otherwise).
 
+Uses Silk icons by Mark James: http://www.famfamfam.com/lab/icons/silk/
+
 ## Requirements
 
 * Compatible web browser (http://tt-rss.org/wiki/CompatibleBrowsers)

atom-to-html.xsl

@@ -21,9 +21,6 @@
 
 		<div class="rss">
 
-		<img class="feedicon" src="images/pub_set.svg" style="width : 64px; height : 64px;" 
-			alt="feed icon"/>
-
 		<h1><xsl:value-of select="atom:title"/></h1>
 
 		<p class="description">This feed has been exported from

classes/api.php

@@ -2,7 +2,7 @@
 
 class API extends Handler {
 
-	const API_LEVEL  = 7;
+	const API_LEVEL  = 9;
 
 	const STATUS_OK  = 0;
 	const STATUS_ERR = 1;
@@ -77,6 +77,7 @@ function login() {
 				$this->wrap(self::STATUS_OK,	array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
 			} else {                                                         // else we are not logged in
+				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
 				$this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
 			}
 		} else {
@@ -199,11 +200,15 @@ function getHeadlines() {
 			$include_nested = sql_bool_to_bool($_REQUEST["include_nested"]);
 			$sanitize_content = !isset($_REQUEST["sanitize"]) ||
 				sql_bool_to_bool($_REQUEST["sanitize"]);
+			$force_update = sql_bool_to_bool($_REQUEST["force_update"]);
 
 			$override_order = false;
 			switch ($_REQUEST["order_by"]) {
+				case "title":
+					$override_order = "ttrss_entries.title";
+					break;
 				case "date_reverse":
-					$override_order = "date_entered, updated";
+					$override_order = "score DESC, date_entered, updated";
 					break;
 				case "feed_dates":
 					$override_order = "updated DESC";
@@ -218,7 +223,7 @@ function getHeadlines() {
 			$headlines = $this->api_get_headlines($feed_id, $limit, $offset,
 				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order,
 				$include_attachments, $since_id, $search, $search_mode,
-				$include_nested, $sanitize_content);
+				$include_nested, $sanitize_content, $force_update);
 
 			$this->wrap(self::STATUS_OK, $headlines);
 		} else {
@@ -309,8 +314,8 @@ function getArticle() {
 
 		if ($article_id) {
 
-			$query = "SELECT id,title,link,content,cached_content,feed_id,comments,int_id,
-				marked,unread,published,score,
+			$query = "SELECT id,title,link,content,feed_id,comments,int_id,
+				marked,unread,published,score,note,lang,
 				".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 				author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title
 				FROM ttrss_entries,ttrss_user_entries
@@ -338,11 +343,13 @@ function getArticle() {
 						"comments" => $line["comments"],
 						"author" => $line["author"],
 						"updated" => (int) strtotime($line["updated"]),
-						"content" => $line["cached_content"] != "" ? $line["cached_content"] : $line["content"],
+						"content" => $line["content"],
 						"feed_id" => $line["feed_id"],
 						"attachments" => $attachments,
 						"score" => (int)$line["score"],
-						"feed_title" => $line["feed_title"]
+						"feed_title" => $line["feed_title"],
+						"note" => $line["note"],
+						"lang" => $line["lang"]
 					);
 
 					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
@@ -423,14 +430,14 @@ function getLabels() {
 
 			$checked = false;
 			foreach ($article_labels as $al) {
-				if ($al[0] == $line['id']) {
+				if (feed_to_label_id($al[0]) == $line['id']) {
 					$checked = true;
 					break;
 				}
 			}
 
 			array_push($rv, array(
-				"id" => (int)$line['id'],
+				"id" => (int)label_to_feed_id($line['id']),
 				"caption" => $line['caption'],
 				"fg_color" => $line['fg_color'],
 				"bg_color" => $line['bg_color'],
@@ -447,7 +454,7 @@ function setArticleLabel() {
 		$assign = (bool) $this->dbh->escape_string($_REQUEST['assign']) == "true";
 
 		$label = $this->dbh->escape_string(label_find_caption(
-			$label_id, $_SESSION["uid"]));
+			feed_to_label_id($label_id), $_SESSION["uid"]));
 
 		$num_updated = 0;
 
@@ -511,7 +518,7 @@ static function api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_n
 					if ($unread || !$unread_only) {
 
 						$row = array(
-								"id" => $cv["id"],
+								"id" => (int) $cv["id"],
 								"title" => $cv["description"],
 								"unread" => $cv["counter"],
 								"cat_id" => -2,
@@ -557,7 +564,7 @@ static function api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_n
 
 					if ($unread || !$unread_only) {
 						$row = array(
-								"id" => $line["id"],
+								"id" => (int) $line["id"],
 								"title" => $line["title"],
 								"unread" => $unread,
 								"is_cat" => true,
@@ -626,7 +633,28 @@ static function api_get_headlines($feed_id, $limit, $offset,
 				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
 				$include_attachments, $since_id,
 				$search = "", $search_mode = "",
-				$include_nested = false, $sanitize_content = true) {
+				$include_nested = false, $sanitize_content = true, $force_update = false) {
+
+			if ($force_update && $feed_id > 0 && is_numeric($feed_id)) {
+				// Update the feed if required with some basic flood control
+
+				$result = db_query(
+					"SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+						FROM ttrss_feeds WHERE id = '$feed_id'");
+
+				if (db_num_rows($result) != 0) {
+					$last_updated = strtotime(db_fetch_result($result, 0, "last_updated"));
+					$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
+
+					if (!$cache_images && time() - $last_updated > 120) {
+						include "rssfuncs.php";
+						update_rss_feed($feed_id, true, true);
+					} else {
+						db_query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
+							WHERE id = '$feed_id'");
+					}
+				}
+			}
 
 			$qfh_ret = queryFeedHeadlines($feed_id, $limit,
 				$view_mode, $is_cat, $search, $search_mode,
@@ -638,11 +666,31 @@ static function api_get_headlines($feed_id, $limit, $offset,
 			$headlines = array();
 
 			while ($line = db_fetch_assoc($result)) {
+				$line["content_preview"] = truncate_string(strip_tags($line["content"]), 100);
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+					$line = $p->hook_query_headlines($line, 100, true);
+				}
+
 				$is_updated = ($line["last_read"] == "" &&
 					($line["unread"] != "t" && $line["unread"] != "1"));
 
 				$tags = explode(",", $line["tag_cache"]);
-				$labels = json_decode($line["label_cache"], true);
+
+				$label_cache = $line["label_cache"];
+				$labels = false;
+
+				if ($label_cache) {
+					$label_cache = json_decode($label_cache, true);
+
+					if ($label_cache) {
+						if ($label_cache["no-labels"] == 1)
+							$labels = array();
+						else
+							$labels = $label_cache;
+					}
+				}
+
+				if (!is_array($labels)) $labels = get_article_labels($line["id"]);
 
 				//if (!$tags) $tags = get_article_tags($line["id"]);
 				//if (!$labels) $labels = get_article_labels($line["id"]);
@@ -660,28 +708,22 @@ static function api_get_headlines($feed_id, $limit, $offset,
 						"tags" => $tags,
 					);
 
-					if ($include_attachments)
-						$headline_row['attachments'] = get_article_enclosures(
-							$line['id']);
+				if ($include_attachments)
+					$headline_row['attachments'] = get_article_enclosures(
+						$line['id']);
 
-				if ($show_excerpt) {
-					$excerpt = truncate_string(strip_tags($line["content_preview"]), 100);
-					$headline_row["excerpt"] = $excerpt;
-				}
+				if ($show_excerpt)
+					$headline_row["excerpt"] = $line["content_preview"];
 
 				if ($show_content) {
 
-					if ($line["cached_content"] != "") {
-						$line["content_preview"] =& $line["cached_content"];
-					}
-
 					if ($sanitize_content) {
 						$headline_row["content"] = sanitize(
-							$line["content_preview"],
+							$line["content"],
 							sql_bool_to_bool($line['hide_images']),
-							false, $line["site_url"]);
+							false, $line["site_url"], false, $line["id"]);
 					} else {
-						$headline_row["content"] = $line["content_preview"];
+						$headline_row["content"] = $line["content"];
 					}
 				}
 
@@ -699,7 +741,10 @@ static function api_get_headlines($feed_id, $limit, $offset,
 				$headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]);
 
 				$headline_row["author"] = $line["author"];
+
 				$headline_row["score"] = (int)$line["score"];
+				$headline_row["note"] = $line["note"];
+				$headline_row["lang"] = $line["lang"];
 
 				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
 					$headline_row = $p->hook_render_article_api(array("headline" => $headline_row));

classes/article.php

@@ -30,7 +30,6 @@ function view() {
 		$id = $this->dbh->escape_string($_REQUEST["id"]);
 		$cids = explode(",", $this->dbh->escape_string($_REQUEST["cids"]));
 		$mode = $this->dbh->escape_string($_REQUEST["mode"]);
-		$omode = $this->dbh->escape_string($_REQUEST["omode"]);
 
 		// in prefetch mode we only output requested cids, main article
 		// just gets marked as read (it already exists in client cache)
@@ -108,7 +107,7 @@ static function create_published_article($title, $url, $content, $labels_str,
 
 		// only check for our user data here, others might have shared this with different content etc
 		$result = db_query("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
-			link = '$url' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
+			guid = '$guid' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
 
 		if (db_num_rows($result) != 0) {
 			$ref_id = db_fetch_result($result, 0, "id");

classes/db/mysql.php

@@ -26,9 +26,12 @@ function escape_string($s, $strip_tags = true) {
 	}
 
 	function query($query, $die_on_error = true) {
-		$result = mysql_query($query, $this->link);
+		$result = @mysql_query($query, $this->link);
 		if (!$result) {
-			user_error("Query $query failed: " . ($this->link ? mysql_error($this->link) : "No connection"),
+			$error = @mysql_error($this->link);
+
+			@mysql_query("ROLLBACK", $this->link);
+			user_error("Query $query failed: " . ($this->link ? $error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 		return $result;

classes/db/mysqli.php

@@ -24,9 +24,12 @@ function escape_string($s, $strip_tags = true) {
 	}
 
 	function query($query, $die_on_error = true) {
-		$result = mysqli_query($this->link, $query);
+		$result = @mysqli_query($this->link, $query);
 		if (!$result) {
-			user_error("Query $query failed: " . ($this->link ? mysqli_error($this->link) : "No connection"),
+			$error = @mysqli_error($this->link);
+
+			@mysqli_query($this->link, "ROLLBACK");
+			user_error("Query $query failed: " . ($this->link ? $error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 

classes/db/pgsql.php

@@ -35,11 +35,14 @@ function escape_string($s, $strip_tags = true) {
 	}
 
 	function query($query, $die_on_error = true) {
-		$result = pg_query($query);
+		$result = @pg_query($this->link, $query);
 
 		if (!$result) {
+			$error = @pg_last_error($this->link);
+
+			@pg_query($this->link, "ROLLBACK");
 			$query = htmlspecialchars($query); // just in case
-			user_error("Query $query failed: " . ($this->link ? pg_last_error($this->link) : "No connection"),
+			user_error("Query $query failed: " . ($this->link ? $error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 		return $result;

classes/dlg.php

@@ -16,7 +16,6 @@ function importOpml() {
 		print __("If you have imported labels and/or filters, you might need to reload preferences to see your new data.") . "</p>";
 
 		print "<div class=\"prefFeedOPMLHolder\">";
-		$owner_uid = $_SESSION["uid"];
 
 		$this->dbh->query("BEGIN");
 
@@ -176,7 +175,7 @@ function printTagSelect() {
 
 		while ($row = $this->dbh->fetch_assoc($result)) {
 			$tmp = htmlspecialchars($row["tag_name"]);
-			print "<option value=\"" . str_replace(" ", "%20", $tmp) . "\">$tmp</option>";
+			print "<option value=\"$tmp\">$tmp</option>";
 		}
 
 		print "</select>";

classes/feedenclosure.php

@@ -3,5 +3,8 @@ class FeedEnclosure {
 	public $link;
 	public $type;
 	public $length;
+	public $title;
+	public $height;
+	public $width;
 }
 ?>