Deprecated templates removed, some code moved to filters, bug fixed in mydata:

[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 31b89cb81e89c73add8eb227eb6b3d4135d30126..a58ac8611f270bb6f4fc06c7af0a4376f981006e 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 07/13/2004 *
- * ===============                              Last change: 08/02/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 07/13/2004 *
+ * ===================                          Last change: 08/02/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : overview-inc.php                                 *
@@ -132,10 +132,10 @@ ORDER BY
 
 // Outputs selected tasks
 function outputSeletectedTasks ($postData, $result_tasks) {
-       if ((isset($postData['assign'])) && (count($postData['task']) > 0)) {
+       if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) {
                // Assign / do tasks
                $OUT = ''; $SW = 2;
-               foreach ($postData['task'] as $id => $sel) {
+               foreach ($postData['sel'] as $id => $sel) {
                        $result_task = SQL_QUERY_ESC("SELECT
        `id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
 FROM
@@ -271,7 +271,7 @@ LIMIT 1",
                                $OUT .= loadTemplate('admin_overview_row', true, $content);
 
                                // Which task do we actually have here?
-                               // @TODO Rewrite this to something with include files
+                               // @TODO Rewrite this to something with include files and/or filter
                                switch ($type) {
                                        case 'EXTENSION': // Install new extensions
                                                $ext_name = substr($subj, 1, strpos($subj, ':') - 1);
@@ -289,7 +289,7 @@ LIMIT 1",
                                                        // Task is closed so nothing is todo
                                                        $OUT .= "<div class=\"admin_failed\">{--ADMIN_EXT_ALREADY_REGISTERED--}</div>\n";
 
-                                                       // Close task but not already closes or deleted or update tasks
+                                                       // Close task but not already closed, solved, deleted or update tasks
                                                        if ((!in_array($status, array('CLOSED','DELETED','SOLVED'))) && ($type != 'EXTENSION_UPDATE')) {
                                                                // Solve the task
                                                                runFilterChain('solve_task', $tid);
@@ -332,6 +332,8 @@ LIMIT 1",
                                                                        'pid' => $pid,
                                                                        'tid' => $tid,
                                                                );
+
+                                                               // Load template
                                                                $OUT .= loadTemplate('admin_payout_overview_form', true, $content);
                                                        } else {
                                                                // Problem obtaining payout id
@@ -347,7 +349,7 @@ LIMIT 1",
                                                if (isExtensionActive('wernis')) {
                                                        // Extension is installed so let him send a notification to the user
                                                        $result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_wernis` WHERE `userid`=%s AND wernis_timestamp=%s LIMIT 1",
-                                                       array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
+                                                               array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
                                                        list($pid) = SQL_FETCHROW($result_pay);
                                                        SQL_FREERESULT($result_pay);
 
@@ -396,17 +398,17 @@ LIMIT 1",
                // Load final template
                loadTemplate('admin_overview_list', false, $OUT);
        } else {
-               if ((isset($postData['task'])) && ((count($postData['task']) > 0) || ($postData['task'][0] == 1))) {
+               if ((isset($postData['sel'])) && ((count($postData['sel']) > 0) || ($postData['sel'][0] == 1))) {
                        // Only unassign / delete tasks when there are selected tasks posted
                        if (!empty($postData['unassign'])) {
                                // Unassign from tasks
-                               foreach ($postData['task'] as $id => $sel) {
+                               foreach ($postData['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",
                                                array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
                                }
                        } elseif (isset($postData['del'])) {
                                // Delete tasks
-                               foreach ($postData['task'] as $id => $sel) {
+                               foreach ($postData['sel'] as $id => $sel) {
                                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND assigned_admin IN (%s,0) LIMIT 1",
                                                array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
                                }