X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=418cfc8ab6cac7c39e643e6a04bca6c5334ae947;hb=e7627208baf6669248953b5b07aa67d0724dea75;hp=a7f26f043b431cd928bea2a2d0c14d5883a3c869;hpb=4001187f22197f55e5a1f211fc8defcc180f7c32;p=mailer.git
diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index a7f26f043b..418cfc8ab6 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -1,7 +1,7 @@
0)
-{
+// Free the result which we don't need
+SQL_FREERESULT($result_maximum);
+
+if (SQL_NUMROWS($result) > 0) {
// Mail orders are in pool so we can display them
// Add navigation table rows
- if ($PAGES > 1)
- {
- define('__TOP_EMAIL_NAV' , ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), true , "3", true));
- define('__BOTTOM_EMAIL_NAV', ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, "3", true));
- }
- else
- {
- define('__TOP_EMAIL_NAV' , "");
- define('__BOTTOM_EMAIL_NAV', "");
- }
-
- $OUT = ""; $SW = 2;
- while ($pool = SQL_FETCHROW($result))
- {
+ $content['top_email_nav'] = '';
+ $content['bottom_email_nav'] = '';
+ if ($pages > 1) {
+ $content['top_email_nav'] = addEmailNavigation($pages, getConfig('mails_page'), true , 3, true);
+ $content['bottom_email_nav'] = addEmailNavigation($pages, getConfig('mails_page'), false, 3, true);
+ } // END - if
+
+ $OUT = ''; $SW = 2;
+ // @TODO Rewrite to SQL_FETCHARRAY()
+ while ($pool = SQL_FETCHROW($result)) {
// Check sent mails and clicks
- $result_mails = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
- array(bigintval($pool[0])), __FILE__, __LINE__);
+ $result_mails = 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($sent, $clicks) = SQL_FETCHROW($result_mails);
SQL_FREERESULT($result_mails);
// Unconfirmed mails
$unconfirmed = $sent - $clicks;
- if ($unconfirmed > 0)
- {
+ if ($unconfirmed > 0) {
// Add link to list_unconfirmed what-file
- $unconfirmed = "".$unconfirmed."";
- }
+ $unconfirmed = "".$unconfirmed."";
+ } // END - if
// Prepare data for the row template
$content = array(
'sw' => $SW,
- 'u_link' => ADMIN_USER_PROFILE_LINK($pool[1]),
- 'subj' => COMPILE_CODE($pool[2]),
- 'text' => COMPILE_CODE($pool[3]),
- 'pay' => GET_PAYMENT($pool[5]),
- 'cat' => GET_CATEGORY($pool[10]),
+ 'u_link' => generateUserProfileLink($pool['sender']),
+ 'subject' => $pool['subject'],
+ 'text' => $pool['text'],
+ 'pay' => getPaymentTitlePrice($pool['payment_id']),
+ 'cat' => getCategory($pool['cat_id']),
'sent' => $sent,
- 'ruids' => str_replace(";", ", ", $pool[4]),
+ 'ruserids' => convertReceivers($pool['receivers']),
'unconfirmed' => $unconfirmed,
- 'type' => TRANSLATE_POOL_TYPE($pool[6]),
- 'tsend' => $pool[9],
- 'frametester' => FRAMETESTER($pool[8]),
- 'url' => COMPILE_CODE($pool[8]),
- 'stamp' => MAKE_DATETIME($pool[7], "0"),
- 'mid' => $pool[0],
+ 'type' => translatePoolType($pool['data_type']),
+ 'target_send' => $pool['target_send'],
+ 'frametester' => generateFrametesterUrl($pool['url']),
+ 'url' => $pool['url'],
+ 'timestamp' => generateDateTime($pool['timestamp'], 0),
+ 'mid' => $pool['id'],
);
// Load row template and switch colors
- $OUT .= LOAD_TEMPLATE("admin_email_archiv_row", true, $content);
+ $OUT .= loadTemplate('admin_email_archiv_row', true, $content);
$SW = 3 - $SW;
- }
+ } // END - while
- // Free memory
- SQL_FREERESULT($result);
- define('__EMAIL_ROWS', $OUT);
+ // Remmber generated rows in array
+ $content['rows'] = $OUT;
// Load main template
- LOAD_TEMPLATE("admin_email_archiv");
+ loadTemplate('admin_email_archiv', false, $content);
} else {
// No mail orders fond
- LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+ loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
}
-//
+
+// Free memory
+SQL_FREERESULT($result);
+
+// [EOF]
?>