Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

[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 52037dd5c90163d10b11166c4182d76f0b748e1f..5c137d098cd5c03741ce1ac4aeb2fba42755cd98 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('mailid')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('mailid'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
        return;
 } // END - if
 
@@ -55,7 +55,7 @@ $listed = false;
 $sql = '';
 
 // List confirmation links from normal or bonus mails
-if (isGetRequestParameterSet('mid')) {
+if (isGetRequestElementSet('mid')) {
        // SQL query for mail data
        $sql = sprintf("SELECT
        s.`id`, p.`sender`, p.`subject`, p.`text`, p.`url`, p.`timestamp`, s.`max_rec`
@@ -68,7 +68,7 @@ ON
 WHERE
        p.`id`=%s
 LIMIT 1",
-               bigintval(getRequestParameter('mid'))
+               bigintval(getRequestElement('mid'))
        );
 
        // Column, type and id for member's mail
@@ -78,26 +78,26 @@ LIMIT 1",
 
        // Load admin_list_unconfirmed template
        $listed = true;
-       $DATA = getRequestParameter('mid');
+       $DATA = getRequestElement('mid');
        $mailType = 'mailid';
-} elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
+} elseif ((isGetRequestElementSet('bid')) && (isExtensionActive('bonus'))) {
        // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}');
 
        // SQL query for mail data (both ids are required for compatiblity to above normal mail
        $sql = sprintf("SELECT
-       `id`, `id` AS `sender`, `subject`, `text`, `url`, `timestamp`, `mails_sent` AS `max_rec`
+       `id`,`id` AS `sender`,`subject`,`text`,`url`,`timestamp`,`mails_sent` AS `max_rec`
 FROM
        `{?_MYSQL_PREFIX?}_bonus`
 WHERE
        `id`=%s
 LIMIT 1",
-               bigintval(getRequestParameter('bid'))
+               bigintval(getRequestElement('bid'))
        );
 
        // Column, type and id for member's mail
        $col = 'bonus_id';
        $type = 'BONUS';
-       $ID = getRequestParameter('bid');
+       $ID = getRequestElement('bid');
 
        // Load admin_list_unconfirmed template
        $listed = true;
@@ -113,7 +113,7 @@ if (($listed === true) && (!empty($sql))) {
        // Load mail data
        $result_master = SQL_QUERY($sql, __FILE__, __LINE__);
 
-       // Do we have an entry?
+       // Is there an entry?
        if (SQL_NUMROWS($result_master) == 1) {
                // Mail order / bonus mail found
                $poolData = SQL_FETCHARRAY($result_master);
@@ -125,14 +125,19 @@ if (($listed === true) && (!empty($sql))) {
 
                // Bonus mails do always have a sender 'NULL'
                if ($col == 'bonus_id') {
-                       $poolData['sender'] = null;
+                       $poolData['sender'] = NULL;
                } // END - if
 
                // Load unconfirmed mail links. Hmmm, this select query is pretty cool
                // but it does only show unconfirmed mail links from existing user
                // accounts. So if you have delete one you did not see those links
                $result = SQL_QUERY_ESC("SELECT
-       l.`userid`, u.`status`, u.`surname`, u.`family`, u.`gender`, u.`email`
+       l.`userid`,
+       u.`status`,
+       u.`surname`,
+       u.`family`,
+       u.`gender`,
+       u.`email`
 FROM
        `{?_MYSQL_PREFIX?}_user_links` AS `l`
 LEFT JOIN
@@ -150,7 +155,7 @@ LIMIT %s",
                                bigintval($poolData['max_rec'])
                        ),__FILE__, __LINE__);
 
-               // Do we have entries?
+               // Are there entries?
                if (!SQL_HASZERONUMS($result)) {
                        // At least one link left to confirm
                        $OUT = '';
@@ -162,7 +167,7 @@ LIMIT %s",
                                                'userid' => $row['userid'],
                                                'link'   => $mailType,
                                                'id'     => $ID,
-                                               'email'  => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">' . translateGender($row['gender']) . ' ' . $row['surname'] . ' ' . $row['family'] . '</a>',
+                                               'email'  => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">{%pipe,translateGender=' . $row['gender'] . '%} ' . $row['surname'] . ' ' . $row['family'] . '</a>',
                                                'status' => $row['status'],
                                        );
 
@@ -192,19 +197,19 @@ LIMIT %s",
 
                // Load final template
                loadTemplate('admin_list_unconfirmed', false, $content);
-       } elseif (getRequestParameter('mid') > 0) {
+       } elseif (getRequestElement('mid') > 0) {
                // Data in pool or in user_stats not found, so let's find out where data is missing
                if (countSumTotalData(bigintval($ID), 'pool', 'id', 'id', true) == 1) {
                        // pool table
-                       displayMessage(getMaskedMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID));
+                       displayMessage('{%message,ADMIN_UNCONFIRMED_POOL_MISSING=' . $ID . '%}');
                } elseif (countSumTotalData(bigintval($ID), 'user_stats', 'id', 'pool_id', true) == 1) {
                        // user_stats table
-                       displayMessage(getMaskedMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID));
+                       displayMessage('{%message,ADMIN_UNCONFIRMED_STATS_MISSING=' . $ID . '%}');
                } else {
                        // both or link is invalid
                        displayMessage('{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
                }
-       } elseif (isGetRequestParameterSet('bid')) {
+       } elseif (isGetRequestElementSet('bid')) {
                // Data in bonus table not found
                displayMessage('{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
        }