Changed all admin getter, closed internal TODOs:

[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 d543264dfd42f1a0d440db101f1ff9539f695346..79df8a21e32afd70dac1afa639d405af2b96280d 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -263,12 +263,12 @@ 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
+                                       'sw'           => $SW,
+                                       'subject'      => $taskData['subject'],
+                                       'add'          => $add,
+                                       'text'         => $taskData['text'],
+                                       'task_created' => generateDateTime($taskData['task_created'], 1),
+                                       'extension'    => $ext_name
                                );
 
                                // Load template
@@ -432,9 +432,6 @@ LIMIT 1",
                        // Init infos
                        $content['infos'] = '';
 
-                       // Generate assign link
-                       $content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
-
                        // Generate infos
                        // @TODO Try to move this in includes
                        switch ($content['task_type']) {
@@ -454,14 +451,9 @@ 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['sw']           = $SW;
+                       $content['task_created'] = generateDateTime($content['task_created'], 2);
 
                        // Do we have extension task?
                        if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {