Fixes/rewrites for ext-surfbar:

[mailer.git] / inc / pool / pool-user.php

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index c2bcfda3f85eae8af779daebd452b75c79176ecf..906ceb9d1df315230b52fea2d464ca35e590b346 100644 (file)
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -143,10 +143,10 @@ if (!SQL_HASZERONUMS($result_main)) {
                                                                $DATA['points'] = getPaymentPoints($DATA['payment_id'], 'payment');
 
                                                                // Load message template
-                                                               $mailText = loadEmailTemplate('normal-mail', $DATA, bigintval($userid));
+                                                               $mailText = loadEmailTemplate('member_user_pool_normal', $DATA, bigintval($userid));
 
                                                                // Send mail away
-                                                               sendEmail(getUserData('email'), $DATA['subject'], $mailText, $isHtml);
+                                                               sendEmail(getUserData('userid'), $DATA['subject'], $mailText, $isHtml);
 
                                                                // Count sent mails...
                                                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_sent`=`emails_sent`+1 WHERE `userid`=%s LIMIT 1",
@@ -195,15 +195,15 @@ if (!SQL_HASZERONUMS($result_main)) {
                                                );
 
                                                // Yes we do, so we notify admin and sender about fully sent mail!
-                                               sendAdminNotification('{--ADMIN_SEND_DONE_SUBJECT--}', 'done-admin', $content, $userid);
+                                               sendAdminNotification('{--ADMIN_SEND_DONE_SUBJECT--}', 'admin_user_pool_done', $content, $userid);
 
                                                // Get sender's data
                                                if (fetchUserData($DATA['sender_userid'])) {
                                                        // Load email template
-                                                       $mailText = loadEmailTemplate('done-member', $content, $DATA['sender_userid']);
+                                                       $mailText = loadEmailTemplate('member_user_pool_done', $content, $DATA['sender_userid']);
 
                                                        // Send it also waway
-                                                       sendEmail(getUserData('email'), '{--MEMBER_SEND_DONE_SUBJECT--}', $mailText);
+                                                       sendEmail(getUserData('userid'), '{--MEMBER_SEND_DONE_SUBJECT--}', $mailText);
                                                } // END - if
 
                                                // Set status to SEND because we completely send it away
@@ -290,16 +290,16 @@ if (!SQL_HASZERONUMS($result_main)) {
                                // We have to pay back some points to the sender (we add them directly :-P)
                                if (fetchUserData($userid)) {
                                        // User account does exists, so we can safely pay back!
-                                       $mailText = loadEmailTemplate('back-member', $content, bigintval($userid));
+                                       $mailText = loadEmailTemplate('member_user_pool_back', $content, bigintval($userid));
 
                                        // Send mail out to member
-                                       sendEmail(getUserData('email'), '{--MEMBER_BACK_JACKPOT--}' . ' (' . $userid . ')', $mailText);
+                                       sendEmail($userid, '{--MEMBER_BACK_JACKPOT--}' . ' (' . $userid . ')', $mailText);
                                } elseif (isExtensionActive('jackpot')) {
                                        // Add to jackpot
                                        addPointsToJackpot($PB);
 
                                        // Send mail out to admin
-                                       sendAdminNotification('{--ADMIN_BACK_JACKPOT--}' . ' (' . $userid . ')', 'back-admin', $content, 'admin');
+                                       sendAdminNotification('{--ADMIN_BACK_JACKPOT--}' . ' (' . $userid . ')', 'admin_user_pool_back', $content, 'admin');
                                }
                        } // END - if
                } // END - foreach