X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=6474a7a1a4e80d4e2c04f777f8ec7ca6e0ee59ee;hb=eb301334eb0960dd060cc0d59e6021260a41f835;hp=57e51bd49763b572422db031ecfebc7fd0a4dc51;hpb=e6785b4a4845d7a885b0e9c6dac517c6867940e1;p=mailer.git
diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 57e51bd497..6474a7a1a4 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -17,7 +17,7 @@
* Needs to be in all Files and every File needs "svn propset *
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -40,53 +40,58 @@
************************************************************************/
// Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
- require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+ die();
+} // END - if
// Add description as navigation point
-ADD_DESCR('admin', __FILE__);
-
-// 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='SEND' OR data_type='DELETED'
- ORDER BY timestamp DESC";
+addMenuDescription('admin', __FILE__);
+
+// Init SQL string
+$sql = "SELECT
+ `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+FROM
+ `{?_MYSQL_PREFIX?}_pool`
+WHERE
+ `data_type`='SEND' OR `data_type`='DELETED'
+ORDER BY
+ `timestamp` DESC";
// Check for maximum pages
-$result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
+$result_maximum = SQL_QUERY($sql, __FILE__, __LINE__);
// Set offset an current page to default values
-if (!REQUEST_ISSET_GET('page')) REQUEST_SET_GET('page' , "1");
-if (!REQUEST_ISSET_GET('offset')) REQUEST_SET_GET('offset', getConfig('mails_page'));
+if (!isGetRequestElementSet('page')) setRequestGetElement('page' , '1');
+if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', getConfig('mails_page'));
// Add limitation to SQL string
-$sql .= " LIMIT ".(REQUEST_GET('offset') * REQUEST_GET('page') - REQUEST_GET('offset')).", ".REQUEST_GET('offset');
+$sql .= " LIMIT ".(getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')).", ".getRequestElement('offset');
// Run SQL query for normal mails
$result = SQL_QUERY($sql, __FILE__, __LINE__);
// Calculate pages
-$PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.5);
-SQL_FREERESULT($result_normal);
+$pages = round(SQL_NUMROWS($result_maximum) / getConfig('mails_page') + 0.5);
+
+// 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', '');
- }
+ $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",
+ $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__);
list($sent, $clicks) = SQL_FETCHROW($result_mails);
SQL_FREERESULT($result_mails);
@@ -95,43 +100,45 @@ if (SQL_NUMROWS($result) > 0) {
$unconfirmed = $sent - $clicks;
if ($unconfirmed > 0) {
// Add link to list_unconfirmed what-file
- $unconfirmed = "".$unconfirmed."";
- }
+ $unconfirmed = "".$unconfirmed."";
+ } // END - if
// Prepare data for the row template
- $content = array(
+ $row = 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[1]),
+ 'subj' => $pool[2],
+ 'text' => $pool[3],
+ 'pay' => getPaymentTitlePrice($pool[5]),
+ 'cat' => getCategory($pool[10]),
'sent' => $sent,
- 'ruids' => str_replace(';', ", ", $pool[4]),
+ 'ruserids' => str_replace(';', ", ", $pool[4]),
'unconfirmed' => $unconfirmed,
- 'type' => TRANSLATE_POOL_TYPE($pool[6]),
+ 'type' => translatePoolType($pool[6]),
'tsend' => $pool[9],
- 'frametester' => FRAMETESTER($pool[8]),
- 'url' => COMPILE_CODE($pool[8]),
- 'stamp' => MAKE_DATETIME($pool[7], "0"),
+ 'frametester' => generateFrametesterUrl($pool[8]),
+ 'url' => $pool[8],
+ 'stamp' => generateDateTime($pool[7], '0'),
'mid' => $pool[0],
);
// Load row template and switch colors
- $OUT .= LOAD_TEMPLATE("admin_email_archiv_row", true, $content);
+ $OUT .= loadTemplate('admin_email_archiv_row', true, $row);
$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]
?>