various improvements, still not complete

3 files changed, 29 insertions, 5 deletions

diff --git a/BitNewsletter.php b/BitNewsletter.php
index 314118c..1e56e45 100644
--- a/BitNewsletter.php
+++ b/BitNewsletter.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletter.php,v 1.20 2006/07/07 02:35:17 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletter.php,v 1.21 2006/07/31 02:17:00 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: BitNewsletter.php,v 1.20 2006/07/07 02:35:17 spiderr Exp $
+ * $Id: BitNewsletter.php,v 1.21 2006/07/31 02:17:00 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.20 $ $Date: 2006/07/07 02:35:17 $ $Author: spiderr $
+ * @version $Revision: 1.21 $ $Date: 2006/07/31 02:17:00 $ $Author: spiderr $
  */
 
 /**
@@ -105,6 +105,28 @@ vd( 'not done yet' );
 		return( count( $this->mErrors ) == 0 );
 	}
 
+	function getSubscriberInfo( $pLookup ) {
+		$ret = array();
+		if( $this->isValid() ) {
+			$bindVars = array();
+			$whereSql = '';
+			if( !empty( $pLookup['email'] ) ) {
+				$whereSql .= ' AND `email`=? ` ';
+				$bindVars[] = $pLookup['email'];
+			}
+			if( !empty( $pLookup['user_id'] ) ) {
+				$whereSql .= ' AND `user_id`=? ` ';
+				$bindVars[] = $pLookup['user_id'];
+			}
+			$whereSql = preg_replace( '/^[\s]AND/', '', $whereSql );
+			$query = "SELECT * from `".BIT_DB_PREFIX."mail_subscriptions` WHERE $whereSql ";
+			if( $res = $this->mDb->query( $query, $bindVars ) ) {
+				$ret = $res->GetRows();
+			}
+		}
+		return $ret;
+	}
+
 	function getSubscribers( $pAll=FALSE) {
 		$ret = array();
 		if( $this->isValid() ) {
diff --git a/index.php b/index.php
index fe55512..1d4d97b 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/bitweaver/_bit_newsletters/index.php,v 1.20 2006/07/07 00:04:30 spiderr Exp $
+// $Header: /cvsroot/bitweaver/_bit_newsletters/index.php,v 1.21 2006/07/31 02:17:00 spiderr Exp $
 
 // Copyright (c) 2006 - bitweaver.org - Christian Fowler, Max Kremmel, et. al
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
@@ -26,6 +26,9 @@ if( !empty( $_REQUEST['nl_id'] ) ) {
 	if (isset($_REQUEST['info'])) {
 		$subscribe = true;
 		$gBitSmarty->assign('subscribe', 'y');
+		$infoHash = array( 'user_id' => $gBitUser->mUserId, 'email' => $gBitUser->getField('email') );
+		$info = $gContent->getSubscriberInfo( $infoHash );
+		vd( $info );
 	}
 }
 $newsletters = $gContent->getList( $listHash );
diff --git a/templates/newsletters.tpl b/templates/newsletters.tpl
index be7631a..efdaa2f 100644
--- a/templates/newsletters.tpl
+++ b/templates/newsletters.tpl
@@ -33,7 +33,6 @@
 						{if $gBitUser->hasPermission( 'p_newsletters_subscribe_email' )}
 							<input type="text" name="email" value="{$email|escape}" />
 						{else}
-							<input type="hidden" name="email" value="{$email|escape}" />
 							{$email|escape}
 						{/if}
 						{/forminput}