- Surfbar extended with dynamic percentage (only config)

[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 20c2b1b3b94acb86e4c0585cdda0bbfb0e4692e0..a4c2c82f766bad2a82d124265d80b2daf8c878a8 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -32,41 +32,44 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
+} elseif (!EXT_IS_ACTIVE("task")) {
+       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "task");
+       return;
 }
+
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
-$WHERE = "";
+$whereStatement = "";
 if (empty($_GET['type'])) $_GET['type'] = "your";
 
 switch ($_GET['type'])
 {
 case "your": // List only your own open (new) tasks
-       $WHERE = "assigned_admin='".GET_ADMIN_ID($_COOKIE['admin_login'])."' AND status='NEW' AND task_type != 'EXTENSION_UPDATE'";
+       $whereStatement = "assigned_admin='".GET_ADMIN_ID(get_session('admin_login'))."' AND status='NEW' AND task_type != 'EXTENSION_UPDATE'";
        break;
 
 case "updates": // List only updates assigned to you
-       $WHERE = "assigned_admin='".GET_ADMIN_ID($_COOKIE['admin_login'])."' AND status='NEW' AND task_type = 'EXTENSION_UPDATE'";
+       $whereStatement = "assigned_admin='".GET_ADMIN_ID(get_session('admin_login'))."' AND status='NEW' AND task_type = 'EXTENSION_UPDATE'";
        break;
 
 case "solved": // List only solved tasks assigned to you
-       $WHERE = "assigned_admin='".GET_ADMIN_ID($_COOKIE['admin_login'])."' AND status='SOLVED'";
+       $whereStatement = "assigned_admin='".GET_ADMIN_ID(get_session('admin_login'))."' AND status='SOLVED'";
        break;
 
 case "unassigned": // List unassigned (but not deleted) tasks
-       $WHERE = "assigned_admin='0' AND status != 'DELETED'";
+       $whereStatement = "assigned_admin='0' AND status != 'DELETED'";
        break;
 
 case "deleted": // List all deleted
-       $WHERE = "status='DELETED'";
+       $whereStatement = "status='DELETED'";
        break;
 
 case "closed": // List all closed
-       $WHERE = "assigned_admin='".GET_ADMIN_ID($_COOKIE['admin_login'])."' AND status='CLOSED'";
+       $whereStatement = "assigned_admin='".GET_ADMIN_ID(get_session('admin_login'))."' AND status='CLOSED'";
        break;
 
 default: // Unknown type
@@ -74,7 +77,7 @@ default: // Unknown type
        break;
 }
 
-if (!empty($WHERE))
+if (!empty($whereStatement))
 {
        $SEL = 0;
        if (isset($_POST['task'])) $SEL = SELECTION_COUNT($_POST['task']);
@@ -90,7 +93,7 @@ if (!empty($WHERE))
                // Start listing tasks matching selected filter
                $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created
 FROM "._MYSQL_PREFIX."_task_system
-WHERE ".$WHERE."
+WHERE ".$whereStatement."
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __LINE__);
                if (($SEL > 0) && (!IS_DEMO()))
                {
@@ -101,7 +104,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                                foreach ($_POST['task'] as $id=>$sel)
                                {
                                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin='0' WHERE id=%d AND assigned_admin='%s' LIMIT 1",
-                                        array(bigintval($id), GET_ADMIN_ID($_COOKIE['admin_login'])), __FILE__, __LINE__);
+                                        array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
                                }
                        }
                         elseif (isset($_POST['del']))
@@ -125,14 +128,14 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                        }
 
                        // Update query
-                       $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM "._MYSQL_PREFIX."_task_system WHERE ".$WHERE." ORDER BY subject, task_created DESC", __FILE__, __LINE__);
+                       $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM "._MYSQL_PREFIX."_task_system WHERE ".$whereStatement." ORDER BY subject, task_created DESC", __FILE__, __LINE__);
                }
 
                // There are uncompleted jobs!
-               $eval = "\$TYPE = ADMIN_OVERVIEW_TASK_".strtoupper($_GET['type'])."_TYPE;";
+               $eval = "\$type = ADMIN_OVERVIEW_TASK_".strtoupper($_GET['type'])."_TYPE;";
                eval($eval);
                LOAD_TEMPLATE("admin_overview_header_task", false, array(
-                       'message' => $TYPE,
+                       'message' => $type,
                        'type'    => $_GET['type']
                ));
                $SW = 2;