Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

[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 9084025f2f84bdb3a57f8e2e1699382eb3a47ab6..7a80734d6eea3903d9f53d4379bd978f548b7693 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -68,9 +68,10 @@ function outputStandardOverview (&$result_tasks) {
                        $extInstalled = (isExtensionInstalled($ext_name) && (isExtensionActive($ext_name)));
 
                        // Is the extension not yet installed?
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',extInstalled=' . intval($extInstalled));
                        if ($extInstalled === false) {
                                // We maybe want to install an extension so let's test-drive it...
-                               if (loadExtension($ext_name, getExtensionMode(), '0.0.0', true)) {
+                               if (loadExtension($ext_name, 'test', '0.0.0', true)) {
                                        // Create a task for newly installed extension (we ignore the task id here)
                                        createNewExtensionTask($ext_name);
                                } // END - if
@@ -102,7 +103,13 @@ function outputStandardOverview (&$result_tasks) {
 
        // At last - but not least - check for own and new unassigned tasks...
        $result_tasks = SQL_QUERY_ESC("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
@@ -256,7 +263,7 @@ LIMIT 1",
                                        $taskData['text'] .= getExtensionNotes();
                                } else {
                                        // This should not normally happen!
-                                       debug_report_bug(__FILE__, __LINE__, 'ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! isVerboseSqlEnabled=' . intval(isVerboseSqlEnabled()));
+                                       reportBug(__FILE__, __LINE__, 'ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! isVerboseSqlEnabled=' . intval(isVerboseSqlEnabled()));
                                }
 
                                // Prepare array for the template
@@ -265,7 +272,7 @@ LIMIT 1",
                                        'add'          => $add,
                                        'text'         => $taskData['text'],
                                        'task_created' => generateDateTime($taskData['task_created'], '1'),
-                                       'extension'    => $ext_name
+                                       'ext_name'     => $ext_name
                                );
 
                                // Load template
@@ -309,7 +316,7 @@ LIMIT 1",
                                                // @TODO This may also be rewritten to include files
                                                switch ($mode) {
                                                        default: // @TODO Unknown support mode
-                                                       logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
+                                                       logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction.", $mode));
                                                        $OUT .= '<div class="notice medium">{%message,ADMIN_UNKNOWN_SUPPORT_MODE=' . $mode . '%}</div>';
                                                        break;
                                                } // END - switch
@@ -400,7 +407,7 @@ 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($taskId), getCurrentAdminId()), __FILE__, __LINE__);
                                } // END - foreach
-                       } elseif (isset($postData['delete'])) {
+                       } elseif (!empty($postData['delete'])) {
                                // Delete tasks
                                foreach ($postData['sel'] as $taskId => $sel) {
                                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND `assigned_admin` IN (%s,0,NULL) LIMIT 1",
@@ -408,7 +415,7 @@ LIMIT 1",
                                } // END - foreach
                        } else {
                                // Unknown action
-                               debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r($postData, true)));
+                               reportBug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r($postData, true)));
                        }
 
                        // Update query
@@ -441,7 +448,7 @@ LIMIT 1",
                        // Add/translate some content
                        $content['task_created'] = generateDateTime($content['task_created'], 2);
 
-                       // Do we have extension task?
+                       // Is there extension task?
                        if (isExtensionTask($content)) {
                                // Load extension row template
                                $OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content);