X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=29e6a73c96993ebe8e99042b73a6583d8dde9872;hb=dba0db3d371da5a17ca7da6a8cde2596251660b7;hp=92f4ea9321ded0a1d40f0ea368312c1589ac1483;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git
diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 92f4ea9321..29e6a73c96 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -14,11 +14,9 @@
* $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 *
@@ -43,10 +41,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
if (!isExtensionActive('task')) {
- loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('task'));
+ displayMessage(generateExtensionInactiveNotInstalledMessage('task'));
return;
} // END - if
@@ -55,7 +53,7 @@ if (!isGetRequestParameterSet('type')) setGetRequestParameter('type', 'your');
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
@@ -67,7 +65,7 @@ switch (getRequestParameter('type')) {
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
@@ -80,12 +78,12 @@ switch (getRequestParameter('type')) {
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(getMaskedMessage('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 = '';
@@ -104,15 +102,15 @@ ORDER BY
`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 (isPostRequestParameterSet('del')) {
+ } elseif (isFormSent('delete')) {
// Delete tasks
foreach (postRequestParameter('sel') as $id => $sel) {
if (getRequestParameter('type') == 'deleted') {
@@ -126,7 +124,7 @@ ORDER BY
} // END - foreach
} else {
// Unknown action performed
- debug_report_bug(sprintf("Unknown task action performed. data=%s
", print_r(postRequestArray(), true)));
+ debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=%s
", print_r(postRequestArray(), true)));
}
// Update query
@@ -142,22 +140,13 @@ ORDER BY
}
// There are uncompleted jobs!
- $type = getMessage('ADMIN_OVERVIEW_TASK_'.strtoupper(getRequestParameter('type')).'_TYPE');
- // @TODO Rewrite these templates to one and add $OUT
- loadTemplate('admin_overview_header_task', false, array(
- 'message' => $type,
- 'type' => getRequestParameter('type')
- ));
- $OUT = ''; $SW = 2;
+ $OUT = '';
while ($content = SQL_FETCHARRAY($result_tasks)) {
// Init infos
- $content['infos'] = '---';
-
- // Generate link
- $content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
+ $content['infos'] = '';
// Get admin task
- $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
+ $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
// Generate infos
switch ($content['task_type']) {
@@ -168,7 +157,7 @@ ORDER BY
} // END - switch
// Member assigned with task?
- if ($content['userid'] > 0) {
+ if (isValidUserId($content['userid'])) {
// Member found otherwise it's a system task
$content['userid'] = generateUserProfileLink($content['userid']);
} else {
@@ -177,40 +166,40 @@ ORDER BY
}
// Prepare content
- // @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template
$content = merge_array($content, array(
- 'sw' => $SW,
- 'admin' => $content['assigned_admin'],
- 'userid' => $content['userid'],
- 'type' => $content['task_type_msg'],
- 'created' => generateDateTime($content['task_created'], 2)
+ '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
- // @TODO Rewrite this to $OUT .= ..., true, ...
- loadTemplate('admin_list_task_ext_rows', false, $content);
+ $OUT .= loadTemplate('admin_list_task_ext_rows', true, $content);
} else {
// Load default row template
- // @TODO Rewrite this to $OUT .= ..., true, ...
- loadTemplate('admin_list_task_rows', false, $content);
+ $OUT .= loadTemplate('admin_list_task_rows', true, $content);
}
-
- // Switch colors
- $SW = 3 - $SW;
} // END - while
// Free memory
SQL_FREERESULT($result_tasks);
+ // Prepare content
+ $content = array(
+ 'message' => '{--ADMIN_OVERVIEW_TASK_' . strtoupper(getRequestParameter('type')) . '_TYPE--}',
+ 'type' => getRequestParameter('type'),
+ 'rows' => $OUT
+ );
+
// Load footer template
if (getRequestParameter('type') == 'deleted') {
// Delete now button
- loadTemplate('admin_overview_footer_task');
+ loadTemplate('admin_list_task_delete', false, $content);
} else {
// Normal footer
- loadTemplate('admin_overview_footer');
+ loadTemplate('admin_list_task', false, $content);
}
}
} // END - if