* $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 *
} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
-
-if (!isExtensionActive('task')) {
- loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('task'));
- return;
-} // END - if
+addYouAreHereLink('admin', __FILE__);
$whereStatement = '';
-if (!isGetRequestParameterSet('type')) setGetRequestParameter('type', 'your');
+if (!isGetRequestParameterSet('type')) {
+ setGetRequestParameter('type', 'your');
+} // END - if
switch (getRequestParameter('type')) {
case 'your': // List only your own open (new) tasks
- $whereStatement = "`assigned_admin`='".getCurrentAdminId()."' AND `status`='NEW' AND `task_type` != 'EXTENSION_UPDATE'";
+ $whereStatement = "`assigned_admin`=".getCurrentAdminId()." AND `status`='NEW' AND `task_type` != 'EXTENSION_UPDATE'";
break;
case 'updates': // List only updates assigned to you
break;
case 'unassigned': // List unassigned (but not deleted) tasks
- $whereStatement = "`assigned_admin`=0 AND `status` != 'DELETED'";
+ $whereStatement = "(`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status` != 'DELETED'";
break;
case 'deleted': // List all deleted
default: // Unknown type
logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestParameter('type')));
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_TASK_UNKNOWN_MODE', getRequestParameter('type')));
+ displayMessage('{%message,ADMIN_TASK_UNKNOWN_MODE' . getRequestParameter('type') . '%}');
break;
} // END - switch
if (!empty($whereStatement)) {
- if ((isPostRequestParameterSet('assign')) && (countPostSelection() > 0)) {
+ if ((isPostRequestParameterSet('assign')) && (ifPostContainsSelections())) {
// Assign / do tasks
loadIncludeOnce('inc/modules/admin/overview-inc.php');
if (empty($dmy)) $dmy = '';
} else {
// Start listing tasks matching selected filter
$result_tasks = SQL_QUERY('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
`subject` ASC,
`task_created` DESC',
__FILE__, __LINE__);
- if ((countPostSelection() > 0) && (!isDemoModeActive())) {
+ if ((ifPostContainsSelections()) && (!isDemoModeActive())) {
// Only unassign / delete tasks when there are selected tasks posted
if (isPostRequestParameterSet('unassign')) {
// Unassign from tasks
foreach (postRequestParameter('sel') as $id => $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($id), getCurrentAdminId()), __FILE__, __LINE__);
} // END - foreach
- } elseif (isFormSent('del')) {
+ } elseif (isFormSent('delete')) {
// Delete tasks
foreach (postRequestParameter('sel') as $id => $sel) {
if (getRequestParameter('type') == 'deleted') {
// Update query
$result_tasks = SQL_QUERY('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
// Init infos
$content['infos'] = '';
- // Get admin task
- $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
-
// Generate infos
switch ($content['task_type']) {
case 'EXTENSION':
// Prepare content
$content = merge_array($content, array(
- 'assign_admin' => $content['assigned_admin'],
- 'userid' => $content['userid'],
- 'task_type_msg' => $content['task_type_msg'],
'task_created' => generateDateTime($content['task_created'], 2)
));
// Do we have an extension task?
- if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
+ if (isExtensionTask($content)) {
// Load extension row template
$OUT .= loadTemplate('admin_list_task_ext_rows', true, $content);
} else {