X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=513997dfc3b2fef763c09396a39b4edb6719e547;hb=f5ebd83b36f343022977241bd9b570051ece4b0f;hp=843b9929dd430d722075acd822da0ecad1fdc724;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594;p=mailer.git
diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 843b9929dd..513997dfc3 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -1,14 +1,14 @@
0) {
// Some unconfirmed mails left
- if (REQUEST_GET('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(REQUEST_GET('uid')), $nums), __FILE__, __LINE__);
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s LIMIT %s",
+ array(bigintval(getRequestParameter('userid')), $nums), __FILE__, __LINE__);
// Prepare mail and send it away
- $msg = LOAD_EMAIL_TEMPLATE("admin-del_links", $nums, bigintval(REQUEST_GET('uid')));
- SEND_EMAIL($email, getMessage('ADMIN_DEL_LINK_SUBJ'), $msg);
+ $message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
+ sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
// Display message
- LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_LINKS_DELETED'));
+ loadTemplate('admin_settings_saved', false, getMessage('ADMIN_LINKS_DELETED'));
} else {
// Init variables
- $OUT = ""; $SW = 2;
+ $OUT = ''; $SW = 2;
// List all unconfirmed mails
// @TODO Find a way to rewrite this. See some lines above for different queries
while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
// Initializes some variables
- $cat = "";
- $DATA = "";
+ $cat = '';
+ $DATA = '';
$PROBLEM = getMessage('GENERAL_MAIL_PROBLEM');
$result_data = false; // Closes Bug #58
// Load data from stats table...
- 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",
- array(bigintval($id)), __FILE__, __LINE__);
- $type = "mailid"; $DATA = $id; $PROBLEM = getMessage('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."";
- break;
-
- default: // Problem in application detected!
- // Log the error
- DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid email type %s detected.", $type));
- break;
- }
+ // @TODO Rewrite this to includes/filter
+ switch ($type) {
+ 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 . '';
+ 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 . '';
+ 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' => MAKE_DATETIME($timestamp, "0"),
- 'cat' => GET_CATEGORY($cat),
+ 'sw' => $SW,
+ 'link' => $LINK,
+ 'subject' => $content['subject'],
+ 'timestamp' => generateDateTime($content['timestamp'], 0),
+ 'cat' => getCategory($content['cat_id']),
);
// Load row template
- $OUT .= LOAD_TEMPLATE("admin_list_links_row", true, $content);
+ $OUT .= loadTemplate('admin_list_links_row', true, $content);
} else {
// Load template for error
- $OUT .= LOAD_TEMPLATE("admin_list_links_problem",
+ $OUT .= loadTemplate('admin_list_links_problem', true,
array(
'sw' => $SW,
'problem' => $PROBLEM,
@@ -151,35 +144,38 @@ if (REQUEST_ISSET_GET(('uid'))) {
)
);
}
+
+ // 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
- define('__SNAME_VALUE', $sname);
- define('__FNAME_VALUE', $fname);
- define('__EMAIL_VALUE', "".$email."");
- define('__EMAIL_LIST' , $OUT);
- define('__NUMS_VALUE' , $nums);
- define('__UID' , bigintval(REQUEST_GET('uid')));
+ $content['surname'] = getUserData('surname');
+ $content['family'] = getUserData('family');
+ $content['email'] = '' . getUserData('email') . '';
+ $content['rows'] = $OUT;
+ $content['nums'] = $nums;
+ $content['userid'] = bigintval(getRequestParameter('userid'));
// Load final template
- LOAD_TEMPLATE("admin_list_links");
+ loadTemplate('admin_list_links', false, $content);
}
} else {
// No mails left to confirm
- LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MEMBER_LINKS'), REQUEST_GET('uid')));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', getRequestParameter('userid')));
}
} else {
// User not found
- LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid')));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')));
}
} else {
// Output selection form with all confirmed user accounts listed
- ADD_MEMBER_SELECTION_BOX();
+ addMemberSelectionBox();
}
-//
+// [EOF]
?>