Some minor improvements

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

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 84f442bb553ff2ce1eda957eb2ea5434d508ec50..41505b26dd2b17220a4ef6dd05aadb78f285361e 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -206,13 +206,13 @@ function updateOldConfigFile () {
                                // Default comment
                                $comment = str_replace('_', '-', $new);
 
-                               // Do we have a special comment?
+                               // Is there a special comment?
                                if (isset($comments[$new])) {
                                        // Then use it
                                        $comment = $comments[$new];
                                } // END - if
 
-                               // Do we need to make $new lowercase?
+                               // Does $new needs to be lower-case?
                                $oldNew = $new;
                                if (in_array($new, $lowerCase)) {
                                        // Then do so... :)
@@ -231,7 +231,7 @@ function updateOldConfigFile () {
        } // END - foreach
 
        // By default the old array $MySQL was not found
-       $found = false;
+       $found = FALSE;
 
        // Analyze every entry again for the MySQL configuration
        foreach ($oldConfig as $line) {
@@ -241,8 +241,8 @@ function updateOldConfigFile () {
                // Is the $MySQL found?
                if (substr($line, 0, 6) == '$MySQL') {
                        // Okay, found
-                       $found = true;
-               } elseif ($found === true) {
+                       $found = TRUE;
+               } elseif ($found === TRUE) {
                        // Now check this row
                        if (substr($line, 0, 2) == ');') {
                                // MySQL array is closed so stop looking for it
@@ -276,14 +276,14 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0'
        // Do not update config in CSS mode
        if ((isCssOutputMode()) || (isRawOutputMode()) || (isInstallationPhase())) {
                // This logger line may be very noisy
-               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not updating configuration. entries[]=' . gettype($entries) . ',values[]=' . gettype($values) . ',updateMode=' . $updateMode . ',config=' . $config . ',isCssOutputMode()=' . intval(isCssOutputMode()) . ',isRawOutputMode()=' . intval(isRawOutputMode()) . ',isInstallationPhase()=' . intval(isInstallationPhase()));
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not updating configuration. entries[]=' . gettype($entries) . ',values[]=' . gettype($values) . ',updateMode=' . $updateMode . ',config=' . $config . ',isCssOutputMode()=' . intval(isCssOutputMode()) . ',isRawOutputMode()=' . intval(isRawOutputMode()) . ',isInstallationPhase()=' . intval(isInstallationPhase()));
                return;
        } // END - if
 
        // Default is empty SQL
        $SQL = '';
 
-       // Do we have multiple entries?
+       // Is there multiple entries?
        if (is_array($entries)) {
                // Walk through all
                foreach ($entries as $idx => $entry) {
@@ -295,7 +295,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...
-                                       reportBug(__FUNCTION__, __LINE__, 'values[' . $idx . '] should not be an array! Content=<pre>'.print_r($values[$idx], true).'</pre>');
+                                       reportBug(__FUNCTION__, __LINE__, 'values[' . $idx . '] should not be an array! Content=<pre>'.print_r($values[$idx], TRUE).'</pre>');
                                } elseif ($values[$idx] == 'UNIX_TIMESTAMP()') {
                                        // Function UNIX_TIMESTAMP() detected
                                        $SQL .= sprintf("`%s`=UNIX_TIMESTAMP(),", $entry);