merge recent changes into HEAD

1 files changed, 21 insertions, 35 deletions

diff --git a/rss_error.php b/rss_error.php
index e3523ce..a76be9d 100644
--- a/rss_error.php
+++ b/rss_error.php
@@ -1,43 +1,29 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_rss/rss_error.php,v 1.3 2005/08/30 22:30:11 squareing Exp $
- *
- * Copyright (c) 2004 bitweaver.org
- * Copyright (c) 2003 tikwiki.org
- * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
- * All Rights Reserved. See copyright.txt for details and a complete list of authors.
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
- *
- * $Id: rss_error.php,v 1.3 2005/08/30 22:30:11 squareing Exp $
- * @package rss
- * @subpackage functions
+ * display an error message when there's something wrong.
+ * default $message is:
+ * "You don't have permission to view this syndication feed."
  */
 
-$feed = "Error Message";
-$title = "Tiki RSS Error Message"; // TODO: make configurable
-$desc = $errmsg; // TODO: make configurable
-$dateId = "last_modified";
-$titleId = "name";
-$desc_id = "description";
-$id = "errorMessage";
-$home ="";
-$output="";
-$now = $gBitSystem->getUTCTime();
-// get default rss feed version from database or set to 1.0 if none in there
-$rss_version = $gBitSystem->getPreference("rssfeed_default_version",1);
+// check permission to view the feed
+$rss->title = $gBitSystem->getPreference( 'title_rss_wiki', $gBitSystem->mPrefs['siteTitle'] );
+$rss->description = $gBitSystem->getPreference( 'desc_rss_wiki', $gBitSystem->mPrefs['siteTitle'].' - '.tra( 'RSS Feed' ) );
 
-// override version if set as request parameter
-if (isset($_REQUEST["ver"]))
-        if (substr($_REQUEST["ver"],0,1) == '2') {
-                $rss_version = 2;
-        } else $rss_version = 1;
+$item = new FeedItem();
+$item->title = tra( 'Syndication Problem' );
+$item->link = 'http://'.$_SERVER['HTTP_HOST'].BIT_ROOT_URL;
+$item->description = !empty( $message ) ? $message : tra( "You don't have permission to view this syndication feed." );
 
-$readrepl = "";
-//$changes=array("data"=>array("name"=>tra("Error"),"description"=>$errmsg,"last_modifiedied"=>$now));
-$changes=array("data"=>array());
-/**
- * jump to rss main page
- */
-require( RSS_PKG_URL.'rss.php' );
+$item->source = 'http://'.$_SERVER['HTTP_HOST'].BIT_ROOT_URL;
+$item->author = $gBitUser->getPreference( 'siteTitle' );
+
+$item->descriptionTruncSize = $gBitSystem->getPreference( 'rssfeed_truncate', 500 );
+$item->descriptionHtmlSyndicated = FALSE;
+
+// pass the item on to the rss feed creator
+$rss->addItem( $item );
+
+// display the error msg
+echo $rss->saveFeed( $rss_version_name, TEMP_PKG_PATH.'rss/error.xml' );
 die;
 ?>