New debugging function debugOutput() introduced, some rewrites to EL:

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

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 8d981e3e24580047b42e35c56ab4758012a16840..fd17c33bd1149abf4546e74a0e0356b404d271e4 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -279,7 +279,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
                                                // Reset extension name
                                                setCurrentExtensionName($ext_name);
                                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
-                                               //* DEBUG: */ print getCurrentExtensionName().':<pre>' . print_r($test, true) . '</pre>';
+                                               //* DEBUG: */ debugOutput(getCurrentExtensionName().':<pre>' . print_r($test, true) . '</pre>');
                                        } // END - if
                                } elseif ($ext_ver != getCurrentExtensionVersion()) {
                                        // Ok, update this extension now
@@ -320,10 +320,10 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 
                // Remains true if extension registration reports no failures
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
-               //* DEBUG: */ print getCurrentExtensionName().':<pre>' . print_r($test, true) . '</pre>';
+               //* DEBUG: */ debugOutput(getCurrentExtensionName().':<pre>' . print_r($test, true) . '</pre>');
                $test = (($test === true) && (getExtensionReportsFailure() === false));
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
-               //* DEBUG: */ print getCurrentExtensionName().':<pre>' . print_r($test, true) . '</pre>';
+               //* DEBUG: */ debugOutput(getCurrentExtensionName().':<pre>' . print_r($test, true) . '</pre>');
 
                // Does everthing before wents ok?
                if ($test === true) {
@@ -415,7 +415,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 
        // Return status code
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ',ext_name=' . $ext_name . ' - EXIT!');
-       //* DEBUG: */ print getCurrentExtensionName().':<pre>'.print_r($ret, true).'</pre>';
+       //* DEBUG: */ debugOutput(getCurrentExtensionName().':<pre>'.print_r($ret, true).'</pre>');
        return $ret;
 }
 
@@ -648,7 +648,7 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) {
        initExtensionSqls();
 
        // Check if version is updated
-       //* DEBUG: */ print getCurrentExtensionName().'/'.$ext_name.':'.getThisExtensionVersion().'/'.$ext_ver.'/'.intval(is_array($history)).'<br />';
+       //* DEBUG: */ debugOutput(getCurrentExtensionName().'/'.$ext_name.':'.getThisExtensionVersion().'/'.$ext_ver.'/'.intval(is_array($history)));
        if (((getThisExtensionVersion() != $ext_ver) || (getExtensionDryRun())) && (is_array($history))) {
                // Search for starting point
                $start = array_search($ext_ver, $history);
@@ -1546,7 +1546,7 @@ function getExtensionMode () {
 
 // Setter for dry-run
 function enableExtensionDryRun ($dry_run = true) {
-       //* DEBUG: */ print __FUNCTION__.': '.getCurrentExtensionName().'='.intval($dry_run).'<br />';
+       //* DEBUG: */ debugOutput(__FUNCTION__.': '.getCurrentExtensionName().'='.intval($dry_run));
        $GLOBALS['ext_dry_run'] = (bool) $dry_run;
 }