cleanup creation of newsletters under single newsletters.php file, and use perm checking in menu

3 files changed, 6 insertions, 73 deletions

diff --git a/admin/index.php b/admin/index.php
deleted file mode 100644
index aaa9685..0000000
--- a/admin/index.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/Attic/index.php,v 1.9 2005/12/28 23:21:24 spiderr 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' );
-$gBitSystem->verifyPackage( 'newsletters' );
-$gBitSystem->verifyPermission( 'tiki_p_admin_newsletters' );
-
-require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_inc.php' );
-
-if( isset( $_REQUEST["remove"] ) && $gContent->isValid() ) {
-	if( !empty( $_REQUEST['cancel'] ) ) {
-		// user cancelled - just continue on, doing nothing
-	} elseif( empty( $_REQUEST['confirm'] ) ) {
-		$formHash['remove'] = TRUE;
-		$formHash['nl_id'] = $gContent->mNewsletterId;
-		$gBitSystem->confirmDialog( $formHash, array( 'warning' => 'Are you sure you want to delete the newsletter '.$gContent->getTitle().'?' ) );
-	} else {
-		if( $gContent->expunge() ) {
-			header( "Location: ".NEWSLETTERS_PKG_URL.'admin/' );
-			die;
-		}
-	}
-} elseif (isset($_REQUEST["save"])) {
-	$sid = $gContent->store( $_REQUEST );
-	header( "Location: ".$_SERVER['PHP_SELF'] );
-	die;
-}
-
-$gContent->invokeServices( 'content_edit_function' );
-
-// Configure quicktags list
-if ($gBitSystem->isPackageActive( 'quicktags' ) ) {
-	include_once( QUICKTAGS_PKG_PATH.'quicktags_inc.php' );
-}
-
-$newsletters = $gContent->getList( $listHash );
-$gBitSmarty->assign_by_ref( 'newsletters', $newsletters );
-$gBitSmarty->assign_by_ref( 'listInfo', $listHash );
-
-// Fill array with possible number of questions per page
-/*
-$freqs = array();
-
-for ($i = 0; $i < 90; $i++) {
-	$aux["i"] = $i;
-
-	$aux["t"] = $i * 24 * 60 * 60;
-	$freqs[] = $aux;
-}
-
-$gBitSmarty->assign('freqs', $freqs);
-*/
-/*
-$cat_type='newsletter';
-$cat_objid = $_REQUEST["nl_id"];
-include_once( CATEGORIES_PKG_PATH.'categorize_list_inc.php' );
-*/
-
-// Display the template
-$gBitSystem->display( 'bitpackage:newsletters/edit_newsletter.tpl');
-
-?>
diff --git a/newsletters.php b/newsletters.php
index 4badfea..579af65 100644
--- a/newsletters.php
+++ b/newsletters.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_newsletters/newsletters.php,v 1.2 2005/12/28 23:21:24 spiderr Exp $
+// $Header: /cvsroot/bitweaver/_bit_newsletters/newsletters.php,v 1.3 2005/12/29 19:51:19 spiderr 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.
@@ -8,7 +8,6 @@
 
 // Initialization
 require_once( '../bit_setup_inc.php' );
-include_once( NEWSLETTERS_PKG_PATH.'nl_lib.php' );
 $gBitSystem->verifyPackage( 'newsletters' );
 $gBitSystem->verifyPermission( 'tiki_p_admin_newsletters' );
 
diff --git a/templates/menu_newsletters.tpl b/templates/menu_newsletters.tpl
index 0d85717..7df92b3 100644
--- a/templates/menu_newsletters.tpl
+++ b/templates/menu_newsletters.tpl
@@ -1,13 +1,15 @@
 {strip}
 <ul>
 	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">{tr}List newsletters{/tr}</a></li>
+	{if $gBitUser->hasPermission( 'bit_p_create_newsletters' )}
+		<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?new=1">{tr}Create Newsletter{/tr}</a></li>
+	{/if}
 	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}edition.php">{tr}List editions{/tr}</a></li>
-	{if $gBitUser->hasPermission( 'tiki_p_admin_newsletters' )}
+	{if $gBitUser->hasPermission( 'bit_p_create_editions' )}
 		<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php">{tr}Create Edition{/tr}</a></li>
 	{/if}
-	{if $gBitUser->hasPermission( 'tiki_p_admin_newsletters' )}
+	{if $gBitUser->hasPermission( 'bit_p_admin_newsletters' )}
 		<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php">{tr}Send newsletters{/tr}</a></li>
-		<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php">{tr}Admin newsletters{/tr}</a></li>
 	{/if}
 </ul>
 {/strip}