X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=7a80734d6eea3903d9f53d4379bd978f548b7693;hp=7304ac172f49c73350ef8ed5db62bf254280d59f;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=c4823d28fd0bd22250b16d73f2034f36fc54abda
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 7304ac172f..7a80734d6e 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,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...
@@ -68,14 +68,15 @@ 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', 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
@@ -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,
@@ -133,11 +140,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),
@@ -151,7 +158,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 +181,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 +212,7 @@ LIMIT 1",
// Is this non-productive?
if (isExtensionProductive() === false) {
// Issue warning
- $taskData['text'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name)) . $taskData['text'];
+ $taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}', true) . $taskData['text'];
} // END - if
// Set current extension name
@@ -243,7 +250,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
@@ -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
@@ -264,8 +271,8 @@ LIMIT 1",
'subject' => $taskData['subject'],
'add' => $add,
'text' => $taskData['text'],
- 'task_created' => generateDateTime($taskData['task_created'], 1),
- 'extension' => $ext_name
+ 'task_created' => generateDateTime($taskData['task_created'], '1'),
+ 'ext_name' => $ext_name
);
// Load template
@@ -287,7 +294,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 +305,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']);
@@ -309,10 +316,10 @@ 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));
- $OUT .= '' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '
';
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction.", $mode));
+ $OUT .= '{%message,ADMIN_UNKNOWN_SUPPORT_MODE=' . $mode . '%}
';
break;
- }
+ } // END - switch
break;
case 'PAYOUT_REQUEST': // Payout requests
@@ -397,22 +404,22 @@ LIMIT 1",
if (!empty($postData['unassign'])) {
// Unassign from tasks
foreach ($postData['sel'] as $taskId => $sel) {
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s 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__);
- }
- } elseif (isset($postData['delete'])) {
+ } // END - foreach
+ } 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) 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 {
// Unknown action
- debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=%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,22 +436,19 @@ 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);