X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=acab810fad0fc551ae35a60835c6c9ca755bdf74;hp=e5f66afc1197cd734ce1e08ef2dce39521eef342;hb=c40a41ce0bf7793d417fb7684b9f061e6fc8cf7f;hpb=30ae22f62ae87c53a56baf0d134569ba91011111 diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php index e5f66afc11..acab810fad 100644 --- a/inc/modules/admin/what-email_archiv.php +++ b/inc/modules/admin/what-email_archiv.php @@ -14,11 +14,9 @@ * $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 * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -46,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); // Init SQL $sql = "SELECT @@ -63,7 +61,7 @@ $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 (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getMailsPage()); // Add limitation to SQL string $sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset'); @@ -72,7 +70,7 @@ $sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page') $result = SQL_QUERY($sql, __FILE__, __LINE__); // Calculate pages -$numPages = 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); @@ -81,8 +79,8 @@ if (!SQL_HASZERONUMS($result)) { // Mail orders are in pool so we can display them // Add navigation table rows - $content['top_email_nav'] = addEmailNavigation($numPages, getConfig('mails_page'), true , 3, true); - $content['bottom_email_nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true); + $content['top_email_nav'] = addEmailNavigation($numPages, getMailsPage(), true , 3, true); + $content['bottom_email_nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true); // List all entries $OUT = ''; @@ -98,7 +96,7 @@ if (!SQL_HASZERONUMS($result)) { SQL_FREERESULT($result_mails); // Unconfirmed mails - $pool['unconfirmed'] = generateUnconfirmedAdminLink($pool['id'], ($pool['max_rec'] - $pool['clicks']), 'mid'); + $pool['unconfirmed'] = generateUnconfirmedAdminLink($pool['id'], ($pool['max_rec'] - $pool['clicks']), 'mid'); // Prepare data for the row template $content['timestamp'] = generateDateTime($pool['timestamp'], 0); @@ -117,7 +115,7 @@ if (!SQL_HASZERONUMS($result)) { loadTemplate('admin_email_archiv', false, $content); } else { // No mail orders fond - loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}'); + displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}'); } // Free memory