summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-01-26 13:48:14 +0400
committerAndrew Dolgov <[email protected]>2012-01-26 13:48:14 +0400
commitaa60999b978f777f63e221b752b1011110f63bd0 (patch)
treea0767a7a20eccd52a6e99e443b5d5ea4ba3d6e0d /classes
parentec418193a8320976f2553d0afac13b8203d29231 (diff)
allow subscribing to twitter feeds without oauth (if require auth checkbox is unset)
Diffstat (limited to 'classes')
-rw-r--r--classes/dlg.php5
-rw-r--r--classes/rpc.php3
2 files changed, 5 insertions, 3 deletions
diff --git a/classes/dlg.php b/classes/dlg.php
index 55eb5e37e..cd098d396 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -284,12 +284,13 @@ class Dlg extends Protected_Handler {
" <input
placeHolder=\"".__("Password")."\"
dojoType=\"dijit.form.TextBox\" type='password'
- style=\"width : 10em;\" name='pass'\">
+ style=\"width : 10em;\" name='pass'\">".
+ " <p class='insensitive'>".__("OAuth will be used automatically for Twitter feeds.")."</p>
</div></div>";
print "<div style=\"clear : both\">
- <input type=\"checkbox\" dojoType=\"dijit.form.CheckBox\" id=\"feedDlg_loginCheck\"
+ <input type=\"checkbox\" name=\"need_auth\" dojoType=\"dijit.form.CheckBox\" id=\"feedDlg_loginCheck\"
onclick='checkboxToggleElement(this, \"feedDlg_loginContainer\")'>
<label for=\"feedDlg_loginCheck\">".
__('This feed requires authentication.')."</div>";
diff --git a/classes/rpc.php b/classes/rpc.php
index 1da3a14ec..58e25a456 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -188,8 +188,9 @@ class RPC extends Protected_Handler {
$cat = db_escape_string($_REQUEST['cat']);
$login = db_escape_string($_REQUEST['login']);
$pass = db_escape_string($_REQUEST['pass']);
+ $need_auth = db_escape_string($_REQUEST['need_auth']) != "";
- $rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass);
+ $rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass, $need_auth);
print json_encode(array("result" => $rc));
}