X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=0726c0b1316a26a028c512ed38d8af3d40d2570b;hb=00283a82c807a00d66bd5811d41992bb3b059996;hp=0af60e17f6136c6e41c7c0593fceb49ea5e06b9d;hpb=903f539b5aac6171fdfee9ad252565531e8dd4e2;p=mailer.git
diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 0af60e17f6..0726c0b131 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -14,11 +14,9 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -43,10 +41,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
if (!isExtensionActive('mailid')) {
- loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mailid'));
+ displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
return;
} // END - if
@@ -57,16 +55,16 @@ 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` ASC",
+ $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)
- $result = SQL_QUERY_ESC("SELECT `stats_id`, `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
+ $result = SQL_QUERY_ESC("SELECT `stats_id`,`stats_id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
}
// Do we have some entries?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// Some unconfirmed mails left
if (getRequestParameter('delete') == "all") {
// Delete all unconfirmed mails by this user
@@ -74,11 +72,11 @@ if (isGetRequestParameterSet('userid')) {
array(bigintval(getRequestParameter('userid')), SQL_NUMROWS($result)), __FILE__, __LINE__);
// Prepare mail and send it away
- $message = loadEmailTemplate('admin-del_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
- sendEmail(getUserData('email'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
+ $message = loadEmailTemplate('member_delete_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
+ sendEmail(getUserData('userid'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
// Display message
- loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}');
+ displayMessage('{--ADMIN_LINKS_DELETED--}');
} else {
// Init variables
$OUT = '';
@@ -86,26 +84,25 @@ if (isGetRequestParameterSet('userid')) {
// 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 = '';
- $PROBLEM = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
- $result_data = false; // Closes Bug #58
+ // Initializes all variables
+ $mailId = '';
+ $problemMessage = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
+ $result_data = false;
// Load data from stats table...
// @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",
+ $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 = '{--NORMAL_MAIL_PROBLEM--}';
+ $type = 'mailid'; $mailId = $id; $problemMessage = '{--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",
+ $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 = '{--BONUS_MAIL_PROBLEM--}';
+ $type = 'bonusid'; $mailId = $id2; $problemMessage = '{--BONUS_MAIL_PROBLEM--}';
$LINK = '' . $id2 . '';
break;
@@ -117,19 +114,15 @@ if (isGetRequestParameterSet('userid')) {
// Do we have an entry?
if (SQL_NUMROWS($result_data) == 1) {
- // Mail was found!
+ // Mail was found
$content = SQL_FETCHARRAY($result_data);
// Fix empty subject
if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
// Prepare data for the row template
- $content = array(
- 'link' => $LINK,
- 'subject' => $content['subject'],
- 'timestamp' => generateDateTime($content['timestamp'], 0),
- 'cat_id' => $content['cat_id'],
- );
+ $content['link'] = $LINK;
+ $content['timestamp'] = generateDateTime($content['timestamp'], 0);
// Load row template
$OUT .= loadTemplate('admin_list_links_row', true, $content);
@@ -137,8 +130,8 @@ if (isGetRequestParameterSet('userid')) {
// Load template for error
$OUT .= loadTemplate('admin_list_links_problem', true,
array(
- 'problem' => $PROBLEM,
- 'data' => $DATA
+ 'problem' => $problemMessage,
+ 'mail_id' => $mailId
)
);
}
@@ -148,8 +141,6 @@ if (isGetRequestParameterSet('userid')) {
} // END - while
// Remember list in constant for the template
- $content['surname'] = getUserData('surname');
- $content['family'] = getUserData('family');
$content['email'] = '' . getUserData('email') . '';
$content['rows'] = $OUT;
$content['nums'] = SQL_NUMROWS($result);
@@ -163,11 +154,11 @@ if (isGetRequestParameterSet('userid')) {
}
} else {
// No mails left to confirm
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
+ displayMessage('{%message,ADMIN_NO_UNCONFIRMED_MAILS_LEFT=' . bigintval(getRequestParameter('userid')) . '%}');
}
} else {
// User not found
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+ displayMessage('{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
}
} else {
// Output selection form with all confirmed user accounts listed