public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-14 20:15:57 +00:00
Code Issues Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
andre-hub
2011-01-15 22:40:47 +01:00
committed by Andrew Dolgov
parent 69de6b46b2
commit 08ac193a41
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
functions.php
View File

@@ -4436,13 +4436,13 @@
<img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>"; <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
} }
function format_notice($msg) { function format_notice($msg, $id = "") {
global $link; global $link;
return "<div class=\"notice\" id=\"$id\"> return "<div class=\"notice\" id=\"$id\">
<img src=\"".theme_image($link, "images/sign_info.png")."\">$msg</div>"; <img src=\"".theme_image($link, "images/sign_info.png")."\">$msg</div>";
} }
function format_error($msg) { function format_error($msg, $id = "") {
global $link; global $link;
return "<div class=\"error\" id=\"$id\"> return "<div class=\"error\" id=\"$id\">
<img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>"; <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";

9
modules/pref-feeds.php
View File

@@ -930,19 +930,26 @@
case 0: case 0:
print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url)); print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
break; 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 ($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"]); $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"]); $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]);
if ($rc <= 2){
$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]); feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
$feed_id = db_fetch_result($result, 0, "id"); $feed_id = db_fetch_result($result, 0, "id");
} else {
$feed_id = 0;
}
print "<p>"; print "<p>";
if ($feed_id) { if ($feed_id) {