X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=3e800b811d4b375edf35a88f509aa2bede930030;hb=4f7df133f736da124e6f7bd02008b9093f736451;hp=6d755cf221562655309d3b35dd0e941be6791309;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 6d755cf221..3e800b811d 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -16,7 +16,7 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * 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 *
@@ -43,15 +43,15 @@ 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...
setExtensionMode('test');
- $jobsDone = true;
+ $jobsDone = TRUE;
// Open the extension directory
- $extensionList = getArrayFromDirectory('inc/extensions/', 'ext-', false, false);
+ $extensionList = getArrayFromDirectory('inc/extensions/', 'ext-', FALSE, FALSE);
foreach ($extensionList as $file) {
// Only file name is required... :(
$file = basename($file);
@@ -62,20 +62,21 @@ function outputStandardOverview (&$result_tasks) {
$ext_name = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!!
// Init variables
- $result = false;
+ $result = FALSE;
// Check if extension is installed or not
$extInstalled = (isExtensionInstalled($ext_name) && (isExtensionActive($ext_name)));
// Is the extension not yet installed?
- if ($extInstalled === false) {
+ //* 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.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
@@ -90,7 +91,7 @@ function outputStandardOverview (&$result_tasks) {
} // END - if
if (isset($GLOBALS['cache_array']['always_active'][$ext_name])) {
- // Maybe we want to keept the current extension active?
+ // Shall the current extension kept activated?
if (($GLOBALS['cache_array']['always_active'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) {
// Reactivate this extension!
doActivateExtension($ext_name);
@@ -102,7 +103,13 @@ 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
@@ -116,7 +123,7 @@ ORDER BY
if (!SQL_HASZERONUMS($result_tasks)) {
// New jobs found
- $jobsDone = false;
+ $jobsDone = FALSE;
} // END - if
// Free the result
@@ -133,7 +140,14 @@ 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
@@ -151,7 +165,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`=NULL 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'])
@@ -167,7 +181,7 @@ LIMIT 1",
} // END - if
// Is a userid assign?
- if ($taskData['userid'] > 0) {
+ if (isValidId($taskData['userid'])) {
// Then load his data!
if (fetchUserData($taskData['userid'])) {
// Fetch row
@@ -186,7 +200,7 @@ LIMIT 1",
$taskData['text'] = decodeEntities($taskData['text']);
// Compile and insert text from task into table template
- $taskData['text'] = loadTemplate('admin_extensions_text', true, $taskData['text']);
+ $taskData['text'] = loadTemplate('admin_extensions_text', TRUE, $taskData['text']);
// Initialize variables (no title for SQL commands by default)
$ext_name = ''; $ext_ver = '';
@@ -200,12 +214,12 @@ LIMIT 1",
// Update task or extension task?
if (($taskData['task_type'] == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
// Load SQL commands for registering in dry-run
- registerExtension($ext_name, $taskId, true);
+ registerExtension($ext_name, $taskId, TRUE);
// Is this non-productive?
- if (isExtensionProductive() === false) {
+ if (isExtensionProductive() === FALSE) {
// Issue warning
- $taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}', true) . $taskData['text'];
+ $taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}', TRUE) . $taskData['text'];
} // END - if
// Set current extension name
@@ -225,7 +239,7 @@ LIMIT 1",
$ext_ver = substr($ext_ver, 0, strpos($ext_ver, ':'));
// Load SQLs from file
- updateExtension($ext_name, $ext_ver, true);
+ updateExtension($ext_name, $ext_ver, TRUE);
// Set current extension name
setCurrentExtensionName($ext_name);
@@ -243,11 +257,11 @@ 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
- updateExtension($ext_name, $ext_ver, true);
+ updateExtension($ext_name, $ext_ver, TRUE);
// Set current extension name
setCurrentExtensionName($ext_name);
@@ -256,7 +270,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,12 +278,12 @@ 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
- $OUT .= loadTemplate('admin_overview_row', true, $content);
+ $OUT .= loadTemplate('admin_overview_row', TRUE, $content);
// Which task do we actually have here?
// @TODO Rewrite this to something with include files and/or filter
@@ -278,7 +292,7 @@ LIMIT 1",
$ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
if (!isExtensionInstalled($ext_name)) {
// New (not yet installed) extension found
- $OUT .= loadTemplate('admin_extension_reg_form', true, array(
+ $OUT .= loadTemplate('admin_extension_reg_form', TRUE, array(
'id' => bigintval($taskId),
'ext_name' => $ext_name
));
@@ -287,7 +301,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 +312,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,7 +323,7 @@ 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));
+ 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
@@ -323,7 +337,7 @@ LIMIT 1",
list($pid) = SQL_FETCHROW($result_pay);
SQL_FREERESULT($result_pay);
- if ((!empty($pid)) && ($pid > 0)) {
+ if (isValidId($pid)) {
// Payout id can be obtained
$content = array(
'pid' => $pid,
@@ -331,7 +345,7 @@ LIMIT 1",
);
// Load template
- $OUT .= loadTemplate('admin_payout_overview_form', true, $content);
+ $OUT .= loadTemplate('admin_payout_overview_form', TRUE, $content);
} else {
// Problem obtaining payout id
$OUT .= '{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}
';
@@ -350,13 +364,13 @@ LIMIT 1",
list($pid) = SQL_FETCHROW($result_pay);
SQL_FREERESULT($result_pay);
- if ((!empty($pid)) && ($pid > 0)) {
+ if (isValidId($pid)) {
// Payout id can be obtained
$content = array(
'pid' => $pid,
'tid' => $taskData['id'],
);
- $OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
+ $OUT .= loadTemplate('admin_wernis_overview_form', TRUE, $content);
} else {
// Problem obtaining wernis id
$OUT .= '{--WERNIS_OBTAIN_ID_FAILED--}
';
@@ -368,11 +382,11 @@ LIMIT 1",
break;
case 'HOLIDAY_REQUEST': // Holiday requests
- $OUT .= loadTemplate('admin_task_holiday', true, $taskData['userid']);
+ $OUT .= loadTemplate('admin_task_holiday', TRUE, $taskData['userid']);
break;
case 'MEMBER_ORDER': // Member mail orders
- $OUT .= loadTemplate('admin_task_order', true, $taskId);
+ $OUT .= loadTemplate('admin_task_order', TRUE, $taskId);
break;
default: // Unknown task type
@@ -390,7 +404,7 @@ LIMIT 1",
} // END - foreach
// Load final template
- loadTemplate('admin_overview_list', false, $OUT);
+ loadTemplate('admin_overview_list', FALSE, $OUT);
} else {
if ((isset($postData['sel'])) && ((count($postData['sel']) > 0) || ($postData['sel'][0] == 1))) {
// Only unassign / delete tasks when there are selected tasks posted
@@ -400,19 +414,19 @@ 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__);
} // END - foreach
- } elseif (isset($postData['delete'])) {
+ } 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 OR `assigned_admin` IS NULL) 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,23 +445,23 @@ LIMIT 1",
break;
} // END - switch
- if (isValidUserId($content['userid'])) {
+ if (isValidId($content['userid'])) {
// Member found otherwise it's a system task
- $content['userid'] = generateUserProfileLink($content['userid']);
+ $content['userid'] = '{%pipe,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);
+ $OUT .= loadTemplate('admin_overview_list_ext_rows', TRUE, $content);
} else {
// Load default row template
- $OUT .= loadTemplate('admin_overview_list_rows', true, $content);
+ $OUT .= loadTemplate('admin_overview_list_rows', TRUE, $content);
}
} // END - while
@@ -455,7 +469,7 @@ LIMIT 1",
SQL_FREERESULT($result_tasks);
// Load footer template
- loadTemplate('admin_overview_table', false, $OUT);
+ loadTemplate('admin_overview_table', FALSE, $OUT);
}
}