summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backend.php14
-rw-r--r--functions.php9
2 files changed, 21 insertions, 2 deletions
diff --git a/backend.php b/backend.php
index aa2a1b3bc..5a88f38ac 100644
--- a/backend.php
+++ b/backend.php
@@ -1208,6 +1208,9 @@
if (strtoupper($upd_intl) == "DEFAULT")
$upd_intl = 0;
+ if (strtoupper($upd_intl) == "DISABLED")
+ $upd_intl = -1;
+
if (strtoupper($purge_intl) == "DEFAULT")
$purge_intl = 0;
@@ -1535,6 +1538,9 @@
if ($line["update_interval"] == "0")
$line["update_interval"] = "Default";
+ if ($line["update_interval"] == "-1")
+ $line["update_interval"] = "Disabled";
+
print "<td><a href=\"javascript:editFeed($feed_id);\">" .
$line["update_interval"] . "</a></td>";
@@ -3021,7 +3027,7 @@
print "<h1>Subscribed feeds</h1>";
$result = db_query($link, "SELECT id,title,feed_url FROM ttrss_feeds
- WHERE owner_uid = '$uid' ORDER BY title");
+ WHERE owner_uid = '$uid' ORDER BY title LIMIT 20");
print "<ul class=\"nomarks\">";
@@ -3038,6 +3044,12 @@
print "<li>$feed_icon&nbsp;<a href=\"".$line["feed_url"]."\">".$line["title"]."</a></li>";
}
+ if (db_num_rows($result) < $num_feeds) {
+ // FIXME - add link to show ALL subscribed feeds here somewhere
+ print "<li><img
+ class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">&nbsp;...</li>";
+ }
+
print "</ul>";
print "</div>";
diff --git a/functions.php b/functions.php
index 7a09b9d86..8095b3142 100644
--- a/functions.php
+++ b/functions.php
@@ -170,6 +170,13 @@
return;
}
+ $result = db_query($link, "SELECT update_interval
+ FROM ttrss_feeds WHERE id = '$feed'");
+
+ $update_interval = db_fetch_result($result, 0, "update_interval");
+
+ if ($update_interval < 0) { return; }
+
$feed = db_escape_string($feed);
error_reporting(0);
@@ -183,7 +190,7 @@
db_query($link, "BEGIN");
- $result = db_query($link, "SELECT title,icon_url,site_url,owner_uid
+ $result = db_query($link, "SELECT title,icon_url,site_url,owner_uid
FROM ttrss_feeds WHERE id = '$feed'");
$registered_title = db_fetch_result($result, 0, "title");