From 0a69b4e17157eda9b6e1c70ff494292ccf8cbbd0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 4 Dec 2009 01:52:44 +0000 Subject: [PATCH] More double quotes to single rewritten, CSS/HTML cleanups --- inc/functions.php | 8 +-- inc/libs/task_functions.php | 6 +- inc/modules/admin/what-config_email.php | 2 +- inc/modules/admin/what-config_points.php | 2 +- inc/modules/admin/what-edit_emails.php | 4 +- inc/modules/admin/what-payments.php | 4 +- inc/modules/admin/what-refbanner.php | 7 ++- inc/modules/member/what-order.php | 16 +++--- show_bonus.php | 6 +- .../de/html/member/member_cats_header.tpl | 2 +- .../de/html/member/member_mydata_overview.tpl | 57 +++---------------- .../de/html/member/member_order-zip2.tpl | 21 +++---- .../de/html/member/member_order_points.tpl | 2 +- 13 files changed, 46 insertions(+), 91 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index 3b95accab0..9131865c19 100644 --- 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 = "{--MYDATA_MAIL_SENT--}"; + $content = '{--MYDATA_MAIL_SENT--}'; break; default: // Unsupported module! logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod)); - $content = "{--UNKNOWN_MODULE--}"; + $content = '{--UNKNOWN_MODULE--}'; break; } // END - switch } else { // Passwords mismatch - $content = "{--MEMBER_PASSWORD_ERROR--}"; + $content = '{--MEMBER_PASSWORD_ERROR--}'; } } else { // Could not load profile - $content = "{--MEMBER_CANNOT_LOAD_PROFILE--}"; + $content = '{--MEMBER_CANNOT_LOAD_PROFILE--}'; } // Send email to user if required diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index fb8fd95c23..27e73d663e 100644 --- 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'] = "{--ADMIN_EXT_BONUS_404--}"; + $content['purged_bonus_mails'] = '{--ADMIN_EXT_BONUS_404--}'; } } else { - $content['purged_bonus_mails'] = "{--ADMIN_EXT_AUTOPURGE_404--}"; - $content['purged_mails'] = "{--ADMIN_EXT_AUTOPURGE_404--}"; + $content['purged_bonus_mails'] = '{--ADMIN_EXT_AUTOPURGE_404--}'; + $content['purged_mails'] = '{--ADMIN_EXT_AUTOPURGE_404--}'; } // diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php index 789a1ec484..9a93ae5e03 100644 --- 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 = "{--MAX_VALUE_ALREADY--}"; + $content = '{--MAX_VALUE_ALREADY--}'; } // Free memory diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php index 8c36a0770b..92845f6c65 100644 --- 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 = "{--SETTINGS_NOT_SAVED--}"; + $message = '{--SETTINGS_NOT_SAVED--}'; } // Remove SQL queries diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php index 187d3c8a30..7a730e3d1a 100644 --- 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 = "{--SETTINGS_NOT_SAVED--}"; + $content = '{--SETTINGS_NOT_SAVED--}'; } // Display message @@ -118,7 +118,7 @@ LIMIT 1", } } else { // No mail orders left in pool - loadTemplate('admin_settings_saved', false, "{--ADMIN_NO_MAILS_IN_POOL--}"); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}'); } // [EOF] diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php index 3424bf9a0a..ec61516298 100644 --- 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 = "{--SETTINGS_SAVED--}"; + $content = '{--SETTINGS_SAVED--}'; } else { // Nothing has changed! - $content = "{--SETTINGS_NOT_SAVED--}"; + $content = '{--SETTINGS_NOT_SAVED--}'; } // Output template diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php index 1d0171b880..174f837e97 100644 --- 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 = "{--SETTINGS_NOT_SAVED--}"; + // Nothing has been updated + $content = '{--SETTINGS_NOT_SAVED--}'; } + + // 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 a51cf0f7ea..d85b9fea81 100644 --- 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'] = " "; + $content['zip_content'] = ' '; } // 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'] = ""; + $content['html_extension'] = ''; } // 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 = " \n"; + if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) $add = ' '; $content['html_extension'] = loadTemplate('member_order-html_intro', true); } else { // No HTML extension installed - $content['html_extension'] = ""; + $content['html_extension'] = ''; } // Default is no ZIP code @@ -681,15 +681,15 @@ LIMIT 1", } } else { // No mail types defined - loadTemplate('admin_settings_saved', false, "{--MEMBER_NO_PAYMENTS--}"); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_PAYMENTS--}'); } } else { // No points left - loadTemplate('admin_settings_saved', false, "{--MEMBER_NO_POINTS--}"); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_POINTS--}'); } } else { // No cateogries are defined yet - loadTemplate('admin_settings_saved', false, "{--MEMBER_NO_CATS--}"); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATS--}'); } } elseif ($mmails == '0') { // Please set more than 0 mails per day diff --git a/show_bonus.php b/show_bonus.php index d8c15a6df4..0a633f1e77 100644 --- 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'] = "{--BONUS_SHOW_NO_DATA--}"; + $content['message'] = '{--BONUS_SHOW_NO_DATA--}'; } // Free memory SQL_FREERESULT($result); } else { // Wrong type entered - $content['message'] = "{--BONUS_SHOW_WRONG_TYPE--}"; + $content['message'] = '{--BONUS_SHOW_WRONG_TYPE--}'; } } else { // Wrong call! - $content['message'] = "{--BONUS_SHOW_WRONG_CALL--}"; + $content['message'] = '{--BONUS_SHOW_WRONG_CALL--}'; } // 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 f5aeab88f2..af20590378 100644 --- a/templates/de/html/member/member_cats_header.tpl +++ b/templates/de/html/member/member_cats_header.tpl @@ -1,6 +1,6 @@
- +
diff --git a/templates/de/html/member/member_mydata_overview.tpl b/templates/de/html/member/member_mydata_overview.tpl index 5566492011..af98d904e3 100644 --- a/templates/de/html/member/member_mydata_overview.tpl +++ b/templates/de/html/member/member_mydata_overview.tpl @@ -1,116 +1,73 @@ -
{--CATNAME--} {--SELECT_CAT--}
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
  $content[change] 
 
