Possible better fix
[mailer.git] / inc / modules / member / what-unconfirmed.php
index 78449324e601d0ac5834007b6017014b4bea87d7..91691d58adf4ff340f7720fb000b4705d975892e 100644 (file)
@@ -8,7 +8,7 @@
  * -------------------------------------------------------------------- *
  * Short description : Unconfirmed mails                                *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Unbestaetigte Mails                              *
+ * Kurzbeschreibung  : Unbestätigte Mails                              *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-} elseif (!IS_MEMBER()) {
-       LOAD_URL('modules.php?module=index');
-} elseif ((!EXT_IS_ACTIVE('mailid')) && (!IS_ADMIN())) {
-       LOAD_URL('modules.php?module=login');
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();
+} elseif ((!isExtensionActive('mailid')) && (!isAdmin())) {
+       redirectToUrl('modules.php?module=login');
 }
 
 // Add description as navigation point
-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);
 
 // Shall we display a mail?
-if ((REQUEST_ISSET_GET(('bonusid'))) && (EXT_IS_ACTIVE('bonus'))) {
+if ((isGetRequestElementSet('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
-FROM `{!_MYSQL_PREFIX!}_bonus`
-WHERE id=%s LIMIT 1",
-               array(bigintval(REQUEST_GET('bonusid'))), __FILE__, __LINE__);
+       $result_data = SQL_QUERY_ESC("SELECT
+       `id`, `subject`, `timestamp`, `cat_id`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
+FROM
+       `{?_MYSQL_PREFIX?}_bonus`
+WHERE
+       `id`=%s
+LIMIT 1",
+               array(bigintval(getRequestElement('bonusid'))), __FILE__, __LINE__);
 
        // Load data
        $content = SQL_FETCHARRAY($result_data);
 
        // Translate some data
-       $content['subject']   = COMPILE_CODE($content['subject']);
-       $content['text']      = COMPILE_CODE($content['text']);
-       $content['timestamp'] = MAKE_DATETIME($content['timestamp'], '2');
-       $content['category']  = GET_CATEGORY($content['cat_id']);
-       $content['points']    = TRANSLATE_COMMA($content['points']);
-       $content['is_notify'] = TRANSLATE_YESNO($content['is_notify']);
-       $content['sender']    = _ADMIN_SHORT;
-       $content['time']      = CREATE_FANCY_TIME($content['time']);
-       $content['uid']       = getUserId();
+       $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('_ADMIN_SHORT');
+       $content['time']      = createFancyTime($content['time']);
+       $content['userid']    = getUserId();
 
        // Get timestamp from insert
        $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON'),
-               MAKE_DATETIME(USER_STATS_GET_TIMESTAMP('bonusid', $content['id']), '2')
+               generateDateTime(getTimestampFromUserStats('bonusid', $content['id']), 2)
        );
 
        // Display it depending on mail (data) type
-       LOAD_TEMPLATE('member_mail_bonus_'.strtolower($content['data_type']), false, $content);
+       loadTemplate('member_mail_bonus_'.strtolower($content['data_type']), false, $content);
 
        // Free result
        SQL_FREERESULT($result_data);
-} elseif (REQUEST_ISSET_GET(('mailid'))) {
+} elseif (isGetRequestElementSet(('mailid'))) {
        // Display regular member mail by loading its full data
-       $result_data = SQL_QUERY_ESC("SELECT s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id, pay.price AS points, p.sender, pay.time, p.data_type
-FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
-LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p
-ON s.pool_id=p.id
-LEFT JOIN `{!_MYSQL_PREFIX!}_payments` AS pay
-ON p.payment_id=pay.id
-WHERE s.id=%s LIMIT 1",
-               array(bigintval(REQUEST_GET('mailid'))), __FILE__, __LINE__);
+       $result_data = SQL_QUERY_ESC("SELECT
+       s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id, pay.price AS points, p.sender, pay.time, p.data_type
+FROM
+       `{?_MYSQL_PREFIX?}_user_stats` AS s
+LEFT JOIN
+       `{?_MYSQL_PREFIX?}_pool` AS p
+ON
+       s.pool_id=p.id
+LEFT JOIN
+       `{?_MYSQL_PREFIX?}_payments` AS pay
+ON
+       p.payment_id=pay.id
+WHERE
+       s.id=%s
+LIMIT 1",
+               array(bigintval(getRequestElement('mailid'))), __FILE__, __LINE__);
 
        // Load data
        $content = SQL_FETCHARRAY($result_data);
 
        // Translate some data
-       $content['subject']   = COMPILE_CODE($content['subject']);
-       $content['text']      = COMPILE_CODE($content['text']);
-       $content['timestamp'] = MAKE_DATETIME($content['timestamp'], '2');
-       $content['category']  = GET_CATEGORY($content['cat_id']);
-       $content['points']    = TRANSLATE_COMMA($content['points']);
-       $content['time']      = CREATE_FANCY_TIME($content['time']);
-       $content['uid']       = getUserId();
+       $content['timestamp'] = generateDateTime($content['timestamp'], 2);
+       $content['category']  = getCategory($content['cat_id']);
+       $content['points']    = translateComma($content['points']);
+       $content['time']      = createFancyTime($content['time']);
+       $content['userid']    = getUserId();
 
        // Get timestamp from insert
        $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
-               MAKE_DATETIME(USER_STATS_GET_TIMESTAMP('mailid', $content['id']), '2')
+               generateDateTime(getTimestampFromUserStats('mailid', $content['id']), 2)
        );
 
        // Display it depending on mail (data) type
-       LOAD_TEMPLATE('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);
 }
 
-if (EXT_IS_ACTIVE('bonus')) {
+if (isExtensionActive('bonus')) {
        // Load bonus ID
-       $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY bonus_id DESC, stats_id DESC",
+       $result = SQL_QUERY_ESC("SELECT `stats_id`, `bonus_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `bonus_id` DESC, stats_id DESC",
                array(getUserId()), __FILE__, __LINE__);
 } else {
        // Don't load bonus ID
-       $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY stats_id DESC",
+       $result = SQL_QUERY_ESC("SELECT `stats_id`, `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `stats_id` DESC",
                array(getUserId()), __FILE__, __LINE__);
 }
 
@@ -131,32 +138,46 @@ if (SQL_NUMROWS($result) > 0) {
        // Please confirm these mails!
        $sum = 0; $OUT = ''; $SW = 2;
 
+       // Init content
+       $content = array();
+
        // @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;
-               switch ($type)
-               {
-               case 'NORMAL':
-                       $result_data = SQL_QUERY_ESC("SELECT s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender
-FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
-LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p
-ON s.pool_id=p.id
-WHERE s.id=%s
+               $cat = '';
+               $result_data = false;
+               $PROBLEM = '';
+               $DATA = $content;
+               switch ($type) {
+                       case 'NORMAL':
+                               $result_data = SQL_QUERY_ESC("SELECT
+       s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender
+FROM
+       `{?_MYSQL_PREFIX?}_user_stats` AS s
+LEFT JOIN
+       `{?_MYSQL_PREFIX?}_pool` AS p
+ON
+       s.pool_id=p.id
+WHERE
+       s.id=%s
 LIMIT 1",
-                               array(bigintval($id)), __FILE__, __LINE__);
-                       $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 = getMessage('BONUS_MAIL_PROBLEM');
-                       break;
-
-               default: // Unknown type detected!
-                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type));
-                       break;
+                                       array(bigintval($id)), __FILE__, __LINE__);
+                               $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 = getMessage('BONUS_MAIL_PROBLEM');
+                               break;
+
+                       default: // Unknown type detected!
+                               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type));
+                               break;
                }
 
                // Data found to this mail?
