Fixes for unset config entries and ['header'] entry

[mailer.git] / inc / modules / member / what-order.php

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index a51cf0f7eaa59627b1f853d38a40fc255bdd7aa6..1ba7228f043febb1a9cee3dc5370a8defca543bc 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -626,12 +626,13 @@ LIMIT 1",
                                                } // END - if
                                        } // END - foreach
 
+                                       // No content is default
+                                       $content['zip_content'] = '';
+
                                        if (isPostRequestParameterSet('zip')) {
                                                // Output entered ZIP code
-                                               $content['zip_content'] = loadTemplate('member_order-zip', true, postRequestParameter('zip'));
-                                       } else {
-                                               $content['zip_content'] = "<tr><td colspan=\"5\" height=\"5\" class=\"seperator\">&nbsp;</td></tr>";
-                                       }
+                                               $content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip'));
+                                       } // END - if
 
                                        // HTML extension
                                        if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
@@ -639,21 +640,19 @@ LIMIT 1",
                                                $content['html_extension'] = loadTemplate('member_order-html_ext', true, addValidHtmlTags());
                                        } else {
                                                // Extension not active and/or class not uploaded
-                                               $content['html_extension'] = "<tr><td colspan=\"5\"><input type=\"hidden\" name=\"html\" value=\"N\" /></td></tr>";
+                                               $content['html_extension'] = '<tr><td colspan="3"><input type="hidden" name="html" value="N" /></td></tr>';
                                        }
 
                                        // Output form for page 2
                                        loadTemplate('member_order_page2', false, $content);
                                } else {
                                        // Remember maybe entered ZIP code in constant
-                                       $add = '';
                                        if (isExtensionActive('html_mail')) {
                                                // Add some content when html extension is active
-                                               if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) $add = "<tr><td colspan=\"2\" class=\"seperator bottom\" height=\"5\">&nbsp;</td></tr>\n";
                                                $content['html_extension'] = loadTemplate('member_order-html_intro', true);
                                        } else {
                                                // No HTML extension installed
-                                               $content['html_extension'] = "<tr><td colspan=\"2\"><input type=\"hidden\" name=\"html\" value=\"N\" /></td></tr>";
+                                               $content['html_extension'] = '<tr><td colspan="3"><input type="hidden" name="html" value="N" /></td></tr>';
                                        }
 
                                        // Default is no ZIP code
@@ -664,13 +663,11 @@ LIMIT 1",
                                                // Yes
                                                if (postRequestParameter('zip') > 0) {
                                                        $data = array(
-                                                               'zip' => bigintval(postRequestParameter('zip')),
-                                                               'add' => $add
+                                                               'zip' => bigintval(postRequestParameter('zip'))
                                                        );
                                                } else {
                                                        $data = array(
-                                                               'zip' => '',
-                                                               'add' => $add
+                                                               'zip' => ''
                                                        );
                                                }
                                                $content['zip_content'] = loadTemplate('member_order-zip1', true, $data);
@@ -681,15 +678,15 @@ LIMIT 1",
                                }
                        } else {
                                // No mail types defined
-                               loadTemplate('admin_settings_saved', false, "<span class=\"member_failed\">{--MEMBER_NO_PAYMENTS--}</span>");
+                               loadTemplate('admin_settings_saved', false, '<span class="member_failed">{--MEMBER_NO_PAYMENTS--}</span>');
                        }
                } else {
                        // No points left
-                       loadTemplate('admin_settings_saved', false, "<span class=\"member_failed\">{--MEMBER_NO_POINTS--}</span>");
+                       loadTemplate('admin_settings_saved', false, '<span class="member_failed">{--MEMBER_NO_POINTS--}</span>');
                }
        } else {
                // No cateogries are defined yet
-               loadTemplate('admin_settings_saved', false, "<span class=\"member_failed\">{--MEMBER_NO_CATS--}</span>");
+               loadTemplate('admin_settings_saved', false, '<span class="member_failed">{--MEMBER_NO_CATS--}</span>');
        }
 } elseif ($mmails == '0') {
        // Please set more than 0 mails per day