remove memcached stuff

1 files changed, 31 insertions, 67 deletions

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index c86c36773..12c4a57d2 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -209,34 +209,13 @@
 		}
 	}
 
-	function update_rss_feed($link, $feed, $ignore_daemon = false, $no_cache = false) {
-
-		global $memcache;
-
-		/* Update all feeds with the same URL to utilize memcache */
-
-		if ($memcache) {
-			$result = db_query($link, "SELECT f1.id
-				FROM ttrss_feeds AS f1, ttrss_feeds AS f2
-				WHERE	f2.feed_url = f1.feed_url AND f2.id = '$feed'");
-
-			while ($line = db_fetch_assoc($result)) {
-				update_rss_feed_real($link, $line["id"], $ignore_daemon, $no_cache);
-			}
-		} else {
-			update_rss_feed_real($link, $feed, $ignore_daemon, $no_cache);
-		}
-	}
-
-	function update_rss_feed_real($link, $feed, $ignore_daemon = false, $no_cache = false,
+	function update_rss_feed($link, $feed, $ignore_daemon = false, $no_cache = false,
 		$override_url = false) {
 
 		require_once "lib/simplepie/simplepie.inc";
 		require_once "lib/magpierss/rss_fetch.inc";
 		require_once 'lib/magpierss/rss_utils.inc';
 
-		global $memcache;
-
 		$debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
 
 		if (!$_REQUEST["daemon"] && !$ignore_daemon) {
@@ -334,62 +313,47 @@
 			_debug("update_rss_feed: fetching [$fetch_url]...");
 		}
 
-		$obj_id = md5("FDATA:$use_simplepie:$fetch_url");
+		// Ignore cache if new feed or manual update.
+		$cache_age = (is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ?
+			-1 : get_feed_update_interval($link, $feed) * 60;
 
-		if ($memcache && $obj = $memcache->get($obj_id)) {
-
-			if ($debug_enabled) {
-				_debug("update_rss_feed: data found in memcache.");
-			}
+		if ($update_method == 3) {
+			$rss = fetch_twitter_rss($link, $fetch_url, $owner_uid);
+		} else if ($update_method == 1) {
 
-			$rss = $obj;
+			define('MAGPIE_CACHE_AGE', $cache_age);
+			define('MAGPIE_CACHE_ON', !$no_cache);
+			define('MAGPIE_FETCH_TIME_OUT', 60);
+			define('MAGPIE_CACHE_DIR', CACHE_DIR . "/magpie");
 
+			$rss = @fetch_rss($fetch_url);
 		} else {
+			$simplepie_cache_dir = CACHE_DIR . "/simplepie";
 
-			// Ignore cache if new feed or manual update.
-			$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) {
-
-				define('MAGPIE_CACHE_AGE', $cache_age);
-				define('MAGPIE_CACHE_ON', !$no_cache);
-				define('MAGPIE_FETCH_TIME_OUT', 60);
-				define('MAGPIE_CACHE_DIR', CACHE_DIR . "/magpie");
-
-				$rss = @fetch_rss($fetch_url);
-			} else {
-				$simplepie_cache_dir = CACHE_DIR . "/simplepie";
-
-				if (!is_dir($simplepie_cache_dir)) {
-					mkdir($simplepie_cache_dir);
-				}
-
-				$rss = new SimplePie();
-				$rss->set_useragent(SELF_USER_AGENT);
-	#			$rss->set_timeout(10);
-				$rss->set_feed_url($fetch_url);
-				$rss->set_output_encoding('UTF-8');
-				//$rss->force_feed(true);
+			if (!is_dir($simplepie_cache_dir)) {
+				mkdir($simplepie_cache_dir);
+			}
 
-				if ($debug_enabled) {
-					_debug("feed update interval (sec): " .
-						get_feed_update_interval($link, $feed)*60);
-				}
+			$rss = new SimplePie();
+			$rss->set_useragent(SELF_USER_AGENT);
+#			$rss->set_timeout(10);
+			$rss->set_feed_url($fetch_url);
+			$rss->set_output_encoding('UTF-8');
+			//$rss->force_feed(true);
 
-				$rss->enable_cache(!$no_cache);
+			if ($debug_enabled) {
+				_debug("feed update interval (sec): " .
+					get_feed_update_interval($link, $feed)*60);
+			}
 
-				if (!$no_cache) {
-					$rss->set_cache_location($simplepie_cache_dir);
-					$rss->set_cache_duration($cache_age);
-				}
+			$rss->enable_cache(!$no_cache);
 
-				$rss->init();
+			if (!$no_cache) {
+				$rss->set_cache_location($simplepie_cache_dir);
+				$rss->set_cache_duration($cache_age);
 			}
 
-			if ($memcache && $rss) $memcache->add($obj_id, $rss, 0, 300);
+			$rss->init();
 		}
 
 //		print_r($rss);