@@ -168,10 +189,7 @@ LIMIT 1",
                        if (empty($subject)) {
                                // No subject line!
                                $subject = getMessage('DEFAULT_SUBJECT_LINE');
-                       } else {
-                               // Compile it
-                               $subject = COMPILE_CODE($subject);
-                       }
+                       } // END - if
 
                        // Prepare sender id
                        if (($sender > 0) && ($type == 'mailid')) {
@@ -188,21 +206,21 @@ LIMIT 1",
                        // Prepare data for template
                        $content = array(
                                'sw'      => $SW,
-                               'uid'     => getUserId(),
+                               'userid'  => getUserId(),
                                'data'    => bigintval($DATA),
                                'type'    => $type,
                                'subject' => $subject,
                                'sender'  => $sender,
-                               'stamp'   => MAKE_DATETIME($timestamp, '2'),
-                               'cat'     => GET_CATEGORY($cat),
-                               'points'  => TRANSLATE_COMMA($pay),
+                               'stamp'   => generateDateTime($timestamp, 2),
+                               'cat'     => getCategory($cat),
+                               'points'  => translateComma($pay),
                        );
 
                        // Load row template
                        if (getConfig('show_points_unconfirmed') == 'Y') {
-                               $OUT .= LOAD_TEMPLATE('member_unconfirmed_row', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_row', true, $content);
                        } else {
-                               $OUT .= LOAD_TEMPLATE('member_unconfirmed_row_nopoints', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_row_nopoints', true, $content);
                        }
 
                        // Count points
@@ -217,9 +235,9 @@ LIMIT 1",
 
                        // Display points or not?
                        if (getConfig('show_points_unconfirmed') == 'Y') {
-                               $OUT .= LOAD_TEMPLATE('member_unconfirmed_404', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_404', true, $content);
                        } else {
-                               $OUT .= LOAD_TEMPLATE('member_unconfirmed_404_nopoints', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_404_nopoints', true, $content);
                        }
                }
 
@@ -234,21 +252,21 @@ LIMIT 1",
        SQL_FREERESULT($result);
 
        // Remember total points
-       define('__TOTAL_POINTS', TRANSLATE_COMMA($sum));
+       $content['total_points'] = translateComma($sum);
 
        // Remember all generated rows in constant for the template
-       define('__UNCONFIRMED_ROWS', $OUT);
+       $content['rows'] = $OUT;
 
        // Load main template
        if (getConfig('show_points_unconfirmed') == 'Y') {
-               LOAD_TEMPLATE('member_unconfirmed_table');
+               loadTemplate('member_unconfirmed_table', false, $content);
        } else {
-               LOAD_TEMPLATE('member_unconfirmed_table_nopoints');
+               loadTemplate('member_unconfirmed_table_nopoints', false, $content);
        }
 } else {
        // No mails left to confirm... :)
-       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM'));
+       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM'));
 }
 
-//
+// [EOF]
 ?>