Naming convention further applied: _ral_ is replaced by _rallye_ to make it clear...

[mailer.git] / inc / modules / admin / overview-inc.php

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 360550d5b99886530e149de939748d34365379d1..81719aadbe6b05380daabcc7400e425ca1447bea 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -85,10 +85,10 @@ function outputStandardOverview (&$result_tasks) {
 
                                // Get extension version
                                $ext_ver = getExtensionVersion($ext_name);
-                               //* DEBUG: */ outputHtml($ext_name."=".$ext_ver."<br />");
+                               //* DEBUG: */ debugOutput($ext_name.'='.$ext_ver);
 
                                // Update extension if extension is installed and outdated
-                               //* DEBUG: */ outputHtml('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)."<br />");
+                               //* DEBUG: */ debugOutput('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name));
                                if (getThisExtensionVersion() > $ext_ver) {
                                        // Update the extension
                                        updateExtension($ext_name, $ext_ver);
@@ -168,7 +168,7 @@ LIMIT 1",
                                if ($taskData['task_type'] == 'SUPPORT_MEMBER') {
                                        $mode = substr($taskData['text'], 0, strpos($taskData['text'], ':'));
                                        $taskData['text'] = substr($taskData['text'], strpos($taskData['text'], ':') + 1);
-                                       $add = "<li>{--ADMIN_TASK_SUPPORT_MODE--}: <strong>" . $mode . "</strong></li>";
+                                       $add = '<li>{--ADMIN_TASK_SUPPORT_MODE--}: <strong>' . $mode . '</strong></li>';
                                } // END - if
 
                                // Is a userid assign?
@@ -179,7 +179,7 @@ LIMIT 1",
                                                $content = getUserDataArray();
 
                                                // Generate HTML list entry
-                                               $add = "<li>{--ADMIN_MEMBER_UID--}: <strong>".generateUserProfileLink($taskData['userid'], 'user_data')." (<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family']."</a>)</strong></li>";
+                                               $add = '<li>{--ADMIN_MEMBER_UID--}: <strong>' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>)</strong></li>';
                                        } else {
                                                // Invalid userid, so log and zero it
                                                logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $taskData['userid'] . ' -> not found!');
@@ -261,7 +261,7 @@ LIMIT 1",
                                        $taskData['text'] .= getExtensionNotes();
                                } else {
                                        // This should not normally happen!
-                                       debug_report_bug('ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! sql_patches=' . getExtensionVersion('sql_patches') . '/verbose_sql=' . getConfig('verbose_sql'));
+                                       debug_report_bug(__FILE__, __LINE__, 'ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! sql_patches=' . getExtensionVersion('sql_patches') . '/verbose_sql=' . getConfig('verbose_sql'));
                                }
 
                                // Prepare array for the template
@@ -421,7 +421,7 @@ LIMIT 1",
                                }
                        } else {
                                // Unknown action
-                               debug_report_bug(sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r($postData, true)));
+                               debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r($postData, true)));
                        }
 
                        // Update query