X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=9084025f2f84bdb3a57f8e2e1699382eb3a47ab6;hb=87a1790a6620f46451f1a8865c7153aa6b7ffec9;hp=caa0096616c47d976a086a675609ccc771d94682;hpb=4c221b6350439b8f91db58f142f03f79014f2eaf;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index caa0096616..9084025f2f 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:: $ *
@@ -17,7 +17,7 @@
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * 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,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...
@@ -70,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(), '0.0', 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
@@ -102,7 +102,7 @@ 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
@@ -133,7 +133,7 @@ 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
@@ -151,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`=NULL 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 +174,7 @@ LIMIT 1",
$content = getUserDataArray();
// Generate HTML list entry
- $add = '
{--ADMIN_MEMBER_UID--}: ' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . ')';
+ $add = '{--ADMIN_MEMBER_USERID--}: ' . generateUserProfileLink($taskData['userid'], 'user_data') . ' ({%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . ')';
} else {
// Invalid userid, so log and zero it
logDebugMessage(__FUNCTION__, __LINE__, 'fetchUserData() failed: userid=' . $taskData['userid'] . ' not found.');
@@ -205,7 +205,7 @@ LIMIT 1",
// Is this non-productive?
if (isExtensionProductive() === false) {
// Issue warning
- $taskData['text'] = displayMessage(getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name), true) . $taskData['text'];
+ $taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}', true) . $taskData['text'];
} // END - if
// Set current extension name
@@ -243,7 +243,7 @@ LIMIT 1",
// Add SQLs to a table
if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
// Add verbose SQL table
- $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="table top left right"', true, '100%');
+ $taskData['text'] .= addExtensionVerboseSqlTable($title);
} // END - if
} elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
// Run SQL commands in dry mode but only return the notes
@@ -264,7 +264,7 @@ LIMIT 1",
'subject' => $taskData['subject'],
'add' => $add,
'text' => $taskData['text'],
- 'task_created' => generateDateTime($taskData['task_created'], 1),
+ 'task_created' => generateDateTime($taskData['task_created'], '1'),
'extension' => $ext_name
);
@@ -287,7 +287,7 @@ LIMIT 1",
$OUT .= '{--ADMIN_EXTENSION_ALREADY_REGISTERED--}
';
// Close task but not already closed, solved, deleted or update tasks
- if ((!in_array($taskData['status'], array('CLOSED','DELETED','SOLVED'))) && ($taskData['task_type'] != 'EXTENSION_UPDATE')) {
+ if ((!in_array($taskData['status'], array('CLOSED', 'DELETED', 'SOLVED'))) && ($taskData['task_type'] != 'EXTENSION_UPDATE')) {
// Solve the task
runFilterChain('solve_task', $taskData['id']);
} // END - if
@@ -298,7 +298,7 @@ LIMIT 1",
// Extension updates are installed automatically
$OUT .= '{--ADMIN_EXTENSION_UPDATED--}
';
- // Close task
+ // Close task if not closed or deleted
if (!in_array($taskData['status'], array('CLOSED', 'DELETED'))) {
// Solve the task
runFilterChain('solve_task', $taskData['id']);
@@ -310,7 +310,7 @@ LIMIT 1",
switch ($mode) {
default: // @TODO Unknown support mode
logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
- $OUT .= '' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '
';
+ $OUT .= '{%message,ADMIN_UNKNOWN_SUPPORT_MODE=' . $mode . '%}
';
break;
} // END - switch
break;
@@ -403,7 +403,7 @@ LIMIT 1",
} elseif (isset($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) LIMIT 1",
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND `assigned_admin` IN (%s,0,NULL) LIMIT 1",
array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
} // END - foreach
} else {
@@ -412,7 +412,7 @@ LIMIT 1",
}
// 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 OR `assigned_admin` IS NULL) 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,14 +431,11 @@ LIMIT 1",
break;
} // END - switch
- // Get task type
- $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
-
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