+ - ".__('Mark as read')."
- ".__('Selection')."
-
+ ";
+
+ if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+
+ print "
- --------
- ".__("Above active article")."
- ".__("Below active article")."
- - --------
+ - --------
";
+ }
+
+ print "
- ".__('Entire feed')."
";
@@ -3629,7 +3856,9 @@
} */
print "";
-
+
+ print "";
+
if ($feed_site_url) {
if (!$bottom) {
$target = "target=\"_new\"";
@@ -3648,6 +3877,8 @@
print " [$user_page_offset] ";
}
+ print "";
+
if (!$bottom) {
print "
";
}
- print " ($cat_unread) $ellipsis";
if ($can_browse) {
@@ -3958,7 +4189,7 @@
if ($collapsed == "t" || $collapsed == "1") {
$holder_class = "feedCatHolder";
$holder_style = "display:none;";
- $ellipsis = "...";
+ $ellipsis = "â¦";
} else {
$holder_class = "feedCatHolder";
$holder_style = "";
@@ -3974,7 +4205,7 @@
print "-
$tmp_category
- ($cat_unread) $ellipsis
";
@@ -3982,7 +4213,7 @@
}
printFeedEntry($feed_id, $class, $feed, $unread,
- ICONS_DIR."/$feed_id.ico", $link, $rtl_content,
+ ICONS_URL."/$feed_id.ico", $link, $rtl_content,
$last_updated, $line["last_error"]);
++$lnum;
@@ -4257,16 +4488,22 @@
$num_tags = 0;
+ if ($_SESSION["theme"] == "3pane") {
+ $tag_limit = 3;
+ } else {
+ $tag_limit = 6;
+ }
+
foreach ($tags as $tag) {
$num_tags++;
$tag_escaped = str_replace("'", "\\'", $tag);
$tag_str = "$tag, ";
- if ($num_tags == 6) {
- $tags_str .= "...";
+ if ($num_tags == $tag_limit) {
+ $tags_str .= "…";
- } else if ($num_tags < 6) {
+ } else if ($num_tags < $tag_limit) {
$tags_str .= $tag_str;
}
$f_tags_str .= $tag_str;
@@ -4275,7 +4512,7 @@
$tags_str = preg_replace("/, $/", "", $tags_str);
$f_tags_str = preg_replace("/, $/", "", $f_tags_str);
- $all_tags_div = "...All Tags: $f_tags_str ";
+ $all_tags_div = "…All Tags: $f_tags_str ";
$tags_str = preg_replace("/\.\.\.$/", "$all_tags_div", $tags_str);
if (!$entry_comments) $entry_comments = " "; # placeholder
@@ -4302,7 +4539,40 @@
$line["content"] = preg_replace("/href=/i", "target=\"_new\" href=", $line["content"]);
}
- print $line["content"] . "";
+ print $line["content"];
+
+ $result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
+ post_id = '$id'");
+
+ if (db_num_rows($result) > 0) {
+ print "";
+
+ if (db_num_rows($result) == 1) {
+ print __("Attachment:") . " ";
+ } else {
+ print __("Attachments:") . " ";
+ }
+
+ $entries = array();
+
+ while ($line = db_fetch_assoc($result)) {
+
+ $url = $line["content_url"];
+
+ $filename = substr($url, strrpos($url, "/")+1);
+
+ $entry = " " .
+ $filename . " (" . $line["content_type"] . ")" . "";
+
+ array_push($entries, $entry);
+ }
+
+ print join(", ", $entries);
+
+ print " ";
@@ -4600,6 +4885,13 @@
print $entry_author;
+ if (!$expand_cdm) {
+ print "
+ (".__('Show article').")";
+ }
+
+
if ($line["feed_title"]) {
print " ( ".$line["feed_title"].")";
}
@@ -4611,27 +4903,52 @@
"target=\"_new\" href=", $line["content_preview"]);
}
- $expand_cdm = get_pref($link, 'CDM_EXPANDED');
+ print " ";
- if ($expand_cdm) {
- $cdm_cstyle = "";
- } else {
- $cdm_cstyle = "style=\"display : none\"";
- }
+// print " ";
+ print $line["content_preview"];
- print " ";
+ $e_result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
+ post_id = '$id'");
- print " ";
- print $line["content_preview"];
- print " ";
+ if (db_num_rows($e_result) > 0) {
+ print " ";
- if (!$expand_cdm) {
+ if (db_num_rows($e_result) == 1) {
+ print __("Attachment:") . " ";
+ } else {
+ print __("Attachments:") . " ";
+ }
+
+ $entries = array();
+
+ while ($e_line = db_fetch_assoc($e_result)) {
+
+ $url = $e_line["content_url"];
+
+ $filename = substr($url, strrpos($url, "/")+1);
+
+ $entry = " " .
+ $filename . " (" . $e_line["content_type"] . ")" . "";
+
+ array_push($entries, $entry);
+ }
+
+ print join(", ", $entries);
+
+ print " ";
+ }
+
+ print " ";
+// print " ";
+
+/* if (!$expand_cdm) {
print "
Show article";
- }
+ } */
- print " ";
+ print " ";
print "";
}
- return array($topmost_article_ids, $headlines_count);
+ return array($topmost_article_ids, $headlines_count, $feed, $disable_cache);
}
// from here: http://www.roscripts.com/Create_tag_cloud-71.html
@@ -4814,26 +5131,154 @@
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) {
$result = db_query($link, "DELETE FROM ttrss_user_entries
WHERE feed_id = '$id' AND marked = false AND owner_uid = " . $_SESSION["uid"]);
$result = db_query($link, "DELETE FROM ttrss_entries WHERE
(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
- }
-
- function add_feed_url() {
+ } // function clear_feed_articles
+
+ /**
+ * 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 .= "?op=pref-feeds&quiet=1&subop=add&feed_url=%s";
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 = '') {
if ($login) {
return "SHA1X:" . sha1("$login:$pass");
} else {
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
?>
|