fixed viewfeed/MarkAllRead behaviour

remotes/origin/jsonfeed-test-branch
Andrew Dolgov 17 years ago
parent 77a1bf8b83
commit deaaa02c50
  1. 10
      NEWS
  2. 31
      backend.php
  3. 2
      config.php-dist
  4. 7
      feedlist.js
  5. 14
      functions.php
  6. 9
      tt-rss.js

10
NEWS

@ -5,9 +5,15 @@ v1.0.3 (Sep xx, 2005)
checking is case insensitive)
- Reworked preferences dialog
- Added ability to mark posts as "starred". These posts are not expired
automatically.
automatically.
- Rework interface using iframes, fixes a lot of scrolling issues.
- Rejoice, kids! Support for MySQL (InnoDB and version 4.1 REQUIRED!)
- Rejoice, kids! Introducing support for MySQL (InnoDB and version 4.1 REQUIRED!)
Special thanks to Jamie McCarthy who basically shamed me into doing this.
Note: Database support could have suffered regressions from many changes
in the code. I need your bugreports and yes - this means YOU! :-)
v1.0.2 (Sep 02, 2005)

@ -303,19 +303,12 @@
$line = db_fetch_assoc($result);
if ($subop == "ForceUpdate" ||
$line["last_updated"] == "" ||
$line["update_timeout"] > MIN_UPDATE_TIME) {
update_rss_feed($link, $line["feed_url"], $feed);
update_rss_feed($link, $line["feed_url"], $feed);
} else {
if ($subop == "MarkAllRead") {
if ($subop == "MarkAllRead") {
db_query($link, "UPDATE ttrss_entries SET unread = false,last_read = NOW()
WHERE feed_id = '$feed'");
}
db_query($link, "UPDATE ttrss_entries SET unread = false,last_read = NOW()
WHERE feed_id = '$feed'");
}
}
@ -361,15 +354,8 @@
$limit_query_part = "LIMIT " . $limit;
}
if (DB_TYPE == "pgsql") {
$extract_epoch_qpart = "
,EXTRACT(EPOCH FROM last_read) AS last_read_ts,
EXTRACT(EPOCH FROM updated) AS updated_ts";
}
$result = db_query($link, "SELECT
id,title,updated,unread,feed_id,marked,link
$extract_epoch_qpart
id,title,updated,unread,feed_id,marked,link,last_read
FROM
ttrss_entries
WHERE
@ -389,7 +375,12 @@
$id = $line["id"];
$feed_id = $line["feed_id"];
if ($line["last_read_ts"] < $line["updated_ts"] && $line["unread"] == "f") {
// printf("%d %s - %d %s<br>", strtotime($line["last_read"]), $line["last_read"],
// strtotime($line["updated"]), $line["updated"]);
if (strtotime($line["last_read"]) < strtotime($line["updated"]) &&
($line["unread"] == "f" || $line["unread"] == "0")) {
$update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\"
alt=\"Updated\">";
++$num_unread;

@ -11,8 +11,6 @@
define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache');
// Local cache directory for RSS feeds
define(MIN_UPDATE_TIME, 1800);
define(WEB_DEMO_MODE, false);

@ -50,10 +50,9 @@ function viewfeed(feed, skip, subop, doc) {
if (subop == "MarkAllRead") {
var feedr = document.getElementById("FEEDR-" + feed);
var feedt = document.getElementById("FEEDT-" + feed);
var feedu = document.getElementById("FEEDU-" + feed);
feedu.innerHTML = "0";
var feedctr = document.getElementById("FEEDCTR-" + feed);
feedctr.className = "invisible";
if (feedr.className.match("Unread")) {
feedr.className = feedr.className.replace("Unread", "");

@ -17,17 +17,7 @@
db_query($link, "BEGIN");
if (!$fetch) {
$result = db_query($link, "SELECT feed_url,id FROM ttrss_feeds WHERE
last_updated is null OR title = '' OR
EXTRACT(EPOCH FROM NOW()) - EXTRACT(EPOCH FROM last_updated) > " .
MIN_UPDATE_TIME);
} else {
$result = db_query($link, "SELECT feed_url,id FROM ttrss_feeds");
}
$result = db_query($link, "SELECT feed_url,id FROM ttrss_feeds");
while ($line = db_fetch_assoc($result)) {
update_rss_feed($link, $line["feed_url"], $line["id"]);
@ -207,7 +197,7 @@
content,
content_hash,
feed_id,
comments,
comments,
no_orig_date)
VALUES
('$entry_title',

@ -159,7 +159,7 @@ function viewCurrentFeed(skip, subop) {
function viewfeed(feed, skip, subop) {
// notify("Loading headlines...");
notify("Loading headlines...");
enableHotkeys();
@ -201,14 +201,13 @@ function viewfeed(feed, skip, subop) {
f_doc.getElementById("ACTFEEDID").innerHTML = feed;
setCookie("ttrss_vf_actfeed", feed);
if (subop == "MarkAllRead") {
var feedr = f_doc.getElementById("FEEDR-" + feed);
var feedt = f_doc.getElementById("FEEDT-" + feed);
var feedu = f_doc.getElementById("FEEDU-" + feed);
var feedctr = f_doc.getElementById("FEEDCTR-" + feed);
feedu.innerHTML = "0";
feedctr.className = "invisible";
if (feedr.className.match("Unread")) {
feedr.className = feedr.className.replace("Unread", "");

Loading…
Cancel
Save