More double quotes to single rewritten, CSS/HTML cleanups

diff --git a/inc/functions.php b/inc/functions.php
index 3b95accab04348cf298294fe1291cbf7f18d402b..9131865c190236b6f69edb151d8d0b62568d0b21 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3818,21 +3818,21 @@ function sendModeMails ($mod, $modes) {
                                        $sub_mem = getMessage('MEMBER_CHANGED_DATA');
 
                                        // Output success message
-                                       $content = "<span class=\"member_done\">{--MYDATA_MAIL_SENT--}</span>";
+                                       $content = '<span class="member_done">{--MYDATA_MAIL_SENT--}</span>';
                                        break;
 
                                default: // Unsupported module!
                                        logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
-                                       $content = "<span class=\"member_failed\">{--UNKNOWN_MODULE--}</span>";
+                                       $content = '<span class="member_failed">{--UNKNOWN_MODULE--}</span>';
                                        break;
                        } // END - switch
                } else {
                        // Passwords mismatch
-                       $content = "<span class=\"member_failed\">{--MEMBER_PASSWORD_ERROR--}</span>";
+                       $content = '<span class="member_failed">{--MEMBER_PASSWORD_ERROR--}</span>';
                }
        } else {
                // Could not load profile
-               $content = "<span class=\"member_failed\">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>";
+               $content = '<span class="member_failed">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>';
        }
 
        // Send email to user if required

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index fb8fd95c230f57feebe447b997c7216993098f04..27e73d663e00ab887bf4e7f802569551d3415e3c 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -209,11 +209,11 @@ function outputAdvancedOverview (&$result_main) {
                } elseif (isExtensionActive('bonus')) {
                        $content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXT_BONUS_OUTDATED', '0.1.8');
                } else {
-                       $content['purged_bonus_mails'] = "<span class=\"admin_note\">{--ADMIN_EXT_BONUS_404--}</span>";
+                       $content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXT_BONUS_404--}</span>';
                }
        } else {
-               $content['purged_bonus_mails'] = "<span class=\"admin_note\">{--ADMIN_EXT_AUTOPURGE_404--}</span>";
-               $content['purged_mails'] = "<span class=\"admin_note\">{--ADMIN_EXT_AUTOPURGE_404--}</span>";
+               $content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXT_AUTOPURGE_404--}</span>';
+               $content['purged_mails'] = '<span class="admin_note">{--ADMIN_EXT_AUTOPURGE_404--}</span>';
        }
 
        //

diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php
index 789a1ec484ff1546f924095f1afee21c0589ee37..9a93ae5e036f695e4689a8842d760e70614d71de 100644 (file)
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -58,7 +58,7 @@ if (isPostRequestParameterSet(('add_max'))) {
                $content = getMessage('MAX_VALUE_SAVED');
        } else {
                // Value does alread exists!
-               $content = "<span class=\"admin_failed\">{--MAX_VALUE_ALREADY--}</span>";
+               $content = '<span class="admin_failed">{--MAX_VALUE_ALREADY--}</span>';
        }
 
        // Free memory

diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index 8c36a0770ba9caaad6e76643cf6410f14f8ea04c..92845f6c658eb96856cf44f290671b32ef4d223a 100644 (file)
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -151,7 +151,7 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
                        rebuildCacheFile('config', 'config');
                } else {
                        // Prepare failed-message
-                       $message = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
+                       $message = '<span class="admin_failed">{--SETTINGS_NOT_SAVED--}</span>';
                }
 
                // Remove SQL queries

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 187d3c8a30a7c075b06b671cbcaee1e0585f9fc5..7a730e3d1a210f88245982c75e110a525a8c2ceb 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -86,7 +86,7 @@ LIMIT 1",
                if (SQL_AFFECTEDROWS() == 1) {
                        $content = getMessage('SETTINGS_SAVED');
                } else {
-                       $content = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
+                       $content = '<span class="admin_failed">{--SETTINGS_NOT_SAVED--}</span>';
                }
 
                // Display message
