summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2005-09-07 15:03:30 +0100
committerAndrew Dolgov <[email protected]>2005-09-07 15:03:30 +0100
commitdeaaa02c504a685ea383b203e1432fadd01d1a27 (patch)
treeceb1bd4e8715e79a57cb00f0c7fb5131f5b27b17
parent77a1bf8b833c0f3f24b918606e3e8b00a0ebce01 (diff)
fixed viewfeed/MarkAllRead behaviour
-rw-r--r--NEWS10
-rw-r--r--backend.php31
-rw-r--r--config.php-dist2
-rw-r--r--feedlist.js7
-rw-r--r--functions.php14
-rw-r--r--tt-rss.js9
6 files changed, 28 insertions, 45 deletions
diff --git a/NEWS b/NEWS
index 44f3002a0..129cbf8a0 100644
--- a/NEWS
+++ b/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)
diff --git a/backend.php b/backend.php
index b4181069f..556c94697 100644
--- a/backend.php
+++ b/backend.php
@@ -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;
diff --git a/config.php-dist b/config.php-dist
index fd35eeb07..e604cf89d 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -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);
diff --git a/feedlist.js b/feedlist.js
index d2b49f415..b5b34bfcc 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -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", "");
diff --git a/functions.php b/functions.php
index 742e026f5..5736c016e 100644
--- a/functions.php
+++ b/functions.php
@@ -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',
diff --git a/tt-rss.js b/tt-rss.js
index 5f1269a5a..25c608518 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -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", "");