fooRequestElementBar() functions renamed, adding of request parameters added:

[mailer.git] / inc / modules / admin / what-list_unconfirmed.php

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 92c54710a9d281443556f6d8f61b28ac5f6fd0dc..568ebf4c63f6bba687a54c8f0fd23f6b40c6bd88 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/09/2004 *
- * ================                             Last change: 10/31/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/09/2004 *
+ * ===================                          Last change: 10/31/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_unconfirmed.php                        *
@@ -53,7 +53,7 @@ if (!isExtensionActive('mailid')) {
 $listed = false;
 
 // List confirmation links from normal or bonus mails
-if (isGetRequestElementSet('mid')) {
+if (isGetRequestParameterSet('mid')) {
        // SQL query for mail data
        $sql = "SELECT
        s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec
@@ -64,22 +64,22 @@ LEFT JOIN
 ON
        p.id=s.pool_id
 WHERE
-       p.id='".getRequestElement('mid')."'
+       p.id='".getRequestParameter('mid')."'
 LIMIT 1";
 
-       // Column, type and ID for member's mail
+       // Column, type and id for member's mail
        $col = 'stats_id'; $type = 'NORMAL'; $ID = '-1';
 
        // Load admin_list_unconfirmed template
-       $listed = true; $DATA = getRequestElement('mid'); $LINK = 'mailid';
-} elseif ((isGetRequestElementSet('bid')) && (isExtensionActive('bonus'))) {
+       $listed = true; $DATA = getRequestParameter('mid'); $LINK = 'mailid';
+} elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
        // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
 
        // SQL query for mail data (both ids are required for compatiblity to above normal mail
-       $sql = "SELECT `id`, `id`, `subject`, `text`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`='".getRequestElement('bid')."' LIMIT 1";
+       $sql = "SELECT `id`, `id`, `subject`, `text`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`='".getRequestParameter('bid')."' LIMIT 1";
 
-       // Column, type and ID for member's mail
-       $col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestElement('bid');
+       // Column, type and id for member's mail
+       $col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestParameter('bid');
 
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = $ID; $LINK = 'bonusid';
@@ -101,7 +101,7 @@ if ($listed === true) {
 
                // Transfer data to constants for the template
                if (($stats_id > 0) && ($ID == '-1')) $ID = $stats_id;
-               if ($col == 'bonus_id') $sender = 0;
+               if ($col == 'bonus_id') $sender = '0';
 
                // Load unconfirmed mail links. Hmmm, this select query is pretty cool
                // but it does only show unconfirmed mail links from existing user
@@ -133,14 +133,14 @@ WHERE
                                        'userid' => $content['userid'],
                                        'link'   => $LINK,
                                        'id'     => $ID,
-                                       'email'  => "<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."</a>",
+                                       'email'  => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>',
                                        'status' => translateUserStatus($content['status']),
                                );
 
                                // Load row template and switch colors
                                $OUT .= loadTemplate('admin_list_unconfirmed_row', true, $content);
                                $SW = 3 - $SW;
-                       }
+                       } // END - while
 
                        // Render it in our new listing
                        $OUT = loadTemplate('admin_list_unconfirmed_list', true, $OUT);
@@ -165,7 +165,7 @@ WHERE
 
                // Load final template
                loadTemplate('admin_list_unconfirmed', false, $content);
-       } elseif (getRequestElement('mid') > 0) {
+       } elseif (getRequestParameter('mid') > 0) {
                // Data in pool or in user_stats not found, so let's find out where data is missing
                $result1 = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
                        array(bigintval($ID)), __FILE__, __LINE__);
@@ -174,10 +174,10 @@ WHERE
 
                if (SQL_NUMROWS($result1) == 1) {
                        // pool table
-                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING'), $ID));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID));
                } elseif (SQL_NUMROWS($result2) == 1) {
                        // user_stats table
-                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_STATS_MISSING'), $ID));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID));
                } else {
                        // both or link is invalid
                        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
@@ -186,7 +186,7 @@ WHERE
                // Free memory
                SQL_FREERESULT($result1);
                SQL_FREERESULT($result2);
-       } elseif (isGetRequestElementSet('bid')) {
+       } elseif (isGetRequestParameterSet('bid')) {
                // Data in bonus table not found
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
        }
@@ -195,5 +195,5 @@ WHERE
        SQL_FREERESULT($result_master);
 }
 
-//
+// [EOF]
 ?>