@@ -118,7 +118,7 @@ LIMIT 1",
        }
 } else {
        // No mail orders left in pool
-       loadTemplate('admin_settings_saved', false, "<span class=\"admin_failed\">{--ADMIN_NO_MAILS_IN_POOL--}</span>");
+       loadTemplate('admin_settings_saved', false, '<span class="admin_failed">{--ADMIN_NO_MAILS_IN_POOL--}</span>');
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index 3424bf9a0a38fd66aefb9ff8916948a705422b98..ec6151629836185a603edebc8dd997018cb9a628 100644 (file)
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -80,10 +80,10 @@ if (isFormSent()) {
        if (countSqls() > 0) {
                // Run all queries
                runFilterChain('run_sqls');
-               $content = "<span class=\"admin_failed\">{--SETTINGS_SAVED--}</span>";
+               $content = '<span class="admin_failed">{--SETTINGS_SAVED--}</span>';
        } else {
                // Nothing has changed!
-               $content = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
+               $content = '<span class="admin_failed">{--SETTINGS_NOT_SAVED--}</span>';
        }
 
        // Output template

diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index 1d0171b880d2eb73fd82ba20f22299ce1c07d42c..174f837e97e8060a0eb26204ae6bd4fea60ebef0 100644 (file)
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -86,11 +86,16 @@ VALUES ('%s','%s','%s')",
                        break;
        }
 
+       // Check if we have saved (updated)
        if (SQL_AFFECTEDROWS() == 1) {
+               // Updated!
                $content = getMessage('SETTINGS_SAVED');
        } else {
-               $content = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
+               // Nothing has been updated
+               $content = '<span class="admin_failed">{--SETTINGS_NOT_SAVED--}</span>';
        }
+
+       // Display message
        loadTemplate('admin_settings_saved', false, $content);
 } elseif ((countPostSelection() > 0) && (isPostRequestParameterSet('edit'))) {
        // Edit banner

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
-                                               $content['zip_content'] = loadTemplate('member_order-zip', true, postRequestParameter('zip'));
+                                               $content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip'));
                                        } 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
@@ -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'] = "<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
@@ -649,11 +649,11 @@ LIMIT 1",
                                        $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'] = "<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
@@ -681,15 +681,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

diff --git a/show_bonus.php b/show_bonus.php
index d8c15a6df4046854b5c74f6f30bb0d972d18e509..0a633f1e771482e37a88064e8e6d86a1f325888c 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -112,18 +112,18 @@ LIMIT 1",
                        $content['message'] = loadTemplate('show_bonus_msg', true, $content);
                } else {
                        // No data found
-                       $content['message'] = "<span class=\"guest_failed\">{--BONUS_SHOW_NO_DATA--}</span>";
+                       $content['message'] = '<span class="guest_failed">{--BONUS_SHOW_NO_DATA--}</span>';
                }
 
                // Free memory
                SQL_FREERESULT($result);
        } else {
                // Wrong type entered
-               $content['message'] = "<span class=\"guest_failed\">{--BONUS_SHOW_WRONG_TYPE--}</span>";
+               $content['message'] = '<span class="guest_failed">{--BONUS_SHOW_WRONG_TYPE--}</span>';
        }
 } else {
        // Wrong call!
-       $content['message'] = "<span class=\"guest_failed\">{--BONUS_SHOW_WRONG_CALL--}</span>";
+       $content['message'] = '<span class="guest_failed">{--BONUS_SHOW_WRONG_CALL--}</span>';
 }
 
 // Load send_bonus header template (for your banners, e.g.?)

diff --git a/templates/de/html/member/member_cats_header.tpl b/templates/de/html/member/member_cats_header.tpl
index f5aeab88f2f7b1af2e4bcd16ad86f7431bcb72f3..af205903787f29feb8ff54fd1f08120bece5daac 100644 (file)
--- a/templates/de/html/member/member_cats_header.tpl
+++ b/templates/de/html/member/member_cats_header.tpl
@@ -1,6 +1,6 @@
 <div align="center">
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=categories%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="member_main dashed">
+<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
 <tr>
        <td align="center" class="header_column bottom" width="408"><strong>{--CATNAME--}</strong></td>
        <td align="center" class="header_column bottom" width="180"><strong>{--SELECT_CAT--}</strong></td>

diff --git a/templates/de/html/member/member_mydata_overview.tpl b/templates/de/html/member/member_mydata_overview.tpl
index 55664920115b953e32ecd90cdcb88f1e058148c5..af98d904e30f12a9e99215ce8575ba0190b64b2d 100644 (file)
--- a/templates/de/html/member/member_mydata_overview.tpl
+++ b/templates/de/html/member/member_mydata_overview.tpl
@@ -1,116 +1,73 @@
-<table border="0" cellspacing="0" cellpadding="0" width="480" class="member_main dashed" align="center">
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" width="480" class="member_table dashed" align="center">
        <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" rowspan="27" class="seperator">&nbsp;</td>
                <td colspan="3" align="center">$content[change]</td>
