Fix for 'Unknown gender F'

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 69d696e544cba7d48983c67135cd89a08c87a952..4faea4e7f50a1a1b847f6f6b20ed0302746a1680 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -89,7 +89,7 @@ function addFatalMessage ($F, $L, $message, $extra = '') {
 
 // Getter for total fatal message count
 function getTotalFatalErrors () {
-       // Init coun
+       // Init count
        $count = '0';
 
        // Do we have at least the first entry?
@@ -376,25 +376,26 @@ function translateComma ($dotted, $cut = true, $max = '0') {
                if (count($com) < 2) {
                        // Don't display commatas even if there are none... ;-)
                        $maxComma = '0';
-               }
+               } // END - if
        } // END - if
 
        // Debug log
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}");
 
        // Translate it now
+       $translated = $dotted;
        switch (getLanguage()) {
                case 'de': // German language
-                       $dotted = number_format($dotted, $maxComma, ',', '.');
+                       $translated = number_format($dotted, $maxComma, ',', '.');
                        break;
 
                default: // All others
-                       $dotted = number_format($dotted, $maxComma, '.', ',');
+                       $translated = number_format($dotted, $maxComma, '.', ',');
                        break;
        } // END - switch
 
        // Return translated value
-       return $dotted;
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'dotted=' . $dotted . ',translated=' . $translated . ',maxComma=' . $maxComma);
+       return $translated;
 }
 
 // Translate Uni*-like gender to human-readable
@@ -404,9 +405,12 @@ function translateGender ($gender) {
 
        // Male/female or company?
        switch ($gender) {
-               case 'M': $ret = '{--GENDER_M--}'; break;
-               case 'F': $ret = '{--GENDER_F--}'; break;
-               case 'C': $ret = '{--GENDER_C--}'; break;
+               case 'M': // Male
+               case 'F': // Female
+               case 'C': // Company
+                       $ret = sprintf("{--GENDER_%s--}", $gender);
+                       break;
+
                default:
                        // Please report bugs on unknown genders
                        debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
@@ -424,17 +428,17 @@ function translateUserStatus ($status) {
                case 'UNCONFIRMED':
                case 'CONFIRMED':
                case 'LOCKED':
-                       $ret = sprintf("{--ACCOUNT_%s--}", $status);
+                       $ret = sprintf("{--ACCOUNT_STATUS_%s--}", $status);
                        break;
 
                case '':
                case null:
-                       $ret = '{--ACCOUNT_DELETED--}';
+                       $ret = '{--ACCOUNT_STATUS_DELETED--}';
                        break;
 
                default:
                        // Please report all unknown status
-                       debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
+                       debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s(%s) detected.", $status, gettype($status)));
                        break;
        } // END - switch
 
@@ -498,7 +502,7 @@ function countSelection ($array) {
        // Integrity check
        if (!is_array($array)) {
                // Not an array!
-               debug_report_bug(__FUNCTION__.': No array provided.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'No array provided.');
        } // END - if
 
        // Init count
@@ -1179,7 +1183,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
                // Sanity check on salt
                if (strlen($salt) != getSaltLength()) {
                        // Not the same!
-                       debug_report_bug(__FUNCTION__.': salt length mismatch! ('.strlen($salt).'/'.getSaltLength().')');
+                       debug_report_bug(__FUNCTION__, __LINE__, 'salt length mismatch! ('.strlen($salt).'/'.getSaltLength().')');
                } // END - if
        }
 
@@ -1365,10 +1369,10 @@ function generateErrorCodeFromUserStatus ($status='') {
        } // END - if
 
        // Default error code if unknown account status
-       $errorCode = getCode('UNKNOWN_STATUS');
+       $errorCode = getCode('ACCOUNT_STATUS_UNKNOWN');
 
        // Generate constant name
-       $codeName = sprintf("ACCOUNT_%s", strtoupper($status));
+       $codeName = sprintf("ACCOUNT_STATUS_%s", strtoupper($status));
 
        // Is the constant there?
        if (isCodeSet($codeName)) {
@@ -1445,7 +1449,7 @@ function getMessageFromErrorCode ($code) {
                case getCode('ACCOUNT_UNCONFIRMED'): $message = '{--LOGIN_STATUS_UNCONFIRMED--}'; break;
                case getCode('COOKIES_DISABLED')   : $message = '{--LOGIN_COOKIES_DISABLED--}'; break;
                case getCode('BEG_SAME_AS_OWN')    : $message = '{--BEG_SAME_UID_AS_OWN--}'; break;
-               case getCode('LOGIN_FAILED')       : $message = '{--LOGIN_FAILED_GENERAL--}'; break;
+               case getCode('LOGIN_FAILED')       : $message = '{--GUEST_LOGIN_FAILED_GENERAL--}'; break;
                case getCode('MODULE_MEMBER_ONLY') : $message = getMaskedMessage('MODULE_MEMBER_ONLY', getRequestParameter('mod')); break;
                case getCode('OVERLENGTH')         : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break;
                case getCode('URL_FOUND')          : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break;