valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: remove option ENABLE_UPDATE_DAEMON

This commit is contained in:
Andrew Dolgov 2011-04-12 19:33:12 +04:00
parent f56c6cd488
commit dbaa4e4aac
6 changed files with 94 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
api/index.php
View File

@ -2,7 +2,7 @@
error_reporting(E_ERROR | E_PARSE); error_reporting(E_ERROR | E_PARSE);
require_once "../config.php"; require_once "../config.php";
require_once "../db.php"; require_once "../db.php";
require_once "../db-prefs.php"; require_once "../db-prefs.php";
require_once "../functions.php"; require_once "../functions.php";
@ -14,7 +14,7 @@
ob_start("ob_gzhandler"); ob_start("ob_gzhandler");
} }
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
$session_expire = SESSION_EXPIRE_TIME; //seconds $session_expire = SESSION_EXPIRE_TIME; //seconds
$session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid_api" : TTRSS_SESSION_NAME . "_api"; $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid_api" : TTRSS_SESSION_NAME . "_api";
@ -31,7 +31,7 @@
if (DB_TYPE == "mysql") { if (DB_TYPE == "mysql") {
print mysql_error(); print mysql_error();
} }
// PG seems to display its own errors just fine by default. // PG seems to display its own errors just fine by default.
return; return;
} }
@ -56,15 +56,15 @@
if ($_SESSION["uid"] && $op != "logout" && !get_pref($link, 'ENABLE_API_ACCESS')) { if ($_SESSION["uid"] && $op != "logout" && !get_pref($link, 'ENABLE_API_ACCESS')) {
print api_wrap_reply(API_STATUS_ERR, $seq, array("error" => 'API_DISABLED')); print api_wrap_reply(API_STATUS_ERR, $seq, array("error" => 'API_DISABLED'));
return; return;
} }
switch ($op) { switch ($op) {
case "getVersion": case "getVersion":
$rv = array("version" => VERSION); $rv = array("version" => VERSION);
print api_wrap_reply(API_STATUS_OK, $seq, $rv); print api_wrap_reply(API_STATUS_OK, $seq, $rv);
break; break;
case "login": case "login":
$login = db_escape_string($_REQUEST["user"]); $login = db_escape_string($_REQUEST["user"]);
$password = db_escape_string($_REQUEST["password"]); $password = db_escape_string($_REQUEST["password"]);
@ -82,13 +82,13 @@
if ($uid && get_pref($link, "ENABLE_API_ACCESS", $uid)) { if ($uid && get_pref($link, "ENABLE_API_ACCESS", $uid)) {
if (authenticate_user($link, $login, $password)) { // try login with normal password if (authenticate_user($link, $login, $password)) { // try login with normal password
print api_wrap_reply(API_STATUS_OK, $seq, print api_wrap_reply(API_STATUS_OK, $seq,
array("session_id" => session_id())); array("session_id" => session_id()));
} else if (authenticate_user($link, $login, $password_base64)) { // else try with base64_decoded password } else if (authenticate_user($link, $login, $password_base64)) { // else try with base64_decoded password
print api_wrap_reply(API_STATUS_OK, $seq, print api_wrap_reply(API_STATUS_OK, $seq,
array("session_id" => session_id())); array("session_id" => session_id()));
} else { // else we are not logged in } else { // else we are not logged in
print api_wrap_reply(API_STATUS_ERR, $seq, print api_wrap_reply(API_STATUS_ERR, $seq,
array("error" => "LOGIN_ERROR")); array("error" => "LOGIN_ERROR"));
} }
} else { } else {
@ -97,40 +97,40 @@
} }
break; break;
case "logout": case "logout":
logout_user(); logout_user();
print api_wrap_reply(API_STATUS_OK, $seq, array("status" => "OK")); print api_wrap_reply(API_STATUS_OK, $seq, array("status" => "OK"));
break; break;
case "isLoggedIn": case "isLoggedIn":
print api_wrap_reply(API_STATUS_OK, $seq, print api_wrap_reply(API_STATUS_OK, $seq,
array("status" => $_SESSION["uid"] != '')); array("status" => $_SESSION["uid"] != ''));
break; break;
case "getUnread": case "getUnread":
$feed_id = db_escape_string($_REQUEST["feed_id"]); $feed_id = db_escape_string($_REQUEST["feed_id"]);
$is_cat = db_escape_string($_REQUEST["is_cat"]); $is_cat = db_escape_string($_REQUEST["is_cat"]);
if ($feed_id) { if ($feed_id) {
print api_wrap_reply(API_STATUS_OK, $seq, print api_wrap_reply(API_STATUS_OK, $seq,
array("unread" => getFeedUnread($link, $feed_id, $is_cat))); array("unread" => getFeedUnread($link, $feed_id, $is_cat)));
} else { } else {
print api_wrap_reply(API_STATUS_OK, $seq, print api_wrap_reply(API_STATUS_OK, $seq,
array("unread" => getGlobalUnread($link))); array("unread" => getGlobalUnread($link)));
} }
break; break;
/* Method added for ttrss-reader for Android */ /* Method added for ttrss-reader for Android */
case "getCounters": case "getCounters":
/* flct (flc is the default) FIXME: document */ /* flct (flc is the default) FIXME: document */
$output_mode = db_escape_string($_REQUEST["output_mode"]); $output_mode = db_escape_string($_REQUEST["output_mode"]);
print api_wrap_reply(API_STATUS_OK, $seq, print api_wrap_reply(API_STATUS_OK, $seq,
getAllCounters($link, $output_mode)); getAllCounters($link, $output_mode));
break; break;
case "getFeeds": case "getFeeds":
$cat_id = db_escape_string($_REQUEST["cat_id"]); $cat_id = db_escape_string($_REQUEST["cat_id"]);
$unread_only = (bool)db_escape_string($_REQUEST["unread_only"]); $unread_only = (bool)db_escape_string($_REQUEST["unread_only"]);
@ -144,13 +144,13 @@
print api_wrap_reply(API_STATUS_OK, $seq, $feeds); print api_wrap_reply(API_STATUS_OK, $seq, $feeds);
break; break;
case "getCategories": case "getCategories":
$unread_only = (bool)db_escape_string($_REQUEST["unread_only"]); $unread_only = (bool)db_escape_string($_REQUEST["unread_only"]);
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
id, title FROM ttrss_feed_categories id, title FROM ttrss_feed_categories
WHERE owner_uid = " . WHERE owner_uid = " .
$_SESSION["uid"]); $_SESSION["uid"]);
$cats = array(); $cats = array();
@ -160,14 +160,14 @@
if ($unread || !$unread_only) { if ($unread || !$unread_only) {
array_push($cats, array("id" => $line["id"], array_push($cats, array("id" => $line["id"],
"title" => $line["title"], "title" => $line["title"],
"unread" => $unread)); "unread" => $unread));
} }
} }
print api_wrap_reply(API_STATUS_OK, $seq, $cats); print api_wrap_reply(API_STATUS_OK, $seq, $cats);
break; break;
case "getHeadlines": case "getHeadlines":
$feed_id = db_escape_string($_REQUEST["feed_id"]); $feed_id = db_escape_string($_REQUEST["feed_id"]);
$limit = (int)db_escape_string($_REQUEST["limit"]); $limit = (int)db_escape_string($_REQUEST["limit"]);
@ -185,7 +185,7 @@
print api_wrap_reply(API_STATUS_OK, $seq, $headlines); print api_wrap_reply(API_STATUS_OK, $seq, $headlines);
break; break;
case "updateArticle": case "updateArticle":
$article_ids = split(",", db_escape_string($_REQUEST["article_ids"])); $article_ids = split(",", db_escape_string($_REQUEST["article_ids"]));
$mode = (int) db_escape_string($_REQUEST["mode"]); $mode = (int) db_escape_string($_REQUEST["mode"]);
@ -242,11 +242,11 @@
} }
} }
print api_wrap_reply(API_STATUS_OK, $seq, array("status" => "OK", print api_wrap_reply(API_STATUS_OK, $seq, array("status" => "OK",
"updated" => $num_updated)); "updated" => $num_updated));
} else { } else {
print api_wrap_reply(API_STATUS_ERR, $seq, print api_wrap_reply(API_STATUS_ERR, $seq,
array("error" => 'INCORRECT_USAGE')); array("error" => 'INCORRECT_USAGE'));
} }
@ -261,7 +261,7 @@
".SUBSTRING_FOR_DATE."(updated,1,16) as updated, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
author author
FROM ttrss_entries,ttrss_user_entries FROM ttrss_entries,ttrss_user_entries
WHERE id IN ($article_id) AND ref_id = id AND owner_uid = " . WHERE id IN ($article_id) AND ref_id = id AND owner_uid = " .
$_SESSION["uid"] ; $_SESSION["uid"] ;
$result = db_query($link, $query); $result = db_query($link, $query);
@ -298,15 +298,13 @@
print api_wrap_reply(API_STATUS_OK, $seq, $articles); print api_wrap_reply(API_STATUS_OK, $seq, $articles);
break; break;
case "getConfig": case "getConfig":
$config = array( $config = array(
"icons_dir" => ICONS_DIR, "icons_dir" => ICONS_DIR,
"icons_url" => ICONS_URL); "icons_url" => ICONS_URL);
if (ENABLE_UPDATE_DAEMON) { $config["daemon_is_running"] = file_is_locked("update_daemon.lock");
$config["daemon_is_running"] = file_is_locked("update_daemon.lock");
}
$result = db_query($link, "SELECT COUNT(*) AS cf FROM $result = db_query($link, "SELECT COUNT(*) AS cf FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]); ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
@ -314,7 +312,7 @@
$num_feeds = db_fetch_result($result, 0, "cf"); $num_feeds = db_fetch_result($result, 0, "cf");
$config["num_feeds"] = (int)$num_feeds; $config["num_feeds"] = (int)$num_feeds;
print api_wrap_reply(API_STATUS_OK, $seq, $config); print api_wrap_reply(API_STATUS_OK, $seq, $config);
break; break;
@ -341,10 +339,10 @@
case "getPref": case "getPref":
$pref_name = db_escape_string($_REQUEST["pref_name"]); $pref_name = db_escape_string($_REQUEST["pref_name"]);
print api_wrap_reply(API_STATUS_OK, $seq, print api_wrap_reply(API_STATUS_OK, $seq,
array("value" => get_pref($link, $pref_name))); array("value" => get_pref($link, $pref_name)));
break; break;
/* Method added for ttrss-reader for Android */ /* Method added for ttrss-reader for Android */
case "getArticles": case "getArticles":
$isCategory = (int)db_escape_string($_REQUEST["is_cat"]); $isCategory = (int)db_escape_string($_REQUEST["is_cat"]);
@ -352,23 +350,23 @@
$displayUnread = (int)db_escape_string($_REQUEST["unread"]); $displayUnread = (int)db_escape_string($_REQUEST["unread"]);
$limit = (int)db_escape_string($_REQUEST["limit"]); $limit = (int)db_escape_string($_REQUEST["limit"]);
$feeds = array(); $feeds = array();
if ($isCategory > 0) { if ($isCategory > 0) {
// Get Feeds of the category // Get Feeds of the category
if ($id == 0) { if ($id == 0) {
$category_part = "cat_id is NULL"; $category_part = "cat_id is NULL";
} else { } else {
$category_part = "cat_id = '$id'"; $category_part = "cat_id = '$id'";
} }
$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE ". $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE ".
$category_part." AND owner_uid = '".$_SESSION["uid"]."'"); $category_part." AND owner_uid = '".$_SESSION["uid"]."'");
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {
array_push($feeds, $line["id"]); array_push($feeds, $line["id"]);
} }
// Virtual feeds // Virtual feeds
$match_part = ""; $match_part = "";
if ($id == -1) { if ($id == -1) {
@ -384,7 +382,7 @@
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid); $intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
if (DB_TYPE == "pgsql") { if (DB_TYPE == "pgsql") {
$match_part .= " AND updated > NOW() - INTERVAL '$intl hour' "; $match_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
} else { } else {
$match_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) "; $match_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
} }
@ -396,9 +394,9 @@
// Only add one feed // Only add one feed
array_push($feeds, $id); array_push($feeds, $id);
} }
$ret = array(); $ret = array();
if (DB_TYPE == "mysql") { if (DB_TYPE == "mysql") {
$limit_part = " LIMIT 0,".$limit; $limit_part = " LIMIT 0,".$limit;
} else if (DB_TYPE == "pgsql") { } else if (DB_TYPE == "pgsql") {
@ -409,34 +407,34 @@
// Fetch articles for the feeds // Fetch articles for the feeds
foreach ($feeds as $feed) { foreach ($feeds as $feed) {
if ($match_part) { if ($match_part) {
$from_qpart = "ttrss_user_entries,ttrss_feeds,ttrss_entries"; $from_qpart = "ttrss_user_entries,ttrss_feeds,ttrss_entries";
$feeds_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND"; $feeds_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
$query = "SELECT ttrss_entries.id,ttrss_entries.title,link,content,feed_id,comments,int_id, $query = "SELECT ttrss_entries.id,ttrss_entries.title,link,content,feed_id,comments,int_id,
marked,unread,published,".SUBSTRING_FOR_DATE."(updated,1,16) as updated,author marked,unread,published,".SUBSTRING_FOR_DATE."(updated,1,16) as updated,author
FROM $from_qpart WHERE FROM $from_qpart WHERE
ttrss_user_entries.ref_id = ttrss_entries.id AND ttrss_user_entries.ref_id = ttrss_entries.id AND
$feeds_qpart ($match_part) AND ttrss_user_entries.owner_uid = ".$_SESSION["uid"]." ORDER BY updated DESC".$limit_part; $feeds_qpart ($match_part) AND ttrss_user_entries.owner_uid = ".$_SESSION["uid"]." ORDER BY updated DESC".$limit_part;
$result = db_query($link, $query); $result = db_query($link, $query);
} else { } else {
$query = "SELECT ttrss_entries.id,ttrss_entries.title,link,content,feed_id,comments,int_id, $query = "SELECT ttrss_entries.id,ttrss_entries.title,link,content,feed_id,comments,int_id,
marked,unread,published,".SUBSTRING_FOR_DATE."(updated,1,16) as updated,author marked,unread,published,".SUBSTRING_FOR_DATE."(updated,1,16) as updated,author
FROM ttrss_entries,ttrss_user_entries FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = '".$feed."' AND ref_id = id AND owner_uid = ". WHERE feed_id = '".$feed."' AND ref_id = id AND owner_uid = ".
$_SESSION["uid"]." AND unread >= '".$displayUnread."' ORDER BY updated DESC".$limit_part; $_SESSION["uid"]." AND unread >= '".$displayUnread."' ORDER BY updated DESC".$limit_part;
$result = db_query($link, $query); $result = db_query($link, $query);
} }
$articles = array(); $articles = array();
$i=0; $i=0;
while ($i < mysql_numrows($result)) { while ($i < mysql_numrows($result)) {
$article_id = db_fetch_result($result, $i, "id"); $article_id = db_fetch_result($result, $i, "id");
$attachments = get_article_enclosures($link, $article_id); $attachments = get_article_enclosures($link, $article_id);
$article = array( $article = array(
@ -454,22 +452,22 @@
"feed_id" => db_fetch_result($result, $i, "feed_id"), "feed_id" => db_fetch_result($result, $i, "feed_id"),
"attachments" => $attachments "attachments" => $attachments
); );
array_push($ret, $article); array_push($ret, $article);
$i++; $i++;
} }
} }
print api_wrap_reply(API_STATUS_OK, $seq, $ret); print api_wrap_reply(API_STATUS_OK, $seq, $ret);
break; break;
/* Method added for ttrss-reader for Android */ /* Method added for ttrss-reader for Android */
case "getNewArticles": case "getNewArticles":
$time = (int) db_escape_string($_REQUEST["time"]); $time = (int) db_escape_string($_REQUEST["time"]);
// unread=1 zeigt alle an, unread=0 nur ungelesene // unread=1 zeigt alle an, unread=0 nur ungelesene
$displayUnread = (int) db_escape_string($_REQUEST["unread"]); $displayUnread = (int) db_escape_string($_REQUEST["unread"]);
if (DB_TYPE == "mysql") { if (DB_TYPE == "mysql") {
$db_time_function = " AND last_updated > FROM_UNIXTIME(".$time.")"; $db_time_function = " AND last_updated > FROM_UNIXTIME(".$time.")";
} else if (DB_TYPE == "pgsql") { } else if (DB_TYPE == "pgsql") {
@ -477,7 +475,7 @@
} else { } else {
$db_time_function = ""; $db_time_function = "";
} }
if (DB_TYPE == "mysql") { if (DB_TYPE == "mysql") {
$db_time_function2 = " AND updated > FROM_UNIXTIME(".$time.")"; $db_time_function2 = " AND updated > FROM_UNIXTIME(".$time.")";
} else if (DB_TYPE == "pgsql") { } else if (DB_TYPE == "pgsql") {
@ -485,7 +483,7 @@
} else { } else {
$db_time_function2 = ""; $db_time_function2 = "";
} }
$cats = array(); $cats = array();
@ -496,18 +494,18 @@
$result_0 = db_query($link, "SELECT id, feed_url, cat_id, title, ". $result_0 = db_query($link, "SELECT id, feed_url, cat_id, title, ".
SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated ". SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated ".
"FROM ttrss_feeds WHERE cat_id IS null AND owner_uid = '".$_SESSION["uid"]."'" . $db_time_function); "FROM ttrss_feeds WHERE cat_id IS null AND owner_uid = '".$_SESSION["uid"]."'" . $db_time_function);
while ($line_feeds = db_fetch_assoc($result_0)) { while ($line_feeds = db_fetch_assoc($result_0)) {
$unread_feed = getFeedUnread($link, $line_feeds["id"], false); $unread_feed = getFeedUnread($link, $line_feeds["id"], false);
if ($unread || $displayUnread > 0) { if ($unread || $displayUnread > 0) {
$result_1 = db_query($link, "SELECT id,title,link,content,feed_id,comments,int_id, $result_1 = db_query($link, "SELECT id,title,link,content,feed_id,comments,int_id,
marked,unread,published,". marked,unread,published,".
SUBSTRING_FOR_DATE."(updated,1,16) as updated,author SUBSTRING_FOR_DATE."(updated,1,16) as updated,author
FROM ttrss_entries,ttrss_user_entries FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = '".$line_feeds["id"]."' AND ref_id = id AND owner_uid = " . WHERE feed_id = '".$line_feeds["id"]."' AND ref_id = id AND owner_uid = " .
$_SESSION["uid"]." AND unread >= '".$displayUnread."'" . $db_time_function2); $_SESSION["uid"]." AND unread >= '".$displayUnread."'" . $db_time_function2);
$articles = array(); $articles = array();
while ($line_articles = db_fetch_assoc($result_1)) { while ($line_articles = db_fetch_assoc($result_1)) {
$article_id = db_fetch_result($result, $i, "id"); $article_id = db_fetch_result($result, $i, "id");
@ -527,7 +525,7 @@
"feed_id" => $line_articles["feed_id"], "feed_id" => $line_articles["feed_id"],
"attachments" => $attachments)); "attachments" => $attachments));
} }
array_push($feeds, array( array_push($feeds, array(
"feed_url" => $line_feeds["feed_url"], "feed_url" => $line_feeds["feed_url"],
"title" => $line_feeds["title"], "title" => $line_feeds["title"],
@ -540,16 +538,16 @@
)); ));
} }
} }
array_push($cats, array_push($cats,
array( array(
"id" => 0, "id" => 0,
"title" => "Uncategorized Feeds", "title" => "Uncategorized Feeds",
"unread" => $unread, "unread" => $unread,
"feeds" => $feeds)); "feeds" => $feeds));
} }
$result = db_query($link, "SELECT id, title FROM ttrss_feed_categories WHERE owner_uid = " . $_SESSION["uid"]); $result = db_query($link, "SELECT id, title FROM ttrss_feed_categories WHERE owner_uid = " . $_SESSION["uid"]);
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {
$unread = getFeedUnread($link, $line["id"], true); $unread = getFeedUnread($link, $line["id"], true);
@ -560,18 +558,18 @@
SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated ". SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated ".
"FROM ttrss_feeds WHERE cat_id = '". "FROM ttrss_feeds WHERE cat_id = '".
$line["id"]."' AND owner_uid = '".$_SESSION["uid"]."'" . $db_time_function); $line["id"]."' AND owner_uid = '".$_SESSION["uid"]."'" . $db_time_function);
while ($line_feeds = db_fetch_assoc($result_0)) { while ($line_feeds = db_fetch_assoc($result_0)) {
$unread_feed = getFeedUnread($link, $line_feeds["id"], false); $unread_feed = getFeedUnread($link, $line_feeds["id"], false);
if ($unread_feed || $displayUnread > 0) { if ($unread_feed || $displayUnread > 0) {
$result_1 = db_query($link, "SELECT id,title,link,content,feed_id,comments,int_id, $result_1 = db_query($link, "SELECT id,title,link,content,feed_id,comments,int_id,
marked,unread,published,". marked,unread,published,".
SUBSTRING_FOR_DATE."(updated,1,16) as updated,author SUBSTRING_FOR_DATE."(updated,1,16) as updated,author
FROM ttrss_entries,ttrss_user_entries FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = '".$line_feeds["id"]."' AND ref_id = id AND owner_uid = " . WHERE feed_id = '".$line_feeds["id"]."' AND ref_id = id AND owner_uid = " .
$_SESSION["uid"]." AND unread >= '".$displayUnread."'" . $db_time_function2); $_SESSION["uid"]." AND unread >= '".$displayUnread."'" . $db_time_function2);
$articles = array(); $articles = array();
while ($line_articles = db_fetch_assoc($result_1)) { while ($line_articles = db_fetch_assoc($result_1)) {
$article_id = db_fetch_result($result, $i, "id"); $article_id = db_fetch_result($result, $i, "id");
@ -591,7 +589,7 @@
"feed_id" => $line_articles["feed_id"], "feed_id" => $line_articles["feed_id"],
"attachments" => $attachments)); "attachments" => $attachments));
} }
array_push($feeds, array( array_push($feeds, array(
"feed_url" => $line_feeds["feed_url"], "feed_url" => $line_feeds["feed_url"],
"title" => $line_feeds["title"], "title" => $line_feeds["title"],
@ -601,28 +599,28 @@
"last_updated" => strtotime($line_feeds["last_updated"]), "last_updated" => strtotime($line_feeds["last_updated"]),
"articles" => $articles "articles" => $articles
)); ));
} }
} }
array_push($cats, array_push($cats,
array( array(
"id" => $line["id"], "id" => $line["id"],
"title" => $line["title"], "title" => $line["title"],
"unread" => $unread, "unread" => $unread,
"feeds" => $feeds)); "feeds" => $feeds));
} }
} }
print api_wrap_reply(API_STATUS_OK, $seq, $cats); print api_wrap_reply(API_STATUS_OK, $seq, $cats);
break; break;
default: default:
print api_wrap_reply(API_STATUS_ERR, $seq, print api_wrap_reply(API_STATUS_ERR, $seq,
array("error" => 'UNKNOWN_METHOD')); array("error" => 'UNKNOWN_METHOD'));
break; break;
} }
db_close($link); db_close($link);
?> ?>

