X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=b48b2e003952b4d10d1048adc87febd17dbc89b7;hb=98b92ea5ba992a63304091fa1b57f477befffc22;hp=fd11ffd1c9b1baa904e6b5748a90d17ea3482c02;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6;p=mailer.git
diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index fd11ffd1c9..b48b2e0039 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -18,6 +18,7 @@
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -56,7 +57,7 @@ if (isGetRequestParameterSet('userid')) {
// @TODO Try to rewrite this to a filter
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 `id`",
+ $result = SQL_QUERY_ESC("SELECT `stats_id`, `bonus_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
} else {
// Load stats id (2nd will be ignored later! But it is needed for the same fetchrow command)
@@ -64,25 +65,23 @@ if (isGetRequestParameterSet('userid')) {
array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
}
- // Get number of rows from the query
- $nums = SQL_NUMROWS($result);
-
- if ($nums > 0) {
+ // Do we have some entries?
+ if (SQL_NUMROWS($result) > 0) {
// Some unconfirmed mails left
if (getRequestParameter('del') == "all") {
// Delete all unconfirmed mails by this user
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s LIMIT %s",
- array(bigintval(getRequestParameter('userid')), $nums), __FILE__, __LINE__);
+ array(bigintval(getRequestParameter('userid')), SQL_NUMROWS($result)), __FILE__, __LINE__);
// Prepare mail and send it away
- $message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
- sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
+ $message = loadEmailTemplate('admin-del_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
+ sendEmail(getUserData('email'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
// Display message
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_LINKS_DELETED'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}');
} else {
// Init variables
- $OUT = ''; $SW = 2;
+ $OUT = '';
// List all unconfirmed mails
// @TODO Find a way to rewrite this. See some lines above for different queries
@@ -90,7 +89,7 @@ if (isGetRequestParameterSet('userid')) {
// Initializes some variables
$cat = '';
$DATA = '';
- $PROBLEM = getMessage('GENERAL_MAIL_PROBLEM');
+ $PROBLEM = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
$result_data = false; // Closes Bug #58
// Load data from stats table...
@@ -99,14 +98,14 @@ if (isGetRequestParameterSet('userid')) {
case 'NORMAL':
$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered` AS `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
array(bigintval($id)), __FILE__, __LINE__);
- $type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
+ $type = 'mailid'; $DATA = $id; $PROBLEM = '{--NORMAL_MAIL_PROBLEM--}';
$LINK = '' . $id . '';
break;
case 'BONUS':
$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
array(bigintval($id2)), __FILE__, __LINE__);
- $type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
+ $type = 'bonusid'; $DATA = $id2; $PROBLEM = '{--BONUS_MAIL_PROBLEM--}';
$LINK = '' . $id2 . '';
break;
@@ -116,61 +115,59 @@ if (isGetRequestParameterSet('userid')) {
break;
} // END - switch
+ // Do we have an entry?
if (SQL_NUMROWS($result_data) == 1) {
// Mail was found!
$content = SQL_FETCHARRAY($result_data);
// Fix empty subject
- if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
+ if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
// Prepare data for the row template
$content = array(
- 'sw' => $SW,
'link' => $LINK,
'subject' => $content['subject'],
'timestamp' => generateDateTime($content['timestamp'], 0),
- 'cat' => getCategory($content['cat_id']),
+ 'cat_id' => $content['cat_id'],
);
// Load row template
$OUT .= loadTemplate('admin_list_links_row', true, $content);
} else {
// Load template for error
- $OUT .= loadTemplate('admin_list_links_problem',
+ $OUT .= loadTemplate('admin_list_links_problem', true,
array(
- 'sw' => $SW,
'problem' => $PROBLEM,
'data' => $DATA
)
);
}
- // Switch color and free result
- $SW = 3 - $SW;
+ // Free result
SQL_FREERESULT($result_data);
} // END - while
- // Free memory
- SQL_FREERESULT($result);
-
// Remember list in constant for the template
$content['surname'] = getUserData('surname');
$content['family'] = getUserData('family');
$content['email'] = '' . getUserData('email') . '';
$content['rows'] = $OUT;
- $content['nums'] = $nums;
+ $content['nums'] = SQL_NUMROWS($result);
$content['userid'] = bigintval(getRequestParameter('userid'));
+ // Free memory
+ SQL_FREERESULT($result);
+
// Load final template
loadTemplate('admin_list_links', false, $content);
}
} else {
// No mails left to confirm
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', getRequestParameter('userid')));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
}
} else {
// User not found
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
}
} else {
// Output selection form with all confirmed user accounts listed