diff options
author | andre-hub <[email protected]> | 2011-01-15 22:40:47 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-01-16 11:04:05 +0300 |
commit | 08ac193a414a72fab13934fac0303714a5a38d40 (patch) | |
tree | 2f7377cfb57a4c5f880aca083f92e6f0b212d65c | |
parent | 69de6b46b2eba1a02808fcb420745e985e97dbbb (diff) |
small fixes
-rw-r--r-- | functions.php | 4 | ||||
-rw-r--r-- | modules/pref-feeds.php | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/functions.php b/functions.php index 7c5a306af..4737e60ee 100644 --- a/functions.php +++ b/functions.php @@ -4436,13 +4436,13 @@ <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>"; } - function format_notice($msg) { + function format_notice($msg, $id = "") { global $link; return "<div class=\"notice\" id=\"$id\"> <img src=\"".theme_image($link, "images/sign_info.png")."\">$msg</div>"; } - function format_error($msg) { + function format_error($msg, $id = "") { global $link; return "<div class=\"error\" id=\"$id\"> <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>"; 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 <b>%s</b>.", $feed_url)); break; + case 5: + print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>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 "<p>"; if ($feed_id) { |