X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=fbed1deafaa4537c5271b83ede7ed4ee01c3ee4e;hb=241acfbd7e38ff9916100dac9d88892713f85c7f;hp=fcdd8aadfee5abba9509715d0f262ee423b91b11;hpb=258bb8c82f21617f7f90bff8023602a11b986f7e;p=mailer.git diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index fcdd8aadfe..fbed1deafa 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(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message); + $message = loadEmailTemplate('admin-del_links', $nums, 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 +91,7 @@ if (isGetRequestElementSet('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,15 +100,15 @@ if (isGetRequestElementSet('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'); - $LINK = "".$id.""; + $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'); - $LINK = "".$id2.""; + $type = 'bonusid'; $DATA = $id2; $PROBLEM = '{--BONUS_MAIL_PROBLEM--}'; + $LINK = '' . $id2 . ''; break; default: // Problem in application detected! @@ -121,32 +122,29 @@ if (isGetRequestElementSet('userid')) { $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 @@ -156,21 +154,21 @@ if (isGetRequestElementSet('userid')) { // Remember list in constant for the template $content['surname'] = getUserData('surname'); $content['family'] = getUserData('family'); - $content['email'] = "".getUserData('email').""; + $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', bigintval(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', bigintval(getRequestParameter('userid')))); } } else { // Output selection form with all confirmed user accounts listed