More cached wrapper functions introduced

[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 79df8a21e32afd70dac1afa639d405af2b96280d..870c5b277eff6ef2760f305b5096b4dcf91014cc 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -116,7 +116,7 @@ ORDER BY
        `task_created` DESC",
                array(getCurrentAdminId()), __FILE__, __LINE__);
 
-       if (SQL_NUMROWS($result_tasks) > 0) {
+       if (!SQL_HASZERONUMS($result_tasks)) {
                // New jobs found!
                $jobsDone = false;
        } // END - if
@@ -132,7 +132,7 @@ ORDER BY
 function outputSeletectedTasks ($postData, $result_tasks) {
        if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) {
                // Assign / do tasks
-               $OUT = ''; $SW = 2;
+               $OUT = '';
                foreach ($postData['sel'] as $id => $sel) {
                        $result_task = SQL_QUERY_ESC("SELECT
        `id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
@@ -195,7 +195,7 @@ LIMIT 1",
                                $title = '{--TASK_NO_TITLE--}';
 
                                // Shall I list SQL commands assigned to an extension installation or update task?
-                               if ((getConfig('verbose_sql') == 'Y')) {
+                               if (isVerboseSqlEnabled()) {
                                        // Extract extension name from subject
                                        $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
 
@@ -243,7 +243,7 @@ LIMIT 1",
                                        }
 
                                        // Add SQLs to a table
-                                       if ((!empty($ext_name)) && (isExtensionInstalled('sql_patches')) && (getConfig('verbose_sql') == 'Y')) {
+                                       if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
                                                // Add verbose SQL table
                                                $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . "<br />\n";
                                        } // END - if
@@ -258,12 +258,11 @@ LIMIT 1",
                                        $taskData['text'] .= getExtensionNotes();
                                } else {
                                        // This should not normally happen!
-                                       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'));
+                                       debug_report_bug(__FILE__, __LINE__, 'ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! isVerboseSqlEnabled=' . intval(isVerboseSqlEnabled()));
                                }
 
                                // Prepare array for the template
                                $content = array(
-                                       'sw'           => $SW,
                                        'subject'      => $taskData['subject'],
                                        'add'          => $add,
                                        'text'         => $taskData['text'],
@@ -285,7 +284,7 @@ LIMIT 1",
                                                SQL_FREERESULT($result_lines);
                                                if ($lines == '0') {
                                                        // New extension found
-                                                       $OUT .= loadTemplate('admin_ext_reg_form', true, array(
+                                                       $OUT .= loadTemplate('admin_extension_reg_form', true, array(
                                                                'id'       => bigintval($id),
                                                                'ext_name' => $ext_name
                                                        ));
@@ -394,9 +393,6 @@ LIMIT 1",
 
                        // Free result
                        SQL_FREERESULT($result_task);
-
-                       // Switch colors
-                       $SW = 3 - $SW;
                } // END - foreach
 
                // Load final template
@@ -427,7 +423,7 @@ LIMIT 1",
                } // END - if
 
                // There are uncompleted jobs!
-               $OUT = ''; $SW = 2;
+               $OUT = '';
                while ($content = SQL_FETCHARRAY($result_tasks)) {
                        // Init infos
                        $content['infos'] = '';
@@ -452,7 +448,6 @@ LIMIT 1",
                        }
 
                        // Add/translate some content
-                       $content['sw']           = $SW;
                        $content['task_created'] = generateDateTime($content['task_created'], 2);
 
                        // Do we have extension task?
@@ -463,9 +458,6 @@ LIMIT 1",
                                // Load default row template
                                $OUT .= loadTemplate('admin_overview_list_rows', true, $content);
                        }
-
-                       // Switch color
-                       $SW = 3 - $SW;
                } // END - while
 
                // Free memory