diff options
| author | Christian Fowler <spider@viovio.com> | 2005-12-28 16:01:51 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2005-12-28 16:01:51 +0000 |
| commit | fd43e1191a1b9e2a87d59e2772c5fd9ef0cd7bcd (patch) | |
| tree | 332128f276d494292c5dfb908e03e6dfda147ca8 /BitMailer.php | |
| parent | 24f652cebb911f360f463ac8bb3d4dbf99a19bc8 (diff) | |
| download | newsletters-fd43e1191a1b9e2a87d59e2772c5fd9ef0cd7bcd.tar.gz newsletters-fd43e1191a1b9e2a87d59e2772c5fd9ef0cd7bcd.tar.bz2 newsletters-fd43e1191a1b9e2a87d59e2772c5fd9ef0cd7bcd.zip | |
more unsub changes and updates. getting closer
Diffstat (limited to 'BitMailer.php')
| -rw-r--r-- | BitMailer.php | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/BitMailer.php b/BitMailer.php index 253b3c2..3f6d185 100644 --- a/BitMailer.php +++ b/BitMailer.php @@ -1,12 +1,12 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_newsletters/Attic/BitMailer.php,v 1.5 2005/12/28 15:23:32 spiderr Exp $ + * $Header: /cvsroot/bitweaver/_bit_newsletters/Attic/BitMailer.php,v 1.6 2005/12/28 16:01:51 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.5 2005/12/28 15:23:32 spiderr Exp $ + * $Id: BitMailer.php,v 1.6 2005/12/28 16:01:51 spiderr Exp $ * * Class that handles editions of newsletters * @package newsletters @@ -15,7 +15,7 @@ * * @author spiderr <spider@steelsun.com> * - * @version $Revision: 1.5 $ $Date: 2005/12/28 15:23:32 $ $Author: spiderr $ + * @version $Revision: 1.6 $ $Date: 2005/12/28 16:01:51 $ $Author: spiderr $ */ /** @@ -154,8 +154,9 @@ class BitMailer extends phpmailer { global $gBitDb; $ret = NULL; if( !empty( $pUrlCode ) ) { - $query = "SELECT * FROM `".BIT_DB_PREFIX."tiki_mail_queue` tmq - INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON( tmq.`nl_content_id`=tc.`content_id` ) + $query = "SELECT tmq.*, tc.*, tct.*, uu.`real_name`, uu.`login`, uu.`email` FROM `".BIT_DB_PREFIX."tiki_mail_queue` tmq + INNER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON( tmq.`content_id`=tc.`content_id` ) + INNER JOIN `".BIT_DB_PREFIX."tiki_content_types` tct ON( tct.`content_type_guid`=tc.`content_type_guid` ) LEFT OUTER JOIN `".BIT_DB_PREFIX."users_users` uu ON( tmq.`user_id`=uu.`user_id` ) WHERE `url_code`=? "; $ret = $gBitDb->getRow( $query, array( $pUrlCode ) ); @@ -171,11 +172,11 @@ class BitMailer extends phpmailer { if( is_array( $pMixed ) ) { $col = key( $pMixed ); $bindVars[] = current( $pMixed ); - $query = "SELECT * FROM `".BIT_DB_PREFIX."tiki_mail_unsubscriptions` tmu + $query = "SELECT tmu.`content_id` AS `hash_key`, * FROM `".BIT_DB_PREFIX."tiki_mail_unsubscriptions` tmu LEFT OUTER JOIN `".BIT_DB_PREFIX."users_users` uu ON( tmu.`user_id`=uu.`user_id` ) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content` tc ON( tmu.`content_id`=tc.`content_id` ) - WHERE $col=? "; - $ret = $gBitDb->getRow( $query, $bindVars ); + WHERE tmu.`$col`=? "; + $ret = $gBitDb->getAssoc( $query, $bindVars ); } return( $ret ); } |