More double quotes to single rewritten, CSS/HTML cleanups

[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..d85b9fea8159956842c7bc8ac562ac8440f64bbe 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -628,9 +628,9 @@ LIMIT 1",
 
                                        if (isPostRequestParameterSet('zip')) {
                                                // Output entered ZIP code
 
                                        if (isPostRequestParameterSet('zip')) {
                                                // Output entered ZIP code

-                                               $content['zip_content'] = loadTemplate('member_order-zip', true, postRequestParameter('zip'));
+                                               $content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip'));

                                        } else {
                                        } else {

-                                               $content['zip_content'] = "<tr><td colspan=\"5\" height=\"5\" class=\"seperator\">&nbsp;</td></tr>";
+                                               $content['zip_content'] = '<tr><td colspan="3" height="5" class="seperator">&nbsp;</td></tr>';

                                        }
 
                                        // HTML extension
                                        }
 
                                        // HTML extension


@@ -639,7 +639,7 @@ LIMIT 1",
                                                $content['html_extension'] = loadTemplate('member_order-html_ext', true, addValidHtmlTags());
                                        } else {
                                                // Extension not active and/or class not uploaded
                                                $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
                                        }
 
                                        // Output form for page 2


@@ -649,11 +649,11 @@ LIMIT 1",
                                        $add = '';
                                        if (isExtensionActive('html_mail')) {
                                                // Add some content when html extension is active
                                        $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";
+                                               if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) $add = '<tr><td colspan="3" class="seperator bottom" height="5">&nbsp;</td></tr>';

                                                $content['html_extension'] = loadTemplate('member_order-html_intro', true);
                                        } else {
                                                // No HTML extension installed
                                                $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
                                        }
 
                                        // Default is no ZIP code


@@ -681,15 +681,15 @@ LIMIT 1",
                                }
                        } else {
                                // No mail types defined
                                }
                        } 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
                        }
                } 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
                }
        } 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
        }
 } elseif ($mmails == '0') {
        // Please set more than 0 mails per day