diff options
author | Andrew Dolgov <[email protected]> | 2006-12-18 06:56:55 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2006-12-18 06:56:55 +0100 |
commit | e513a74a6b37a3a406686e0f3cbe9011265d1453 (patch) | |
tree | 3d4e0c3bc32650ef0518408aa727611aace4bd2c /modules/pref-feeds.php | |
parent | d507dfd50d113e831bb53f447cd53d5bbf7fdc54 (diff) |
add edit feed link into firefox from-rss subscribe dialog
Diffstat (limited to 'modules/pref-feeds.php')
-rw-r--r-- | modules/pref-feeds.php | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 0572978dd..1ea63c96f 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -428,7 +428,7 @@ $cat_id = db_escape_string($_GET["cat_id"]); $p_from = db_escape_string($_GET["from"]); - if ($p_from) { + if ($p_from != 'tt-rss') { print "<html> <head> <title>Tiny Tiny RSS - Subscribe to feed...</title> @@ -437,26 +437,42 @@ <body> <img class=\"logo\" src=\"images/ttrss_logo.png\" alt=\"Tiny Tiny RSS\"/> - <h1>Subscribe to feed...</h1>"; + <h1>Subscribe to feed...</h1> + <div class=\"content\">"; } if (subscribe_to_feed($link, $feed_url, $cat_id)) { - print "Added feed."; + print "Subscribed to <b>$feed_url</b>."; } else { print "<div class=\"warning\"> - Feed <b>$feed_url</b> already exists in the database. + Already subscribed to <b>$feed_url</b>. </div>"; } - if ($p_from) { + if ($p_from != 'tt-rss') { $tt_uri = 'http://' . $_SERVER['SERVER_NAME'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]); - print "<p><a href='$tt_uri'>Return to Tiny Tiny RSS</a> or - <a href='javascript:window.close()'>close this window</a>.</p>"; + $tp_uri = 'http://' . $_SERVER['SERVER_NAME'] . + preg_replace('/backend\.php.*$/', + 'prefs.php', $_SERVER["REQUEST_URI"]); + + print "<p><a href='$tt_uri'>Return to Tiny Tiny RSS</a> |"; + + $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE + feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]); + + $feed_id = db_fetch_result($result, 0, "id"); + + if ($feed_id) { + print "<a href='$tp_uri?tab=feedConfig&subop=editFeed:$feed_id'> + Edit subscription options</a> | "; + } + + print "<a href='javascript:window.close()'>Close this window</a>.</p>"; - print "</body></html>"; + print "</div></body></html>"; return; } } |