Bad things are now 'classified' as bad (CSS class 'bad' is being used instead of...
authorRoland Häder <roland@mxchange.org>
Sun, 14 Aug 2011 00:05:08 +0000 (00:05 +0000)
committerRoland Häder <roland@mxchange.org>
Sun, 14 Aug 2011 00:05:08 +0000 (00:05 +0000)
26 files changed:
inc/functions.php
inc/language/birthday_de.php
inc/libs/bonus_functions.php
inc/libs/register_functions.php
inc/libs/task_functions.php
inc/libs/user_functions.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-config_cats.php
inc/modules/admin/what-config_payouts.php
inc/modules/admin/what-config_points.php
inc/modules/admin/what-edit_emails.php
inc/modules/admin/what-list_email_max_rec.php
inc/modules/admin/what-payments.php
inc/modules/admin/what-refbanner.php
inc/modules/admin/what-theme_import.php
inc/modules/guest/what-login.php
inc/modules/member/what-order.php
inc/mysql-manager.php
inc/template-functions.php
show_bonus.php
theme/business/css/general.css
theme/default/css/general.css
theme/desert/css/general.css
theme/org/css/general.css
theme/schleuder/css/general.css
theme/ship-simu/css/general.css

index 546086c..1b6b5dc 100644 (file)
@@ -1135,7 +1135,7 @@ function getMessageFromErrorCode ($code) {
        switch ($code) {
                case '': break;
                case getCode('LOGOUT_DONE')        : $message = '{--LOGOUT_DONE--}'; break;
-               case getCode('LOGOUT_FAILED')      : $message = '<span class="notice">{--LOGOUT_FAILED--}</span>'; break;
+               case getCode('LOGOUT_FAILED')      : $message = '<span class="bad">{--LOGOUT_FAILED--}</span>'; 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;
index 63addc4..7837100 100644 (file)
@@ -48,7 +48,7 @@ addMessages(array(
        'ADMIN_CONFIG_BIRTHDAY_POINTS_NOTE' => "Wert <strong>0</strong> deaktiviert die Extragutschrift.",
        'MEMBER_BIRTHDAY_CANNOT_STATUS' => "Kann keine {?POINTS?} gutschreiben! Status Ihres Accounts: <span class=\"data\">{%%pipe,translateUserStatus=%s%%}</span>",
        '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?<br /><div class=\"notice\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>",
+       'ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE' => "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?<br /><div class=\"notice\">(Nur in Verbindung mit der Erweiterung <strong>ext-autopurge</strong>!)</div>",
 ));
 
 // [EOF]
index c19a1c0..57d2dc9 100644 (file)
@@ -194,7 +194,7 @@ LIMIT 1",
                // @TODO Move this HTML to a template
                $OUT = '<tr>
   <td colspan="3" align="center" height="30" class="bottom">
-    <div class="notice">{%message,MEMBER_BONUS_NO_RANKS=' . $data . '%}</div>
+    <div class="bad">{%message,MEMBER_BONUS_NO_RANKS=' . $data . '%}</div>
   </td>
 </tr>';
        }
index 480e65d..62a62dd 100644 (file)
@@ -120,9 +120,9 @@ function registerGenerateCategoryTable ($mode) {
 // Outputs a 'failed message'
 function registerOutputFailedMessage ($messageId, $extra='') {
        if (empty($messageId)) {
-               outputHtml('<div class="notice">' . $extra . '</div>');
+               outputHtml('<div class="bad">' . $extra . '</div>');
        } else {
-               outputHtml('<div class="notice">{--' . $messageId . '--}' . $extra . '</div>');
+               outputHtml('<div class="bad">{--' . $messageId . '--}' . $extra . '</div>');
        }
 }
 
index 432d966..2422785 100644 (file)
@@ -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'] = '<span class="notice">{--ADMIN_EXTENSION_BONUS_404--}</span>';
+                       $content['purged_bonus_mails'] = '<span class="bad">{--ADMIN_EXTENSION_BONUS_404--}</span>';
                }
        } else {
-               $content['purged_bonus_mails'] = '<span class="notice">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
-               $content['purged_mails'] = '<span class="notice">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
+               $content['purged_bonus_mails'] = '<span class="bad">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
+               $content['purged_mails'] = '<span class="bad">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
        }
 
        //
index 80fcaf5..71b180e 100644 (file)
@@ -468,8 +468,8 @@ function doNewUserPassword ($email, $userid) {
                        redirectToUrl('modules.php?module=index&amp;what=login&amp;login=' . $errorCode);
                }
        } else {
-               // id or email is wrong
-               displayMessage('<span class="notice">{--GUEST_WRONG_ID_EMAIL--}</span>');
+               // Id or email is wrong
+               displayMessage('<span class="bad">{--GUEST_WRONG_ID_EMAIL--}</span>');
        }
 
        // Return the error code
