X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=a2c6ec2cd7850c7b9b3c846474acbb3fe610f55a;hp=369cf7f3210d3b293ac8e0e86c57e4184a11fe02;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php index 369cf7f321..a2c6ec2cd7 100644 --- a/inc/modules/admin/what-email_archiv.php +++ b/inc/modules/admin/what-email_archiv.php @@ -14,12 +14,10 @@ * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * - * Needs to be in all Files and every File needs "svn propset * - * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2012 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -35,9 +33,6 @@ * along with this program; if not, write to the Free Software * * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, * * MA 02110-1301 USA * - * -------------------------------------------------------------------- * - * Mod-Copyright (c) 2004 by Robert Niedziela * - * www.megacomputing.de * ************************************************************************/ // Some security stuff... @@ -46,11 +41,11 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); -// Init SQL string +// Init SQL $sql = "SELECT - `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id` + `id`,`sender`,`subject`,`text`,`receivers`,`payment_id`,`data_type`,`timestamp`,`url`,`target_send`,`cat_id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE @@ -62,37 +57,33 @@ ORDER BY $result_maximum = SQL_QUERY($sql, __FILE__, __LINE__); // Set offset an current page to default values -if (!isGetRequestParameterSet('page')) setGetRequestParameter('page' , 1); -if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getConfig('mails_page')); +if (!isGetRequestElementSet('page')) setGetRequestElement('page' , 1); +if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getMailsPage()); // Add limitation to SQL string -$sql .= " LIMIT ".(getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('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_maximum) / getConfig('mails_page') + 0.5); +$numPages = round(SQL_NUMROWS($result_maximum) / getMailsPage() + 0.5); // Free the result which we don't need SQL_FREERESULT($result_maximum); -if (SQL_NUMROWS($result) > 0) { +if (!SQL_HASZERONUMS($result)) { // Mail orders are in pool so we can display them // Add navigation table rows - $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 + $content['top_email_nav'] = addEmailNavigation($numPages, getMailsPage(), true , 3, true); + $content['bottom_email_nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true); // List all entries - $OUT = ''; $SW = 2; + $OUT = ''; while ($pool = SQL_FETCHARRAY($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['id'])), __FILE__, __LINE__); // Load entries @@ -102,34 +93,16 @@ if (SQL_NUMROWS($result) > 0) { SQL_FREERESULT($result_mails); // Unconfirmed mails - $pool['unconfirmed'] = $pool['max_rec'] - $pool['clicks']; - if ($pool['unconfirmed'] > 0) { - // Add link to list_unconfirmed what-file - $pool['unconfirmed'] = '' . $pool['unconfirmed'] . ''; - } // END - if + $pool['unconfirmed'] = generateUnconfirmedAdminLink($pool['id'], ($pool['max_rec'] - $pool['clicks']), 'mid'); // Prepare data for the row template - $content = merge_array($content, array( - 'sw' => $SW, - 'u_link' => generateUserProfileLink($pool['sender']), - 'subject' => $pool['subject'], - 'text' => $pool['text'], - 'pay' => getPaymentTitlePrice($pool['payment_id']), - 'cat' => getCategory($pool['cat_id']), - 'sent' => $pool['max_rec'], - 'ruserids' => convertReceivers($pool['receivers']), - 'unconfirmed' => $pool['unconfirmed'], - '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'], - )); + $content['timestamp'] = generateDateTime($pool['timestamp'], 0); + + // Merge pool data with content + $content = merge_array($content, $pool); // Load row template and switch colors $OUT .= loadTemplate('admin_email_archiv_row', true, $content); - $SW = 3 - $SW; } // END - while // Remmber generated rows in array @@ -139,7 +112,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_email_archiv', false, $content); } else { // No mail orders fond - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL')); + displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}'); } // Free memory