Typo fixed :-(

[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 022b93b7f1045ea8f10e04114c89703047d1de22..abeab6b2fefc66983718a5fde4e7c69f8cfc27ff 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`
@@ -263,12 +263,11 @@ LIMIT 1",
 
                                // Prepare array for the template
                                $content = array(
-                                       'sw'        => $SW,
-                                       'subject'   => $taskData['subject'],
-                                       'add'       => $add,
-                                       'text'      => $taskData['text'],
-                                       'created'   => generateDateTime($taskData['task_created'], 1),
-                                       'extension' => $ext_name
+                                       'subject'      => $taskData['subject'],
+                                       'add'          => $add,
+                                       'text'         => $taskData['text'],
+                                       'task_created' => generateDateTime($taskData['task_created'], 1),
+                                       'extension'    => $ext_name
                                );
 
                                // Load template
@@ -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,13 +423,10 @@ LIMIT 1",
                } // END - if
 
                // There are uncompleted jobs!
-               $OUT = ''; $SW = 2;
+               $OUT = '';
                while ($content = SQL_FETCHARRAY($result_tasks)) {
                        // Init infos
-                       $content['infos'] = '---';
-
-                       // Generate assign link
-                       $content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
+                       $content['infos'] = '';
 
                        // Generate infos
                        // @TODO Try to move this in includes
@@ -454,14 +447,8 @@ LIMIT 1",
                                $content['userid'] = '<em>{--ADMIN_IS_SYSTEM_TASK--}</em>';
                        }
 
-                       // Prepare content
-                       $content = merge_array($content, array(
-                               'sw'             => $SW,
-                               'assigned_admin' => $content['assigned_admin'],
-                               'userid'         => $content['userid'],
-                               'task_type_msg'  => $content['task_type_msg'],
-                               'created'        => generateDateTime($content['task_created'], 2)
-                       ));
+                       // Add/translate some content
+                       $content['task_created'] = generateDateTime($content['task_created'], 2);
 
                        // Do we have extension task?
                        if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
@@ -471,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