6
config.php-dist
View File

@ -38,12 +38,6 @@
define('TMP_DIRECTORY', '/tmp'); define('TMP_DIRECTORY', '/tmp');
// Directory for temporary files // Directory for temporary files
define('ENABLE_UPDATE_DAEMON', false);
// This enables different mechanism for user-triggered updates designed
// for update daemon running in background on the server.
// This option suggests FEEDS_FRAME_REFRESH set to a small value
// (like 60 seconds, depending on number of users and server/bandwidth load).
define('DAEMON_SLEEP_INTERVAL', 120); define('DAEMON_SLEEP_INTERVAL', 120);
// Interval between update daemon update runs // Interval between update daemon update runs

3
functions.php
View File

@ -3231,7 +3231,6 @@
$params["theme"] = get_user_theme($link); $params["theme"] = get_user_theme($link);
$params["theme_options"] = get_user_theme_options($link); $params["theme_options"] = get_user_theme_options($link);
$params["daemon_enabled"] = ENABLE_UPDATE_DAEMON;
$params["sign_progress"] = theme_image($link, "images/indicator_white.gif"); $params["sign_progress"] = theme_image($link, "images/indicator_white.gif");
$params["sign_progress_tiny"] = theme_image($link, "images/indicator_tiny.gif"); $params["sign_progress_tiny"] = theme_image($link, "images/indicator_tiny.gif");
@ -3288,7 +3287,7 @@
$data['last_article_id'] = getLastArticleId($link); $data['last_article_id'] = getLastArticleId($link);
$data['cdm_expanded'] = get_pref($link, 'CDM_EXPANDED'); $data['cdm_expanded'] = get_pref($link, 'CDM_EXPANDED');
if (ENABLE_UPDATE_DAEMON) { if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
$data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock"); $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");

