remove twitter-specific code

3 files changed, 14 insertions, 80 deletions

diff --git a/include/functions.php b/include/functions.php
index 2924d1796..b9383790b 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1782,32 +1782,20 @@
 
 		$update_method = 0;
 
-		$result = db_query($link, "SELECT twitter_oauth FROM ttrss_users
-			WHERE id = ".$_SESSION['uid']);
+		if (!fetch_file_contents($url, false, $auth_login, $auth_pass))
+			return array("code" => 5, "message" => $fetch_last_error);
 
-		$has_oauth = db_fetch_result($result, 0, 'twitter_oauth');
-
-		if (!$need_auth || !$has_oauth || strpos($url, '://api.twitter.com') === false) {
-			if (!fetch_file_contents($url, false, $auth_login, $auth_pass))
-				return array("code" => 5, "message" => $fetch_last_error);
-
-			if (url_is_html($url, $auth_login, $auth_pass)) {
-				$feedUrls = get_feeds_from_html($url, $auth_login, $auth_pass);
-				if (count($feedUrls) == 0) {
-					return array("code" => 3);
-				} else if (count($feedUrls) > 1) {
-					return array("code" => 4);
-				}
-				//use feed url as new URL
-				$url = key($feedUrls);
+		if (url_is_html($url, $auth_login, $auth_pass)) {
+			$feedUrls = get_feeds_from_html($url, $auth_login, $auth_pass);
+			if (count($feedUrls) == 0) {
+				return array("code" => 3);
+			} else if (count($feedUrls) > 1) {
+				return array("code" => 4);
 			}
+			//use feed url as new URL
+			$url = key($feedUrls);
+		}
 
-			} else {
-				if (!fetch_twitter_rss($link, $url, $_SESSION['uid']))
-					return array("code" => 5);
-
-				$update_method = 3;
-			}
 		if ($cat_id == "0" || !$cat_id) {
 			$cat_qpart = "NULL";
 		} else {
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 47e0c68f3..925983657 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -157,58 +157,6 @@
 
 	} // function update_daemon_common
 
-	function fetch_twitter_rss($link, $url, $owner_uid) {
-
-		require_once 'lib/tmhoauth/tmhOAuth.php';
-		require_once "lib/magpierss/rss_fetch.inc";
-		require_once 'lib/magpierss/rss_utils.inc';
-
-		$result = db_query($link, "SELECT twitter_oauth FROM ttrss_users
-			WHERE id = $owner_uid");
-
-		$access_token = json_decode(db_fetch_result($result, 0, 'twitter_oauth'), true);
-		$url_escaped = db_escape_string($url);
-
-		if ($access_token) {
-
-			$tmhOAuth = new tmhOAuth(array(
-				'consumer_key'    => CONSUMER_KEY,
-				'consumer_secret' => CONSUMER_SECRET,
-				'user_token' => $access_token['oauth_token'],
-				'user_secret' => $access_token['oauth_token_secret'],
-			));
-
-			$code = $tmhOAuth->request('GET', $url,
-				convertUrlQuery(parse_url($url, PHP_URL_QUERY)));
-
-			if ($code == 200) {
-
-				$content = $tmhOAuth->response['response'];
-
-				define('MAGPIE_CACHE_ON', false);
-
-				$rss = new MagpieRSS($content, MAGPIE_OUTPUT_ENCODING,
-					MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
-
-				return $rss;
-
-			} else {
-
-				db_query($link, "UPDATE ttrss_feeds
-					SET last_error = 'OAuth authorization failed ($code).'
-					WHERE feed_url = '$url_escaped' AND owner_uid = $owner_uid");
-			}
-
-		} else {
-
-			db_query($link, "UPDATE ttrss_feeds
-				SET last_error = 'OAuth information not found.'
-				WHERE feed_url = '$url_escaped' AND owner_uid = $owner_uid");
-
-			return false;
-		}
-	}
-
 	function update_rss_feed($link, $feed, $ignore_daemon = false, $no_cache = false,
 		$override_url = false) {
 
@@ -317,9 +265,7 @@
 		$cache_age = (is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ?
 			-1 : get_feed_update_interval($link, $feed) * 60;
 
-		if ($update_method == 3) {
-			$rss = fetch_twitter_rss($link, $fetch_url, $owner_uid);
-		} else if ($update_method == 1) {
+		if ($update_method == 1) {
 
 			define('MAGPIE_CACHE_AGE', $cache_age);
 			define('MAGPIE_CACHE_ON', !$no_cache);
diff --git a/include/sanity_config.php b/include/sanity_config.php
index a414265f5..c0626243d 100644
--- a/include/sanity_config.php
+++ b/include/sanity_config.php
@@ -1,3 +1,3 @@
-<?php # This file has been generated at:  Thu Aug 23 23:48:15 MSK 2012
+<?php # This file has been generated at:  Fri Sep 7 10:20:51 MSK 2012
 define('GENERATED_CONFIG_CHECK', 26);
-$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_MODULES', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'DEFAULT_UPDATE_METHOD', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_HOST', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CONSUMER_KEY', 'CONSUMER_SECRET', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'FEEDBACK_URL', 'ARTICLE_BUTTON_PLUGINS', 'CONFIG_VERSION'); ?>
+$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_MODULES', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'DEFAULT_UPDATE_METHOD', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_HOST', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'FEEDBACK_URL', 'ARTICLE_BUTTON_PLUGINS', 'CONFIG_VERSION'); ?>