merge recent changes into HEAD

4 files changed, 170 insertions, 210 deletions

diff --git a/admin/admin_rss_inc.php b/admin/admin_rss_inc.php
index 82fa4fb..1725a58 100644
--- a/admin/admin_rss_inc.php
+++ b/admin/admin_rss_inc.php
@@ -1,33 +1,26 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_rss/admin/admin_rss_inc.php,v 1.2 2005/08/01 18:41:19 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_rss/admin/admin_rss_inc.php,v 1.3 2005/10/23 14:41:54 squareing Exp $
 
 // 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.
 
-foreach( array_keys( $gBitSystem->mPrefs ) as $rss_feed ) {
-	if( preg_match( "/^rss_/",$rss_feed ) ) {
-		$rss_name = preg_replace( "/rss_/","",$rss_feed );
-		$formRSSFeeds[$rss_feed] = array(
-			'label' => $rss_name,
-			'note' => '',
+foreach( $gBitSystem->mPackages as $pkg => $pkgInfo ) {
+	if( is_file( $pkgInfo['path'].$pkg.'_rss.php' ) ) {
+		$formRSSFeeds['rss_'.$pkg] = array(
+			'label' => $pkg,
 		);
 	}
 }
-$gBitSmarty->assign( "formRSSFeeds",$formRSSFeeds );
+$gBitSmarty->assign( "formRSSFeeds", $formRSSFeeds );
 
 $formRSSSettings = array(
 	'rssfeed_language' => array(
 		'label' => 'Language',
 	),
-	'rssfeed_publisher' => array(
-		'label' => 'Publisher',
-		'note' => 'RDF 1.0',
-	),
 	'rssfeed_creator' => array(
 		'label' => 'Creator',
-		'note' => 'RDF 1.0',
 	),
 	'rssfeed_editor' => array(
 		'label' => 'Editor',
@@ -38,16 +31,27 @@ $formRSSSettings = array(
 		'note' => 'Email address for person responsible for technical issues relating to channel. For RDF 2.0',
 	),
 	'rssfeed_image_url' => array(
-		'label' => 'Enter the full URL to an image that you want to associate with your RSS channels',
+		'label' => 'Image URL',
+		'note' => 'Enter the full URL to an image that you want to associate with your RSS channels',
 	),
 );
 $gBitSmarty->assign( "formRSSSettings",$formRSSSettings );
 
-$processForm = set_tab();
-
-if( $processForm ) {
-	
+$feedTypes = array(
+	0 => "RSS 0.91",
+	1 => "RSS 1.0",
+	2 => "RSS 2.0",
+	3 => "PIE 0.1",
+	4 => "MBOX",
+	5 => "ATOM",
+	6 => "ATOM 0.3",
+	7 => "OPML",
+	8 => "HTML",
+	9 => "JS",
+);
+$gBitSmarty->assign( "feedTypes",$feedTypes );
 
+if( !empty( $_REQUEST['feed_settings'] ) ) {
 	// save package specific RSS feed settings
 	foreach( array_keys( $formRSSFeeds ) as $item ) {
 		simple_set_toggle( $item );
@@ -57,11 +61,9 @@ if( $processForm ) {
 	}
 	
 	// deal with the RSS settings
-	simple_set_toggle( 'rssfeed_css' );
 	foreach( array_keys( $formRSSSettings ) as $item ) {
 		simple_set_value( $item );
 	}
 	simple_set_value( 'rssfeed_default_version' );
 }
-
 ?>
diff --git a/admin/admin_rssmodules.php b/admin/admin_rssmodules.php
new file mode 100644
index 0000000..78278b8
--- /dev/null
+++ b/admin/admin_rssmodules.php
@@ -0,0 +1,142 @@
+<?php
+
+// $Header: /cvsroot/bitweaver/_bit_rss/admin/admin_rssmodules.php,v 1.2 2005/10/23 14:41:54 squareing Exp $
+
+// 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.
+
+// Initialization
+require_once( '../../bit_setup_inc.php' );
+include_once( RSS_PKG_PATH.'rss_lib.php' );
+
+if( !isset( $rsslib ) ) {
+	$rsslib = new RssLib();
+}
+
+$gBitSystem->verifyPermission( 'bit_p_admin' );
+
+if( !isset( $_REQUEST["rss_id"] ) ) {
+	$_REQUEST["rss_id"] = 0;
+}
+
+$gBitSmarty->assign( 'rss_id', $_REQUEST["rss_id"] );
+
+if( isset( $_REQUEST["view"] ) ) {
+	$data = $rsslib->get_rss_module_content( $_REQUEST["view"] );
+	$items = $rsslib->parse_rss_data( $data, $_REQUEST["rss_id"] );
+
+	$gBitSmarty->assign_by_ref( 'items', $items );
+}
+
+if( $_REQUEST["rss_id"] ) {
+	$info = $rsslib->get_rss_module( $_REQUEST["rss_id"] );
+} else {
+	$info = array();
+
+	$info["name"] = '';
+	$info["description"] = '';
+	$info["url"] = '';
+	$info["refresh"] = 900;
+	$info["show_title"] = 'n';
+	$info["show_pub_date"] = 'n';
+}
+
+$gBitSmarty->assign('name', $info["name"]);
+$gBitSmarty->assign('description', $info["description"]);
+$gBitSmarty->assign('url', $info["url"]);
+$gBitSmarty->assign('refresh', $info["refresh"]);
+$gBitSmarty->assign('show_title', $info["show_title"]);
+$gBitSmarty->assign('show_pub_date', $info["show_pub_date"]);
+
+if (isset($_REQUEST["remove"])) {
+	
+	$rsslib->remove_rss_module($_REQUEST["remove"]);
+}
+
+if (isset($_REQUEST["save"])) {
+	
+
+	if (isset($_REQUEST['show_title']) == 'on') {
+		$gBitSmarty->assign('show_title', 'y');
+		$info["show_title"] = 'y';
+	}
+	else
+	{
+		$gBitSmarty->assign('show_title', 'n');
+		$info["show_title"] = 'n';
+	}
+	if (isset($_REQUEST['show_pub_date']) == 'on') {
+		$gBitSmarty->assign('show_pub_date', 'y');
+		$info["show_pub_date"] = 'y';
+	}
+	else
+	{
+		$gBitSmarty->assign('show_pub_date', 'n');
+		$info["show_pub_date"] = 'n';
+	}
+
+	$rsslib->replace_rss_module($_REQUEST["rss_id"], $_REQUEST["name"], $_REQUEST["description"], $_REQUEST["url"], $_REQUEST["refresh"], $info["show_title"], $info["show_pub_date"]);
+
+	$gBitSmarty->assign('rss_id', 0);
+	$gBitSmarty->assign('name', '');
+	$gBitSmarty->assign('description', '');
+	$gBitSmarty->assign('url', '');
+	$gBitSmarty->assign('refresh', 900);
+	$gBitSmarty->assign('show_title', 'n');
+	$gBitSmarty->assign('show_pub_date', 'n');
+}
+
+if ( empty( $_REQUEST["sort_mode"] ) ) {
+	$sort_mode = 'name_desc';
+} else {
+	$sort_mode = $_REQUEST["sort_mode"];
+}
+
+if (!isset($_REQUEST["offset"])) {
+	$offset = 0;
+} else {
+	$offset = $_REQUEST["offset"];
+}
+if (isset($_REQUEST['page'])) {
+	$page = &$_REQUEST['page'];
+	$offset = ($page - 1) * $maxRecords;
+}
+$gBitSmarty->assign_by_ref('offset', $offset);
+
+if (isset($_REQUEST["find"])) {
+	$find = $_REQUEST["find"];
+} else {
+	$find = '';
+}
+
+$gBitSmarty->assign('find', $find);
+
+$gBitSmarty->assign_by_ref('sort_mode', $sort_mode);
+$channels = $rsslib->list_rss_modules($offset, $maxRecords, $sort_mode, $find);
+
+$cant_pages = ceil($channels["cant"] / $maxRecords);
+$gBitSmarty->assign_by_ref('cant_pages', $cant_pages);
+$gBitSmarty->assign('actual_page', 1 + ($offset / $maxRecords));
+
+if ($channels["cant"] > ($offset + $maxRecords)) {
+	$gBitSmarty->assign('next_offset', $offset + $maxRecords);
+} else {
+	$gBitSmarty->assign('next_offset', -1);
+}
+
+// If offset is > 0 then prev_offset
+if ($offset > 0) {
+	$gBitSmarty->assign('prev_offset', $offset - $maxRecords);
+} else {
+	$gBitSmarty->assign('prev_offset', -1);
+}
+
+$gBitSmarty->assign_by_ref('channels', $channels["data"]);
+
+
+// Display the template
+$gBitSystem->display( 'bitpackage:rss/admin_rssmodules.tpl');
+
+?>
+
diff --git a/admin/index.php b/admin/index.php
index 8ee9116..3e305fe 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,152 +1,6 @@
-<?php
+<?php 
 
-// $Header: /cvsroot/bitweaver/_bit_rss/admin/index.php,v 1.2 2005/08/01 18:41:20 squareing Exp $
+	// This is not a package.
+	header ("location: ../index.php");
 
-// 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.
-
-// Initialization
-require_once( '../../bit_setup_inc.php' );
-
-include_once( RSS_PKG_PATH.'rss_lib.php' );
-
-if (!isset($rsslib)) {
-	$rsslib = new RssLib();
-}
-
-if (!$gBitUser->isAdmin()) {
-	$gBitSmarty->assign('msg', tra("You dont have permission to use this feature"));
-
-	$gBitSystem->display( 'error.tpl' );
-	die;
-}
-
-if (!isset($_REQUEST["rss_id"])) {
-	$_REQUEST["rss_id"] = 0;
-}
-
-$gBitSmarty->assign('rss_id', $_REQUEST["rss_id"]);
-
-$gBitSmarty->assign('preview', 'n');
-
-if (isset($_REQUEST["view"])) {
-	$gBitSmarty->assign('preview', 'y');
-
-	$data = $rsslib->get_rss_module_content($_REQUEST["view"]);
-	$items = $rsslib->parse_rss_data($data, $_REQUEST["rss_id"]);
-
-	$gBitSmarty->assign_by_ref('items', $items);
-}
-
-if ($_REQUEST["rss_id"]) {
-	$info = $rsslib->get_rss_module($_REQUEST["rss_id"]);
-} else {
-	$info = array();
-
-  // default for new rss feed:
-	$info["name"] = '';
-	$info["description"] = '';
-	$info["url"] = '';
-	$info["refresh"] = 1;
-	$info["show_title"] = 'n';
-	$info["show_pub_date"] = 'n';
-}
-
-$gBitSmarty->assign('name', $info["name"]);
-$gBitSmarty->assign('description', $info["description"]);
-$gBitSmarty->assign('url', $info["url"]);
-$gBitSmarty->assign('refresh', $info["refresh"]);
-$gBitSmarty->assign('show_title', $info["show_title"]);
-$gBitSmarty->assign('show_pub_date', $info["show_pub_date"]);
-
-if (isset($_REQUEST["remove"])) {
-	
-	$rsslib->remove_rss_module($_REQUEST["remove"]);
-}
-
-if (isset($_REQUEST["save"])) {
-	
-
-	if (isset($_REQUEST['show_title']) == 'on') {
-		$gBitSmarty->assign('show_title', 'y');
-		$info["show_title"] = 'y';
-	}
-	else
-	{
-		$gBitSmarty->assign('show_title', 'n');
-		$info["show_title"] = 'n';
-	}
-	if (isset($_REQUEST['show_pub_date']) == 'on') {
-		$gBitSmarty->assign('show_pub_date', 'y');
-		$info["show_pub_date"] = 'y';
-	}
-	else
-	{
-		$gBitSmarty->assign('show_pub_date', 'n');
-		$info["show_pub_date"] = 'n';
-	}
-
-	$rsslib->replace_rss_module($_REQUEST["rss_id"], $_REQUEST["name"], $_REQUEST["description"], $_REQUEST["url"], $_REQUEST["refresh"], $info["show_title"], $info["show_pub_date"]);
-
-	$gBitSmarty->assign('rss_id', 0);
-	$gBitSmarty->assign('name', '');
-	$gBitSmarty->assign('description', '');
-	$gBitSmarty->assign('url', '');
-	$gBitSmarty->assign('refresh', 900);
-	$gBitSmarty->assign('show_title', 'n');
-	$gBitSmarty->assign('show_pub_date', 'n');
-}
-
-if ( empty( $_REQUEST["sort_mode"] ) ) {
-	$sort_mode = 'name_desc';
-} else {
-	$sort_mode = $_REQUEST["sort_mode"];
-}
-
-if (!isset($_REQUEST["offset"])) {
-	$offset = 0;
-} else {
-	$offset = $_REQUEST["offset"];
-}
-if (isset($_REQUEST['page'])) {
-	$page = &$_REQUEST['page'];
-	$offset = ($page - 1) * $maxRecords;
-}
-$gBitSmarty->assign_by_ref('offset', $offset);
-
-if (isset($_REQUEST["find"])) {
-	$find = $_REQUEST["find"];
-} else {
-	$find = '';
-}
-
-$gBitSmarty->assign('find', $find);
-
-$gBitSmarty->assign_by_ref('sort_mode', $sort_mode);
-$channels = $rsslib->list_rss_modules($offset, $maxRecords, $sort_mode, $find);
-
-$cant_pages = ceil($channels["cant"] / $maxRecords);
-$gBitSmarty->assign_by_ref('cant_pages', $cant_pages);
-$gBitSmarty->assign('actual_page', 1 + ($offset / $maxRecords));
-
-if ($channels["cant"] > ($offset + $maxRecords)) {
-	$gBitSmarty->assign('next_offset', $offset + $maxRecords);
-} else {
-	$gBitSmarty->assign('next_offset', -1);
-}
-
-// If offset is > 0 then prev_offset
-if ($offset > 0) {
-	$gBitSmarty->assign('prev_offset', $offset - $maxRecords);
-} else {
-	$gBitSmarty->assign('prev_offset', -1);
-}
-
-$gBitSmarty->assign_by_ref('channels', $channels["data"]);
-
-
-// Display the template
-$gBitSystem->display( 'bitpackage:rss/admin_rssmodules.tpl');
-
-?>
+?>
\ No newline at end of file
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 2f1a91e..472059e 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -1,35 +1,6 @@
 <?php
-
-$tables = array(
-
-'tiki_rss_modules' => "
-  rss_id I4 AUTO PRIMARY,
-  name C(30) NOTNULL,
-  description X,
-  url C(255) NOTNULL,
-  refresh I4,
-  last_updated I8,
-  show_title C(1) DEFAULT 'n',
-  show_pub_date C(1) DEFAULT 'n',
-  content X
-",
-
-'tiki_rss_feeds' => "
-  name C(30) NOTNULL,
-  rss_ver C(1) NOTNULL DEFAULT '1',
-  refresh I4 DEFAULT '300',
-  last_updated I8,
-  cache B
-"
-
-);
-
 global $gBitInstaller;
 
-foreach( array_keys( $tables ) AS $tableName ) {
-	$gBitInstaller->registerSchemaTable( RSS_PKG_NAME, $tableName, $tables[$tableName] );
-}
-
 $gBitInstaller->registerPackageInfo( RSS_PKG_NAME, array(
 	'description' => "Resource Description Framework (RDF) Site Summary (RSS) is a lightweight multipurpose extensible metadata description and syndication format. It allows users to read healines from your site with a dedicated RSS reader.",
 	'license' => '<a href="http://www.gnu.org/licenses/licenses.html#LGPL">LGPL</a>',
@@ -38,18 +9,9 @@ $gBitInstaller->registerPackageInfo( RSS_PKG_NAME, array(
 	'dependencies' => '',
 ) );
 
-// ### Default MenuOptions
-$gBitInstaller->registerMenuOptions( RSS_PKG_NAME, array(
-	array(42,'o','RSS modules','tiki-admin_rssmodules.php',1100,'','bit_p_admin','')
-) );
-
 // ### Default Preferences
 $gBitInstaller->registerPreferences( RSS_PKG_NAME, array(
-	array( RSS_PKG_NAME, 'rssfeed_css','y'),
-	array( RSS_PKG_NAME, 'rssfeed_default_version','2'),
-	array( RSS_PKG_NAME, 'rssfeed_language','en-us'),
-	array( RSS_PKG_NAME, 'rss_wiki','y'),
-	array( RSS_PKG_NAME, 'rss_blogs','y'),
+	array( RSS_PKG_NAME, 'rss_wiki', 'y'),
+	array( RSS_PKG_NAME, 'rss_blogs', 'y'),
 ) );
-
 ?>