4
sanity_config.php
View File

@ -1,3 +1,3 @@
<?php # This file has been generated at: Tue Apr 12 19:27:00 MSD 2011 <?php # This file has been generated at: Tue Apr 12 19:32:50 MSD 2011
define('GENERATED_CONFIG_CHECK', 22); define('GENERATED_CONFIG_CHECK', 22);
$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'SELF_URL_PATH', 'MAGPIE_FETCH_TIME_OUT', 'MAGPIE_CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'SINGLE_USER_MODE', 'TMP_DIRECTORY', 'ENABLE_UPDATE_DAEMON', 'DAEMON_SLEEP_INTERVAL', 'DATABASE_BACKED_SESSIONS', 'SESSION_CHECK_ADDRESS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'DAEMON_UPDATE_LOGIN_LIMIT', 'CHECK_FOR_NEW_VERSION', 'DIGEST_ENABLE', 'DIGEST_EMAIL_LIMIT', 'DAEMON_SENDS_DIGESTS', 'MYSQL_CHARSET', 'DEFAULT_UPDATE_METHOD', 'SIMPLEPIE_CACHE_DIR', 'SIMPLEPIE_CACHE_IMAGES', 'COUNTERS_MAX_AGE', 'DIGEST_FROM_NAME', 'DIGEST_FROM_ADDRESS', 'DIGEST_SUBJECT', 'DIGEST_SMTP_HOST', 'DIGEST_SMTP_LOGIN', 'DIGEST_SMTP_PASSWORD', 'DAEMON_FEED_LIMIT', 'ALLOW_REMOTE_USER_AUTH', 'AUTO_LOGIN', 'AUTO_CREATE_USER', 'LOCK_DIRECTORY', 'ENABLE_GZIP_OUTPUT', 'PHP_EXECUTABLE', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'FEEDBACK_URL', 'FORCE_ARTICLE_PURGE', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_TWEET_BUTTON', 'CONSUMER_KEY', 'CONSUMER_SECRET', 'PUBSUBHUBBUB_HUB', 'ISCONFIGURED', 'CONFIG_VERSION'); ?> $requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'SELF_URL_PATH', 'MAGPIE_FETCH_TIME_OUT', 'MAGPIE_CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'SINGLE_USER_MODE', 'TMP_DIRECTORY', 'DAEMON_SLEEP_INTERVAL', 'DATABASE_BACKED_SESSIONS', 'SESSION_CHECK_ADDRESS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'DAEMON_UPDATE_LOGIN_LIMIT', 'CHECK_FOR_NEW_VERSION', 'DIGEST_ENABLE', 'DIGEST_EMAIL_LIMIT', 'DAEMON_SENDS_DIGESTS', 'MYSQL_CHARSET', 'DEFAULT_UPDATE_METHOD', 'SIMPLEPIE_CACHE_DIR', 'SIMPLEPIE_CACHE_IMAGES', 'COUNTERS_MAX_AGE', 'DIGEST_FROM_NAME', 'DIGEST_FROM_ADDRESS', 'DIGEST_SUBJECT', 'DIGEST_SMTP_HOST', 'DIGEST_SMTP_LOGIN', 'DIGEST_SMTP_PASSWORD', 'DAEMON_FEED_LIMIT', 'ALLOW_REMOTE_USER_AUTH', 'AUTO_LOGIN', 'AUTO_CREATE_USER', 'LOCK_DIRECTORY', 'ENABLE_GZIP_OUTPUT', 'PHP_EXECUTABLE', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'FEEDBACK_URL', 'FORCE_ARTICLE_PURGE', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_TWEET_BUTTON', 'CONSUMER_KEY', 'CONSUMER_SECRET', 'PUBSUBHUBBUB_HUB', 'ISCONFIGURED', 'CONFIG_VERSION'); ?>

