X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=a2193ec131550c4fa45cd7ebe5fe8a60d7fe8de4;hp=7e58510f76c1bf8cdd285758f2edcaa4476e048d;hb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;hpb=143e78d4231adddd9e706cbf55ec5dd8c1651890
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 7e58510f76..a2193ec131 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -48,36 +48,33 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
}
// Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
// Normal mails ordered by your members
// 0 1 2 3 4 5 6 7 8 9 10
$SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
-FROM "._MYSQL_PREFIX."_pool
+FROM `{!_MYSQL_PREFIX!}_pool`
WHERE data_type IN('ADMIN','TEMP','NEW','ACTIVE')
ORDER BY timestamp DESC";
$WHO = _ALL;
$SQL2 = "";
-if (!empty($_GET['mid']))
-{
+if (!empty($_GET['mid'])) {
// Only a specific mail shall be displayed
// 0 1 2 3 4 5 6 7 8 9 10
$SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
- FROM "._MYSQL_PREFIX."_pool
+ FROM `{!_MYSQL_PREFIX!}_pool`
WHERE id='".bigintval($_GET['mid'])."'
LIMIT 1";
$WHO = MAIL_ID.": ".$_GET['mid'];
-}
- elseif (!empty($_GET['u_id']))
-{
+} elseif (!empty($_GET['u_id'])) {
// All mails by a specific member shall be displayed
// 0 1 2 3 4 5 6 7 8 9 10
$SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
- FROM "._MYSQL_PREFIX."_pool
- WHERE sender='".bigintval($_GET['u_id'])."'
- ORDER by timestamp DESC";
+FROM `{!_MYSQL_PREFIX!}_pool`
+WHERE sender='".bigintval($_GET['u_id'])."'
+ORDER by timestamp DESC";
$WHO = USER_ID.": ".$_GET['u_id'];
}
@@ -85,8 +82,9 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
// Bonus mails sent by you
// 0 1 2 3 4 5 6 7 8 9 10 11 12
$SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks
- FROM "._MYSQL_PREFIX."_bonus
- ORDER BY timestamp DESC";
+FROM `{!_MYSQL_PREFIX!}_bonus`
+WHERE is_notify='N'
+ORDER BY timestamp DESC";
// Check for maximum pages
$result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
@@ -97,11 +95,10 @@ $result_normal = SQL_QUERY($SQL, __FILE__, __LINE__);
// Set offset an current page to default values
if (empty($_GET['page'])) $_GET['page'] = "1";
-if (empty($_GET['offset'])) $_GET['offset'] = $_CONFIG['mails_page'];
+if (empty($_GET['offset'])) $_GET['offset'] = getConfig('mails_page');
// Add limitation to SQL string
-if (empty($_GET['mid']))
-{
+if (empty($_GET['mid'])) {
// Create limitation line
$ADD = " LIMIT ".(bigintval($_GET['offset']) * bigintval($_GET['page']) - bigintval($_GET['offset'])).", ".bigintval($_GET['offset']);
@@ -110,14 +107,14 @@ if (empty($_GET['mid']))
// For bonus mails
if (!empty($SQL2)) $SQL2 .= $ADD;
-}
+} // END - if
// Run SQL query for normal mails
$result_list = SQL_QUERY($SQL, __FILE__, __LINE__);
if ((!empty($SQL2)) && ($WHO == _ALL)) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
// Calculate pages
-$PAGES = round(SQL_NUMROWS($result_normal) / $_CONFIG['mails_page'] + 0.3);
+$PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
SQL_FREERESULT($result_normal);
$MAIL = false;
@@ -128,7 +125,7 @@ if (SQL_NUMROWS($result_list) > 0) {
// Walk through all entries
while ($pool = SQL_FETCHARRAY($result_list)) {
// Unconfirmed mails and sent mails
- $result_uncon = SQL_QUERY_ESC("SELECT max_rec, clicks FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s LIMIT 1",
+ $result_uncon = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
array(bigintval($pool['id'])), __FILE__, __LINE__);
list($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon);
SQL_FREERESULT($result_uncon);
@@ -137,7 +134,7 @@ if (SQL_NUMROWS($result_list) > 0) {
$pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks'];
if ($pool['unconfirmed'] > 0) {
// Add link to list_unconfirmed what-file
- $pool['unconfirmed'] = "".$pool['unconfirmed']."";
+ $pool['unconfirmed'] = "".$pool['unconfirmed']."";
} elseif ($pool['unconfirmed'] < 0) {
// Sometimes rarely displayed minus values will be "fixed" to zero
$pool['unconfirmed'] = 0;
@@ -153,6 +150,7 @@ if (SQL_NUMROWS($result_list) > 0) {
$content['receivers'] = str_replace(";", ", ", $pool['receivers']);
$content['type'] = TRANSLATE_POOL_TYPE($pool['data_type']);
$content['frametester'] = FRAMETESTER($pool['url']);
+ $content['url'] = COMPILE_CODE($pool['url']);
$content['timestamp'] = MAKE_DATETIME($pool['timestamp'], "0");
// Load row template
@@ -164,7 +162,7 @@ if (SQL_NUMROWS($result_list) > 0) {
// Add navigation (with change box and colspan=3)
$content['nav'] = "";
- if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true);
+ if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, "3", true);
// Prepare content
$content['rows'] = $OUT;
@@ -184,7 +182,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
// Load bonus mails only when extension is active
if (SQL_NUMROWS($result_bonus) > 0) {
// Calculate pages
- $PAGES = round(SQL_NUMROWS($result_bonus) / $_CONFIG['mails_page'] + 0.5);
+ $PAGES = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
// List emails
$OUT = ""; $content = array();
@@ -195,7 +193,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
// Add link?
if ($bonus['unconfirmed'] > 0) {
// Add link to list_unconfirmed what-file
- $bonus['unconfirmed'] = "".$bonus['unconfirmed']."";
+ $bonus['unconfirmed'] = "".$bonus['unconfirmed']."";
} // END - if
// Prepare content
@@ -209,11 +207,11 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
// Load row template
$OUT .= LOAD_TEMPLATE("admin_list_bonus_emails_row", true, $content);
- }
+ } // END - while
// Add navigation (without change box but with colspan=3)
$content['nav'] = "";
- if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true);
+ if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, "3", true);
// Prepare content
$content['rows'] = $OUT;
@@ -221,13 +219,13 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
// Load main template
LOAD_TEMPLATE("admin_list_bonus_emails", false, $content);
$MAIL = true;
- }
-}
+ } // END - if
+} // END - if
if (!$MAIL) {
// No mail orders fond
- OUTPUT_HTML("".ADMIN_NO_MAILS_IN_POOL."");
-}
+ LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+} // END - if
//
?>