diff options
| author | Andrew Dolgov <[email protected]> | 2010-01-13 12:48:49 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2010-01-13 12:48:49 +0300 |
| commit | a5819bb35d94e318d3d221dd7bbc4bea36c24ef0 (patch) | |
| tree | 18d5effb206f985d16a4629eeca7ff68d6230743 /modules/pref-feeds.php | |
| parent | 542aebacb73d9fe571048d01d9ffc12d4bca1643 (diff) | |
code cleanup; remove unnecessary callbacks; rework subscribtion dialog
Diffstat (limited to 'modules/pref-feeds.php')
| -rw-r--r-- | modules/pref-feeds.php | 116 |
1 files changed, 53 insertions, 63 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index c1190b549..9d33461af 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -819,67 +819,71 @@ } if ($subop == "add") { - - if (!WEB_DEMO_MODE) { - $feed_url = db_escape_string(trim($_REQUEST["feed_url"])); - $cat_id = db_escape_string($_REQUEST["cat_id"]); - $p_from = db_escape_string($_REQUEST["from"]); - - /* only read authentication information from POST */ - - $auth_login = db_escape_string(trim($_POST["auth_login"])); - $auth_pass = db_escape_string(trim($_POST["auth_pass"])); - - if ($p_from != 'tt-rss') { - print "<html> - <head> - <title>Tiny Tiny RSS</title> - <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\"> - </head> - <body> - <img class=\"floatingLogo\" src=\"images/ttrss_logo.png\" - alt=\"Tiny Tiny RSS\"/> - <h1>Subscribe to feed...</h1>"; - } + $feed_url = db_escape_string(trim($_REQUEST["feed_url"])); + $cat_id = db_escape_string($_REQUEST["cat_id"]); + $p_from = db_escape_string($_REQUEST["from"]); - if (subscribe_to_feed($link, $feed_url, $cat_id, $auth_login, $auth_pass)) { - print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url)); - } else { - print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url)); - } + /* only read authentication information from POST */ - if ($p_from != 'tt-rss') { - $tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]); + $auth_login = db_escape_string(trim($_POST["auth_login"])); + $auth_pass = db_escape_string(trim($_POST["auth_pass"])); + if ($p_from != 'tt-rss') { + print "<html> + <head> + <title>Tiny Tiny RSS</title> + <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\"> + </head> + <body> + <img class=\"floatingLogo\" src=\"images/ttrss_logo.png\" + alt=\"Tiny Tiny RSS\"/> + <h1>Subscribe to feed...</h1>"; + } - $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]); + $rc = subscribe_to_feed($link, $feed_url, $cat_id, $auth_login, $auth_pass); + + switch ($rc) { + case 1: + print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url)); + break; + case 2: + print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url)); + break; + case 0: + print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url)); + break; + } - $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE - feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]); + if ($p_from != 'tt-rss') { + $tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]); - $feed_id = db_fetch_result($result, 0, "id"); - print "<p>"; + $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]); - if ($feed_id) { - print "<form method=\"GET\" style='display: inline' - action=\"$tp_uri\"> - <input type=\"hidden\" name=\"tab\" value=\"feedConfig\"> - <input type=\"hidden\" name=\"subop\" value=\"editFeed\"> - <input type=\"hidden\" name=\"subopparam\" value=\"$feed_id\"> - <input type=\"submit\" value=\"".__("Edit subscription options")."\"> - </form>"; - } + $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE + feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]); - print "<form style='display: inline' method=\"GET\" action=\"$tt_uri\"> - <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> - </form></p>"; + $feed_id = db_fetch_result($result, 0, "id"); - print "</body></html>"; - return; + print "<p>"; + + if ($feed_id) { + print "<form method=\"GET\" style='display: inline' + action=\"$tp_uri\"> + <input type=\"hidden\" name=\"tab\" value=\"feedConfig\"> + <input type=\"hidden\" name=\"subop\" value=\"editFeed\"> + <input type=\"hidden\" name=\"subopparam\" value=\"$feed_id\"> + <input type=\"submit\" value=\"".__("Edit subscription options")."\"> + </form>"; } + print "<form style='display: inline' method=\"GET\" action=\"$tt_uri\"> + <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> + </form></p>"; + + print "</body></html>"; + return; } } @@ -1358,21 +1362,6 @@ print "<p>"; -/* print "<div id=\"feedOpToolbar\">"; - - if (get_pref($link, 'ENABLE_FEED_CATS')) { - - print __('Selection:') . " "; - - print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled"); - - print " <input type=\"submit\" class=\"button\" disabled=\"true\" - onclick=\"javascript:categorizeSelectedFeeds()\" value=\"". - __('Recategorize')."\">"; - } - - print "</div>"; */ - } else { print "<p>"; @@ -1538,4 +1527,5 @@ return $feedctr; } + ?> |