11
update.php
View File

@ -41,13 +41,13 @@
} }
// Create a database connection. // Create a database connection.
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
if (!$link) { if (!$link) {
if (DB_TYPE == "mysql") { if (DB_TYPE == "mysql") {
print mysql_error(); print mysql_error();
} }
// PG seems to display its own errors just fine by default. // PG seems to display its own errors just fine by default.
return; return;
} }
@ -64,9 +64,6 @@
} }
if ($op == "-daemon") { if ($op == "-daemon") {
if (!ENABLE_UPDATE_DAEMON)
die("Please enable option ENABLE_UPDATE_DAEMON in config.php\n");
while (true) { while (true) {
passthru(PHP_EXECUTABLE . " " . $argv[0] . " -daemon-loop"); passthru(PHP_EXECUTABLE . " " . $argv[0] . " -daemon-loop");
_debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds..."); _debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds...");
@ -79,7 +76,7 @@
die("error: unable to create stampfile\n"); die("error: unable to create stampfile\n");
} }
// Call to the feed batch update function // Call to the feed batch update function
// or regenerate feedbrowser cache // or regenerate feedbrowser cache
if (rand(0,100) > 30) { if (rand(0,100) > 30) {
@ -89,7 +86,7 @@
_debug("Feedbrowser updated, $count feeds processed."); _debug("Feedbrowser updated, $count feeds processed.");
purge_orphans($link, true); purge_orphans($link, true);
$rc = cleanup_tags($link, 14, 50000); $rc = cleanup_tags($link, 14, 50000);
_debug("Cleaned $rc cached tags."); _debug("Cleaned $rc cached tags.");

24
update_daemon2.php
View File

@ -26,10 +26,6 @@
die("error: This script requires PHP compiled with PCNTL module.\n"); die("error: This script requires PHP compiled with PCNTL module.\n");
} }
if (!ENABLE_UPDATE_DAEMON) {
die("error: Please enable option ENABLE_UPDATE_DAEMON in config.php\n");
}
require_once "db.php"; require_once "db.php";
require_once "db-prefs.php"; require_once "db-prefs.php";
require_once "functions.php"; require_once "functions.php";
@ -67,7 +63,7 @@
function check_ctimes() { function check_ctimes() {
global $ctimes; global $ctimes;
foreach (array_keys($ctimes) as $pid) { foreach (array_keys($ctimes) as $pid) {
$started = $ctimes[$pid]; $started = $ctimes[$pid];
@ -101,12 +97,12 @@
function sigint_handler() { function sigint_handler() {
shutdown(); shutdown();
die("[SIGINT] removing lockfile and exiting.\n"); die("[SIGINT] removing lockfile and exiting.\n");
} }
function task_sigint_handler() { function task_sigint_handler() {
task_shutdown(); task_shutdown();
die("[SIGINT] removing lockfile and exiting.\n"); die("[SIGINT] removing lockfile and exiting.\n");
} }
pcntl_signal(SIGCHLD, 'sigchld_handler'); pcntl_signal(SIGCHLD, 'sigchld_handler');
@ -132,13 +128,13 @@
// Testing database connection. // Testing database connection.
// It is unnecessary to start the fork loop if database is not ok. // It is unnecessary to start the fork loop if database is not ok.
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
if (!$link) { if (!$link) {
if (DB_TYPE == "mysql") { if (DB_TYPE == "mysql") {
print mysql_error(); print mysql_error();
} }
// PG seems to display its own errors just fine by default. // PG seems to display its own errors just fine by default.
return; return;
} }
@ -189,13 +185,13 @@
$start_timestamp = time(); $start_timestamp = time();
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
if (!$link) { if (!$link) {
if (DB_TYPE == "mysql") { if (DB_TYPE == "mysql") {
print mysql_error(); print mysql_error();
} }
// PG seems to display its own errors just fine by default. // PG seems to display its own errors just fine by default.
return; return;
} }
@ -205,9 +201,9 @@
// not really, tho for the time being -fox // not really, tho for the time being -fox
if (!make_stampfile('update_daemon.stamp')) { if (!make_stampfile('update_daemon.stamp')) {
print "warning: unable to create stampfile"; print "warning: unable to create stampfile";
} }
// Call to the feed batch update function // Call to the feed batch update function
// or regenerate feedbrowser cache // or regenerate feedbrowser cache
if (rand(0,100) > 30) { if (rand(0,100) > 30) {
@ -225,7 +221,7 @@
} }
_debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)"); _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
db_close($link); db_close($link);
// We are in a fork. // We are in a fork.