From 08ac193a414a72fab13934fac0303714a5a38d40 Mon Sep 17 00:00:00 2001 From: andre-hub Date: Sat, 15 Jan 2011 22:40:47 +0100 Subject: small fixes --- modules/pref-feeds.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 66902d441..7f1b029a1 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -930,19 +930,26 @@ case 0: print_warning(T_sprintf("Already subscribed to %s.", $feed_url)); break; + case 5: + print_error(T_sprintf("Could not subscribe to %s.
Can't download the Feed URL.", $feed_url)); + break; } if ($p_from != 'tt-rss') { + if (!isset($_SERVER['HTTPS'])) $_SERVER['HTTPS'] = 'off'; $tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]); $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]); - $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 ($rc <= 2){ + $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"); + } else { + $feed_id = 0; + } print "

"; if ($feed_id) { -- cgit v1.2.3