index 85c2d67..fb70b05 100644 (file)
@@ -296,7 +296,7 @@ ORDER BY
                                                $OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
                                        }
                                } else {
-                                       $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404_TITLE=' . $menu . '%}">';
+                                       $OUT .= '<em style="cursor:help" class="bad" title="{%message,ADMIN_MENU_ACTION_404_TITLE=' . $menu . '%}">';
                                }
 
                                $OUT .= $title;
@@ -359,7 +359,7 @@ ORDER BY
                                                                        $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
                                                                }
                                                        } else {
-                                                               $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $what_sub . '%}">';
+                                                               $OUT .= '<em style="cursor:help" class="bad" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $what_sub . '%}">';
                                                        }
 
                                                        $OUT .= $title_what;
@@ -1630,7 +1630,7 @@ function generateAdminLink ($adminId) {
                        }
                } else {
                        // Maybe deleted?
-                       $adminLink = '<div class="notice">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
+                       $adminLink = '<div class="bad">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
                }
        } // END - if
 
index 4a6b52b..5fd1ef8 100644 (file)
@@ -62,7 +62,7 @@ if (isFormSent('add')) {
                $content = '{--CATEGORY_ADDED--}';
        } else {
                // Category does already exists
-               $content = '<span class="notice">{--CATEGORY_ALREADY_EXISTS--}</span>';
+               $content = '<span class="bad">{--CATEGORY_ALREADY_EXISTS--}</span>';
        }
 
        // Free memory
index fe27897..022278e 100644 (file)
@@ -77,7 +77,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('title')) && (postRequestEle
                SQL_FREERESULT($result);
 
                // Does already exist
-               $message = '<div class="notice">{--ADMIN_PAYOUT_TYPE_ALREADY--}</div>';
+               $message = '<div class="bad">{--ADMIN_PAYOUT_TYPE_ALREADY--}</div>';
        }
 }
 
index 46aefa2..11c5475 100644 (file)
@@ -152,7 +152,7 @@ WHERE
                        rebuildCache('config', 'config');
                } else {
                        // Prepare failed-message
-                       $message = '<span class="notice">{--SETTINGS_NOT_SAVED--}</span>';
+                       $message = '<span class="bad">{--SETTINGS_NOT_SAVED--}</span>';
                }
 
                // Remove SQL queries
index cd340e2..887262c 100644 (file)
@@ -128,7 +128,7 @@ LIMIT 1",
                if (!SQL_HASZEROAFFECTED()) {
                        $content = '{--ADMIN_EMAIL_CHANGES_SAVED--}';
                } else {
-                       $content = '<span class="notice">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
+                       $content = '<span class="bad">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
                }
        } elseif (isPostRequestElementSet('bid')) {
                // Update pool
@@ -151,11 +151,11 @@ LIMIT 1",
                if (!SQL_HASZEROAFFECTED()) {
                        $content = '{--ADMIN_EMAIL_CHANGES_SAVED--}';
                } else {
-                       $content = '<span class="notice">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
+                       $content = '<span class="bad">{--ADMIN_EMAIL_CHANGES_NOT_SAVED--}</span>';
                }
        } else {
                // No valid action
-               $content = '<span class="notice">{--ADMIN_EDIT_EMAIL_FAILED--}</span>';
+               $content = '<span class="bad">{--ADMIN_EDIT_EMAIL_FAILED--}</span>';
        }
 
        // Display message
