Updates migration of rss feeds with new format, updates rss feeds to …

…use new expRss info.
exponentcms · Apr 28, 2011 · c1b7b64 · c1b7b64
1 parent 1fed930
commit c1b7b64
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/framework/modules/migration/controllers/migrationController.php b/framework/modules/migration/controllers/migrationController.php
@@ -784,8 +784,11 @@ private function convert($iloc, $module, $hc=0) {
 						$newrss = new expRss();
 						$newrss->module = $loc->mod;
 						$newrss->src = $loc->src;
+						$newrss->enable_rss = $oldconfig->enable_rss;
 						$newrss->feed_title = $oldconfig->feed_title;
 						$newrss->feed_desc = $oldconfig->feed_desc;
+						$newrss->rss_limit = isset($oldconfig->rss_limit) ? $oldconfig->rss_limit : 24;
+						$newrss->rss_cachetime = isset($oldconfig->rss_cachetime) ? $oldconfig->rss_cachetime : 1440;
 						$newrss->save();
 					}
 				}
@@ -895,8 +898,11 @@ private function convert($iloc, $module, $hc=0) {
 						$newrss = new expRss();
 						$newrss->module = $loc->mod;
 						$newrss->src = $loc->src;
+						$newrss->enable_rss = $oldconfig->enable_rss;
 						$newrss->feed_title = $oldconfig->feed_title;
 						$newrss->feed_desc = $oldconfig->feed_desc;
+						$newrss->rss_limit = isset($oldconfig->rss_limit) ? $oldconfig->rss_limit : 24;
+						$newrss->rss_cachetime = isset($oldconfig->rss_cachetime) ? $oldconfig->rss_cachetime : 1440;
 						$newrss->save();
 					}
 					if ($newconfig != null) {
@@ -961,8 +967,11 @@ private function convert($iloc, $module, $hc=0) {
 						$newrss = new expRss();
 						$newrss->module = $loc->mod;
 						$newrss->src = $loc->src;
+						$newrss->enable_rss = $oldconfig->enable_rss;
 						$newrss->feed_title = $oldconfig->feed_title;
 						$newrss->feed_desc = $oldconfig->feed_desc;
+						$newrss->rss_limit = isset($oldconfig->rss_limit) ? $oldconfig->rss_limit : 24;
+						$newrss->rss_cachetime = isset($oldconfig->rss_cachetime) ? $oldconfig->rss_cachetime : 1440;
 						$newrss->save();
 					}					
 				}
@@ -1162,8 +1171,11 @@ private function convert($iloc, $module, $hc=0) {
 						$newrss = new expRss();
 						$newrss->module = $loc->mod;
 						$newrss->src = $loc->src;
+						$newrss->enable_rss = $oldconfig->enable_rss;
 						$newrss->feed_title = $oldconfig->feed_title;
 						$newrss->feed_desc = $oldconfig->feed_desc;
+						$newrss->rss_limit = isset($oldconfig->rss_limit) ? $oldconfig->rss_limit : 24;
+						$newrss->rss_cachetime = isset($oldconfig->rss_cachetime) ? $oldconfig->rss_cachetime : 1440;
 						$newrss->save();
 					}					
                 }

diff --git a/site_rss.php b/site_rss.php
@@ -24,17 +24,9 @@
 if (!defined('SYS_RSS')) include_once('core_rss.php');
 
 $site_rss = new expRss($_REQUEST);
-
-//FIXME: 
-// We need to add a site wide config to turn RSS on/off
-// and a site wide title & description as well..i'm hardcoding 
-// these for now.
-$config = new expConfig(exponent_core_makeLocation($_REQUEST['module'], $_REQUEST['src']));
-
-$config->enable_rss = true;
-$config->feed_title = empty($site_rss->feed_title) ? 'RSS for '.URL_FULL : $site_rss->feed_title;
-$config->feed_desc = empty($site_rss->feed_desc) ? 'This is the site wide RSS syndication for '.HOSTNAME : $site_rss->feed_desc;
-if (isset($config->config['rss_cachetime'])) { $ttl = $config->config['rss_cachetime']; }
+$site_rss->feed_title = empty($site_rss->feed_title) ? 'RSS for '.URL_FULL : $site_rss->feed_title;
+$site_rss->feed_desc = empty($site_rss->feed_desc) ? 'This is the site wide RSS syndication for '.HOSTNAME : $site_rss->feed_desc;
+if (isset($site_rss->rss_cachetime)) { $ttl = $site_rss->rss_cachetime; }
 if ($ttl == 0) { $ttl = 1440; }
 
 // $ic = explode(";", $config->config['itunes_cats']);
@@ -48,18 +40,18 @@
 	// $x++;
 // }
 
-if ($config->enable_rss == true) {
+if ($site_rss->enable_rss == true) {
 	$rss = new UniversalFeedCreator();
 	$rss->cssStyleSheet = "";
 //	$rss->useCached("PODCAST");
 	$rss->useCached();
-	$rss->title = $config->feed_title;
-	$rss->description = $config->feed_desc;
+	$rss->title = $site_rss->feed_title;
+	$rss->description = $site_rss->feed_desc;
 	$rss->ttl = $ttl;
 	$rss->link = "http://".HOSTNAME.PATH_RELATIVE;
 	$rss->syndicationURL = "http://".HOSTNAME.PATH_RELATIVE.$_SERVER['PHP_SELF'];
 	if ($_REQUEST['module'] == "filedownload") {
-		$rss->itunes->summary = $config->feed_desc;
+		$rss->itunes->summary = $site_rss->feed_desc;
 		$rss->itunes->author = ORGANIZATION_NAME;
 //		$rss->itunes->category = @$itunes_cats[0]->category;
 //		$rss->itunes->subcategory = @$itunes_cats[0]->subcategory;
@@ -77,8 +69,8 @@
 		if ($item->date > $pubDate) { $pubDate = $item->date; }
 		$rss->addItem($item);
 	}
-	if (isset($config->config['rss_limit']) && $config->config['rss_limit'] > 0) {
-		$rss->items = array_slice($rss->items, 0, $config->config['rss_limit']);
+	if (isset($site_rss->rss_limit) && $site_rss->rss_limit > 0) {
+		$rss->items = array_slice($rss->items, 0, $site_rss->rss_limit);
 	}
 	$rss->pubDate = $pubDate;