]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/admin/what-email_details.php
More rewrites/templates swapped out:
[mailer.git] / inc / modules / admin / what-email_details.php
index e66c6bb224cb8f239e41a946e8b54ec447fc5f9b..22ca7fb20afb36c6be8a91286566656502f3e4a0 100644 (file)
@@ -56,43 +56,52 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('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`
-WHERE data_type IN('ADMIN','TEMP','NEW','ACTIVE')
-ORDER BY timestamp DESC";
+$sql = "SELECT
+       `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+FROM
+       `{?_MYSQL_PREFIX?}_pool`
+WHERE
+       `data_type` IN('ADMIN','TEMP','NEW','ACTIVE')
+ORDER BY
+       `timestamp` DESC";
 
 $WHO = getMessage('_ALL');
 $SQL2 = '';
 
 if (isGetRequestParameterSet(('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`
-        WHERE `id`='".bigintval(getRequestParameter('mid'))."'
-        LIMIT 1";
-       $WHO = getMessage('MAIL_ID').": ".getRequestParameter('mid');
+       $sql = "SELECT
+       `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+FROM
+       `{?_MYSQL_PREFIX?}_pool`
+WHERE
+       `id`='".bigintval(getRequestParameter('mid'))."'
+LIMIT 1";
+       $WHO = getMessage('MAIL_ID') . ': ' . getRequestParameter('mid');
 } elseif (isGetRequestParameterSet('userid')) {
        // 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(getRequestParameter('userid'))."'
-ORDER by timestamp DESC";
-       $WHO = getMessage('USER_ID').": ".getRequestParameter('userid');
+       $sql = "SELECT
+       `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+FROM
+       `{?_MYSQL_PREFIX?}_pool`
+WHERE
+       `sender`='".bigintval(getRequestParameter('userid'))."'
+ORDER BY
+       `timestamp` DESC";
+       $WHO = getMessage('USER_ID') . ': ' . getRequestParameter('userid');
 }
 
 if ((isExtensionActive('bonus')) && ($WHO == getMessage('_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`
-WHERE is_notify='N'
-ORDER BY timestamp DESC";
-
        // Check for maximum pages
-       $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+       $result_bonus = SQL_QUERY("SELECT
+       `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `clicks`
+       (`mails_sent` - `clicks`) AS `unconfirmed`
+FROM
+       `{?_MYSQL_PREFIX?}_bonus`
+WHERE
+       `is_notify`='N'
+ORDER BY
+       `timestamp` DESC", __FILE__, __LINE__);
 }
 
 // Check for maximum pages
@@ -114,7 +123,7 @@ if (!isGetRequestParameterSet('offset')) {
 // Add limitation to SQL string
 if (!isGetRequestParameterSet(('mid'))) {
        // Create limitation line
-       $add = " LIMIT ".(bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))).", ".bigintval(getRequestParameter('offset'));
+       $add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))) . ', ' . bigintval(getRequestParameter('offset'));
 
        // For normal mails
        $sql .= $add;
@@ -139,35 +148,25 @@ SQL_FREERESULT($result_normal);
 $MAIL = false;
 if (SQL_NUMROWS($result_list) > 0) {
        // 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'] = "<strong><a href=\"{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=" . $pool['id'] . "%}\">" . $pool['unconfirmed'] . "</a></strong>";
-               } 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);
@@ -201,24 +200,12 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
                $PAGES = 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'] = "<strong><a href=\"{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=" . $bonus['id'] . "%}\">" . $bonus['unconfirmed'] . "</a></strong>";
-                       } // 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
@@ -243,5 +230,5 @@ if ($MAIL === false) {
        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
 } // END - if
 
-//
+// [EOF]
 ?>