index 850a7ca..1b0a24a 100644 (file)
@@ -59,7 +59,7 @@ if (isPostRequestElementSet('add_max')) {
                $content = '{--ADMIN_MAX_VALUE_SAVED--}';
        } else {
                // Value does alread exists!
-               $content = '<span class="notice">{--ADMIN_MAX_VALUE_ALREADY--}</span>';
+               $content = '<span class="bad">{--ADMIN_MAX_VALUE_ALREADY--}</span>';
        }
 
        // Free memory
index 19e0990..07e2a54 100644 (file)
@@ -74,10 +74,10 @@ if (isFormSent()) {
        if (countSqls() > 0) {
                // Run all queries
                runFilterChain('run_sqls');
-               $content = '<span class="notice">{--SETTINGS_SAVED--}</span>';
+               $content = '<span class="good">{--SETTINGS_SAVED--}</span>';
        } else {
                // Nothing has changed!
-               $content = '<span class="notice">{--SETTINGS_NOT_SAVED--}</span>';
+               $content = '<span class="bad">{--SETTINGS_NOT_SAVED--}</span>';
        }
 
        // Output template
index c204458..e8754f6 100644 (file)
@@ -97,7 +97,7 @@ VALUES ('%s','%s','%s')",
                $content = '{--SETTINGS_SAVED--}';
        } else {
                // Nothing has been updated
-               $content = '<span class="notice">{--SETTINGS_NOT_SAVED--}</span>';
+               $content = '<span class="bad">{--SETTINGS_NOT_SAVED--}</span>';
        }
 
        // Display message
index fd04a90..c0fe085 100644 (file)
@@ -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
index dca4bbd..f45d269 100644 (file)
@@ -125,7 +125,7 @@ if (!empty($errorCode)) {
        // @TODO Move this HTML code into a template
        $content['message'] = '<tr>
   <td colspan="4" align="center">
-    <span class="notice">' . getMessageFromErrorCode($errorCode) . '</span>
+    <span class="bad">' . getMessageFromErrorCode($errorCode) . '</span>
   </td>
 </tr>';
 } // END - if
index 0581dc2..e87be3b 100644 (file)
@@ -720,15 +720,15 @@ LIMIT 1",
                                }
                        } else {
                                // No mail types defined
-                               displayMessage('<span class="notice">{--MEMBER_ORDER_NO_PAYMENTS--}</span>');
+                               displayMessage('<span class="bad">{--MEMBER_ORDER_NO_PAYMENTS--}</span>');
                        }
                } else {
                        // No points left
-                       displayMessage('<span class="notice">{--MEMBER_ORDER_NO_POINTS--}</span>');
+                       displayMessage('<span class="bad">{--MEMBER_ORDER_NO_POINTS--}</span>');
                }
        } else {
                // No cateogries are defined yet
-               displayMessage('<span class="notice">{--MEMBER_NO_CATEGORIES--}</span>');
+               displayMessage('<span class="bad">{--MEMBER_NO_CATEGORIES--}</span>');
        }
 } else {
        // Please confirm some mails first
index 8f9d7bb..13b29b5 100644 (file)
@@ -279,7 +279,7 @@ ORDER BY
                                                }
                                        } else {
                                                // Not found - open
-                                               $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $content['sub_what'] . '%}">';
+                                               $OUT .= '<div style="cursor:help" class="bad" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $content['sub_what'] . '%}">';
                                        }
 
                                        // Menu title
@@ -294,7 +294,7 @@ ORDER BY
                                                } // END - if
                                        } else {
                                                // Not found - close
-                                               $OUT .= '</em>';
+                                               $OUT .= '</div>';
                                        }
 
                                        // Cunt it up
@@ -1513,7 +1513,7 @@ function generateCategoryOptionsList ($mode) {
                } // END - foreach
        } else {
                // No cateogries are defined yet
-               $OUT = '<option class="notice">{--MEMBER_NO_CATEGORIES--}</option>';
+               $OUT = '<option class="bad">{--MEMBER_NO_CATEGORIES--}</option>';
        }
 
        // Return HTML code
