summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2007-04-25 16:00:08 +0100
committerAndrew Dolgov <[email protected]>2007-04-25 16:00:08 +0100
commitf27de5153111f07ecfa6204baa2b77c93b48a09d (patch)
treea6e606e9458ef6c5915fb060c153beebc02c27d3 /modules
parentbce7001fd1f1c2f105e7ebe9d1b533cf553bb3c5 (diff)
add auth support to subscribe-to-feed dialog
Diffstat (limited to 'modules')
-rw-r--r--modules/popup-dialog.php13
-rw-r--r--modules/pref-feeds.php13
2 files changed, 22 insertions, 4 deletions
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index b69d36e2f..7eab1bae7 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -72,6 +72,19 @@
print "</div></td></tr>"; */
print "</table>";
+
+ print "<div id='fadd_login_prompt'><br/>
+ <a href='javascript:showBlockElement(\"fadd_login_container\",
+ \"fadd_login_prompt\")'>Click here if this feed requires authentication.</a></div>";
+
+ print "<div id='fadd_login_container'>
+ <table width='100%'>
+ <tr><td>Login:</td><td><input name='auth_login' class='iedit'></td></tr>
+ <tr><td>Password:</td><td><input type='password'
+ name='auth_pass' class='iedit'></td></tr>
+ </table>
+ </div>";
+
print "</form>";
print "<div align='right'>
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 61fc2167c..c11ce2aa3 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -425,9 +425,14 @@
if (!WEB_DEMO_MODE) {
- $feed_url = db_escape_string(trim($_POST["feed_url"]));
- $cat_id = db_escape_string($_POST["cat_id"]);
- $p_from = db_escape_string($_POST["from"]);
+ $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>
@@ -442,7 +447,7 @@
<div class=\"content\">";
}
- if (subscribe_to_feed($link, $feed_url, $cat_id)) {
+ 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));