From 304aadb907c5173b90f97812b4b2614b96e39c23 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 7 Sep 2012 10:23:46 +0400
Subject: remove twitter-specific code

---
 classes/pref/feeds.php | 37 -------------------------------------
 classes/rpc.php        | 11 +----------
 2 files changed, 1 insertion(+), 47 deletions(-)

(limited to 'classes')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 74ad97387..ef308ee1c 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -24,14 +24,6 @@ class Pref_Feeds extends Handler_Protected {
 		return;
 	}
 
-	function remtwitterinfo() {
-
-		db_query($this->link, "UPDATE ttrss_users SET twitter_oauth = NULL
-			WHERE id = " . $_SESSION['uid']);
-
-		return;
-	}
-
 	private function get_category_items($cat_id) {
 		$show_empty_cats = $_REQUEST['mode'] != 2 &&
 			get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS');
@@ -1603,35 +1595,6 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "</div>"; #pane
 
-		if (defined('CONSUMER_KEY') && CONSUMER_KEY != '') {
-
-			print "<div id=\"pref-feeds-twitter\" dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Twitter')."\">";
-
-			$result = db_query($this->link, "SELECT COUNT(*) AS cid FROM ttrss_users
-				WHERE twitter_oauth IS NOT NULL AND twitter_oauth != '' AND
-				id = " . $_SESSION['uid']);
-
-			$is_registered = db_fetch_result($result, 0, "cid") != 0;
-
-			if (!$is_registered) {
-				print_notice(__('Before you can update your Twitter feeds, you must register this instance of Tiny Tiny RSS with Twitter.com.'));
-			} else {
-				print_notice(__('You have been successfully registered with Twitter.com and should be able to access your Twitter feeds.'));
-			}
-
-			print "<button dojoType=\"dijit.form.Button\" onclick=\"window.location.href = 'twitter.php?op=register'\">".
-				__("Register with Twitter.com")."</button>";
-
-			print " ";
-
-			print "<button dojoType=\"dijit.form.Button\"
-				onclick=\"return clearTwitterCredentials()\">".
-				__("Clear stored credentials")."</button>";
-
-			print "</div>"; # pane
-
-		}
-
 		print "</div>"; #container
 
 	}
diff --git a/classes/rpc.php b/classes/rpc.php
index d9caae4db..db34a6c9d 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -790,10 +790,6 @@ class RPC extends Handler_Protected {
 		$pass = db_escape_string($_REQUEST['pass']);
 		$need_auth = db_escape_string($_REQUEST['need_auth']) != "";
 
-		$result = db_query($this->link, "SELECT twitter_oauth FROM ttrss_users
-WHERE id = ".$_SESSION['uid']);
-		$has_oauth = db_fetch_result($result, 0, 'twitter_oauth') != "";
-
 		foreach ($feeds as $feed) {
 			$feed = trim($feed);
 
@@ -801,12 +797,7 @@ WHERE id = ".$_SESSION['uid']);
 
 				db_query($this->link, "BEGIN");
 
-				if (!$need_auth || !$has_oauth || strpos($url, '://api.twitter.com')
-																=== false) {
-					$update_method = 0;
-				} else {
-					$update_method = 3;
-				}
+				$update_method = 0;
 
 				if ($cat_id == "0" || !$cat_id) {
 					$cat_qpart = "NULL";
-- 
cgit v1.2.3