X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=2ba0d8721b8778596615748e888b1b965c57ba7d;hb=101e5f161c0c367c022c9288398226a57f3919d7;hp=db1e154849cc5becddc63b7ae12d1a588e46a43a;hpb=d2c972ef5f68c2f69865aa4f392841d166a419ae;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index db1e154849..2ba0d8721b 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -8,17 +8,15 @@
* -------------------------------------------------------------------- *
* 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 *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -72,7 +70,7 @@ 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
@@ -108,7 +106,7 @@ function outputStandardOverview (&$result_tasks) {
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
@@ -139,7 +137,7 @@ function outputSeletectedTasks ($postData, $result_tasks) {
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`=NULL LIMIT 1",
array(
getCurrentAdminId(),
bigintval($taskData['id'])
@@ -176,10 +174,10 @@ 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__, 'Invalid userid=' . $taskData['userid'] . ' -> not found!');
+ logDebugMessage(__FUNCTION__, __LINE__, 'fetchUserData() failed: userid=' . $taskData['userid'] . ' not found.');
$taskData['userid'] = '0';
}
} // END - if
@@ -207,7 +205,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
@@ -245,7 +243,7 @@ LIMIT 1",
// Add SQLs to a table
if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
// Add verbose SQL table
- $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . '
';
+ $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="table top left right"', true, '100%');
} // END - if
} elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
// Run SQL commands in dry mode but only return the notes
@@ -286,7 +284,7 @@ LIMIT 1",
));
} else {
// Extension is already installed
- $OUT .= '{--ADMIN_EXTENSION_ALREADY_REGISTERED--}
';
+ $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')) {
@@ -298,7 +296,7 @@ LIMIT 1",
case 'EXTENSION_UPDATE': // Extension update
// Extension updates are installed automatically
- $OUT .= '{--ADMIN_EXTENSION_UPDATED--}
';
+ $OUT .= '{--ADMIN_EXTENSION_UPDATED--}
';
// Close task
if (!in_array($taskData['status'], array('CLOSED', 'DELETED'))) {
@@ -312,9 +310,9 @@ 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;
case 'PAYOUT_REQUEST': // Payout requests
@@ -336,11 +334,11 @@ LIMIT 1",
$OUT .= loadTemplate('admin_payout_overview_form', true, $content);
} else {
// Problem obtaining payout id
- $OUT .= '{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}
';
+ $OUT .= '{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}
';
}
} else {
// Extension is not installed
- $OUT .= '{--ADMIN_PAYOUT_NOT_INSTALLED--}
';
+ $OUT .= '{--ADMIN_PAYOUT_NOT_INSTALLED--}
';
}
break;
@@ -361,11 +359,11 @@ LIMIT 1",
$OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
} else {
// Problem obtaining wernis id
- $OUT .= '{--WERNIS_OBTAIN_ID_FAILED--}
';
+ $OUT .= '{--WERNIS_OBTAIN_ID_FAILED--}
';
}
} else {
// Extension is not installed
- $OUT .= '{--ADMIN_WERNIS_NOT_INSTALLED--}
';
+ $OUT .= '{--ADMIN_WERNIS_NOT_INSTALLED--}
';
}
break;
@@ -379,7 +377,7 @@ LIMIT 1",
default: // Unknown task type
logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $taskData['task_type']));
- $OUT .= '' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $taskId) . '
';
+ $OUT .= '' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $taskId) . '
';
break;
}
$OUT .= '
@@ -399,22 +397,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['del'])) {
+ } // END - foreach
+ } 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",
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)));
}
// 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,10 +429,7 @@ 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