move update daemon code to common function, reorganize backend.php (patch from landure)
This commit is contained in:
Andrew Dolgov
parent
34459667e2
commit
45004d4340
5 changed files with 533 additions and 541 deletions
737
backend.php
737
backend.php
|
|
@ -145,432 +145,439 @@
|
||||||
|
|
||||||
if (!sanity_check($link)) { return; }
|
if (!sanity_check($link)) { return; }
|
||||||
|
|
||||||
if ($op == "rpc") {
|
switch($op) { // Select action according to $op value.
|
||||||
handle_rpc_request($link);
|
case "rpc":
|
||||||
}
|
// Handle remote procedure calls.
|
||||||
|
handle_rpc_request($link);
|
||||||
if ($op == "feeds") {
|
break; // rpc
|
||||||
|
|
||||||
$tags = $_GET["tags"];
|
case "feeds":
|
||||||
|
$tags = $_GET["tags"];
|
||||||
|
|
||||||
$subop = $_GET["subop"];
|
$subop = $_GET["subop"];
|
||||||
|
|
||||||
if ($subop == "catchupAll") {
|
switch($subop) {
|
||||||
db_query($link, "UPDATE ttrss_user_entries SET
|
case "catchupAll":
|
||||||
last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);
|
db_query($link, "UPDATE ttrss_user_entries SET
|
||||||
}
|
last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);
|
||||||
|
break;
|
||||||
|
|
||||||
if ($subop == "collapse") {
|
case "collapse":
|
||||||
$cat_id = db_escape_string($_GET["cid"]);
|
$cat_id = db_escape_string($_GET["cid"]);
|
||||||
|
|
||||||
db_query($link, "UPDATE ttrss_feed_categories SET
|
db_query($link, "UPDATE ttrss_feed_categories SET
|
||||||
collapsed = NOT collapsed WHERE id = '$cat_id' AND owner_uid = " .
|
collapsed = NOT collapsed WHERE id = '$cat_id' AND owner_uid = " .
|
||||||
$_SESSION["uid"]);
|
$_SESSION["uid"]);
|
||||||
return;
|
return;
|
||||||
}
|
break;
|
||||||
|
|
||||||
outputFeedList($link, $tags);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "view") {
|
|
||||||
|
|
||||||
$id = db_escape_string($_GET["id"]);
|
|
||||||
$feed_id = db_escape_string($_GET["feed"]);
|
|
||||||
$cids = split(",", db_escape_string($_GET["cids"]));
|
|
||||||
$mode = db_escape_string($_GET["mode"]);
|
|
||||||
$omode = db_escape_string($_GET["omode"]);
|
|
||||||
|
|
||||||
print "<reply>";
|
|
||||||
|
|
||||||
// in prefetch mode we only output requested cids, main article
|
|
||||||
// just gets marked as read (it already exists in client cache)
|
|
||||||
|
|
||||||
if ($mode == "") {
|
|
||||||
outputArticleXML($link, $id, $feed_id);
|
|
||||||
} else {
|
|
||||||
catchupArticleById($link, $id, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($cids as $cid) {
|
|
||||||
if ($cid) {
|
|
||||||
outputArticleXML($link, $cid, $feed_id, false);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if ($mode != "prefetch_old") {
|
outputFeedList($link, $tags);
|
||||||
print "<counters>";
|
break; // feeds
|
||||||
getAllCounters($link, $omode);
|
|
||||||
print "</counters>";
|
|
||||||
}
|
|
||||||
|
|
||||||
print "</reply>";
|
case "view":
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "viewfeed") {
|
$id = db_escape_string($_GET["id"]);
|
||||||
|
$feed_id = db_escape_string($_GET["feed"]);
|
||||||
|
$cids = split(",", db_escape_string($_GET["cids"]));
|
||||||
|
$mode = db_escape_string($_GET["mode"]);
|
||||||
|
$omode = db_escape_string($_GET["omode"]);
|
||||||
|
|
||||||
$print_exec_time = true;
|
print "<reply>";
|
||||||
$timing_info = getmicrotime();
|
|
||||||
|
|
||||||
print "<reply>";
|
// in prefetch mode we only output requested cids, main article
|
||||||
|
// just gets marked as read (it already exists in client cache)
|
||||||
|
|
||||||
if ($_GET["debug"]) $timing_info = print_checkpoint("0", $timing_info);
|
if ($mode == "") {
|
||||||
|
outputArticleXML($link, $id, $feed_id);
|
||||||
$omode = db_escape_string($_GET["omode"]);
|
|
||||||
|
|
||||||
$feed = db_escape_string($_GET["feed"]);
|
|
||||||
$subop = db_escape_string($_GET["subop"]);
|
|
||||||
$view_mode = db_escape_string($_GET["view_mode"]);
|
|
||||||
$limit = db_escape_string($_GET["limit"]);
|
|
||||||
$cat_view = db_escape_string($_GET["cat"]);
|
|
||||||
$next_unread_feed = db_escape_string($_GET["nuf"]);
|
|
||||||
$offset = db_escape_string($_GET["skip"]);
|
|
||||||
|
|
||||||
set_pref($link, "_DEFAULT_VIEW_MODE", $view_mode);
|
|
||||||
set_pref($link, "_DEFAULT_VIEW_LIMIT", $limit);
|
|
||||||
|
|
||||||
if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {
|
|
||||||
db_query($link, "UPDATE ttrss_feeds SET last_viewed = NOW()
|
|
||||||
WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
print "<headlines id=\"$feed\"><![CDATA[";
|
|
||||||
|
|
||||||
$ret = outputHeadlinesList($link, $feed, $subop,
|
|
||||||
$view_mode, $limit, $cat_view, $next_unread_feed, $offset);
|
|
||||||
|
|
||||||
$topmost_article_ids = $ret[0];
|
|
||||||
$headlines_count = $ret[1];
|
|
||||||
$returned_feed = $ret[2];
|
|
||||||
$disable_cache = $ret[3];
|
|
||||||
|
|
||||||
print "]]></headlines>";
|
|
||||||
|
|
||||||
print "<headlines-count value=\"$headlines_count\"/>";
|
|
||||||
|
|
||||||
$headlines_unread = getFeedUnread($link, $returned_feed);
|
|
||||||
|
|
||||||
print "<headlines-unread value=\"$headlines_unread\"/>";
|
|
||||||
printf("<disable-cache value=\"%d\"/>", $disable_cache);
|
|
||||||
|
|
||||||
if ($_GET["debug"]) $timing_info = print_checkpoint("10", $timing_info);
|
|
||||||
|
|
||||||
if (is_array($topmost_article_ids) && !get_pref($link, 'COMBINED_DISPLAY_MODE')) {
|
|
||||||
print "<articles>";
|
|
||||||
foreach ($topmost_article_ids as $id) {
|
|
||||||
outputArticleXML($link, $id, $feed, false);
|
|
||||||
}
|
|
||||||
print "</articles>";
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($_GET["debug"]) $timing_info = print_checkpoint("20", $timing_info);
|
|
||||||
|
|
||||||
print "<counters>";
|
|
||||||
getAllCounters($link, $omode, $feed);
|
|
||||||
print "</counters>";
|
|
||||||
|
|
||||||
if ($_GET["debug"]) $timing_info = print_checkpoint("30", $timing_info);
|
|
||||||
|
|
||||||
print_runtime_info($link);
|
|
||||||
|
|
||||||
print "</reply>";
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "pref-feeds") {
|
|
||||||
module_pref_feeds($link);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "pref-filters") {
|
|
||||||
module_pref_filters($link);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "pref-labels") {
|
|
||||||
module_pref_labels($link);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "pref-prefs") {
|
|
||||||
module_pref_prefs($link);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "pref-users") {
|
|
||||||
module_pref_users($link);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "help") {
|
|
||||||
module_help($link);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "dlg") {
|
|
||||||
module_popup_dialog($link);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "pref-pub-items") {
|
|
||||||
module_pref_pub_items($link);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// update feeds of all users, may be used anonymously
|
|
||||||
if ($op == "globalUpdateFeeds") {
|
|
||||||
|
|
||||||
$result = db_query($link, "SELECT id FROM ttrss_users");
|
|
||||||
|
|
||||||
while ($line = db_fetch_assoc($result)) {
|
|
||||||
$user_id = $line["id"];
|
|
||||||
// print "<!-- updating feeds of uid $user_id -->";
|
|
||||||
update_all_feeds($link, false, $user_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
print "<rpc-reply>
|
|
||||||
<message msg=\"All feeds updated\"/>
|
|
||||||
</rpc-reply>";
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "user-details") {
|
|
||||||
|
|
||||||
if (WEB_DEMO_MODE || $_SESSION["access_level"] < 10) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* print "<html><head>
|
|
||||||
<title>Tiny Tiny RSS : User Details</title>
|
|
||||||
<link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
|
|
||||||
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
|
|
||||||
</head><body>"; */
|
|
||||||
|
|
||||||
$uid = sprintf("%d", $_GET["id"]);
|
|
||||||
|
|
||||||
print "<div id=\"infoBoxTitle\">User details</div>";
|
|
||||||
|
|
||||||
print "<div class='infoBoxContents'>";
|
|
||||||
|
|
||||||
$result = db_query($link, "SELECT login,
|
|
||||||
SUBSTRING(last_login,1,16) AS last_login,
|
|
||||||
access_level,
|
|
||||||
(SELECT COUNT(int_id) FROM ttrss_user_entries
|
|
||||||
WHERE owner_uid = id) AS stored_articles,
|
|
||||||
SUBSTRING(created,1,16) AS created
|
|
||||||
FROM ttrss_users
|
|
||||||
WHERE id = '$uid'");
|
|
||||||
|
|
||||||
if (db_num_rows($result) == 0) {
|
|
||||||
print "<h1>User not found</h1>";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
# print "<h1>User Details</h1>";
|
|
||||||
|
|
||||||
$login = db_fetch_result($result, 0, "login");
|
|
||||||
|
|
||||||
# print "<h1>$login</h1>";
|
|
||||||
|
|
||||||
print "<table width='100%'>";
|
|
||||||
|
|
||||||
$last_login = date(get_pref($link, 'LONG_DATE_FORMAT'),
|
|
||||||
strtotime(db_fetch_result($result, 0, "last_login")));
|
|
||||||
|
|
||||||
$created = date(get_pref($link, 'LONG_DATE_FORMAT'),
|
|
||||||
strtotime(db_fetch_result($result, 0, "created")));
|
|
||||||
|
|
||||||
$access_level = db_fetch_result($result, 0, "access_level");
|
|
||||||
$stored_articles = db_fetch_result($result, 0, "stored_articles");
|
|
||||||
|
|
||||||
# print "<tr><td>Username</td><td>$login</td></tr>";
|
|
||||||
# print "<tr><td>Access level</td><td>$access_level</td></tr>";
|
|
||||||
print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
|
|
||||||
print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
|
|
||||||
print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>";
|
|
||||||
|
|
||||||
$result = db_query($link, "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
|
|
||||||
WHERE owner_uid = '$uid'");
|
|
||||||
|
|
||||||
$num_feeds = db_fetch_result($result, 0, "num_feeds");
|
|
||||||
|
|
||||||
print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
|
|
||||||
|
|
||||||
/* $result = db_query($link, "SELECT
|
|
||||||
SUM(LENGTH(content)+LENGTH(title)+LENGTH(link)+LENGTH(guid)) AS db_size
|
|
||||||
FROM ttrss_user_entries,ttrss_entries
|
|
||||||
WHERE owner_uid = '$uid' AND ref_id = id");
|
|
||||||
|
|
||||||
$db_size = round(db_fetch_result($result, 0, "db_size") / 1024);
|
|
||||||
|
|
||||||
print "<tr><td>Approx. used DB size</td><td>$db_size KBytes</td></tr>"; */
|
|
||||||
|
|
||||||
print "</table>";
|
|
||||||
|
|
||||||
print "<h1>".__('Subscribed feeds')."</h1>";
|
|
||||||
|
|
||||||
$result = db_query($link, "SELECT id,title,site_url FROM ttrss_feeds
|
|
||||||
WHERE owner_uid = '$uid' ORDER BY title");
|
|
||||||
|
|
||||||
print "<ul class=\"userFeedList\">";
|
|
||||||
|
|
||||||
$row_class = "odd";
|
|
||||||
|
|
||||||
while ($line = db_fetch_assoc($result)) {
|
|
||||||
|
|
||||||
$icon_file = ICONS_URL."/".$line["id"].".ico";
|
|
||||||
|
|
||||||
if (file_exists($icon_file) && filesize($icon_file) > 0) {
|
|
||||||
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"$icon_file\">";
|
|
||||||
} else {
|
} else {
|
||||||
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
|
catchupArticleById($link, $id, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
print "<li class=\"$row_class\">$feed_icon <a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
|
foreach ($cids as $cid) {
|
||||||
|
if ($cid) {
|
||||||
|
outputArticleXML($link, $cid, $feed_id, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$row_class = toggleEvenOdd($row_class);
|
if ($mode != "prefetch_old") {
|
||||||
|
print "<counters>";
|
||||||
|
getAllCounters($link, $omode);
|
||||||
|
print "</counters>";
|
||||||
|
}
|
||||||
|
|
||||||
}
|
print "</reply>";
|
||||||
|
break; // view
|
||||||
|
|
||||||
if (db_num_rows($result) < $num_feeds) {
|
case "viewfeed":
|
||||||
// FIXME - add link to show ALL subscribed feeds here somewhere
|
|
||||||
print "<li><img
|
|
||||||
class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\"> ...</li>";
|
|
||||||
}
|
|
||||||
|
|
||||||
print "</ul>";
|
|
||||||
|
|
||||||
print "</div>";
|
$print_exec_time = true;
|
||||||
|
$timing_info = getmicrotime();
|
||||||
|
|
||||||
print "<div align='center'>
|
print "<reply>";
|
||||||
<input type='submit' class='button'
|
|
||||||
onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
|
|
||||||
|
|
||||||
// print "</body></html>";
|
if ($_GET["debug"]) $timing_info = print_checkpoint("0", $timing_info);
|
||||||
|
|
||||||
}
|
$omode = db_escape_string($_GET["omode"]);
|
||||||
|
|
||||||
if ($op == "pref-feed-browser") {
|
$feed = db_escape_string($_GET["feed"]);
|
||||||
module_pref_feed_browser($link);
|
$subop = db_escape_string($_GET["subop"]);
|
||||||
}
|
$view_mode = db_escape_string($_GET["view_mode"]);
|
||||||
|
$limit = db_escape_string($_GET["limit"]);
|
||||||
|
$cat_view = db_escape_string($_GET["cat"]);
|
||||||
|
$next_unread_feed = db_escape_string($_GET["nuf"]);
|
||||||
|
$offset = db_escape_string($_GET["skip"]);
|
||||||
|
|
||||||
if ($op == "publish") {
|
set_pref($link, "_DEFAULT_VIEW_MODE", $view_mode);
|
||||||
$key = db_escape_string($_GET["key"]);
|
set_pref($link, "_DEFAULT_VIEW_LIMIT", $limit);
|
||||||
|
|
||||||
$result = db_query($link, "SELECT login, owner_uid
|
if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {
|
||||||
FROM ttrss_user_prefs, ttrss_users WHERE
|
db_query($link, "UPDATE ttrss_feeds SET last_viewed = NOW()
|
||||||
pref_name = '_PREFS_PUBLISH_KEY' AND
|
WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
|
||||||
value = '$key' AND
|
}
|
||||||
ttrss_users.id = owner_uid");
|
|
||||||
|
print "<headlines id=\"$feed\"><![CDATA[";
|
||||||
|
|
||||||
|
$ret = outputHeadlinesList($link, $feed, $subop,
|
||||||
|
$view_mode, $limit, $cat_view, $next_unread_feed, $offset);
|
||||||
|
|
||||||
|
$topmost_article_ids = $ret[0];
|
||||||
|
$headlines_count = $ret[1];
|
||||||
|
$returned_feed = $ret[2];
|
||||||
|
$disable_cache = $ret[3];
|
||||||
|
|
||||||
|
print "]]></headlines>";
|
||||||
|
|
||||||
|
print "<headlines-count value=\"$headlines_count\"/>";
|
||||||
|
|
||||||
|
$headlines_unread = getFeedUnread($link, $returned_feed);
|
||||||
|
|
||||||
|
print "<headlines-unread value=\"$headlines_unread\"/>";
|
||||||
|
printf("<disable-cache value=\"%d\"/>", $disable_cache);
|
||||||
|
|
||||||
|
if ($_GET["debug"]) $timing_info = print_checkpoint("10", $timing_info);
|
||||||
|
|
||||||
|
if (is_array($topmost_article_ids) && !get_pref($link, 'COMBINED_DISPLAY_MODE')) {
|
||||||
|
print "<articles>";
|
||||||
|
foreach ($topmost_article_ids as $id) {
|
||||||
|
outputArticleXML($link, $id, $feed, false);
|
||||||
|
}
|
||||||
|
print "</articles>";
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($_GET["debug"]) $timing_info = print_checkpoint("20", $timing_info);
|
||||||
|
|
||||||
|
print "<counters>";
|
||||||
|
getAllCounters($link, $omode, $feed);
|
||||||
|
print "</counters>";
|
||||||
|
|
||||||
|
if ($_GET["debug"]) $timing_info = print_checkpoint("30", $timing_info);
|
||||||
|
|
||||||
|
print_runtime_info($link);
|
||||||
|
|
||||||
|
print "</reply>";
|
||||||
|
break; // viewfeed
|
||||||
|
|
||||||
|
case "pref-feeds":
|
||||||
|
module_pref_feeds($link);
|
||||||
|
break; // pref-feeds
|
||||||
|
|
||||||
|
case "pref-filters":
|
||||||
|
module_pref_filters($link);
|
||||||
|
break; // pref-filters
|
||||||
|
|
||||||
|
case "pref-labels":
|
||||||
|
module_pref_labels($link);
|
||||||
|
break; // pref-labels
|
||||||
|
|
||||||
|
case "pref-prefs":
|
||||||
|
module_pref_prefs($link);
|
||||||
|
break; // pref-prefs
|
||||||
|
|
||||||
|
case "pref-users":
|
||||||
|
module_pref_users($link);
|
||||||
|
break; // prefs-users
|
||||||
|
|
||||||
|
case "help":
|
||||||
|
module_help($link);
|
||||||
|
break; // help
|
||||||
|
|
||||||
|
case "dlg":
|
||||||
|
module_popup_dialog($link);
|
||||||
|
break; // dlg
|
||||||
|
|
||||||
|
case "pref-pub-items":
|
||||||
|
module_pref_pub_items($link);
|
||||||
|
break; // pref-pub-items
|
||||||
|
|
||||||
|
case "globalUpdateFeeds":
|
||||||
|
// update feeds of all users, may be used anonymously
|
||||||
|
|
||||||
|
// Update all feeds needing a update.
|
||||||
|
update_daemon_common($link, 0, true, false);
|
||||||
|
|
||||||
|
// FIXME : old feed update way. To be removed.
|
||||||
|
//$result = db_query($link, "SELECT id FROM ttrss_users");
|
||||||
|
|
||||||
|
//while ($line = db_fetch_assoc($result)) {
|
||||||
|
// $user_id = $line["id"];
|
||||||
|
// print "<!-- updating feeds of uid $user_id -->";
|
||||||
|
// update_all_feeds($link, false, $user_id);
|
||||||
|
//}
|
||||||
|
|
||||||
|
print "<rpc-reply>
|
||||||
|
<message msg=\"All feeds updated\"/>
|
||||||
|
</rpc-reply>";
|
||||||
|
break; // globalUpdateFeeds
|
||||||
|
|
||||||
|
case "user-details":
|
||||||
|
|
||||||
|
if (WEB_DEMO_MODE || $_SESSION["access_level"] < 10) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
print "<html><head>
|
||||||
|
<title>Tiny Tiny RSS : User Details</title>
|
||||||
|
<link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
|
||||||
|
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
|
||||||
|
</head><body>";
|
||||||
|
*/
|
||||||
|
|
||||||
|
$uid = sprintf("%d", $_GET["id"]);
|
||||||
|
|
||||||
|
print "<div id=\"infoBoxTitle\">User details</div>";
|
||||||
|
|
||||||
|
print "<div class='infoBoxContents'>";
|
||||||
|
|
||||||
|
$result = db_query($link, "SELECT login,
|
||||||
|
SUBSTRING(last_login,1,16) AS last_login,
|
||||||
|
access_level,
|
||||||
|
(SELECT COUNT(int_id) FROM ttrss_user_entries
|
||||||
|
WHERE owner_uid = id) AS stored_articles,
|
||||||
|
SUBSTRING(created,1,16) AS created
|
||||||
|
FROM ttrss_users
|
||||||
|
WHERE id = '$uid'");
|
||||||
|
|
||||||
|
if (db_num_rows($result) == 0) {
|
||||||
|
print "<h1>User not found</h1>";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// print "<h1>User Details</h1>";
|
||||||
|
|
||||||
if (db_num_rows($result) == 1) {
|
|
||||||
$owner = db_fetch_result($result, 0, "owner_uid");
|
|
||||||
$login = db_fetch_result($result, 0, "login");
|
$login = db_fetch_result($result, 0, "login");
|
||||||
|
|
||||||
generate_syndicated_feed($link, $owner, -2, false);
|
// print "<h1>$login</h1>";
|
||||||
|
|
||||||
} else {
|
print "<table width='100%'>";
|
||||||
print "<error>User not found</error>";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
$last_login = date(get_pref($link, 'LONG_DATE_FORMAT'),
|
||||||
|
strtotime(db_fetch_result($result, 0, "last_login")));
|
||||||
|
|
||||||
if ($op == "rss") {
|
$created = date(get_pref($link, 'LONG_DATE_FORMAT'),
|
||||||
$feed = db_escape_string($_GET["id"]);
|
strtotime(db_fetch_result($result, 0, "created")));
|
||||||
$user = db_escape_string($_GET["user"]);
|
|
||||||
$pass = db_escape_string($_GET["pass"]);
|
|
||||||
$is_cat = $_GET["is_cat"] != false;
|
|
||||||
|
|
||||||
$search = db_escape_string($_GET["q"]);
|
$access_level = db_fetch_result($result, 0, "access_level");
|
||||||
$match_on = db_escape_string($_GET["m"]);
|
$stored_articles = db_fetch_result($result, 0, "stored_articles");
|
||||||
$search_mode = db_escape_string($_GET["smode"]);
|
|
||||||
|
|
||||||
if (!$_SESSION["uid"] && $user && $pass) {
|
// print "<tr><td>Username</td><td>$login</td></tr>";
|
||||||
authenticate_user($link, $user, $pass);
|
// print "<tr><td>Access level</td><td>$access_level</td></tr>";
|
||||||
}
|
print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
|
||||||
|
print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
|
||||||
|
print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>";
|
||||||
|
|
||||||
if ($_SESSION["uid"] ||
|
$result = db_query($link, "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
|
||||||
http_authenticate_user($link)) {
|
WHERE owner_uid = '$uid'");
|
||||||
|
|
||||||
generate_syndicated_feed($link, 0, $feed, $is_cat,
|
$num_feeds = db_fetch_result($result, 0, "num_feeds");
|
||||||
$search, $search_mode, $match_on);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
|
||||||
|
|
||||||
if ($op == "labelFromSearch") {
|
/*
|
||||||
$search = db_escape_string($_GET["search"]);
|
$result = db_query($link, "SELECT
|
||||||
$search_mode = db_escape_string($_GET["smode"]);
|
SUM(LENGTH(content)+LENGTH(title)+LENGTH(link)+LENGTH(guid)) AS db_size
|
||||||
$match_on = db_escape_string($_GET["match"]);
|
FROM ttrss_user_entries,ttrss_entries
|
||||||
$is_cat = db_escape_string($_GET["is_cat"]);
|
WHERE owner_uid = '$uid' AND ref_id = id");
|
||||||
$title = db_escape_string($_GET["title"]);
|
|
||||||
$feed = sprintf("%d", $_GET["feed"]);
|
|
||||||
|
|
||||||
$label_qparts = array();
|
$db_size = round(db_fetch_result($result, 0, "db_size") / 1024);
|
||||||
|
|
||||||
$search_expr = getSearchSql($search, $match_on);
|
print "<tr><td>Approx. used DB size</td><td>$db_size KBytes</td></tr>";
|
||||||
|
*/
|
||||||
|
|
||||||
|
print "</table>";
|
||||||
|
|
||||||
|
print "<h1>".__('Subscribed feeds')."</h1>";
|
||||||
|
|
||||||
|
$result = db_query($link, "SELECT id,title,site_url FROM ttrss_feeds
|
||||||
|
WHERE owner_uid = '$uid' ORDER BY title");
|
||||||
|
|
||||||
|
print "<ul class=\"userFeedList\">";
|
||||||
|
|
||||||
|
$row_class = "odd";
|
||||||
|
|
||||||
|
while ($line = db_fetch_assoc($result)) {
|
||||||
|
|
||||||
|
$icon_file = ICONS_URL."/".$line["id"].".ico";
|
||||||
|
|
||||||
|
if (file_exists($icon_file) && filesize($icon_file) > 0) {
|
||||||
|
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"$icon_file\">";
|
||||||
|
} else {
|
||||||
|
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
|
||||||
|
}
|
||||||
|
|
||||||
|
print "<li class=\"$row_class\">$feed_icon <a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
|
||||||
|
|
||||||
|
$row_class = toggleEvenOdd($row_class);
|
||||||
|
|
||||||
if ($is_cat) {
|
|
||||||
if ($feed != 0) {
|
|
||||||
$search_expr .= " AND ttrss_feeds.cat_id = $feed ";
|
|
||||||
} else {
|
|
||||||
$search_expr .= " AND ttrss_feeds.cat_id IS NULL ";
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
if ($search_mode == "all_feeds") {
|
|
||||||
// NOOP
|
|
||||||
} else if ($search_mode == "this_cat") {
|
|
||||||
|
|
||||||
$tmp_result = db_query($link, "SELECT cat_id
|
if (db_num_rows($result) < $num_feeds) {
|
||||||
FROM ttrss_feeds WHERE id = '$feed'");
|
// FIXME - add link to show ALL subscribed feeds here somewhere
|
||||||
|
print "<li><img
|
||||||
|
class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\"> ...</li>";
|
||||||
|
}
|
||||||
|
|
||||||
|
print "</ul>";
|
||||||
|
|
||||||
$cat_id = db_fetch_result($tmp_result, 0, "cat_id");
|
print "</div>";
|
||||||
|
|
||||||
if ($cat_id > 0) {
|
print "<div align='center'>
|
||||||
$search_expr .= " AND ttrss_feeds.cat_id = $cat_id ";
|
<input type='submit' class='button'
|
||||||
|
onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
|
||||||
|
|
||||||
|
// print "</body></html>";
|
||||||
|
|
||||||
|
break; // user-details
|
||||||
|
|
||||||
|
case "pref-feed-browser":
|
||||||
|
module_pref_feed_browser($link);
|
||||||
|
break; // pref-feed-browser
|
||||||
|
|
||||||
|
case "publish":
|
||||||
|
$key = db_escape_string($_GET["key"]);
|
||||||
|
|
||||||
|
$result = db_query($link, "SELECT login, owner_uid
|
||||||
|
FROM ttrss_user_prefs, ttrss_users WHERE
|
||||||
|
pref_name = '_PREFS_PUBLISH_KEY' AND
|
||||||
|
value = '$key' AND
|
||||||
|
ttrss_users.id = owner_uid");
|
||||||
|
|
||||||
|
if (db_num_rows($result) == 1) {
|
||||||
|
$owner = db_fetch_result($result, 0, "owner_uid");
|
||||||
|
$login = db_fetch_result($result, 0, "login");
|
||||||
|
|
||||||
|
generate_syndicated_feed($link, $owner, -2, false);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
print "<error>User not found</error>";
|
||||||
|
}
|
||||||
|
break; // publish
|
||||||
|
|
||||||
|
case "rss":
|
||||||
|
$feed = db_escape_string($_GET["id"]);
|
||||||
|
$user = db_escape_string($_GET["user"]);
|
||||||
|
$pass = db_escape_string($_GET["pass"]);
|
||||||
|
$is_cat = $_GET["is_cat"] != false;
|
||||||
|
|
||||||
|
$search = db_escape_string($_GET["q"]);
|
||||||
|
$match_on = db_escape_string($_GET["m"]);
|
||||||
|
$search_mode = db_escape_string($_GET["smode"]);
|
||||||
|
|
||||||
|
if (!$_SESSION["uid"] && $user && $pass) {
|
||||||
|
authenticate_user($link, $user, $pass);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($_SESSION["uid"] ||
|
||||||
|
http_authenticate_user($link)) {
|
||||||
|
|
||||||
|
generate_syndicated_feed($link, 0, $feed, $is_cat,
|
||||||
|
$search, $search_mode, $match_on);
|
||||||
|
}
|
||||||
|
break; // rss
|
||||||
|
|
||||||
|
case "labelFromSearch":
|
||||||
|
$search = db_escape_string($_GET["search"]);
|
||||||
|
$search_mode = db_escape_string($_GET["smode"]);
|
||||||
|
$match_on = db_escape_string($_GET["match"]);
|
||||||
|
$is_cat = db_escape_string($_GET["is_cat"]);
|
||||||
|
$title = db_escape_string($_GET["title"]);
|
||||||
|
$feed = sprintf("%d", $_GET["feed"]);
|
||||||
|
|
||||||
|
$label_qparts = array();
|
||||||
|
|
||||||
|
$search_expr = getSearchSql($search, $match_on);
|
||||||
|
|
||||||
|
if ($is_cat) {
|
||||||
|
if ($feed != 0) {
|
||||||
|
$search_expr .= " AND ttrss_feeds.cat_id = $feed ";
|
||||||
} else {
|
} else {
|
||||||
$search_expr .= " AND ttrss_feeds.cat_id IS NULL ";
|
$search_expr .= " AND ttrss_feeds.cat_id IS NULL ";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$search_expr .= " AND ttrss_feeds.id = $feed ";
|
if ($search_mode == "all_feeds") {
|
||||||
|
// NOOP
|
||||||
|
} else if ($search_mode == "this_cat") {
|
||||||
|
|
||||||
|
$tmp_result = db_query($link, "SELECT cat_id
|
||||||
|
FROM ttrss_feeds WHERE id = '$feed'");
|
||||||
|
|
||||||
|
$cat_id = db_fetch_result($tmp_result, 0, "cat_id");
|
||||||
|
|
||||||
|
if ($cat_id > 0) {
|
||||||
|
$search_expr .= " AND ttrss_feeds.cat_id = $cat_id ";
|
||||||
|
} else {
|
||||||
|
$search_expr .= " AND ttrss_feeds.cat_id IS NULL ";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$search_expr .= " AND ttrss_feeds.id = $feed ";
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
$search_expr = db_escape_string($search_expr);
|
||||||
|
|
||||||
$search_expr = db_escape_string($search_expr);
|
print $search_expr;
|
||||||
|
|
||||||
print $search_expr;
|
if ($title) {
|
||||||
|
$result = db_query($link,
|
||||||
|
"INSERT INTO ttrss_labels (sql_exp,description,owner_uid)
|
||||||
|
VALUES ('$search_expr', '$title', '".$_SESSION["uid"]."')");
|
||||||
|
}
|
||||||
|
break; // labelFromSearch
|
||||||
|
|
||||||
if ($title) {
|
case "getUnread":
|
||||||
$result = db_query($link,
|
$login = db_escape_string($_GET["login"]);
|
||||||
"INSERT INTO ttrss_labels (sql_exp,description,owner_uid)
|
|
||||||
VALUES ('$search_expr', '$title', '".$_SESSION["uid"]."')");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($op == "getUnread") {
|
header("Content-Type: text/plain; charset=utf-8");
|
||||||
$login = db_escape_string($_GET["login"]);
|
|
||||||
|
|
||||||
header("Content-Type: text/plain; charset=utf-8");
|
$result = db_query($link, "SELECT id FROM ttrss_users WHERE login = '$login'");
|
||||||
|
|
||||||
$result = db_query($link, "SELECT id FROM ttrss_users WHERE login = '$login'");
|
if (db_num_rows($result) == 1) {
|
||||||
|
$uid = db_fetch_result($result, 0, "id");
|
||||||
|
print getGlobalUnread($link, $uid);
|
||||||
|
} else {
|
||||||
|
print "-1;User not found";
|
||||||
|
}
|
||||||
|
|
||||||
if (db_num_rows($result) == 1) {
|
$print_exec_time = false;
|
||||||
$uid = db_fetch_result($result, 0, "id");
|
break; // getUnread
|
||||||
print getGlobalUnread($link, $uid);
|
|
||||||
} else {
|
|
||||||
print "-1;User not found";
|
|
||||||
}
|
|
||||||
|
|
||||||
$print_exec_time = false;
|
case "digestTest":
|
||||||
}
|
header("Content-Type: text/plain");
|
||||||
|
print_r(prepare_headlines_digest($link, $_SESSION["uid"]));
|
||||||
|
$print_exec_time = false;
|
||||||
|
break; // digestTest
|
||||||
|
|
||||||
if ($op == "digestTest") {
|
case "digestSend":
|
||||||
header("Content-Type: text/plain");
|
header("Content-Type: text/plain");
|
||||||
print_r(prepare_headlines_digest($link, $_SESSION["uid"]));
|
send_headlines_digests($link);
|
||||||
$print_exec_time = false;
|
$print_exec_time = false;
|
||||||
|
break; // digestSend
|
||||||
|
|
||||||
}
|
} // Select action according to $op value.
|
||||||
|
|
||||||
if ($op == "digestSend") {
|
|
||||||
header("Content-Type: text/plain");
|
|
||||||
send_headlines_digests($link);
|
|
||||||
$print_exec_time = false;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// We close the connection to database.
|
||||||
db_close($link);
|
db_close($link);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
|
||||||
155
functions.php
155
functions.php
|
|
@ -72,11 +72,17 @@
|
||||||
require_once "magpierss/rss_fetch.inc";
|
require_once "magpierss/rss_fetch.inc";
|
||||||
require_once 'magpierss/rss_utils.inc';
|
require_once 'magpierss/rss_utils.inc';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Print a timestamped debug message.
|
||||||
|
*
|
||||||
|
* @param string $msg The debug message.
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
function _debug($msg) {
|
function _debug($msg) {
|
||||||
$ts = strftime("%H:%M:%S", time());
|
$ts = strftime("%H:%M:%S", time());
|
||||||
$ts = "$ts/" . posix_getpid();
|
$ts = "$ts/" . posix_getpid();
|
||||||
print "[$ts] $msg\n";
|
print "[$ts] $msg\n";
|
||||||
}
|
} // function _debug
|
||||||
|
|
||||||
function purge_feed($link, $feed_id, $purge_interval, $debug = false) {
|
function purge_feed($link, $feed_id, $purge_interval, $debug = false) {
|
||||||
|
|
||||||
|
|
@ -459,7 +465,7 @@
|
||||||
function update_rss_feed($link, $feed_url, $feed, $ignore_daemon = false) {
|
function update_rss_feed($link, $feed_url, $feed, $ignore_daemon = false) {
|
||||||
|
|
||||||
if (!$_GET["daemon"] && !$ignore_daemon) {
|
if (!$_GET["daemon"] && !$ignore_daemon) {
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
|
if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
|
||||||
|
|
@ -490,7 +496,7 @@
|
||||||
if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
|
if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
|
||||||
_debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND/SKIPPED");
|
_debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND/SKIPPED");
|
||||||
}
|
}
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$update_method = db_fetch_result($result, 0, "update_method");
|
$update_method = db_fetch_result($result, 0, "update_method");
|
||||||
|
|
@ -3356,6 +3362,13 @@
|
||||||
return $res;
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Send by mail a digest of last articles.
|
||||||
|
*
|
||||||
|
* @param mixed $link The database connection.
|
||||||
|
* @param integer $limit The maximum number of articles by digest.
|
||||||
|
* @return boolean Return false if digests are not enabled.
|
||||||
|
*/
|
||||||
function send_headlines_digests($link, $limit = 100) {
|
function send_headlines_digests($link, $limit = 100) {
|
||||||
|
|
||||||
if (!DIGEST_ENABLE) return false;
|
if (!DIGEST_ENABLE) return false;
|
||||||
|
|
@ -5118,26 +5131,154 @@
|
||||||
return $url_path;
|
return $url_path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Purge a feed contents, marked articles excepted.
|
||||||
|
*
|
||||||
|
* @param mixed $link The database connection.
|
||||||
|
* @param integer $id The id of the feed to purge.
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
function clear_feed_articles($link, $id) {
|
function clear_feed_articles($link, $id) {
|
||||||
$result = db_query($link, "DELETE FROM ttrss_user_entries
|
$result = db_query($link, "DELETE FROM ttrss_user_entries
|
||||||
WHERE feed_id = '$id' AND marked = false AND owner_uid = " . $_SESSION["uid"]);
|
WHERE feed_id = '$id' AND marked = false AND owner_uid = " . $_SESSION["uid"]);
|
||||||
|
|
||||||
$result = db_query($link, "DELETE FROM ttrss_entries WHERE
|
$result = db_query($link, "DELETE FROM ttrss_entries WHERE
|
||||||
(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
|
(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
|
||||||
}
|
} // function clear_feed_articles
|
||||||
|
|
||||||
function add_feed_url() {
|
/**
|
||||||
|
* Compute the Mozilla Firefox feed adding URL from server HOST and REQUEST_URI.
|
||||||
|
*
|
||||||
|
* @return string The Mozilla Firefox feed adding URL.
|
||||||
|
*/
|
||||||
|
function add_feed_url() {
|
||||||
$url_path = 'http://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
|
$url_path = 'http://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
|
||||||
$url_path .= "?op=pref-feeds&quiet=1&subop=add&feed_url=%s";
|
$url_path .= "?op=pref-feeds&quiet=1&subop=add&feed_url=%s";
|
||||||
return $url_path;
|
return $url_path;
|
||||||
}
|
} // function add_feed_url
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Encrypt a password in SHA1.
|
||||||
|
*
|
||||||
|
* @param string $pass The password to encrypt.
|
||||||
|
* @param string $login A optionnal login.
|
||||||
|
* @return string The encrypted password.
|
||||||
|
*/
|
||||||
function encrypt_password($pass, $login = '') {
|
function encrypt_password($pass, $login = '') {
|
||||||
if ($login) {
|
if ($login) {
|
||||||
return "SHA1X:" . sha1("$login:$pass");
|
return "SHA1X:" . sha1("$login:$pass");
|
||||||
} else {
|
} else {
|
||||||
return "SHA1:" . sha1($pass);
|
return "SHA1:" . sha1($pass);
|
||||||
}
|
}
|
||||||
}
|
} // function encrypt_password
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update a feed batch.
|
||||||
|
* Used by daemons to update n feeds by run.
|
||||||
|
* Only update feed needing a update, and not being processed
|
||||||
|
* by another process.
|
||||||
|
*
|
||||||
|
* @param mixed $link Database link
|
||||||
|
* @param integer $limit Maximum number of feeds in update batch. Default to DAEMON_FEED_LIMIT.
|
||||||
|
* @param boolean $from_http Set to true if you call this function from http to disable cli specific code.
|
||||||
|
* @param boolean $debug Set to false to disable debug output. Default to true.
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
function update_daemon_common($link, $limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) {
|
||||||
|
// Process all other feeds using last_updated and interval parameters
|
||||||
|
|
||||||
|
// Test if the user has loggued in recently. If not, it does not update its feeds.
|
||||||
|
if (DAEMON_UPDATE_LOGIN_LIMIT > 0) {
|
||||||
|
if (DB_TYPE == "pgsql") {
|
||||||
|
$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
|
||||||
|
} else {
|
||||||
|
$login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$login_thresh_qpart = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test if the feed need a update (update interval exceded).
|
||||||
|
if (DB_TYPE == "pgsql") {
|
||||||
|
$update_limit_qpart = "AND ((
|
||||||
|
ttrss_feeds.update_interval = 0
|
||||||
|
AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
|
||||||
|
) OR (
|
||||||
|
ttrss_feeds.update_interval > 0
|
||||||
|
AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
|
||||||
|
))";
|
||||||
|
} else {
|
||||||
|
$update_limit_qpart = "AND ((
|
||||||
|
ttrss_feeds.update_interval = 0
|
||||||
|
AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
|
||||||
|
) OR (
|
||||||
|
ttrss_feeds.update_interval > 0
|
||||||
|
AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
|
||||||
|
))";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test if feed is currently being updated by another process.
|
||||||
|
if (DB_TYPE == "pgsql") {
|
||||||
|
$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')";
|
||||||
|
} else {
|
||||||
|
$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test if there is a limit to number of updated feeds
|
||||||
|
$query_limit = "";
|
||||||
|
if($limit) $query_limit = sprintf("LIMIT %d", $limit);
|
||||||
|
|
||||||
|
// We search for feed needing update.
|
||||||
|
$result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid,
|
||||||
|
SUBSTRING(ttrss_feeds.last_updated,1,19) AS last_updated,
|
||||||
|
ttrss_feeds.update_interval
|
||||||
|
FROM
|
||||||
|
ttrss_feeds, ttrss_users, ttrss_user_prefs
|
||||||
|
WHERE
|
||||||
|
ttrss_feeds.owner_uid = ttrss_users.id
|
||||||
|
AND ttrss_users.id = ttrss_user_prefs.owner_uid
|
||||||
|
AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
|
||||||
|
$login_thresh_qpart $update_limit_qpart
|
||||||
|
$updstart_thresh_qpart
|
||||||
|
ORDER BY ttrss_feeds.last_updated ASC $query_limit");
|
||||||
|
|
||||||
|
$user_prefs_cache = array();
|
||||||
|
|
||||||
|
if($debug) _debug(sprintf("Scheduled %d feeds to update...\n", db_num_rows($result)));
|
||||||
|
|
||||||
|
// Here is a little cache magic in order to minimize risk of double feed updates.
|
||||||
|
$feeds_to_update = array();
|
||||||
|
while ($line = db_fetch_assoc($result)) {
|
||||||
|
$feeds_to_update[$line['id']] = $line;
|
||||||
|
}
|
||||||
|
|
||||||
|
// We update the feed last update started date before anything else.
|
||||||
|
// There is no lag due to feed contents downloads
|
||||||
|
// It prevent an other process to update the same feed.
|
||||||
|
$feed_ids = array_keys($feeds_to_update);
|
||||||
|
if($feed_ids) {
|
||||||
|
db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
|
||||||
|
WHERE id IN (%s)", implode(',', $feed_ids)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// For each feed, we call the feed update function.
|
||||||
|
while ($line = array_pop($feeds_to_update)) {
|
||||||
|
|
||||||
|
if($debug) _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
|
||||||
|
|
||||||
|
// We setup a alarm to alert if the feed take more than 300s to update.
|
||||||
|
// => HANG alarm.
|
||||||
|
if(!$from_http) pcntl_alarm(300);
|
||||||
|
update_rss_feed($link, $line["feed_url"], $line["id"], true);
|
||||||
|
// Cancel the alarm (the update went well)
|
||||||
|
if(!$from_http) pcntl_alarm(0);
|
||||||
|
|
||||||
|
sleep(1); // prevent flood (FIXME make this an option?)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send feed digests by email if needed.
|
||||||
|
if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
|
||||||
|
|
||||||
|
} // function update_daemon_common
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -88,6 +88,7 @@
|
||||||
if (!pcntl_fork()) {
|
if (!pcntl_fork()) {
|
||||||
pcntl_signal(SIGINT, 'sigint_handler');
|
pcntl_signal(SIGINT, 'sigint_handler');
|
||||||
|
|
||||||
|
// Try to lock a file in order to avoid concurrent update.
|
||||||
$lock_handle = make_lockfile("update_daemon.lock");
|
$lock_handle = make_lockfile("update_daemon.lock");
|
||||||
|
|
||||||
if (!$lock_handle) {
|
if (!$lock_handle) {
|
||||||
|
|
@ -115,6 +116,8 @@
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
|
|
||||||
|
// Since sleep is interupted by SIGCHLD, we need another way to
|
||||||
|
// respect the SPAWN_INTERVAL
|
||||||
$next_spawn = $last_checkpoint + SPAWN_INTERVAL - time();
|
$next_spawn = $last_checkpoint + SPAWN_INTERVAL - time();
|
||||||
|
|
||||||
if ($next_spawn % 10 == 0) {
|
if ($next_spawn % 10 == 0) {
|
||||||
|
|
@ -180,89 +183,8 @@
|
||||||
// $last_purge = time();
|
// $last_purge = time();
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// Process all other feeds using last_updated and interval parameters
|
// Call to the feed batch update function
|
||||||
|
update_daemon_common($link);
|
||||||
$random_qpart = sql_random_function();
|
|
||||||
|
|
||||||
if (DAEMON_UPDATE_LOGIN_LIMIT > 0) {
|
|
||||||
if (DB_TYPE == "pgsql") {
|
|
||||||
$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
|
|
||||||
} else {
|
|
||||||
$login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$login_thresh_qpart = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (DB_TYPE == "pgsql") {
|
|
||||||
$update_limit_qpart = "AND ((
|
|
||||||
ttrss_feeds.update_interval = 0
|
|
||||||
AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
|
|
||||||
) OR (
|
|
||||||
ttrss_feeds.update_interval > 0
|
|
||||||
AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
|
|
||||||
))";
|
|
||||||
} else {
|
|
||||||
$update_limit_qpart = "AND ((
|
|
||||||
ttrss_feeds.update_interval = 0
|
|
||||||
AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
|
|
||||||
) OR (
|
|
||||||
ttrss_feeds.update_interval > 0
|
|
||||||
AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
|
|
||||||
))";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (DB_TYPE == "pgsql") {
|
|
||||||
$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')";
|
|
||||||
} else {
|
|
||||||
$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))";
|
|
||||||
}
|
|
||||||
|
|
||||||
$result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid,
|
|
||||||
SUBSTRING(ttrss_feeds.last_updated,1,19) AS last_updated,
|
|
||||||
ttrss_feeds.update_interval
|
|
||||||
FROM
|
|
||||||
ttrss_feeds, ttrss_users, ttrss_user_prefs
|
|
||||||
WHERE
|
|
||||||
ttrss_feeds.owner_uid = ttrss_users.id
|
|
||||||
AND ttrss_users.id = ttrss_user_prefs.owner_uid
|
|
||||||
AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
|
|
||||||
$login_thresh_qpart $update_limit_qpart
|
|
||||||
$updstart_thresh_qpart
|
|
||||||
ORDER BY $random_qpart DESC LIMIT " . DAEMON_FEED_LIMIT);
|
|
||||||
|
|
||||||
$user_prefs_cache = array();
|
|
||||||
|
|
||||||
_debug(sprintf("Scheduled %d feeds to update...\n", db_num_rows($result)));
|
|
||||||
|
|
||||||
// Here is a little cache magic in order to minimize risk of double feed updates.
|
|
||||||
$feeds_to_update = array();
|
|
||||||
while ($line = db_fetch_assoc($result)) {
|
|
||||||
$feeds_to_update[$line['id']] = $line;
|
|
||||||
}
|
|
||||||
|
|
||||||
// We update the feed last update started date before anything else.
|
|
||||||
// There is no lag due to feed contents downloads
|
|
||||||
// It prevent an other process to update the same feed.
|
|
||||||
$feed_ids = array_keys($feeds_to_update);
|
|
||||||
if($feed_ids) {
|
|
||||||
db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
|
|
||||||
WHERE id IN (%s)", implode(',', $feed_ids)));
|
|
||||||
}
|
|
||||||
|
|
||||||
while ($line = array_pop($feeds_to_update)) {
|
|
||||||
|
|
||||||
_debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
|
|
||||||
|
|
||||||
pcntl_alarm(300);
|
|
||||||
update_rss_feed($link, $line["feed_url"], $line["id"], true);
|
|
||||||
pcntl_alarm(0);
|
|
||||||
|
|
||||||
sleep(1); // prevent flood (FIXME make this an option?)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
|
|
||||||
|
|
||||||
_debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
|
_debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@
|
||||||
|
|
||||||
// Process all other feeds using last_updated and interval parameters
|
// Process all other feeds using last_updated and interval parameters
|
||||||
|
|
||||||
$random_qpart = sql_random_function();
|
// $random_qpart = sql_random_function();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
|
ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
|
||||||
|
|
@ -104,85 +104,9 @@
|
||||||
marked = false AND
|
marked = false AND
|
||||||
feed_id = '$feed_id' AND
|
feed_id = '$feed_id' AND
|
||||||
ttrss_entries.date_entered < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */
|
ttrss_entries.date_entered < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */
|
||||||
|
|
||||||
if (DAEMON_UPDATE_LOGIN_LIMIT > 0) {
|
|
||||||
if (DB_TYPE == "pgsql") {
|
|
||||||
$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
|
|
||||||
} else {
|
|
||||||
$login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$login_thresh_qpart = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (DB_TYPE == "pgsql") {
|
// Call to the feed batch update function
|
||||||
$update_limit_qpart = "AND ((
|
update_daemon_common($link);
|
||||||
ttrss_feeds.update_interval = 0
|
|
||||||
AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
|
|
||||||
) OR (
|
|
||||||
ttrss_feeds.update_interval > 0
|
|
||||||
AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
|
|
||||||
))";
|
|
||||||
} else {
|
|
||||||
$update_limit_qpart = "AND ((
|
|
||||||
ttrss_feeds.update_interval = 0
|
|
||||||
AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
|
|
||||||
) OR (
|
|
||||||
ttrss_feeds.update_interval > 0
|
|
||||||
AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
|
|
||||||
))";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (DB_TYPE == "pgsql") {
|
|
||||||
$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')";
|
|
||||||
} else {
|
|
||||||
$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))";
|
|
||||||
}
|
|
||||||
|
|
||||||
$result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid,
|
|
||||||
SUBSTRING(ttrss_feeds.last_updated,1,19) AS last_updated,
|
|
||||||
ttrss_feeds.update_interval
|
|
||||||
FROM
|
|
||||||
ttrss_feeds, ttrss_users, ttrss_user_prefs
|
|
||||||
WHERE
|
|
||||||
ttrss_feeds.owner_uid = ttrss_users.id
|
|
||||||
AND ttrss_users.id = ttrss_user_prefs.owner_uid
|
|
||||||
AND ttrss_user_prefs.pref_name='DEFAULT_UPDATE_INTERVAL'
|
|
||||||
$login_thresh_qpart $update_limit_qpart
|
|
||||||
$updstart_thresh_qpart
|
|
||||||
ORDER BY $random_qpart DESC LIMIT " . DAEMON_FEED_LIMIT);
|
|
||||||
|
|
||||||
$user_prefs_cache = array();
|
|
||||||
|
|
||||||
_debug(sprintf("Scheduled %d feeds to update...\n", db_num_rows($result)));
|
|
||||||
|
|
||||||
// Here is a little cache magic in order to minimize risk of double feed updates.
|
|
||||||
$feeds_to_update = array();
|
|
||||||
while ($line = db_fetch_assoc($result)) {
|
|
||||||
$feeds_to_update[$line['id']] = $line;
|
|
||||||
}
|
|
||||||
|
|
||||||
// We update the feed last update started date before anything else.
|
|
||||||
// There is no lag due to feed contents downloads
|
|
||||||
// It prevent an other process to update the same feed (for exemple, forced update by user).
|
|
||||||
$feed_ids = array_keys($feeds_to_update);
|
|
||||||
if($feed_ids) {
|
|
||||||
db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
|
|
||||||
WHERE id IN (%s)", implode(',', $feed_ids)));
|
|
||||||
}
|
|
||||||
|
|
||||||
while ($line = array_pop($feeds_to_update)) {
|
|
||||||
|
|
||||||
_debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
|
|
||||||
|
|
||||||
pcntl_alarm(300);
|
|
||||||
update_rss_feed($link, $line["feed_url"], $line["id"], true);
|
|
||||||
pcntl_alarm(0);
|
|
||||||
|
|
||||||
sleep(1); // prevent flood (FIXME make this an option?)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
|
|
||||||
|
|
||||||
db_close($link);
|
db_close($link);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,11 +19,13 @@
|
||||||
|
|
||||||
$lock_handle = make_lockfile($lock_filename);
|
$lock_handle = make_lockfile($lock_filename);
|
||||||
|
|
||||||
|
// Try to lock a file in order to avoid concurrent update.
|
||||||
if (!$lock_handle) {
|
if (!$lock_handle) {
|
||||||
die("error: Can't create lockfile ($lock_filename). ".
|
die("error: Can't create lockfile ($lock_filename). ".
|
||||||
"Maybe another process is already running.\n");
|
"Maybe another process is already running.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 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) {
|
||||||
|
|
@ -44,14 +46,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = db_query($link, "SELECT id FROM ttrss_users");
|
// Update all feeds needing a update.
|
||||||
|
update_daemon_common($link, $limit=0);
|
||||||
while ($line = db_fetch_assoc($result)) {
|
|
||||||
$user_id = $line["id"];
|
|
||||||
initialize_user_prefs($link, $user_id);
|
|
||||||
update_all_feeds($link, false, $user_id, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// Send feed digests by email if needed.
|
||||||
if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
|
if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
|
||||||
|
|
||||||
db_close($link);
|
db_close($link);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue