clean up sending so it acutally works now

3 files changed, 27 insertions, 15 deletions

diff --git a/BitMailer.php b/BitMailer.php
index 3578fb3..41cdfab 100644
--- a/BitMailer.php
+++ b/BitMailer.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_newsletters/Attic/BitMailer.php,v 1.1 2005/12/16 06:34:54 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_newsletters/Attic/BitMailer.php,v 1.2 2005/12/20 22:05:07 spiderr Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * 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: BitMailer.php,v 1.1 2005/12/16 06:34:54 spiderr Exp $
+ * $Id: BitMailer.php,v 1.2 2005/12/20 22:05:07 spiderr Exp $
  *
  * Class that handles editions of newsletters
  * @package newsletters
@@ -15,7 +15,7 @@
  *
  * @author spiderr <spider@steelsun.com>
  *
- * @version $Revision: 1.1 $ $Date: 2005/12/16 06:34:54 $ $Author: spiderr $
+ * @version $Revision: 1.2 $ $Date: 2005/12/20 22:05:07 $ $Author: spiderr $
  */
 
 /**
@@ -51,22 +51,20 @@ class BitMailer extends phpmailer {
         exit;
     }
 
-	function queueRecipients( $pRecipients ) {
+	function queueRecipients( $pContentId, $pRecipients ) {
 		$ret = 0;
-		if( $this->isValid() ) {
-vd( $this->mContentId );
+		if( !empty( $pRecipients ) && BitBase::verifyId( $pContentId ) ) {
 			$queueTime = time();
 			foreach( array_keys( $pRecipients ) AS $email ) {
 				$insertHash['email'] = $email;
 				if( !empty( $pRecipients[$email]['user_id'] ) ) {
 					$insertHash['user_id'] = $pRecipients[$email]['user_id'];
 				}
-				$insertHash['content_id'] = $this->mContentId;
+				$insertHash['content_id'] = $pContentId;
 				$insertHash['queue_date'] = $queueTime;
 				$this->mDb->associateInsert( BIT_DB_PREFIX.'tiki_mail_queue', $insertHash );
 				$ret++;
 			}
-die;
 		}
 		return $ret;
 	}
diff --git a/admin/send.php b/admin/send.php
index d455a55..58dedcd 100644
--- a/admin/send.php
+++ b/admin/send.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/send.php,v 1.7 2005/12/11 08:52:21 spiderr Exp $
+// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/send.php,v 1.8 2005/12/20 22:05:07 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,14 +8,15 @@
 
 // Initialization
 require_once( '../../bit_setup_inc.php' );
-include_once( NEWSLETTERS_PKG_PATH.'nl_lib.php' );
-include_once( UTIL_PKG_PATH.'htmlMimeMail.php' );
+include_once( NEWSLETTERS_PKG_PATH.'BitMailer.php' );
 
 $gBitSystem->verifyPackage( 'newsletters' );
 
 require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_edition_inc.php' );
 
-if (isset($_REQUEST["template_id"]) && $_REQUEST["template_id"] > 0) {
+$feedback = array();
+
+if( @BitBase::verifyId( $_REQUEST["template_id"] ) ) {
 	$template_data = $tikilib->get_template($_REQUEST["template_id"]);
 
 	$_REQUEST['edit'] = $template_data["content"];
@@ -30,9 +31,15 @@ if( $gContent->isValid() && isset( $_REQUEST['preview'] ) ) {
 	$recipients = $gContent->getRecipients( $_REQUEST['send_group'] );
 	$gBitSmarty->assign_by_ref( 'recipientList', $recipients );
 } elseif( $gContent->isValid() && isset( $_REQUEST["send"] ) ) {
-	$emails = $gContent->getRecipients( $_REQUEST['send_group'] );
-	$gContent->queueRecipients( $emails );
-die;
+	if( $emails = $gContent->getRecipients( $_REQUEST['send_group'] ) ) {
+		global $gBitMailer;
+		$gBitMailer = new BitMailer();
+		$gBitMailer->queueRecipients( $gContent->mContentId, $emails );
+		$feedback['success'] = count( $emails ).' '.tra( 'emails were queued to be sent:' ).' '.$gContent->getTitle();
+		$gContent->mEditionId = NULL;
+	} else {
+		$feedback['error'] = tra( 'No emails were queued.' );
+	}
 }
 
 if( $gContent->isValid() ) {
@@ -51,6 +58,7 @@ if( $gContent->isValid() ) {
 	}
 }
 
+$gBitSmarty->assign_by_ref( 'feedback', $feedback );
 // Display the template
 $gBitSystem->display( 'bitpackage:newsletters/send_newsletters.tpl');
 
diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl
index 44e803c..4fb40b5 100644
--- a/templates/send_newsletters.tpl
+++ b/templates/send_newsletters.tpl
@@ -7,6 +7,12 @@
 	</div>
 
 	<div class="body">
+		{if $feedback}
+			<div class="row">
+				{formfeedback hash=$feedback}
+			</div>
+		{/if}
+
 		{if $gContent->isValid()}
 			{form}
 				<input type="hidden" name="edition_id" value="{$gContent->mEditionId|escape}" />