A lot has been rewritten, ext-teams added, ext-forced continued:

[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 f9884af24a42155d0a85ae2c0a1c706e147b864b..3a5138c64ce3f6338273c4796a2e463dc31a8c3e 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,19 +41,16 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
-
-if (!isExtensionActive('task')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('task'));
-       return;
-} // END - if
+addYouAreHereLink('admin', __FILE__);
 
 $whereStatement = '';
-if (!isGetRequestParameterSet('type')) setGetRequestParameter('type', 'your');
+if (!isGetRequestParameterSet('type')) {
+       setGetRequestParameter('type', 'your');
+} // END - if
 
 switch (getRequestParameter('type')) {
        case 'your': // List only your own open (new) tasks
-               $whereStatement = "`assigned_admin`='".getCurrentAdminId()."' AND `status`='NEW' AND `task_type` != 'EXTENSION_UPDATE'";
+               $whereStatement = "`assigned_admin`=".getCurrentAdminId()." AND `status`='NEW' AND `task_type` != 'EXTENSION_UPDATE'";
                break;
 
        case 'updates': // List only updates assigned to you
@@ -67,7 +62,7 @@ switch (getRequestParameter('type')) {
                break;
 
        case 'unassigned': // List unassigned (but not deleted) tasks
-               $whereStatement = "`assigned_admin`=0 AND `status` != 'DELETED'";
+               $whereStatement = "(`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status` != 'DELETED'";
                break;
 
        case 'deleted': // List all deleted
@@ -80,7 +75,7 @@ switch (getRequestParameter('type')) {
 
        default: // Unknown type
                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestParameter('type')));
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_TASK_UNKNOWN_MODE', getRequestParameter('type')));
+               displayMessage('{%message,ADMIN_TASK_UNKNOWN_MODE' . getRequestParameter('type') . '%}');
                break;
 } // END - switch
 
@@ -93,7 +88,7 @@ if (!empty($whereStatement)) {
        } else {
                // Start listing tasks matching selected filter
                $result_tasks = SQL_QUERY('SELECT
-       `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
+       `id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created`
 FROM
        `{?_MYSQL_PREFIX?}_task_system`
 WHERE
@@ -109,10 +104,10 @@ ORDER BY
                        if (isPostRequestParameterSet('unassign')) {
                                // Unassign from tasks
                                foreach (postRequestParameter('sel') as $id => $sel) {
-                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=NULL WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
                                                array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
                                } // END - foreach
-                       } elseif (isFormSent('del')) {
+                       } elseif (isFormSent('delete')) {
                                // Delete tasks
                                foreach (postRequestParameter('sel') as $id => $sel) {
                                        if (getRequestParameter('type') == 'deleted') {
@@ -131,7 +126,7 @@ ORDER BY
 
                        // Update query
                        $result_tasks = SQL_QUERY('SELECT
-       `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
+       `id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created`
 FROM
        `{?_MYSQL_PREFIX?}_task_system`
 WHERE
@@ -147,9 +142,6 @@ ORDER BY
                        // Init infos
                        $content['infos'] = '';
 
-                       // Get admin task
-                       $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
-
                        // Generate infos
                        switch ($content['task_type']) {
                                case 'EXTENSION':
@@ -169,14 +161,11 @@ ORDER BY
 
                        // Prepare content
                        $content = merge_array($content, array(
-                               'assign_admin'  => $content['assigned_admin'],
-                               'userid'        => $content['userid'],
-                               'task_type_msg' => $content['task_type_msg'],
                                'task_created'  => generateDateTime($content['task_created'], 2)
                        ));
 
                        // Do we have an extension task?
-                       if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
+                       if (isExtensionTask($content)) {
                                // Load extension row template
                                $OUT .= loadTemplate('admin_list_task_ext_rows', true, $content);
                        } else {