X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=13a66c760d6011b56398a0c8ea17d5dc856d9c3a;hb=5ef42cb239e9225f160f5963a718f14bc70a1866;hp=7304ac172f49c73350ef8ed5db62bf254280d59f;hpb=c4823d28fd0bd22250b16d73f2034f36fc54abda;p=mailer.git diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 7304ac172f..13a66c760d 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -8,7 +8,7 @@ * -------------------------------------------------------------------- * * Short description : Output standard task management * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Standart-Aufgaben-Management ausgeben * + * Kurzbeschreibung : Standard-Aufgaben-Management ausgeben * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -16,8 +16,8 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009 - 2011 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * 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 * * it under the terms of the GNU General Public License as published by * @@ -43,15 +43,15 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // @TODO This function does also check for uncompleted tasks function outputStandardOverview (&$result_tasks) { // First check for solved and not assigned tasks and assign them to current admin - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE assigned_admin < 1 AND status != 'NEW'", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `assigned_admin` IS NULL AND status != 'NEW'", array(getCurrentAdminId()), __FILE__, __LINE__); // We currently don't want to install an extension so let's find out if we need... setExtensionMode('test'); - $jobsDone = true; + $jobsDone = TRUE; // Open the extension directory - $extensionList = getArrayFromDirectory('inc/extensions/', 'ext-', false, false); + $extensionList = getArrayFromDirectory('inc/extensions/', 'ext-', FALSE, FALSE); foreach ($extensionList as $file) { // Only file name is required... :( $file = basename($file); @@ -62,20 +62,21 @@ function outputStandardOverview (&$result_tasks) { $ext_name = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!! // Init variables - $result = false; + $result = FALSE; // Check if extension is installed or not $extInstalled = (isExtensionInstalled($ext_name) && (isExtensionActive($ext_name))); // Is the extension not yet installed? - if ($extInstalled === false) { + //* 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', 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 } else { - // Test-drive extension in update mode + // Test-drive extension loadExtension($ext_name, 'test'); // Get extension version @@ -90,7 +91,7 @@ function outputStandardOverview (&$result_tasks) { } // END - if if (isset($GLOBALS['cache_array']['always_active'][$ext_name])) { - // Maybe we want to keept the current extension active? + // Shall the current extension kept activated? if (($GLOBALS['cache_array']['always_active'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) { // Reactivate this extension! doActivateExtension($ext_name); @@ -102,11 +103,17 @@ 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 - `assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW') + `assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `userid` DESC, `task_type` DESC, @@ -116,7 +123,7 @@ ORDER BY if (!SQL_HASZERONUMS($result_tasks)) { // New jobs found - $jobsDone = false; + $jobsDone = FALSE; } // END - if // Free the result @@ -133,11 +140,18 @@ function outputSeletectedTasks ($postData, $result_tasks) { $OUT = ''; foreach ($postData['sel'] as $taskId => $sel) { $result_task = SQL_QUERY_ESC("SELECT - `id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin` + `id`, + `userid`, + `task_type`, + `subject`, + `text`, + `task_created`, + `status`, + `assigned_admin` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE - `id`=%s AND (`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW')) + `id`=%s AND (`assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW')) LIMIT 1", array( bigintval($taskId), @@ -151,7 +165,7 @@ LIMIT 1", if ($taskData['assigned_admin'] == '0') { // Assgin current admin to unassgigned task - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin`=0 LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin` IS NULL LIMIT 1", array( getCurrentAdminId(), bigintval($taskData['id']) @@ -174,7 +188,7 @@ LIMIT 1", $content = getUserDataArray(); // Generate HTML list entry - $add = '
%s", print_r($postData, true))); + reportBug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=
%s", print_r($postData, TRUE))); } // Update query - $result_tasks = SQL_QUERY_ESC("SELECT `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW') ORDER BY `task_created` DESC", + $result_tasks = SQL_QUERY_ESC("SELECT `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `task_created` DESC", array(getCurrentAdminId()), __FILE__, __LINE__); } // END - if @@ -429,28 +443,25 @@ LIMIT 1", case 'EXTENSION_UPDATE': $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1); break; - } - - // Get task type - $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}'; + } // END - switch if (isValidUserId($content['userid'])) { // Member found otherwise it's a system task $content['userid'] = generateUserProfileLink($content['userid']); } else { - $content['userid'] = '{--ADMIN_IS_SYSTEM_TASK--}'; + $content['userid'] = '{--ADMIN_IS_SYSTEM_TASK--}'; } // 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); + $OUT .= loadTemplate('admin_overview_list_ext_rows', TRUE, $content); } else { // Load default row template - $OUT .= loadTemplate('admin_overview_list_rows', true, $content); + $OUT .= loadTemplate('admin_overview_list_rows', TRUE, $content); } } // END - while @@ -458,7 +469,7 @@ LIMIT 1", SQL_FREERESULT($result_tasks); // Load footer template - loadTemplate('admin_overview_table', false, $OUT); + loadTemplate('admin_overview_table', FALSE, $OUT); } }