diff options
| author | Andrew Dolgov <[email protected]> | 2012-01-26 13:48:14 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-01-26 13:48:14 +0400 |
| commit | aa60999b978f777f63e221b752b1011110f63bd0 (patch) | |
| tree | a0767a7a20eccd52a6e99e443b5d5ea4ba3d6e0d /include | |
| parent | ec418193a8320976f2553d0afac13b8203d29231 (diff) | |
allow subscribing to twitter feeds without oauth (if require auth checkbox is unset)
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/functions.php b/include/functions.php index 415047458..3ace20f86 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1843,14 +1843,6 @@ } /** - * Subscribes the user to the given feed - * - * @param resource $link Database connection - * @param string $url Feed URL to subscribe to - * @param integer $cat_id Category ID the feed shall be added to - * @param string $auth_login (optional) Feed username - * @param string $auth_pass (optional) Feed password - * * @return integer Status code: * 0 - OK, Feed already exists * 1 - OK, Feed added @@ -1862,7 +1854,7 @@ * 5 - Couldn't download the URL content. */ function subscribe_to_feed($link, $url, $cat_id = 0, - $auth_login = '', $auth_pass = '') { + $auth_login = '', $auth_pass = '', $need_auth = false) { require_once "include/rssfuncs.php"; @@ -1877,7 +1869,7 @@ $has_oauth = db_fetch_result($result, 0, 'twitter_oauth'); - if (!$has_oauth || strpos($url, '://api.twitter.com') === false) { + if (!$need_auth || !$has_oauth || strpos($url, '://api.twitter.com') === false) { if (!fetch_file_contents($url, false, $auth_login, $auth_pass)) return 5; if (url_is_html($url, $auth_login, $auth_pass)) { |