A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[mailer.git] / inc / modules / member / what-unconfirmed.php

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 88249052ccb9097b3fe3806ca102f6fd732439fa..b431d9a52220cc6c551cc555d54a5604a859bfb5 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -67,7 +67,7 @@ WHERE id=%s LIMIT 1",
        $content['uid']       = $GLOBALS['userid'];
 
        // Get timestamp from insert
-       $content['user_status'] = sprintf(MEMBER_MAIL_BONUS_CONFIRMED_ON,
+       $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON'),
                MAKE_DATETIME(USER_STATS_GET_TIMESTAMP("bonusid", $content['id']), "2")
        );
 
@@ -100,7 +100,7 @@ WHERE s.id=%s LIMIT 1",
        $content['uid']       = $GLOBALS['userid'];
 
        // Get timestamp from insert
-       $content['user_status'] = sprintf(MEMBER_MAIL_NORMAL_CONFIRMED_ON,
+       $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
                MAKE_DATETIME(USER_STATS_GET_TIMESTAMP("mailid", $content['id']), "2")
        );
 
@@ -124,7 +124,9 @@ if (EXT_IS_ACTIVE("bonus")) {
 // Mails left for confirmation?
 if (SQL_NUMROWS($result) > 0) {
        // Please confirm these mails!
-       $sum = 0; $SW = 2; $OUT = "";
+       $sum = 0; $OUT = ""; $SW = 2;
+
+       // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
        while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
                // Load data from stats table...
                $cat = ""; $result_data = false;
@@ -138,13 +140,13 @@ ON s.pool_id=p.id
 WHERE s.id=%s
 LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
-                       $type = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM;
+                       $type = "mailid"; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
                        break;
 
                case "BONUS":
                        $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
                         array(bigintval($id2)), __FILE__, __LINE__);
-                       $type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;
+                       $type = "bonusid"; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
                        break;
 
                default: // Unknown type detected!
@@ -160,7 +162,7 @@ LIMIT 1",
                        // Subject line found?
                        if (empty($subject)) {
                                // No subject line!
-                               $subject = DEFAULT_SUBJECT_LINE;
+                               $subject = getMessage('DEFAULT_SUBJECT_LINE');
                        } else {
                                // Compile it
                                $subject = COMPILE_CODE($subject);
@@ -172,10 +174,10 @@ LIMIT 1",
                                $sender = bigintval($sender);
                        } elseif ($type == "bonusid") {
                                // Is admin
-                               $sender = _ADMIN_SHORT;
+                               $sender = getMessage('_ADMIN_SHORT');
                        } else {
                                // Deleted
-                               $sender = EMAIL_STATUS_DELETED;
+                               $sender = getMessage('EMAIL_STATUS_DELETED');
                        }
 
                        // Prepare data for template