Fixes and further rewrites to make use of EL

[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 e12ea8eb2bf3e6f304506421adc780f1180dc7c5..48178e2cfe4c32670163ab66bbc227bc6c359e81 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -8,7 +8,7 @@
  * -------------------------------------------------------------------- *
  * Short description : Unconfirmed mails                                *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Unbestätigte Mails                              *
+ * Kurzbeschreibung  : Unbestaetigte Mails                              *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -51,7 +51,7 @@ addMenuDescription('member', __FILE__);
 if ((isGetRequestParameterSet('bonusid')) && (isExtensionActive('bonus'))) {
        // Display bonus mail by loading it's full data
        $result_data = SQL_QUERY_ESC("SELECT
-       `id`, `subject`, `timestamp`, `cat_id`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
+       `id`, `subject`, `timestamp`, `cat_id` AS `category`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
 FROM
        `{?_MYSQL_PREFIX?}_bonus`
 WHERE
@@ -63,18 +63,17 @@ LIMIT 1",
        $content = SQL_FETCHARRAY($result_data);
 
        // Translate some data
-       $content['timestamp'] = generateDateTime($content['timestamp'], 2);
-       $content['category']  = getCategory($content['cat_id']);
-       $content['points']    = translateComma($content['points']);
-       $content['is_notify'] = translateYesNo($content['is_notify']);
-       $content['sender']    = getMessage('USERNAME_ADMIN_SHORT');
-       $content['time']      = createFancyTime($content['time']);
-       $content['userid']    = getMemberId();
-
-       // Get timestamp from insert
-       $content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON',
-               generateDateTime(getTimestampFromUserStats('bonusid', $content['id']), 2)
-       );
+       $content['timestamp']   = generateDateTime($content['timestamp'], 2);
+       $content['userid']      = getMemberId();
+       $content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN', $content['id']);
+
+       // Is ext-user installed?
+       if (isExtensionInstalled('user')) {
+               // Get timestamp from insert
+               $content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON',
+                       generateDateTime(getTimestampFromUserStats('bonusid', $content['id']), 2)
+               );
+       } // END - if
 
        // Display it depending on mail (data) type
        loadTemplate('member_mail_bonus_'.strtolower($content['data_type']), false, $content);
@@ -104,19 +103,20 @@ LIMIT 1",
        $content = SQL_FETCHARRAY($result_data);
 
        // Translate some data
-       $content['timestamp'] = generateDateTime($content['timestamp'], 2);
-       $content['category']  = getCategory($content['cat_id']);
-       $content['points']    = translateComma($content['points']);
-       $content['time']      = createFancyTime($content['time']);
-       $content['userid']    = getMemberId();
-
-       // Get timestamp from insert
-       $content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON',
-               generateDateTime(getTimestampFromUserStats('mailid', $content['id']), 2)
-       );
+       $content['timestamp']   = generateDateTime($content['timestamp'], 2);
+       $content['userid']      = getMemberId();
+       $content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN', $content['id']);
+
+       // Is ext-user installed?
+       if (isExtensionInstalled('user')) {
+               // Get timestamp from insert
+               $content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON',
+                       generateDateTime(getTimestampFromUserStats('mailid', $content['id']), 2)
+               );
+       } // END - if
 
        // Display it depending on mail (data) type
-       loadTemplate('member_mail_normal_'.strtolower($content['data_type']), false, $content);
+       loadTemplate('member_mail_normal_' . strtolower($content['data_type']), false, $content);
 
        // Free result
        SQL_FREERESULT($result_data);
@@ -135,7 +135,7 @@ if (isExtensionActive('bonus')) {
 // Mails left for confirmation?
 if (SQL_NUMROWS($result) > 0) {
        // Please confirm these mails!
-       $sum = '0'; $OUT = ''; $SW = 2;
+       $sum = '0'; $OUT = '';
 
        // Init content
        $content = array();
@@ -145,7 +145,7 @@ if (SQL_NUMROWS($result) > 0) {
                // Load data from stats table...
                $cat = '';
                $result_data = false;
-               $PROBLEM = getMessage('MEMBER_GENERAL_MAIL_PROBLEM');
+               $PROBLEM = '{--MEMBER_GENERAL_MAIL_PROBLEM--}';
                $DATA = $id . '/' . $id2 . '/' . $type;
                switch ($type) {
                        case 'NORMAL':
@@ -163,7 +163,7 @@ LIMIT 1",
                                        array(bigintval($id)), __FILE__, __LINE__);
                                $type = 'mailid';
                                $DATA = $id;
-                               $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
+                               $PROBLEM = '{--NORMAL_MAIL_PROBLEM--}';
                                break;
 
                        case 'BONUS':
@@ -171,7 +171,7 @@ LIMIT 1",
                                        array(bigintval($id2)), __FILE__, __LINE__);
                                $type = 'bonusid';
                                $DATA = $id2;
-                               $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
+                               $PROBLEM = '{--BONUS_MAIL_PROBLEM--}';
                                break;
 
                        default: // Unknown type detected!
@@ -187,7 +187,7 @@ LIMIT 1",
                        // Subject line found?
                        if (empty($subject)) {
                                // No subject line!
-                               $subject = getMessage('DEFAULT_SUBJECT_LINE');
+                               $subject = '{--DEFAULT_SUBJECT_LINE--}';
                        } // END - if
 
                        // Prepare sender id
@@ -196,23 +196,20 @@ LIMIT 1",
                                $sender = bigintval($sender);
                        } elseif ($type == 'bonusid') {
                                // Is admin
-                               $sender = getMessage('USERNAME_ADMIN_SHORT');
+                               $sender = '{--USERNAME_ADMIN_SHORT--}';
                        } else {
                                // Deleted
-                               $sender = getMessage('EMAIL_STATUS_DELETED');
+                               $sender = '{--EMAIL_STATUS_DELETED--}';
                        }
 
                        // Prepare data for template
                        $content = array(
-                               'sw'        => $SW,
-                               'userid'    => getMemberId(),
                                'data'      => bigintval($DATA),
                                'type'      => $type,
                                'subject'   => $subject,
                                'sender'    => $sender,
                                'timestamp' => generateDateTime($timestamp, 2),
-                               'cat'       => getCategory($cat),
-                               'points'    => translateComma($pay),
+                               'points'    => $pay,
                        );
 
                        // Load row template
@@ -227,7 +224,6 @@ LIMIT 1",
                } else {
                        // Prepare data for template
                        $content = array(
-                               'sw'    => $SW,
                                'data'  => $DATA,
                                'probl' => $PROBLEM,
                        );
@@ -242,16 +238,13 @@ LIMIT 1",
 
                // Free result
                SQL_FREERESULT($result_data);
-
-               // Switch color
-               $SW = 3 - $SW;
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Remember total points
-       $content['total_points'] = translateComma($sum);
+       $content['total_points'] = $sum;
 
        // Remember all generated rows in constant for the template
        $content['rows'] = $OUT;
@@ -264,7 +257,7 @@ LIMIT 1",
        }
 } else {
        // No mails left to confirm... :)
-       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM'));
+       loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_MAILS_TO_CONFIRM--}');
 }
 
 // [EOF]