X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=83150be3e37d825c1db78dc6b40cdc1825eaab14;hb=29157685184b9aa2ddbf42e9d2e49141af95f7e2;hp=1edcfd6c277d378dc67bed90361f94e43a04cfbe;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df;p=mailer.git
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 1edcfd6c27..83150be3e3 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -1,7 +1,7 @@
0) {
+if (!SQL_HASZERONUMS($result_list)) {
// Init rows
- $OUT = ''; $content = array();
+ $OUT = '';
// Walk through all entries
- while ($pool = SQL_FETCHARRAY($result_list)) {
+ while ($content = 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",
- array(bigintval($pool['id'])), __FILE__, __LINE__);
- list($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon);
+ $result_uncon = SQL_QUERY_ESC("SELECT (`max_rec` - `clicks`) AS `unconfirmed` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
+ array(bigintval($content['id'])), __FILE__, __LINE__);
+
+ // Load and merge data
+ $content = merge_array($content, SQL_FETCHARRAY($result_uncon));
+
+ // Free result
SQL_FREERESULT($result_uncon);
// Unconfirmed mails
- $pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks'];
- if ($pool['unconfirmed'] > 0) {
- // Add link to list_unconfirmed what-file
- $pool['unconfirmed'] = "".$pool['unconfirmed']."";
- } elseif ($pool['unconfirmed'] < 0) {
- // Sometimes rarely displayed minus values will be "fixed" to zero
- $pool['unconfirmed'] = 0;
- }
+ $content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], ($content['unconfirmed']), 'mid');
// Prepare content
- $content = $pool;
- $content['sender_link'] = generateUserProfileLink($pool['sender']);
- $content['payment'] = getPaymentTitlePrice($pool['payment_id']);
- $content['category'] = getCategory($pool['cat_id']);
- $content['receivers'] = convertReceivers($pool['receivers']);
- $content['type'] = translatePoolType($pool['data_type']);
- $content['frametester'] = generateFrametesterUrl($pool['url']);
- $content['timestamp'] = generateDateTime($pool['timestamp'], 0);
+ $content['timestamp'] = generateDateTime($content['timestamp'], 0);
// Load row template
$OUT .= loadTemplate('admin_list_emails_row', true, $content);
@@ -176,8 +183,7 @@ if (SQL_NUMROWS($result_list) > 0) {
SQL_FREERESULT($result_list);
// Add navigation (with change box and colspan=3)
- $content['nav'] = '';
- if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
+ $content['nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
// Prepare content
$content['rows'] = $OUT;
@@ -187,37 +193,25 @@ if (SQL_NUMROWS($result_list) > 0) {
loadTemplate('admin_list_emails', false, $content);
$MAIL = true;
- if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
- // Check only if bonus extension is active
- if (SQL_NUMROWS($result_bonus) > 0) outputHtml('
');
- }
+ if ((isExtensionActive('bonus')) && (empty($WHO))) {
+ // Only check if bonus extension is active
+ if (!SQL_HASZERONUMS($result_bonus)) outputHtml('
');
+ } // END - if
}
-if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+if ((isExtensionActive('bonus')) && (empty($WHO))) {
// Load bonus mails only when extension is active
- if (SQL_NUMROWS($result_bonus) > 0) {
+ if (!SQL_HASZERONUMS($result_bonus)) {
// Calculate pages
- $PAGES = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
+ $numPages = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
// List emails
- $OUT = ''; $content = array();
- while ($bonus = SQL_FETCHARRAY($result_bonus)) {
- // Calculate unconfirmed emails
- $bonus['unconfirmed'] = $bonus['mails_sent'] - $bonus['clicks'];
-
- // Add link?
- if ($bonus['unconfirmed'] > 0) {
- // Add link to list_unconfirmed what-file
- $bonus['unconfirmed'] = "".$bonus['unconfirmed']."";
- } // END - if
+ $OUT = '';
+ while ($content = SQL_FETCHARRAY($result_bonus)) {
+ // Add link to list_unconfirmed what-file
+ $content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], $content['unconfirmed']);
// Prepare content
- $content = $bonus;
- $content['time'] = createFancyTime($content['time']);
- $content['category'] = getCategory($content['cat_id']);
- $content['receivers'] = convertReceivers($content['receivers']);
- $content['type'] = translatePoolType($content['data_type']);
- $content['frametester'] = generateFrametesterUrl($content['url']);
$content['timestamp'] = generateDateTime($content['timestamp'], 0);
// Load row template
@@ -225,8 +219,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
} // END - while
// Add navigation (without change box but with colspan=3)
- $content['nav'] = '';
- if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
+ $content['nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
// Prepare content
$content['rows'] = $OUT;
@@ -239,8 +232,8 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
if ($MAIL === false) {
// No mail orders fond
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
} // END - if
-//
+// [EOF]
?>