Some marjor bugfixes and little improvements

[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 1795e056ab26b951004b153f71310932e11cc191..effc1b8c72885a342de235389fb8b4d54e193616 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -60,8 +60,7 @@ ORDER BY timestamp DESC";
 $WHO = _ALL;
 $SQL2 = "";
 
 $WHO = _ALL;
 $SQL2 = "";
 

-if (!empty($_GET['mid']))
-{
+if (!empty($_GET['mid'])) {

        // Only a specific mail shall be displayed
        //              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
        // Only a specific mail shall be displayed
        //              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


@@ -69,9 +68,7 @@ if (!empty($_GET['mid']))
         WHERE id='".bigintval($_GET['mid'])."'
         LIMIT 1";
        $WHO = MAIL_ID.": ".$_GET['mid'];
         WHERE id='".bigintval($_GET['mid'])."'
         LIMIT 1";
        $WHO = MAIL_ID.": ".$_GET['mid'];

-}
- elseif (!empty($_GET['u_id']))
-{
+} elseif (!empty($_GET['u_id'])) {

        // All mails by a specific member shall be displayed
        //              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
        // All mails by a specific member shall be displayed
        //              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


@@ -101,8 +98,7 @@ if (empty($_GET['page']))   $_GET['page']   = "1";
 if (empty($_GET['offset'])) $_GET['offset'] = getConfig('mails_page');
 
 // Add limitation to SQL string
 if (empty($_GET['offset'])) $_GET['offset'] = getConfig('mails_page');
 
 // Add limitation to SQL string

-if (empty($_GET['mid']))
-{
+if (empty($_GET['mid'])) {

        // Create limitation line
        $ADD = " LIMIT ".(bigintval($_GET['offset']) * bigintval($_GET['page']) - bigintval($_GET['offset'])).", ".bigintval($_GET['offset']);
 
        // Create limitation line
        $ADD = " LIMIT ".(bigintval($_GET['offset']) * bigintval($_GET['page']) - bigintval($_GET['offset'])).", ".bigintval($_GET['offset']);
 


@@ -111,7 +107,7 @@ if (empty($_GET['mid']))
 
        // For bonus mails
        if (!empty($SQL2)) $SQL2 .= $ADD;
 
        // For bonus mails
        if (!empty($SQL2)) $SQL2 .= $ADD;

-}
+} // END - if

 
 // Run SQL query for normal mails
 $result_list = SQL_QUERY($SQL, __FILE__, __LINE__);
 
 // Run SQL query for normal mails
 $result_list = SQL_QUERY($SQL, __FILE__, __LINE__);


@@ -211,7 +207,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
 
                        // Load row template
                        $OUT .= LOAD_TEMPLATE("admin_list_bonus_emails_row", true, $content);
 
                        // Load row template
                        $OUT .= LOAD_TEMPLATE("admin_list_bonus_emails_row", true, $content);

-               }
+               } // END - while

 
                // Add navigation (without change box but with colspan=3)
                $content['nav'] = "";
 
                // Add navigation (without change box but with colspan=3)
                $content['nav'] = "";


@@ -223,13 +219,13 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
                // Load main template
                LOAD_TEMPLATE("admin_list_bonus_emails", false, $content);
                $MAIL = true;
                // Load main template
                LOAD_TEMPLATE("admin_list_bonus_emails", false, $content);
                $MAIL = true;

-       }
-}
+       } // END - if
+} // END - if

 
 if (!$MAIL) {
        // No mail orders fond
 
 if (!$MAIL) {
        // No mail orders fond

-       OUTPUT_HTML("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
-}
+       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MAILS_IN_POOL);
+} // END - if

 
 //
 ?>
 
 //
 ?>