Even more fixes/improvements:

[mailer.git] / inc / config-functions.php

diff --git a/inc/config-functions.php b/inc/config-functions.php
index bc3eea007071a28706792fa977eac94d557114af..b32fcf713f01eb49bd9562ada8e074fa79dd480f 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -47,7 +47,7 @@ function initConfig () {
        // Init not if already found
        if (isConfigurationLoaded()) {
                // Already initialized
-               debug_report_bug(sprintf("[%s:%s] Configuration is already initialized.", __FUNCTION__, __LINE__));
+               debug_report_bug(__FUNCTION__, __LINE__, 'Configuration is already initialized.');
        } // END - if
 
        // Set a minimum of configuration, required to by-pass some error triggers in getConfig()
@@ -79,11 +79,7 @@ function getConfig ($configEntry) {
        // Is the entry there?
        if (!isset($GLOBALS['config'][$configEntry])) {
                // Raise an error of missing entries
-               debug_report_bug(sprintf("[%s:%s] Configuration entry <em>%s</em> is missing.",
-                       __FUNCTION__,
-                       __LINE__,
-                       $configEntry
-               ));
+               debug_report_bug(__FUNCTION__, __LINE__, sprintf("Configuration entry <em>%s</em> is missing.", $configEntry));
        } // END - if
 
        // Return it
@@ -228,7 +224,7 @@ function updateOldConfigFile () {
 
                                /// ... and write it to the new config
                                //* DEBUG: */ outputHtml('function=' . $function . ',new=' . $new . ',comment=' . $comment . "<br />");
-                               changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", "\");", constant($new), 0);
+                               changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", '");', constant($new), 0);
                                //* DEBUG: */ outputHtml("CHANGED!<br />");
 
                                // Mark it as done
@@ -267,7 +263,7 @@ function updateOldConfigFile () {
                        $key = substr(trim($parts[0]), 1, -1); $value = substr(trim($parts[1]), 1, -2);
 
                        // We can now save the right part in new config file
-                       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', $comments[$key], "       '".$key."'     => \"", "\",", $value, 0);
+                       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', $comments[$key], "       '".$key."'     => \"", '",', $value, 0);
                }
        } // END - foreach
 
@@ -298,7 +294,7 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
                                // Check if string or number but no array
                                if (is_array($values[$idx])) {
                                        // Arrays must be fixed...
-                                       debug_report_bug('values[' . $idx . '] should not be an array! Content=<pre>'.print_r($values[$idx], true).'</pre>');
+                                       debug_report_bug(__FUNCTION__, __LINE__, 'values[' . $idx . '] should not be an array! Content=<pre>'.print_r($values[$idx], true).'</pre>');
                                } elseif (($values[$idx] + 0) === $values[$idx]) {
                                        // Number detected
                                        $all .= sprintf("`%s`=%s,", $entry, (float)$values[$idx]);