Even some more HTML cleanups #3

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 80bdad05142dcdad743cc463f9dc7c7a411d596c..3699d4ea8f4dfeb29a015fa48801bd18024464cb 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -820,10 +820,10 @@ function translateGender ($gender) {
                case 'F': $ret = getMessage('GENDER_F'); break;
                case 'C': $ret = getMessage('GENDER_C'); break;
                default:
-                       // Log unknown gender
-                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
+                       // Please report bugs on unknown genders
+                       debug_report_bug(sprintf("Unknown gender %s detected.", $gender));
                        break;
-       }
+       } // END - switch
 
        // Return translated gender
        return $ret;
@@ -845,8 +845,8 @@ function translateUserStatus ($status) {
                        break;
 
                default:
-                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
-                       $ret = getMaskedMessage('UNKNOWN_STATUS', $status);
+                       // Please report all unknown status
+                       debug_report_bug(sprintf("Unknown status %s detected.", $status));
                        break;
        } // END - switch
 
@@ -2281,6 +2281,12 @@ function app_die ($F, $L, $message) {
                // Make sure, that the script realy realy diese here and now
                $GLOBALS['app_died'] = true;
 
+               // Set content type if not set
+               if (!isContentTypeSet()) {
+                       // text/html is the right one
+                       setContentType('text/html');
+               } // END - if
+
                // Load header
                loadIncludeOnce('inc/header.php');
 
@@ -3812,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
@@ -3845,7 +3851,7 @@ function sendModeMails ($mod, $modes) {
                        $content = getMessage('CANNOT_SEND_ADMIN_MAILS');
                } else {
                        // No mail to admin
-                       $content = "<span class=\"member_done\">{--MYDATA_MAIL_SENT--}</span>";
+                       $content = '<span class="member_done">{--MYDATA_MAIL_SENT--}</span>';
                }
        } // END - if