Functions imported, some dev-scripts added

[mailer.git] / inc / modules / admin / what-list_task.php

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 3e8f80cb75850b641e5f55852cdf813129e7d4c6..493903850cc995609536a3e7f0a03749e39f58c1 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("task")) {
-       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "task");
+       addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "task");
        return;
 }
 
@@ -49,15 +49,15 @@ if (empty($_GET['type'])) $_GET['type'] = "your";
 switch ($_GET['type'])
 {
 case "your": // List only your own open (new) tasks
-       $whereStatement = "assigned_admin='".GET_CURRENT_ADMIN_ID()."' AND status='NEW' AND task_type != 'EXTENSION_UPDATE'";
+       $whereStatement = "assigned_admin='".GET_CURRENT_ADMIN_ID()."' AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'";
        break;
 
 case "updates": // List only updates assigned to you
-       $whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND status='NEW' AND task_type = 'EXTENSION_UPDATE'";
+       $whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND `status`='NEW' AND task_type = 'EXTENSION_UPDATE'";
        break;
 
 case "solved": // List only solved tasks assigned to you
-       $whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND status='SOLVED'";
+       $whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND `status`='SOLVED'";
        break;
 
 case "unassigned": // List unassigned (but not deleted) tasks
@@ -65,16 +65,16 @@ case "unassigned": // List unassigned (but not deleted) tasks
        break;
 
 case "deleted": // List all deleted
-       $whereStatement = "status='DELETED'";
+       $whereStatement = "`status`='DELETED'";
        break;
 
 case "closed": // List all closed
-       $whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND status='CLOSED'";
+       $whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND `status`='CLOSED'";
        break;
 
 default: // Unknown type
        DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $_GET['type']));
-       LOAD_TEMPLATE("admin_settings_saved", false, TASK_ADMIN_UNKNOWN_MODE_1.$_GET['type'].TASK_ADMIN_UNKNOWN_MODE_2);
+       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_TASK_UNKNOWN_MODE'), $_GET['type']));
        break;
 }
 
@@ -126,29 +126,12 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                        'type'    => $_GET['type']
                ));
                $SW = 2;
-               while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks))
-               {
+               while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) {
+                       // Init infos
                        $infos = "---";
-                       if ($admin == "0")
-                       {
-                               // No admin currently is assigned
-                               $admin = "<div class=\"admin_note\">{!ADMIN_NO_ADMIN_ASSIGNED!}</div>";
-                       }
-                        else
-                       {
-                               // Load admin's data
-                               $login = GET_ADMIN_LOGIN($admin);
-                               if ($login != "***")
-                               {
-                                       // Admin found
-                                       $admin = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
-                               }
-                                else
-                               {
-                                       // Maybe deleted?
-                                       $admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
-                               }
-                       }
+
+                       // Generate link
+                       $admin = GENERATE_AID_LINK($admin);
 
                        // Get admin task
                        $type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).'');