-               <td width="10" rowspan="27" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="3" height="7" class="seperator">&nbsp;</td>
        </tr>
        <tr>
                <td width="225" align="right">{--YOUR_LOGIN--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td width="225"><strong>$content[userid]</strong></td>
        </tr>
-       <tr>
-               <td colspan="3" height="7" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td width="225" align="right">{--GENDER--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td width="225"><strong>$content[gender]</strong></td>
        </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td width="225" align="right">{--SURNAME--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td width="225"><strong>$content[surname]</strong></td>
        </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td align="right">{--FAMILY--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td><strong>$content[family]</strong></td>
        </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td align="right">{--STREET_NR--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td><strong>$content[street_nr]</strong></td>
        </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td align="right">{--COUNTRY--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td><strong>$content[country]</strong></td>
        </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td align="right">{--ZIP--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td><strong>$content[zip]</strong></td>
        </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td align="right">{--CITY--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td><strong>$content[city]</strong></td>
        </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td align="right">{--EMAIL--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td><strong>$content[email]</strong></td>
        </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td align="right">{--BIRTHDAY--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td><strong>$content[dob]</strong></td>
        </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td align="right">{--MAILS_PER_DAY--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
-               <td><strong>$content[max_mails]</strong>&nbsp;({--TODAY--}: <strong>$content[receive_mails]</strong>)
+               <td>
+                       <strong>$content[max_mails]</strong>
+                       ({--TODAY--}: <strong>$content[receive_mails]</strong>)
                </td>
        </tr>
-       <tr>
-               <td colspan="3" height="3" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td align="right">{--PROFILE_LAST_CHANGE--}:</td>
                <td width="10" class="seperator">&nbsp;</td>
                <td><strong>$content[last_update]</strong></td>
        </tr>
-       <tr>
-               <td colspan="3" height="7" class="seperator">&nbsp;</td>
-       </tr>
        <tr>
                <td colspan="3" align="center">$content[change]</td>
        </tr>
-       <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
-       </tr>
-</table>
\ No newline at end of file
+</table>
+</div>

diff --git a/templates/de/html/member/member_order-zip2.tpl b/templates/de/html/member/member_order-zip2.tpl
index 6fc0671b997a139b271af5817cce6ead1c60efd8..f55e068ef7a92b045098159898d2eec0b40f52fe 100644 (file)
--- a/templates/de/html/member/member_order-zip2.tpl
+++ b/templates/de/html/member/member_order-zip2.tpl
@@ -1,24 +1,17 @@
 <tr>
-       <td colspan="5" align="center" class="member_title2 bottom"
-               height="30"><strong>{--MEMBER_ORDER_PAGE2_INTRO--}</strong></td>
-</tr>
-<tr>
-       <td colspan="5" height="5" class="seperator">&nbsp;</td>
+       <td colspan="3" align="center" class="member_title2 bottom" height="30">
+               <strong>{--MEMBER_ORDER_PAGE2_INTRO--}</strong>
+       </td>
 </tr>
 <tr>
-       <td width="10" class="seperator">&nbsp;</td>
        <td align="center" colspan="3">
-       <table border="0" cellspacing="0" cellpadding="0"
-               class="member_main dashed">
+       <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
                <tr>
-                       <td width="10" class="seperator">&nbsp;</td>
                        <td align="right">{--MEMBER_ENTER_ZIP_CODE--}</td>
-                       <td width="10" class="seperator">&nbsp;</td>
-                       <td><input type="text" name="zip" class="member_normal" size="5"
-                               maxlength="6" value="$content">
-                       <td width="10" class="seperator">&nbsp;</td>
+                       <td>
+                               <input type="text" name="zip" class="member_normal" size="5" maxlength="6" value="$content" />
+                       </td>
                </tr>
        </table>
        </td>
-       <td width="10" class="seperator">&nbsp;</td>
 </tr>
\ No newline at end of file

diff --git a/templates/de/html/member/member_order_points.tpl b/templates/de/html/member/member_order_points.tpl
index dea7095dbd287d84fb7187cc57e0a3ff8e2a9b66..5bb21614284e1165604fbf3697eed0f85299f1c3 100644 (file)
--- a/templates/de/html/member/member_order_points.tpl
+++ b/templates/de/html/member/member_order_points.tpl
@@ -1,5 +1,5 @@
 <div class="para" align="center">
-<table border="0" cellspacing="0" cellpadding="0" class="member_main dashed">
+<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
        <tr>
                <td align="center" height="50" class="member_main" style="padding-left: 5px; padding-right: 5px">
                        <div class="para">