New functions introduced:

[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 52775b3073764a97a286d79923077020d76f0973..09e6922b4df5b3bb21d7de858a6382a476d05052 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -43,6 +43,13 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
+// Is 'sql_patches' updated?
+if (!isExtensionInstalledAndNewer('sql_patches', '0.7.4')) {
+       // No, abort here
+       loadTemplate('admin_settings_saved', false, 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`, `mails_sent`, `cat_id`
@@ -97,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__);
@@ -108,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);
@@ -134,7 +141,7 @@ if ((!empty($SQL2)) && (empty($WHO))) $result_bonus = SQL_QUERY($SQL2, __FILE__,
 // 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
@@ -171,7 +178,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;
@@ -191,7 +198,7 @@ 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 = '';
@@ -207,7 +214,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;