merge recent changes into HEAD

4 files changed, 60 insertions, 7 deletions

diff --git a/BitBook.php b/BitBook.php
index 38ecd9d..ba4234d 100644
--- a/BitBook.php
+++ b/BitBook.php
@@ -1,9 +1,9 @@
-<?
+<?php
 /**
  * BitBook class
  *
  * @author   spider <spider@steelsun.com>
- * @version  $Revision: 1.2 $
+ * @version  $Revision: 1.3 $
  * @package  wiki
  */
 // +----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
 // | Authors: spider <spider@steelsun.com>
 // +----------------------------------------------------------------------+
 //
-// $Id: BitBook.php,v 1.2 2005/06/28 07:46:27 spiderr Exp $
+// $Id: BitBook.php,v 1.3 2005/10/23 14:44:19 squareing Exp $
 
 
 /**
@@ -34,7 +34,7 @@ define('BITBOOK_CONTENT_TYPE_GUID', 'bitbook' );
  *
  * @abstract
  * @author   spider <spider@steelsun.com>
- * @version  $Revision: 1.2 $
+ * @version  $Revision: 1.3 $
  * @package  wiki
  * @subpackage BitBook
  */
diff --git a/BitPage.php b/BitPage.php
index 406286f..de5107c 100644
--- a/BitPage.php
+++ b/BitPage.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_wiki/BitPage.php,v 1.10 2005/10/12 15:14:13 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_wiki/BitPage.php,v 1.11 2005/10/23 14:44:19 squareing Exp $
  * @package wiki
  *
  * @author spider <spider@steelsun.com>
  *
- * @version $Revision: 1.10 $ $Date: 2005/10/12 15:14:13 $ $Author: spiderr $
+ * @version $Revision: 1.11 $ $Date: 2005/10/23 14:44:19 $ $Author: squareing $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -13,7 +13,7 @@
  * 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: BitPage.php,v 1.10 2005/10/12 15:14:13 spiderr Exp $
+ * $Id: BitPage.php,v 1.11 2005/10/23 14:44:19 squareing Exp $
  */
 
 /**
@@ -604,6 +604,10 @@ class BitPage extends LibertyAttachable {
 				// if rollback can destroy the current page version, it can be used
 				// maliciously
 				$res['force_history'] = 1;
+				// JHT 2005-10-16_22:21:10
+				// title must be set or store fails
+				// we use current page name
+				$res['title'] = $this->mPageName;
 				if( $this->store( $res ) ) {
 					$action = "Changed actual version to $pVersion";
 					$t = $gBitSystem->getUTCTime();
diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
new file mode 100644
index 0000000..705d959
--- /dev/null
+++ b/templates/header_inc.tpl
@@ -0,0 +1,6 @@
+{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/header_inc.tpl,v 1.2 2005/10/23 14:44:19 squareing Exp $ *}
+{strip}
+{if $gBitSystem->isPackageActive( 'rss' ) and $smarty.const.ACTIVE_PACKAGE eq 'wiki' and $gBitUser->hasPermission( 'bit_p_view' )}
+	<link rel="alternate" type="application/rss+xml" title="{$siteTitle} - wiki" href="{$smarty.const.WIKI_PKG_URL}wiki_rss.php" />
+{/if}
+{/strip}
diff --git a/wiki_rss.php b/wiki_rss.php
new file mode 100644
index 0000000..53f33f3
--- /dev/null
+++ b/wiki_rss.php
@@ -0,0 +1,43 @@
+<?php
+require_once( "../bit_setup_inc.php" );
+require_once( RSS_PKG_PATH."rss_inc.php" );
+require_once( WIKI_PKG_PATH."BitPage.php" );
+
+$gBitSystem->verifyPackage( 'wiki' );
+$gBitSystem->verifyPackage( 'rss' );
+
+$rss->title = $gBitSystem->getPreference( 'title_rss_wiki', $gBitSystem->mPrefs['siteTitle'] );
+$rss->description = $gBitSystem->getPreference( 'desc_rss_wiki', $gBitSystem->mPrefs['siteTitle'].' - '.tra( 'RSS Feed' ) );
+
+// check permission to view wiki pages
+if( !$gBitUser->hasPermission( 'bit_p_view' ) ) {
+	require_once( RSS_PKG_PATH."rss_error.php" );
+} else {
+	$wiki = new BitPage();
+	$feeds = $wiki->getList( 0, $gBitSystem->getPreference( 'max_rss_wiki', 10 ), 'last_modified_desc');
+	$feeds = $feeds['data'];
+
+	// get all the data ready for the feed creator
+	foreach( $feeds as $feed ) {
+		$item = new FeedItem();
+		$item->title = $feed['title'];
+		$item->link = 'http://'.$_SERVER['HTTP_HOST'].BIT_ROOT_URL.$wiki->getDisplayUrl( $feed['title'] );
+		$item->description = $feed['description']."\n\n".$feed['comment'];
+
+		$item->date = (int) $feed['last_modified'];
+		$item->source = 'http://'.$_SERVER['HTTP_HOST'].BIT_ROOT_URL;
+		$item->author = $gBitUser->getDisplayName( FALSE, array( 'real_name' => $feed['modifier_real_name'], 'login' => $feed['modifier_user'] ) );
+
+		$item->descriptionTruncSize = $gBitSystem->getPreference( 'rssfeed_truncate', 500 );
+		$item->descriptionHtmlSyndicated = FALSE;
+
+		// pass the item on to the rss feed creator
+		$rss->addItem( $item );
+	}
+
+	// finally we are ready to serve the data
+	$cacheFile = TEMP_PKG_PATH.'rss/wiki_'.$version.'.xml';
+	$rss->useCached( $cacheFile ); // use cached version if age < 1 hour
+	echo $rss->saveFeed( $rss_version_name, $cacheFile );
+}
+?>