New wrapper functions introduced, TODOs.txt updated

[mailer.git] / inc / modules / admin / what-email_details.php

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 3bc7046f6f9e8be134964ff3e42b6a51107d5b24..182525c71aa87708d772c24d1ffac8bd32457eba 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * 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 *
@@ -33,16 +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                                                  *
- * -------------------------------------------------------------------- *
- *           Moded What-email_details.php   / also Editet !             *
- * Auf langsammen Servern (wie mein z.B Dauert das Laden)               *
- * enorm hoch zu lang. Jetzt werden nur auftraege aufgelistet die       *
- * NEU sind ( DB NEW) oder ADMIN freischalten muss (DB ADMIN )          *
- * oder noch als TEMP gespecihert sind                                  *
- * der rest der schon als SEND sich melden darf wird per                *
- * what-email_archiv .php aufgerufen                                    *
- * beste gruesse Robert Niedziela / www.personal-webserver.de           *
- * oder auch www.mc-p.org                                               *
  ************************************************************************/
 
 // Some security stuff...
@@ -51,11 +41,18 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
+
+// Is 'sql_patches' updated?
+if (!isExtensionInstalledAndNewer('sql_patches', '0.7.4')) {
+       // No, abort here
+       displayMessage(generateExtensionOutdatedMessage('sql_patches', '0.7.4'));
+       return false;
+} // END - if
 
 // Normal mails ordered by your members
 $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`, `mails_sent`, `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -107,7 +104,7 @@ WHERE
        `is_notify`='N'
 ORDER BY
        `timestamp` DESC", __FILE__, __LINE__);
-}
+} // END - if
 
 // Check for maximum pages
 $result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
@@ -118,7 +115,7 @@ if (!isGetRequestParameterSet('page')) setGetRequestParameter('page', 1);
 if (!isGetRequestParameterSet('offset')) {
        if (isConfigEntrySet('mails_page')) {
                // Set config entry
-               setGetRequestParameter('offset', getConfig('mails_page'));
+               setGetRequestParameter('offset', getMailsPage());
        } else {
                // Set default one
                setGetRequestParameter('offset', 10);
@@ -139,12 +136,14 @@ if (!isGetRequestParameterSet('mid')) {
 
 // Run SQL query for normal mails
 $result_list = SQL_QUERY($sql, __FILE__, __LINE__);
-if ((!empty($SQL2)) && (empty($WHO))) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+if ((!empty($SQL2)) && (empty($WHO))) {
+       $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+} // END - if
 
 // Calculate pages
 $numPages = '0';
 if (isConfigEntrySet('mails_page')) {
-       $numPages = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
+       $numPages = round(SQL_NUMROWS($result_normal) / getMailsPage() + 0.3);
 } // END - if
 
 // Free result
@@ -181,7 +180,7 @@ if (!SQL_HASZERONUMS($result_list)) {
        SQL_FREERESULT($result_list);
 
        // Add navigation (with change box and colspan=3)
-       $content['nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
+       $content['nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
 
        // Prepare content
        $content['rows'] = $OUT;
@@ -195,13 +194,13 @@ if (!SQL_HASZERONUMS($result_list)) {
                // Only check if bonus extension is active
                if (!SQL_HASZERONUMS($result_bonus)) outputHtml('<br /><br />');
        } // END - if
-}
+} // END - if
 
 if ((isExtensionActive('bonus')) && (empty($WHO))) {
        // Load bonus mails only when extension is active
        if (!SQL_HASZERONUMS($result_bonus)) {
                // Calculate pages
-               $numPages = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
+               $numPages = round(SQL_NUMROWS($result_bonus) / getMailsPage() + 0.5);
 
                // List emails
                $OUT = '';
@@ -217,7 +216,7 @@ if ((isExtensionActive('bonus')) && (empty($WHO))) {
                } // END - while
 
                // Add navigation (without change box but with colspan=3)
-               $content['nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
+               $content['nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
 
                // Prepare content
                $content['rows'] = $OUT;
@@ -230,7 +229,7 @@ if ((isExtensionActive('bonus')) && (empty($WHO))) {
 
 if ($MAIL === false) {
        // No mail orders fond
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
+       displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 } // END - if
 
 // [EOF]