From e3934352dffa6eb9da59a137ae1a9414e5b4d80b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 14 Aug 2011 00:05:08 +0000 Subject: [PATCH] Bad things are now 'classified' as bad (CSS class 'bad' is being used instead of 'notice') --- inc/functions.php | 2 +- inc/language/birthday_de.php | 2 +- inc/libs/bonus_functions.php | 2 +- inc/libs/register_functions.php | 4 ++-- inc/libs/task_functions.php | 6 +++--- inc/libs/user_functions.php | 4 ++-- inc/modules/admin/admin-inc.php | 6 +++--- inc/modules/admin/what-config_cats.php | 2 +- inc/modules/admin/what-config_payouts.php | 2 +- inc/modules/admin/what-config_points.php | 2 +- inc/modules/admin/what-edit_emails.php | 6 +++--- inc/modules/admin/what-list_email_max_rec.php | 2 +- inc/modules/admin/what-payments.php | 4 ++-- inc/modules/admin/what-refbanner.php | 2 +- inc/modules/admin/what-theme_import.php | 12 ++++++------ inc/modules/guest/what-login.php | 2 +- inc/modules/member/what-order.php | 6 +++--- inc/mysql-manager.php | 6 +++--- inc/template-functions.php | 10 +++++----- show_bonus.php | 6 +++--- theme/business/css/general.css | 4 ++-- theme/default/css/general.css | 6 +++--- theme/desert/css/general.css | 4 ++-- theme/org/css/general.css | 7 +++---- theme/schleuder/css/general.css | 4 ++-- theme/ship-simu/css/general.css | 4 ++-- 26 files changed, 58 insertions(+), 59 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index 546086cb96..1b6b5dc88c 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1135,7 +1135,7 @@ function getMessageFromErrorCode ($code) { switch ($code) { case '': break; case getCode('LOGOUT_DONE') : $message = '{--LOGOUT_DONE--}'; break; - case getCode('LOGOUT_FAILED') : $message = '{--LOGOUT_FAILED--}'; break; + case getCode('LOGOUT_FAILED') : $message = '{--LOGOUT_FAILED--}'; break; case getCode('DATA_INVALID') : $message = '{--MAIL_DATA_INVALID--}'; break; case getCode('POSSIBLE_INVALID') : $message = '{--MAIL_POSSIBLE_INVALID--}'; break; case getCode('USER_404') : $message = '{--USER_404--}'; break; diff --git a/inc/language/birthday_de.php b/inc/language/birthday_de.php index 63addc4ead..783710017b 100644 --- a/inc/language/birthday_de.php +++ b/inc/language/birthday_de.php @@ -48,7 +48,7 @@ addMessages(array( 'ADMIN_CONFIG_BIRTHDAY_POINTS_NOTE' => "Wert 0 deaktiviert die Extragutschrift.", 'MEMBER_BIRTHDAY_CANNOT_STATUS' => "Kann keine {?POINTS?} gutschreiben! Status Ihres Accounts: {%%pipe,translateUserStatus=%s%%}", 'MEMBER_BIRTHDAY_CANNOT_LOAD_DATA' => "Entweder haben Sie bereits Ihr Geburtsgeschenk erhalten oder Sie haben heute keinen Geburtstag.", - 'ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE' => "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?
(Nur in Verbindung mit der Erweiterung autopurge!)
", + 'ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE' => "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?
(Nur in Verbindung mit der Erweiterung ext-autopurge!)
", )); // [EOF] diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php index c19a1c0256..57d2dc975e 100644 --- a/inc/libs/bonus_functions.php +++ b/inc/libs/bonus_functions.php @@ -194,7 +194,7 @@ LIMIT 1", // @TODO Move this HTML to a template $OUT = ' -
{%message,MEMBER_BONUS_NO_RANKS=' . $data . '%}
+
{%message,MEMBER_BONUS_NO_RANKS=' . $data . '%}
'; } diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 480e65dbd6..62a62dde42 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -120,9 +120,9 @@ function registerGenerateCategoryTable ($mode) { // Outputs a 'failed message' function registerOutputFailedMessage ($messageId, $extra='') { if (empty($messageId)) { - outputHtml('
' . $extra . '
'); + outputHtml('
' . $extra . '
'); } else { - outputHtml('
{--' . $messageId . '--}' . $extra . '
'); + outputHtml('
{--' . $messageId . '--}' . $extra . '
'); } } diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index 432d96683c..24227858c8 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -215,11 +215,11 @@ function outputAdvancedOverview (&$result_main) { } elseif (isExtensionActive('bonus')) { $content['purged_bonus_mails'] = '{%message,ADMIN_EXTENSION_BONUS_OUTDATED=0.1.8%}'; } else { - $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}'; + $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}'; } } else { - $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; - $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; + $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; + $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; } // diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 80fcaf50ea..71b180ee8f 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -468,8 +468,8 @@ function doNewUserPassword ($email, $userid) { redirectToUrl('modules.php?module=index&what=login&login=' . $errorCode); } } else { - // id or email is wrong - displayMessage('{--GUEST_WRONG_ID_EMAIL--}'); + // Id or email is wrong + displayMessage('{--GUEST_WRONG_ID_EMAIL--}'); } // Return the error code diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 85c2d67250..fb70b05816 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -296,7 +296,7 @@ ORDER BY $OUT .= '['; } } else { - $OUT .= ''; + $OUT .= ''; } $OUT .= $title; @@ -359,7 +359,7 @@ ORDER BY $OUT .= '['; } } else { - $OUT .= ''; + $OUT .= ''; } $OUT .= $title_what; @@ -1630,7 +1630,7 @@ function generateAdminLink ($adminId) { } } else { // Maybe deleted? - $adminLink = '
{%message,ADMIN_ID_404=' . $adminId . '%}
'; + $adminLink = '
{%message,ADMIN_ID_404=' . $adminId . '%}
'; } } // END - if diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php index 4a6b52b392..5fd1ef8f92 100644 --- a/inc/modules/admin/what-config_cats.php +++ b/inc/modules/admin/what-config_cats.php @@ -62,7 +62,7 @@ if (isFormSent('add')) { $content = '{--CATEGORY_ADDED--}'; } else { // Category does already exists - $content = '{--CATEGORY_ALREADY_EXISTS--}'; + $content = '{--CATEGORY_ALREADY_EXISTS--}'; } // Free memory diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php index fe27897052..022278ebe6 100644 --- a/inc/modules/admin/what-config_payouts.php +++ b/inc/modules/admin/what-config_payouts.php @@ -77,7 +77,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('title')) && (postRequestEle SQL_FREERESULT($result); // Does already exist - $message = '
{--ADMIN_PAYOUT_TYPE_ALREADY--}
'; + $message = '
{--ADMIN_PAYOUT_TYPE_ALREADY--}
'; } } diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php index 46aefa2608..11c5475390 100644 --- a/inc/modules/admin/what-config_points.php +++ b/inc/modules/admin/what-config_points.php @@ -152,7 +152,7 @@ WHERE rebuildCache('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 cd340e2194..887262cb61 100644 --- a/inc/modules/admin/what-edit_emails.php +++ b/inc/modules/admin/what-edit_emails.php @@ -128,7 +128,7 @@ LIMIT 1", if (!SQL_HASZEROAFFECTED()) { $content = '{--ADMIN_EMAIL_CHANGES_SAVED--}'; } else { - $content = '{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}'; + $content = '{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}'; } } elseif (isPostRequestElementSet('bid')) { // Update pool @@ -151,11 +151,11 @@ LIMIT 1", if (!SQL_HASZEROAFFECTED()) { $content = '{--ADMIN_EMAIL_CHANGES_SAVED--}'; } else { - $content = '{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}'; + $content = '{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}'; } } else { // No valid action - $content = '{--ADMIN_EDIT_EMAIL_FAILED--}'; + $content = '{--ADMIN_EDIT_EMAIL_FAILED--}'; } // Display message diff --git a/inc/modules/admin/what-list_email_max_rec.php b/inc/modules/admin/what-list_email_max_rec.php index 850a7ca6bb..1b0a24aa72 100644 --- a/inc/modules/admin/what-list_email_max_rec.php +++ b/inc/modules/admin/what-list_email_max_rec.php @@ -59,7 +59,7 @@ if (isPostRequestElementSet('add_max')) { $content = '{--ADMIN_MAX_VALUE_SAVED--}'; } else { // Value does alread exists! - $content = '{--ADMIN_MAX_VALUE_ALREADY--}'; + $content = '{--ADMIN_MAX_VALUE_ALREADY--}'; } // Free memory diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php index 19e0990d94..07e2a54fc4 100644 --- a/inc/modules/admin/what-payments.php +++ b/inc/modules/admin/what-payments.php @@ -74,10 +74,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 c204458fd5..e8754f6ba2 100644 --- a/inc/modules/admin/what-refbanner.php +++ b/inc/modules/admin/what-refbanner.php @@ -97,7 +97,7 @@ VALUES ('%s','%s','%s')", $content = '{--SETTINGS_SAVED--}'; } else { // Nothing has been updated - $content = '{--SETTINGS_NOT_SAVED--}'; + $content = '{--SETTINGS_NOT_SAVED--}'; } // Display message diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php index fd04a90685..c0fe085887 100644 --- a/inc/modules/admin/what-theme_import.php +++ b/inc/modules/admin/what-theme_import.php @@ -107,12 +107,12 @@ foreach ($includes as $inc) { loadInclude($inc); // Add found theme to array - $themes['theme_unix'][] = $dir; - $themes['theme_name'][] = $GLOBALS['theme_data']['name']; - $themes['theme_author'][] = $GLOBALS['theme_data']['author']; - $themes['theme_email'][] = $GLOBALS['theme_data']['email']; - $themes['theme_url'][] = $GLOBALS['theme_data']['url']; - $themes['theme_version'][] = $GLOBALS['theme_data']['version']; + $themes['theme_unix'][] = $dir; + $themes['theme_name'][] = $GLOBALS['theme_data']['name']; + $themes['theme_author'][] = $GLOBALS['theme_data']['author']; + $themes['theme_email'][] = $GLOBALS['theme_data']['email']; + $themes['theme_url'][] = $GLOBALS['theme_data']['url']; + $themes['theme_version'][] = $GLOBALS['theme_data']['version']; } // END - while // Sort array by Uni* name diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php index dca4bbdcd4..f45d269bce 100644 --- a/inc/modules/guest/what-login.php +++ b/inc/modules/guest/what-login.php @@ -125,7 +125,7 @@ if (!empty($errorCode)) { // @TODO Move this HTML code into a template $content['message'] = ' - ' . getMessageFromErrorCode($errorCode) . ' + ' . getMessageFromErrorCode($errorCode) . ' '; } // END - if diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 0581dc2fa5..e87be3b9ac 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -720,15 +720,15 @@ LIMIT 1", } } else { // No mail types defined - displayMessage('{--MEMBER_ORDER_NO_PAYMENTS--}'); + displayMessage('{--MEMBER_ORDER_NO_PAYMENTS--}'); } } else { // No points left - displayMessage('{--MEMBER_ORDER_NO_POINTS--}'); + displayMessage('{--MEMBER_ORDER_NO_POINTS--}'); } } else { // No cateogries are defined yet - displayMessage('{--MEMBER_NO_CATEGORIES--}'); + displayMessage('{--MEMBER_NO_CATEGORIES--}'); } } else { // Please confirm some mails first diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 8f9d7bb7a9..13b29b5264 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -279,7 +279,7 @@ ORDER BY } } else { // Not found - open - $OUT .= ''; + $OUT .= '
'; } // Menu title @@ -294,7 +294,7 @@ ORDER BY } // END - if } else { // Not found - close - $OUT .= ''; + $OUT .= '
'; } // Cunt it up @@ -1513,7 +1513,7 @@ function generateCategoryOptionsList ($mode) { } // END - foreach } else { // No cateogries are defined yet - $OUT = ''; + $OUT = ''; } // Return HTML code diff --git a/inc/template-functions.php b/inc/template-functions.php index ee0e92585d..29270c1e73 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -340,7 +340,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) { // Only admins shall see this warning or when installation mode is active $ret = '
- {--TEMPLATE_404--} + {--TEMPLATE_404--}
(' . $template . ') @@ -1603,16 +1603,16 @@ function sendModeMails ($mod, $modes) { default: // Unsupported module! logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod)); - $content['message'] = '{--UNKNOWN_MODULE--}'; + $content['message'] = '{--UNKNOWN_MODULE--}'; break; } // END - switch } else { // Passwords mismatch - $content['message'] = '{--MEMBER_PASSWORD_ERROR--}'; + $content['message'] = '{--MEMBER_PASSWORD_ERROR--}'; } } else { // Could not load profile - $content['message'] = '{--MEMBER_CANNOT_LOAD_PROFILE--}'; + $content['message'] = '{--MEMBER_CANNOT_LOAD_PROFILE--}'; } // Send email to user if required @@ -1837,7 +1837,7 @@ function doTemplateAdminMemberMailLinks ($template, $clear, $mailId) { // Helper function to create a selection box for YES/NO configuration entries function doTemplateConfigurationYesNoSelectionBox ($template, $clear, $configEntry) { // Default is a "missing entry" warning - $OUT = '!' . $configEntry . '!'; + $OUT = '!' . $configEntry . '!'; // Generate the HTML code if (isConfigEntrySet($configEntry)) { diff --git a/show_bonus.php b/show_bonus.php index 217a685cfc..6f8bed824d 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/theme/business/css/general.css b/theme/business/css/general.css index 29a8c8c37d..3ff2849c6a 100644 --- a/theme/business/css/general.css +++ b/theme/business/css/general.css @@ -642,11 +642,11 @@ li.listing { padding-bottom: 5px; } -bad { +.bad { color: #aa0000; font-style: italic; } -good { +.good { color: #00aa00; } diff --git a/theme/default/css/general.css b/theme/default/css/general.css index 027d171af0..c4c51cf0cc 100644 --- a/theme/default/css/general.css +++ b/theme/default/css/general.css @@ -120,7 +120,7 @@ pre { } .notice { - color: #aa0000; + color: #00aa00; font-size: 12px; } @@ -688,11 +688,11 @@ li.listing { padding-bottom: 5px; } -bad { +.bad { color: #aa0000; font-style: italic; } -good { +.good { color: #00aa00; } diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css index d96848eafd..550dc32925 100644 --- a/theme/desert/css/general.css +++ b/theme/desert/css/general.css @@ -628,11 +628,11 @@ li.listing { padding-bottom: 5px; } -bad { +.bad { color: #aa0000; font-style: italic; } -good { +.good { color: #00aa00; } diff --git a/theme/org/css/general.css b/theme/org/css/general.css index c841298d2d..3548ee4786 100644 --- a/theme/org/css/general.css +++ b/theme/org/css/general.css @@ -104,9 +104,8 @@ pre { } .form_delete { - border-style : groove; + border-style : groove 1px #000000; color : #881111; - border-color : #000000; } .form_submit { @@ -521,11 +520,11 @@ li.listing { padding-bottom: 5px; } -bad { +.bad { color: #aa0000; font-style: italic; } -good { +.good { color: #00aa00; } diff --git a/theme/schleuder/css/general.css b/theme/schleuder/css/general.css index 4fbcec6615..b0355932a0 100644 --- a/theme/schleuder/css/general.css +++ b/theme/schleuder/css/general.css @@ -561,11 +561,11 @@ li.listing { padding-bottom: 5px; } -bad { +.bad { color: #aa0000; font-style: italic; } -good { +.good { color: #00aa00; } diff --git a/theme/ship-simu/css/general.css b/theme/ship-simu/css/general.css index a266c0b5fb..07ed502383 100644 --- a/theme/ship-simu/css/general.css +++ b/theme/ship-simu/css/general.css @@ -531,11 +531,11 @@ li.listing { padding-bottom: 5px; } -bad { +.bad { color: #aa0000; font-style: italic; } -good { +.good { color: #00aa00; } -- 2.39.2