X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=9084025f2f84bdb3a57f8e2e1699382eb3a47ab6;hb=5c159f0b199d12742dcd65d5d638cb504ee93c66;hp=328e5e5ddfe3b889c9b2192cc4014301a8260fb7;hpb=903f539b5aac6171fdfee9ad252565531e8dd4e2;p=mailer.git diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 328e5e5ddf..9084025f2f 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -8,18 +8,16 @@ * -------------------------------------------------------------------- * * Short description : Output standard task management * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Standart-Aufgaben-Management ausgeben * + * Kurzbeschreibung : Standard-Aufgaben-Management ausgeben * * -------------------------------------------------------------------- * * $Revision:: $ * * $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 * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2011 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 * @@ -45,7 +43,7 @@ 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... @@ -72,12 +70,12 @@ function outputStandardOverview (&$result_tasks) { // Is the extension not yet installed? if ($extInstalled === false) { // We maybe want to install an extension so let's test-drive it... - if (loadExtension($ext_name, getExtensionMode(), '', true)) { + if (loadExtension($ext_name, getExtensionMode(), '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 @@ -104,11 +102,11 @@ 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, @@ -117,7 +115,7 @@ ORDER BY array(getCurrentAdminId()), __FILE__, __LINE__); if (!SQL_HASZERONUMS($result_tasks)) { - // New jobs found! + // New jobs found $jobsDone = false; } // END - if @@ -135,11 +133,11 @@ 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), @@ -153,7 +151,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']) @@ -176,10 +174,10 @@ LIMIT 1", $content = getUserDataArray(); // Generate HTML list entry - $add = '
%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 @@ -431,16 +429,13 @@ 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