X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=513997dfc3b2fef763c09396a39b4edb6719e547;hb=f5ebd83b36f343022977241bd9b570051ece4b0f;hp=6e9ad7d1e237a97886eb614d9eb35cd39d490057;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git
diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 6e9ad7d1e2..513997dfc3 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -1,7 +1,7 @@
0) {
// Some unconfirmed mails left
- if (getRequestElement('del') == "all") {
+ 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(getRequestElement('userid')), $nums), __FILE__, __LINE__);
+ array(bigintval(getRequestParameter('userid')), $nums), __FILE__, __LINE__);
// Prepare mail and send it away
- $message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestElement('userid')));
- sendEmail($email, getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
+ $message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
+ sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
// Display message
loadTemplate('admin_settings_saved', false, getMessage('ADMIN_LINKS_DELETED'));
@@ -104,76 +97,80 @@ if (isGetRequestElementSet('userid')) {
// @TODO Rewrite this to includes/filter
switch ($type) {
case 'NORMAL':
- $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+ $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');
- $LINK = "".$id."";
+ $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');
- $LINK = "".$id2."";
+ $LINK = '' . $id2 . '';
break;
default: // Problem in application detected!
// Log the error
logDebugMessage(__FILE__, __LINE__, sprintf("Invalid email type %s detected.", $type));
break;
- }
+ } // END - switch
if (SQL_NUMROWS($result_data) == 1) {
// Mail was found!
- list($subject, $timestamp, $cat) = SQL_FETCHROW($result_data);
- SQL_FREERESULT($result_data);
- if (empty($subject)) $subject = getMessage('DEFAULT_SUBJECT_LINE');
+ $content = SQL_FETCHARRAY($result_data);
+
+ // Fix empty subject
+ if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
// Prepare data for the row template
$content = array(
- 'sw' => $SW,
- 'link' => $LINK,
- 'subj' => $subject,
- 'stamp' => generateDateTime($timestamp, '0'),
- 'cat' => getCategory($cat),
+ 'sw' => $SW,
+ 'link' => $LINK,
+ 'subject' => $content['subject'],
+ 'timestamp' => generateDateTime($content['timestamp'], 0),
+ 'cat' => getCategory($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',
- array(
+ $OUT .= loadTemplate('admin_list_links_problem', true,
+ array(
'sw' => $SW,
'problem' => $PROBLEM,
'data' => $DATA
- )
+ )
);
}
+
+ // Switch color and free result
$SW = 3 - $SW;
- }
+ SQL_FREERESULT($result_data);
+ } // END - while
// Free memory
SQL_FREERESULT($result);
// Remember list in constant for the template
- $content['surname'] = $surname;
- $content['family'] = $family;
- $content['email'] = "".$email."";
+ $content['surname'] = getUserData('surname');
+ $content['family'] = getUserData('family');
+ $content['email'] = '' . getUserData('email') . '';
$content['rows'] = $OUT;
$content['nums'] = $nums;
- $content['userid'] = bigintval(getRequestElement('userid'));
+ $content['userid'] = bigintval(getRequestParameter('userid'));
// Load final template
loadTemplate('admin_list_links', false, $content);
}
} else {
// No mails left to confirm
- loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_LINKS'), getRequestElement('userid')));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', getRequestParameter('userid')));
}
} else {
// User not found
- loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), getRequestElement('userid')));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')));
}
} else {
// Output selection form with all confirmed user accounts listed