Fixes for doubler (not fully fixed) and rewrites for beg/doubler:

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 69d696e544cba7d48983c67135cd89a08c87a952..c171e6217fb7d810a2e926a427a8d6c699c42c1b 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
@@ -498,7 +499,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 +1180,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
        }