X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=a331e22230506b05a6648d85e00c757e6f8c34d3;hb=e2148142f8b1a8f40fd6e7ca32185569c5a9083e;hp=9dd067d1b1d3142137c0357cb933274898e85b19;hpb=508228c85fba8448d00865b1639cb8cd7a69e457;p=mailer.git
diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 9dd067d1b1..a331e22230 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -1,7 +1,7 @@
0) && ($ID == "-1")) $ID = $stats_id;
- if ($col == "bonus_id") $sender = 0;
-
- // @TODO Rewrite these constants
- define('__LIST_UNCON_SENDER' , $sender);
- define('__LIST_UNCON_SUBJECT', COMPILE_CODE($subj));
- define('__LIST_UNCON_TEXT' , COMPILE_CODE($text));
- define('__LIST_UNCON_URL' , encodeString($url));
- define('__LIST_UNCON_STAMP' , MAKE_DATETIME($stamp, "2"));
+ if (($stats_id > 0) && ($ID == '-1')) $ID = $stats_id;
+ 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
// accounts. So if you have delete one you did not see those links
- //
- $result = SQL_QUERY_ESC("SELECT DISTINCT l.userid, u.status, u.surname, u.family, u.gender, u.email
-FROM `{!_MYSQL_PREFIX!}_user_links` AS l
-LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS u
-ON l.userid=u.userid
-WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
+ $result = SQL_QUERY_ESC("SELECT
+ l.userid, u.status, u.surname, u.family, u.gender, u.email
+FROM
+ `{?_MYSQL_PREFIX?}_user_links` AS l
+LEFT JOIN
+ `{?_MYSQL_PREFIX?}_user_data` AS u
+ON
+ l.userid=u.userid
+WHERE
+ l.%s='%s' ORDER BY l.userid LIMIT %s",
array($col, $ID, bigintval($max)),__FILE__, __LINE__);
- $unconfirmed = SQL_NUMROWS($result);
- // @TODO Rewrite this constant
- define('__LIST_UNCO_UNCONFIRMED', $unconfirmed);
+ // Total number of unconfirmed mails
+ $unconfirmed = SQL_NUMROWS($result);
if ($unconfirmed > 0) {
// At least one link left to confirm
- $OUT = LOAD_TEMPLATE("admin_list_unconfirmed_header", true);
- $SW = 2;
+ $OUT = ''; $SW = 2;
while ($content = SQL_FETCHARRAY($result)) {
// Prepare data for the row template
- // @TODO Rewritings: uid->userid
+ // @TODO Rewritings: userid->userid
$content = array(
'sw' => $SW,
- 'u_link' => ADMIN_USER_PROFILE_LINK($content['userid']),
- 'uid' => $content['userid'],
+ 'u_link' => generateUserProfileLink($content['userid']),
+ 'userid' => $content['userid'],
'link' => $LINK,
'id' => $ID,
- 'email' => "".TRANSLATE_GENDER($content['gender'])." ".$content['surname']." ".$content['family']."",
- 'status' => TRANSLATE_STATUS($content['status']),
+ 'email' => "".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."",
+ 'status' => translateUserStatus($content['status']),
);
// Load row template and switch colors
- $OUT .= LOAD_TEMPLATE("admin_list_unconfirmed_row", true, $content);
+ $OUT .= loadTemplate('admin_list_unconfirmed_row', true, $content);
$SW = 3 - $SW;
}
- $OUT .= "\n";
+
+ // Render it in our new listing
+ $OUT = loadTemplate('admin_list_unconfirmed_list', true, $OUT);
// Free memory
SQL_FREERESULT($result);
-
- // Store table rows in a constant
- define('__LIST_UNCON_LISTING', $OUT);
} else {
// All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.
- define('__LIST_UNCON_LISTING', LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_UNCONFIRMED_NO_LINK_LEFT')));
+ $OUT = loadTemplate('admin_settings_saved', true, getMessage('ADMIN_UNCONFIRMED_NO_LINK_LEFT'));
}
+ // Prepare content
+ $content = array(
+ 'sender_link' => generateUserProfileLink($sender),
+ 'subject' => $subj,
+ 'text' => $text,
+ 'url' => generateFrametesterUrl($url),
+ 'unconfirmed' => $unconfirmed,
+ 'stamp' => generateDateTime($stamp, 2),
+ 'rows' => $OUT
+ );
+
// Load final template
- LOAD_TEMPLATE("admin_list_unconfirmed");
- } elseif (REQUEST_GET('mid') > 0) {
+ loadTemplate('admin_list_unconfirmed', false, $content);
+ } elseif (getRequestElement('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",
+ $result1 = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
array(bigintval($ID)), __FILE__, __LINE__);
- $result2 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+ $result2 = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
array(bigintval($ID)), __FILE__, __LINE__);
+
if (SQL_NUMROWS($result1) == 1) {
// pool table
- LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID)));
+ loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING'), $ID));
} elseif (SQL_NUMROWS($result2) == 1) {
// user_stats table
- LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID)));
+ loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_STATS_MISSING'), $ID));
} else {
// both or link is invalid
- LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
+ loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
}
// Free memory
SQL_FREERESULT($result1);
SQL_FREERESULT($result2);
- } elseif (REQUEST_ISSET_GET(('bid'))) {
+ } elseif (isGetRequestElementSet('bid')) {
// Data in bonus table not found
- LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
+ loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
}
+
+ // Free result
+ SQL_FREERESULT($result_master);
}
-//
+// [EOF]
?>