X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=0647775f9e0044a7b665b4ddc68108100244beae;hp=97957c0b8bc0e36b824fc9844c81de862636bd63;hb=e9da1508b2a3ccbf63adc999981674740a47e074;hpb=32933a97e4462c232a794fc33bd91f01ff997cb9
diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 97957c0b8b..0647775f9e 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -14,12 +14,10 @@
* $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 *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2015 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,19 +41,16 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
} // 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 (!isGetRequestElementSet('type')) {
+ setGetRequestElement('type', 'your');
+} // END - if
-switch (getRequestParameter('type')) {
+switch (getRequestElement('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 +62,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
@@ -79,20 +74,20 @@ switch (getRequestParameter('type')) {
break;
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')));
+ logDebugMessage(__FILE__, __LINE__, sprintf('Unknown task type %s detected.', getRequestElement('type')));
+ displayMessage('{%message,ADMIN_TASK_UNKNOWN_MODE' . getRequestElement('type') . '%}');
break;
} // END - switch
if (!empty($whereStatement)) {
- if ((isPostRequestParameterSet('assign')) && (countPostSelection() > 0)) {
+ if ((isPostRequestElementSet('assign')) && (ifPostContainsSelections())) {
// Assign / do tasks
loadIncludeOnce('inc/modules/admin/overview-inc.php');
if (empty($dmy)) $dmy = '';
outputSeletectedTasks(postRequestArray(), $dmy);
} else {
// Start listing tasks matching selected filter
- $result_tasks = SQL_QUERY('SELECT
+ $result_tasks = sqlQuery('SELECT
`id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
FROM
`{?_MYSQL_PREFIX?}_task_system`
@@ -104,20 +99,20 @@ 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')) {
+ if (isFormSent('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",
+ foreach (postRequestElement('sel') as $id => $sel) {
+ sqlQueryEscaped("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') {
+ foreach (postRequestElement('sel') as $id => $sel) {
+ if (getRequestElement('type') == 'deleted') {
// Delete task immediately
- SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1",
+ sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1",
array(bigintval($id)),__FILE__, __LINE__);
} else {
// Mark task as to be deleted (purged by autopurge extension)
@@ -126,11 +121,11 @@ ORDER BY
} // END - foreach
} else {
// Unknown action performed
- debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=%s
", print_r(postRequestArray(), true)));
+ reportBug(__FILE__, __LINE__, sprintf('Unknown task action performed. data=%s
', print_r(postRequestArray(), TRUE)));
}
// Update query
- $result_tasks = SQL_QUERY('SELECT
+ $result_tasks = sqlQuery('SELECT
`id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
FROM
`{?_MYSQL_PREFIX?}_task_system`
@@ -142,22 +137,10 @@ 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;
- while ($content = SQL_FETCHARRAY($result_tasks)) {
+ $OUT = '';
+ while ($content = sqlFetchArray($result_tasks)) {
// Init infos
- $content['infos'] = '---';
-
- // Generate link
- $content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
-
- // Get admin task
- $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
+ $content['infos'] = '';
// Generate infos
switch ($content['task_type']) {
@@ -168,49 +151,46 @@ ORDER BY
} // END - switch
// Member assigned with task?
- if (isValidUserId($content['userid'])) {
+ if (isValidId($content['userid'])) {
// Member found otherwise it's a system task
$content['userid'] = generateUserProfileLink($content['userid']);
} else {
// Is a system task!
- $content['userid'] = '{--ADMIN_IS_SYSTEM_TASK--}';
+ $content['userid'] = '{--ADMIN_IS_SYSTEM_TASK--}';
}
// Prepare content
- // @TODO Rewritings: admin->assigned_admin,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)
+ 'task_created' => generateDateTime($content['task_created'], 2)
));
- // Do we have an extension task?
- if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
+ // Is there an extension task?
+ 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);
+ sqlFreeResult($result_tasks);
+
+ // Prepare content
+ $content = array(
+ 'message' => '{--ADMIN_OVERVIEW_TASK_' . strtoupper(getRequestElement('type')) . '_TYPE_TITLE--}',
+ 'type' => getRequestElement('type'),
+ 'rows' => $OUT
+ );
// Load footer template
- if (getRequestParameter('type') == 'deleted') {
+ if (getRequestElement('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