{--YOUR_LOGIN--}:   $content[userid]
 
{--GENDER--}:   $content[gender]
 
{--SURNAME--}:   $content[surname]
 
{--FAMILY--}:   $content[family]
 
{--STREET_NR--}:   $content[street_nr]
 
{--COUNTRY--}:   $content[country]
 
{--ZIP--}:   $content[zip]
 
{--CITY--}:   $content[city]
 
{--EMAIL--}:   $content[email]
 
{--BIRTHDAY--}:   $content[dob]
 
{--MAILS_PER_DAY--}:  $content[max_mails] ({--TODAY--}: $content[receive_mails]) + + $content[max_mails] + ({--TODAY--}: $content[receive_mails])
 
{--PROFILE_LAST_CHANGE--}:   $content[last_update]
 
$content[change]
 
\ No newline at end of file + +
diff --git a/templates/de/html/member/member_order-zip2.tpl b/templates/de/html/member/member_order-zip2.tpl index 6fc0671b99..f55e068ef7 100644 --- a/templates/de/html/member/member_order-zip2.tpl +++ b/templates/de/html/member/member_order-zip2.tpl @@ -1,24 +1,17 @@ - {--MEMBER_ORDER_PAGE2_INTRO--} - - -   + + {--MEMBER_ORDER_PAGE2_INTRO--} + -   - +
- - - +
  {--MEMBER_ENTER_ZIP_CODE--}  -   + +
-   \ 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 dea7095dbd..5bb2161428 100644 --- a/templates/de/html/member/member_order_points.tpl +++ b/templates/de/html/member/member_order_points.tpl @@ -1,5 +1,5 @@
- +
-- 2.39.5