Merge branch 'master' of /home/fox/public_html/testbox/tt-rss

9 files changed, 378 insertions, 7 deletions

diff --git a/api/index.php b/api/index.php
new file mode 100644
index 000000000..1b263daa1
--- /dev/null
+++ b/api/index.php
@@ -0,0 +1,346 @@
+<?php
+	error_reporting(E_ERROR | E_PARSE);
+
+	require_once "../config.php";
+	
+	require_once "../db.php";
+	require_once "../db-prefs.php";
+	require_once "../functions.php";
+
+	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);	
+
+	$session_expire = SESSION_EXPIRE_TIME; //seconds
+	$session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid_api" : TTRSS_SESSION_NAME . "_api";
+
+	session_start();
+
+	if (!$link) {
+		if (DB_TYPE == "mysql") {
+			print mysql_error();
+		}
+		// PG seems to display its own errors just fine by default.		
+		return;
+	}
+
+	init_connection($link);
+
+	$op = db_escape_string($_REQUEST["op"]);
+
+//	header("Content-Type: application/json");
+
+	if (!$_SESSION["uid"] && $op != "login" && $op != "isLoggedIn") {
+		print json_encode(array("error" => 'NOT_LOGGED_IN'));
+		return;
+	}
+
+	if ($_SESSION["uid"] && $op != "logout" && !get_pref($link, 'ENABLE_API_ACCESS')) {
+		print json_encode(array("error" => 'API_DISABLED'));
+		return;
+	} 
+
+	switch ($op) {
+		case "getVersion":
+			$rv = array("version" => VERSION);
+			print json_encode($rv);
+		break;
+		case "login":
+			$login = db_escape_string($_REQUEST["user"]);
+			$password = db_escape_string($_REQUEST["password"]);
+
+			$result = db_query($link, "SELECT id FROM ttrss_users WHERE login = '$login'");
+
+			if (db_num_rows($result) != 0) {
+				$uid = db_fetch_result($result, 0, "id");
+			} else {
+				$uid = 0;
+			}
+
+			if (get_pref($link, "ENABLE_API_ACCESS", $uid)) {
+				if (authenticate_user($link, $login, $password)) {
+					print json_encode(array("uid" => $_SESSION["uid"]));
+				} else {
+					print json_encode(array("error" => "LOGIN_ERROR"));
+				}
+			} else {
+				print json_encode(array("error" => "API_DISABLED"));
+			}
+
+			break;
+		case "logout":
+			logout_user();
+			print json_encode(array("uid" => 0));
+			break;
+		case "isLoggedIn":
+			print json_encode(array("status" => $_SESSION["uid"] != ''));
+			break;
+		case "getUnread":
+			$feed_id = db_escape_string($_REQUEST["feed_id"]);
+			$is_cat = db_escape_string($_REQUEST["is_cat"]);
+
+			if ($feed_id) {
+				print json_encode(array("unread" => getFeedUnread($link, $feed_id, $is_cat)));
+			} else {
+				print json_encode(array("unread" => getGlobalUnread($link)));
+			}
+			break;
+		case "getFeeds":
+			$cat_id = db_escape_string($_REQUEST["cat_id"]);
+			$unread_only = (bool)db_escape_string($_REQUEST["unread_only"]);
+
+			if (!$cat_id) {
+				$result = db_query($link, "SELECT 
+					id, feed_url, cat_id, title, ".
+						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+						FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
+			} else {
+				$result = db_query($link, "SELECT 
+					id, feed_url, cat_id, title, ".
+						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+						FROM ttrss_feeds WHERE 
+							cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"]);
+			}
+
+			$feeds = array();
+
+			while ($line = db_fetch_assoc($result)) {
+
+				$unread = getFeedUnread($link, $line["id"]);
+
+				if ($unread || !$unread_only) {
+
+					$row = array(
+							"feed_url" => $line["feed_url"],
+							"title" => $line["title"],
+							"id" => (int)$line["id"],
+							"unread" => (int)$unread,
+							"cat_id" => (int)$line["cat_id"],
+							"last_updated" => strtotime($line["last_updated"])
+						);
+	
+					array_push($feeds, $row);
+				}
+			}
+
+			/* Labels */
+
+			if (!$cat_id || $cat_id == -2) {
+				$counters = getLabelCounters($link, false, true);
+
+				foreach (array_keys($counters) as $id) {
+
+					$unread = $counters[$id]["counter"];
+	
+					if ($unread || !$unread_only) {
+	
+						$row = array(
+								"id" => $id,
+								"title" => $counters[$id]["description"],
+								"unread" => $counters[$id]["counter"],
+								"cat_id" => -2,
+							);
+	
+						array_push($feeds, $row);
+					}
+				}
+			}
+
+			/* Virtual feeds */
+
+			if (!$cat_id || $cat_id == -1) {
+				foreach (array(-1, -2, -3, -4) as $i) {
+					$unread = getFeedUnread($link, $i);
+
+					if ($unread || !$unread_only) {
+						$title = getFeedTitle($link, $i);
+
+						$row = array(
+								"id" => $i,
+								"title" => $title,
+								"unread" => $unread,
+								"cat_id" => -1,
+							);
+						array_push($feeds, $row);
+					}
+
+				}
+			}
+
+			print json_encode($feeds);
+
+			break;
+		case "getCategories":
+			$unread_only = (bool)db_escape_string($_REQUEST["unread_only"]);
+
+			$result = db_query($link, "SELECT 
+					id, title FROM ttrss_feed_categories 
+				WHERE owner_uid = " . 
+				$_SESSION["uid"]);
+
+			$cats = array();
+
+			while ($line = db_fetch_assoc($result)) {
+				$unread = getFeedUnread($link, $line["id"], true);
+
+				if ($unread || !$unread_only) {
+					array_push($cats, array("id" => $line["id"],
+						"title" => $line["title"], 
+						"unread" => $unread));
+				}
+			}
+
+			print json_encode($cats);
+			break;
+		case "getHeadlines":
+			$feed_id = db_escape_string($_REQUEST["feed_id"]);
+			$limit = (int)db_escape_string($_REQUEST["limit"]);
+			$filter = db_escape_string($_REQUEST["filter"]);
+			$is_cat = (bool)db_escape_string($_REQUEST["is_cat"]);
+			$show_except = (bool)db_escape_string($_REQUEST["show_excerpt"]);
+
+			/* do not rely on params below */
+
+			$search = db_escape_string($_REQUEST["search"]);
+			$search_mode = db_escape_string($_REQUEST["search_mode"]);
+			$match_on = db_escape_string($_REQUEST["match_on"]);
+			
+			$qfh_ret = queryFeedHeadlines($link, $feed_id, $limit, 
+				$view_mode, $is_cat, $search, $search_mode, $match_on);
+
+			$result = $qfh_ret[0];
+			$feed_title = $qfh_ret[1];
+
+			$headlines = array();
+
+			while ($line = db_fetch_assoc($result)) {
+				$is_updated = ($line["last_read"] == "" && 
+					($line["unread"] != "t" && $line["unread"] != "1"));
+
+				$headline_row = array(
+						"id" => (int)$line["id"],
+						"unread" => sql_bool_to_bool($line["unread"]),
+						"marked" => sql_bool_to_bool($line["marked"]),
+						"updated" => strtotime($line["updated"]),
+						"is_updated" => $is_updated,
+						"title" => $line["title"],
+						"feed_id" => $line["feed_id"],
+					);
+
+				if ($show_except) $headline_row["excerpt"] = $line["content_preview"];
+			
+				array_push($headlines, $headline_row);
+			}
+
+			print json_encode($headlines);
+
+			break;
+		case "updateArticle":
+			$article_id = (int) db_escape_string($_GET["article_id"]);
+			$mode = (int) db_escape_string($_REQUEST["mode"]);
+			$field_raw = (int)db_escape_string($_REQUEST["field"]);
+
+			$field = "";
+			$set_to = "";
+
+			switch ($field_raw) {
+				case 0:
+					$field = "marked";
+					break;
+				case 1:
+					$field = "published";
+					break;
+				case 2:
+					$field = "unread";
+					break;
+			};
+
+			switch ($mode) {
+				case 1:
+					$set_to = "true";
+					break;
+				case 0:
+					$set_to = "false";
+					break;
+				case 2:
+					$set_to = "NOT $field";
+					break;
+			}
+
+			if ($field && $set_to) {
+				if ($field == "unread") {
+					$result = db_query($link, "UPDATE ttrss_user_entries SET $field = $set_to,
+						last_read = NOW()
+						WHERE ref_id = '$article_id' AND owner_uid = " . $_SESSION["uid"]);
+				} else {
+					$result = db_query($link, "UPDATE ttrss_user_entries SET $field = $set_to
+						WHERE ref_id = '$article_id' AND owner_uid = " . $_SESSION["uid"]);
+				}
+			}
+
+			break;
+
+		case "getArticle":
+
+			$article_id = (int)db_escape_string($_REQUEST["article_id"]);
+
+			$query = "SELECT title,link,content,feed_id,comments,int_id,
+				marked,unread,published,
+				".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
+				author
+				FROM ttrss_entries,ttrss_user_entries
+				WHERE	id = '$article_id' AND ref_id = id AND owner_uid = " . 
+					$_SESSION["uid"] ;
+
+			$result = db_query($link, $query);
+
+			$article = array();
+			
+			if (db_num_rows($result) != 0) {
+				$line = db_fetch_assoc($result);
+	
+				$article = array(
+					"title" => $line["title"],
+					"link" => $line["link"],
+					"labels" => get_article_labels($link, $article_id),
+					"unread" => sql_bool_to_bool($line["unread"]),
+					"marked" => sql_bool_to_bool($line["marked"]),
+					"published" => sql_bool_to_bool($line["published"]),
+					"comments" => $line["comments"],
+					"author" => $line["author"],
+					"updated" => strtotime($line["updated"]),
+					"content" => $line["content"],
+					"feed_id" => $line["feed_id"],			
+				);
+			}
+
+			print json_encode($article);
+
+			break;
+		case "getConfig":
+			$config = array(
+				"icons_dir" => ICONS_DIR,
+				"icons_url" => ICONS_URL);
+
+			if (ENABLE_UPDATE_DAEMON) {
+				$config["daemon_is_running"] = file_is_locked("update_daemon.lock");
+			}
+
+			$result = db_query($link, "SELECT COUNT(*) AS cf FROM
+				ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
+
+			$num_feeds = db_fetch_result($result, 0, "cf");
+
+			$config["num_feeds"] = (int)$num_feeds;
+	
+			print json_encode($config);
+
+			break;
+
+		case "getPref":
+			$pref_name = db_escape_string($_REQUEST["pref_name"]);
+			print json_encode(array("value" => get_pref($link, $pref_name)));
+			break;
+	}
+
+	db_close($link);
+	
+?>
diff --git a/db-prefs.php b/db-prefs.php
index f9b57e6b1..659035e15 100644
--- a/db-prefs.php
+++ b/db-prefs.php
@@ -2,7 +2,7 @@
 	require_once "config.php";
 	require_once "db.php";
 
-	if (!defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {
+	if (!defined('DISABLE_SESSIONS')) {
 		if (!$_SESSION["prefs_cache"])
 			$_SESSION["prefs_cache"] = array();
 	}
diff --git a/functions.php b/functions.php
index 7980b68d8..dfe1a41c6 100644
--- a/functions.php
+++ b/functions.php
@@ -362,11 +362,17 @@
 				curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
 				curl_setopt($ch, CURLOPT_TIMEOUT, 45);
 				curl_exec($ch);
-				curl_close($ch);
-				fclose($fp);					
+
+				if (strpos(curl_getinfo($ch, CURLINFO_CONTENT_TYPE), "image/") !== false) {
+					curl_close($ch);
+					fclose($fp);					
+					$contents = file_get_contents($tmpfile);
+				} else {
+					curl_close($ch);
+					fclose($fp);					
+				}
 			}
 
-			$contents =  file_get_contents($tmpfile);
 			unlink($tmpfile);
 
 			return $contents;
diff --git a/localized_schema.php b/localized_schema.php
index 35fb6dc0c..8d827d1dc 100644
--- a/localized_schema.php
+++ b/localized_schema.php
@@ -81,5 +81,6 @@
 	__("Enable inline MP3 player");
 	__("Enable the Flash-based XSPF Player to play MP3-format podcast enclosures.");
 	__("Do not show images in articles");
+	__("Enable external API");
 
 ?>
diff --git a/sanity_check.php b/sanity_check.php
index 600f8d9f4..55df98141 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
 	require_once "functions.php";
 
 	define('EXPECTED_CONFIG_VERSION', 18);
-	define('SCHEMA_VERSION', 57);
+	define('SCHEMA_VERSION', 58);
 
 	if (!file_exists("config.php")) {
 		print "<b>Fatal Error</b>: You forgot to copy 
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index d3c8b5f15..04c601fae 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -226,7 +226,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) TYPE=InnoDB;
 
-insert into ttrss_version values (57);
+insert into ttrss_version values (58);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -359,6 +359,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ENABLE_OFFLINE_READING', 1, 'false', 'Enable offline reading',1,	'Synchronize new articles for offline reading using Google Gears.');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_API_ACCESS', 1, 'false', 'Enable external API', 3);
+
 create table ttrss_user_prefs (
    owner_uid integer not null,
    pref_name varchar(250),
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 61ffcb10a..b2458d4ba 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -202,7 +202,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (57);
+insert into ttrss_version values (58);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -329,6 +329,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ENABLE_OFFLINE_READING', 1, 'false', 'Enable offline reading',1,	'Synchronize new articles for offline reading using Google Gears.');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_API_ACCESS', 1, 'false', 'Enable external API', 3);
+
 create table ttrss_user_prefs (
 	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
 	pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,
diff --git a/schema/versions/mysql/58.sql b/schema/versions/mysql/58.sql
new file mode 100644
index 000000000..61173c1d5
--- /dev/null
+++ b/schema/versions/mysql/58.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_API_ACCESS', 1, 'false', 'Enable external API', 3);
+
+update ttrss_version set schema_version = 58;
+
+commit;
diff --git a/schema/versions/pgsql/58.sql b/schema/versions/pgsql/58.sql
new file mode 100644
index 000000000..61173c1d5
--- /dev/null
+++ b/schema/versions/pgsql/58.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_API_ACCESS', 1, 'false', 'Enable external API', 3);
+
+update ttrss_version set schema_version = 58;
+
+commit;