index ee0e925..29270c1 100644 (file)
@@ -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 = '<div class="para">
-       <span class="notice">{--TEMPLATE_404--}</span>
+       <span class="bad">{--TEMPLATE_404--}</span>
 </div>
 <div class="para">
        (' . $template . ')
@@ -1603,16 +1603,16 @@ function sendModeMails ($mod, $modes) {
 
                                default: // Unsupported module!
                                        logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
-                                       $content['message'] = '<span class="notice">{--UNKNOWN_MODULE--}</span>';
+                                       $content['message'] = '<span class="bad">{--UNKNOWN_MODULE--}</span>';
                                        break;
                        } // END - switch
                } else {
                        // Passwords mismatch
-                       $content['message'] = '<span class="notice">{--MEMBER_PASSWORD_ERROR--}</span>';
+                       $content['message'] = '<span class="bad">{--MEMBER_PASSWORD_ERROR--}</span>';
                }
        } else {
                // Could not load profile
-               $content['message'] = '<span class="notice">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>';
+               $content['message'] = '<span class="bad">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>';
        }
 
        // 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 = '<em style="cursor:help" class="notice" title="{%message,ADMIN_CONFIG_ENTRY_MISSING=' . $configEntry . '%}">!' . $configEntry . '!</em>';
+       $OUT = '<em style="cursor:help" class="bad" title="{%message,ADMIN_CONFIG_ENTRY_MISSING=' . $configEntry . '%}">!' . $configEntry . '!</em>';
 
        // Generate the HTML code
        if (isConfigEntrySet($configEntry)) {
index 217a685..6f8bed8 100644 (file)
@@ -112,18 +112,18 @@ LIMIT 1",
                        $content['message'] = loadTemplate('show_bonus_msg', true, $content);
                } else {
                        // No data found
-                       $content['message'] = '<span class="notice">{--BONUS_SHOW_NO_DATA--}</span>';
+                       $content['message'] = '<span class="bad">{--BONUS_SHOW_NO_DATA--}</span>';
                }
 
                // Free memory
                SQL_FREERESULT($result);
        } else {
                // Wrong type entered
-               $content['message'] = '<span class="notice">{--BONUS_SHOW_WRONG_TYPE--}</span>';
+               $content['message'] = '<span class="bad">{--BONUS_SHOW_WRONG_TYPE--}</span>';
        }
 } else {
        // Wrong call!
-       $content['message'] = '<span class="notice">{--BONUS_SHOW_WRONG_CALL--}</span>';
+       $content['message'] = '<span class="bad">{--BONUS_SHOW_WRONG_CALL--}</span>';
 }
 
 // Load send_bonus header template (for your banners, e.g.?)
index 29a8c8c..3ff2849 100644 (file)
@@ -642,11 +642,11 @@ li.listing {
        padding-bottom: 5px;
 }
 
-bad {
+.bad {
        color: #aa0000;
        font-style: italic;
 }
 
-good {
+.good {
        color: #00aa00;
 }
index 027d171..c4c51cf 100644 (file)
@@ -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;
 }
index d96848e..550dc32 100644 (file)
@@ -628,11 +628,11 @@ li.listing {
        padding-bottom: 5px;
 }
 
-bad {
+.bad {
        color: #aa0000;
        font-style: italic;
 }
 
-good {
+.good {
        color: #00aa00;
 }
index c841298..3548ee4 100644 (file)
@@ -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;
 }
index 4fbcec6..b035593 100644 (file)
@@ -561,11 +561,11 @@ li.listing {
        padding-bottom: 5px;
 }
 
-bad {
+.bad {
        color: #aa0000;
        font-style: italic;
 }
 
-good {
+.good {
        color: #00aa00;
 }
index a266c0b..07ed502 100644 (file)
@@ -531,11 +531,11 @@ li.listing {
        padding-bottom: 5px;
 }
 
-bad {
+.bad {
        color: #aa0000;
        font-style: italic;
 }
 
-good {
+.good {
        color: #00aa00;
 }