diff --git a/backend.php b/backend.php index 637647cbd..aaf4e9850 100644 --- a/backend.php +++ b/backend.php @@ -118,7 +118,11 @@ FROM ttrss_entries WHERE marked = true AND unread = true"); $num_starred = db_fetch_result($result, 0, "num_starred"); - printFeedEntry(-1, "odd", "Starred articles", $num_starred, + $class = "odd"; + + if ($num_starred > 0) $class .= "Unread"; + + printFeedEntry(-1, $class, "Starred articles", $num_starred, "images/mark_set.png"); if (ENABLE_LABELS) { diff --git a/functions.php b/functions.php index 82ff0cbd8..378e123f2 100644 --- a/functions.php +++ b/functions.php @@ -20,7 +20,7 @@ $result = db_query($link, "SELECT feed_url,id,last_updated FROM ttrss_feeds"); while ($line = db_fetch_assoc($result)) { - if ($line["last_updated"] && time() - strtotime($line["last_updated"]) > 1800) { + if (!$line["last_updated"] || time() - strtotime($line["last_updated"]) > 1800) { update_rss_feed($link, $line["feed_url"], $line["id"]); } } @@ -157,6 +157,11 @@ // if (!$entry_content) continue; + // WTF + if (is_array($entry_content)) { + $entry_content = $entry_content["encoded"]; + } + $content_hash = "SHA1:" . sha1(strip_tags($entry_content)); $entry_comments = $item["comments"]; diff --git a/viewfeed.js b/viewfeed.js index 9d891ec66..4e9c7da50 100644 --- a/viewfeed.js +++ b/viewfeed.js @@ -114,12 +114,17 @@ function toggleMark(id, toggle) { } var vfeedctr = f_document.getElementById("FEEDCTR--1"); + var vfeedr = f_document.getElementById("FEEDR--1"); if (vfeedu && vfeedctr) { if ((+vfeedu.innerHTML) > 0) { vfeedctr.className = "odd"; + if (!vfeedr.className.match("Unread")) { + vfeedr.className = vfeedr.className + "Unread"; + } } else { vfeedctr.className = "invisible"; + vfeedr.className = vfeedr.className.replace("Unread", ""); } }