queue of recipients even closer

3 files changed, 18 insertions, 35 deletions

diff --git a/BitNewsletterEdition.php b/BitNewsletterEdition.php
index b13e785..fa530d0 100644
--- a/BitNewsletterEdition.php
+++ b/BitNewsletterEdition.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletterEdition.php,v 1.4 2005/12/11 08:22:51 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletterEdition.php,v 1.5 2005/12/11 08:52:21 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: BitNewsletterEdition.php,v 1.4 2005/12/11 08:22:51 spiderr Exp $
+ * $Id: BitNewsletterEdition.php,v 1.5 2005/12/11 08:52:21 spiderr Exp $
  *
  * Virtual base class (as much as one can have such things in PHP) for all
  * derived tikiwiki classes that require database access.
@@ -16,7 +16,7 @@
  *
  * @author drewslater <andrew@andrewslater.com>, spiderr <spider@steelsun.com>
  *
- * @version $Revision: 1.4 $ $Date: 2005/12/11 08:22:51 $ $Author: spiderr $
+ * @version $Revision: 1.5 $ $Date: 2005/12/11 08:52:21 $ $Author: spiderr $
  */
 
 /**
@@ -183,6 +183,10 @@ class BitNewsletterEdition extends LibertyAttachable {
 		}
 		return $ret;
 	}
+
+	function queueRecipients( $pRecipients ) {
+vd( $pRecipients );
+	}
 }
 
 ?>
diff --git a/admin/send.php b/admin/send.php
index c5558fc..d455a55 100644
--- a/admin/send.php
+++ b/admin/send.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/send.php,v 1.6 2005/12/11 08:22:51 spiderr Exp $
+// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/send.php,v 1.7 2005/12/11 08:52:21 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.
@@ -31,37 +31,8 @@ if( $gContent->isValid() && isset( $_REQUEST['preview'] ) ) {
 	$gBitSmarty->assign_by_ref( 'recipientList', $recipients );
 } elseif( $gContent->isValid() && isset( $_REQUEST["send"] ) ) {
 	$emails = $gContent->getRecipients( $_REQUEST['send_group'] );
-vd( $emails );
-vd( $_REQUEST );
+	$gContent->queueRecipients( $emails );
 die;
-
-	$mail = new htmlMimeMail();
-	$mail->setFrom('noreply@noreply.com');
-	$mail->setSubject($_REQUEST['title']);
-	$sent = 0;
-
-	foreach ($subscribers as $email) {
-		$to_array = array();
-
-		$to_array[] = $email;
-		if ($nl_info["unsub_msg"] = 'y') {
-			$unsubmsg = $nllib->get_unsub_msg($_REQUEST["nl_id"], $email);
-		} else {
-			$unsubmsg = ' ';
-		}
-		$mail->setHeadCharset("utf-8");
-		$mail->setTextCharset("utf-8");
-		$mail->setHtmlCharset("utf-8");
-		$mail->setFrom($sender_email);
-		$mail->setHTML($_REQUEST['edit'] . $unsubmsg, strip_tags($_REQUEST['edit']));
-
-		if ($mail->send($to_array, 'mail'))
-			$sent++;
-	}
-
-	$gBitSmarty->assign('sent', $sent);
-	$gBitSmarty->assign('emited', 'y');
-	$nllib->replace_edition($_REQUEST["nl_id"], $_REQUEST['title'], $_REQUEST['edit'], $sent);
 }
 
 if( $gContent->isValid() ) {
diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl
index 32ee1c9..b4cc3df 100644
--- a/templates/send_newsletters.tpl
+++ b/templates/send_newsletters.tpl
@@ -30,11 +30,19 @@
 			{/jstab}
 			{jstab title="Preview Recipient List"}
 				{legend legend="Preview Recipient List"}
+				<div class="row">
+					{foreach from=$smarty.request.send_group item=groupId key=i}
+						<input type="hidden" name="send_group[]" value="{$groupId}" />
+					{/foreach}
+					{formlabel label="Actual Recipients"}
+					{forminput}
 					<ol>
 					{foreach from=$recipientList item=recipient key=email}
-						<li>{$email}</li>
+						<li>"{$recipient.login}" <{$email}></li>
 					{/foreach}
 					</ol>
+					{/forminput}
+				</div>
 				{/legend}
 			{/jstab}
 		{/jstabs}