X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=9084025f2f84bdb3a57f8e2e1699382eb3a47ab6;hb=cc356117082319cd963082c5b60a2be542c3e7db;hp=46b470a6be5a9eef0b42915083d6cf3271f2f4d6;hpb=8d70fd41c880ca61bafb47a69a6411c741c71dff;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 46b470a6be..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 *
@@ -40,12 +38,12 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!isAdmin())) {
die();
-}
+} // END - if
// @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...
@@ -71,24 +69,21 @@ function outputStandardOverview (&$result_tasks) {
// Is the extension not yet installed?
if ($extInstalled === false) {
- // Generate subject line
- $ext_subj = sprintf("[%s:]", $ext_name);
-
// We maybe want to install an extension so let's test-drive it...
- if (loadExtension($ext_name, getExtensionMode(), '', true)) {
- // Create a task for newly installed extension
- createNewExtensionTask(getCurrentAdminId(), $ext_subj, $ext_name);
+ 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
$ext_ver = getExtensionVersion($ext_name);
- //* DEBUG: */ outputHtml($ext_name."=".$ext_ver."
");
+ //* DEBUG: */ debugOutput($ext_name.'='.$ext_ver);
// Update extension if extension is installed and outdated
- //* DEBUG: */ outputHtml('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)."
");
+ //* DEBUG: */ debugOutput('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name));
if (getThisExtensionVersion() > $ext_ver) {
// Update the extension
updateExtension($ext_name, $ext_ver);
@@ -107,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,
@@ -119,8 +114,8 @@ ORDER BY
`task_created` DESC",
array(getCurrentAdminId()), __FILE__, __LINE__);
- if (SQL_NUMROWS($result_tasks) > 0) {
- // New jobs found!
+ if (!SQL_HASZERONUMS($result_tasks)) {
+ // New jobs found
$jobsDone = false;
} // END - if
@@ -135,17 +130,17 @@ ORDER BY
function outputSeletectedTasks ($postData, $result_tasks) {
if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) {
// Assign / do tasks
- $OUT = ''; $SW = 2;
- foreach ($postData['sel'] as $id => $sel) {
+ $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($id),
+ bigintval($taskId),
getCurrentAdminId()
), __FILE__, __LINE__);
@@ -156,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'])
@@ -165,10 +160,10 @@ LIMIT 1",
$add = '';
// @TODO Rewrite this to a filter
- if ($taskData['task_type'] == 'SUPPORT_MEMBER') {
+ if ($taskData['task_type'] == 'MEMBER_SUPPORT') {
$mode = substr($taskData['text'], 0, strpos($taskData['text'], ':'));
$taskData['text'] = substr($taskData['text'], strpos($taskData['text'], ':') + 1);
- $add = "
%s", print_r($postData, true))); + debug_report_bug(__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 // There are uncompleted jobs! - $OUT = ''; $SW = 2; + $OUT = ''; while ($content = SQL_FETCHARRAY($result_tasks)) { // Init infos - $content['infos'] = '---'; - - // Generate assign link - $content['assigned_admin'] = generateAdminLink($content['assigned_admin']); + $content['infos'] = ''; // Generate infos // @TODO Try to move this in includes @@ -445,38 +429,26 @@ LIMIT 1", case 'EXTENSION_UPDATE': $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1); break; - } + } // END - switch - // Get task type - $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).''); - - if ($content['userid'] > 0) { + 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--}'; } - // Prepare content - $content = merge_array($content, array( - 'sw' => $SW, - 'assigned_admin' => $content['assigned_admin'], - 'userid' => $content['userid'], - 'task_type_msg' => $content['task_type_msg'], - 'created' => generateDateTime($content['task_created'], 2) - )); + // Add/translate some content + $content['task_created'] = generateDateTime($content['task_created'], 2); // Do we have extension task? - if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) { + if (isExtensionTask($content)) { // Load extension row template $OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content); } else { // Load default row template $OUT .= loadTemplate('admin_overview_list_rows', true, $content); } - - // Switch color - $SW = 3 - $SW; } // END - while // Free memory