* $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 *
// Some security stuff...
if ((!defined('__SECURITY')) || (!isAdmin())) {
die();
-}
+} // END - if
// @TODO This function does also check for uncompleted tasks
function outputStandardOverview (&$result_tasks) {
if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) {
// Assign / do tasks
$OUT = '';
- foreach ($postData['sel'] as $id => $sel) {
+ foreach ($postData['sel'] as $taskId => $sel) {
$result_task = SQL_QUERY_ESC("SELECT
`id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
FROM
`id`=%s AND (`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW'))
LIMIT 1",
array(
- bigintval($id),
+ bigintval($taskId),
getCurrentAdminId()
), __FILE__, __LINE__);
$add = '';
// @TODO Rewrite this to a filter
- if ($taskData['task_type'] == 'SUPPORT_MEMBER') {
+ if ($taskData['task_type'] == 'MEMBER_SUPPORT') {
$mode = substr($taskData['text'], 0, strpos($taskData['text'], ':'));
$taskData['text'] = substr($taskData['text'], strpos($taskData['text'], ':') + 1);
$add = '<li>{--ADMIN_TASK_SUPPORT_MODE--}: <strong>' . $mode . '</strong></li>';
// Initialize variables (no title for SQL commands by default)
$ext_name = ''; $ext_ver = '';
- $title = '{--TASK_NO_TITLE--}';
+ $title = '{--ADMIN_TASK_NO_SQL_TITLE--}';
// Shall I list SQL commands assigned to an extension installation or update task?
- if ((getConfig('verbose_sql') == 'Y')) {
+ if ((isVerboseSqlEnabled()) || (!isExtensionInstalled('sql_patches'))) {
// Extract extension name from subject
$ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 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, $id, true);
+ registerExtension($ext_name, $taskId, true);
// 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'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name)) . $taskData['text'];
} // END - if
// Set current extension name
}
// Add SQLs to a table
- if ((!empty($ext_name)) && (isExtensionInstalled('sql_patches')) && (getConfig('verbose_sql') == 'Y')) {
+ if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
// Add verbose SQL table
- $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . "<br />\n";
+ $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="table top left right"', true, '100%') . '<br />';
} // END - if
} elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
// Run SQL commands in dry mode but only return the notes
$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! sql_patches=' . getExtensionVersion('sql_patches') . '/verbose_sql=' . getConfig('verbose_sql'));
+ debug_report_bug(__FILE__, __LINE__, 'ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! isVerboseSqlEnabled=' . intval(isVerboseSqlEnabled()));
}
// Prepare array for the template
switch ($taskData['task_type']) {
case 'EXTENSION': // Install new extensions
$ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
- $result_lines = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
- array($ext_name), __FILE__, __LINE__);
- $lines = SQL_NUMROWS($result_lines);
- SQL_FREERESULT($result_lines);
- if ($lines == '0') {
- // New extension found
+ if (!isExtensionInstalled($ext_name)) {
+ // New (not yet installed) extension found
$OUT .= loadTemplate('admin_extension_reg_form', true, array(
- 'id' => bigintval($id),
+ 'id' => bigintval($taskId),
'ext_name' => $ext_name
));
} else {
- // Task is closed so nothing is todo
- $OUT .= '<div class="admin_failed">{--ADMIN_EXTENSION_ALREADY_REGISTERED--}</div>';
+ // Extension is already installed
+ $OUT .= '<div class="notice">{--ADMIN_EXTENSION_ALREADY_REGISTERED--}</div>';
// 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')) {
case 'EXTENSION_UPDATE': // Extension update
// Extension updates are installed automatically
- $OUT .= '<div class="admin_failed medium">{--ADMIN_EXTENSION_UPDATED--}</div>';
+ $OUT .= '<div class="notice medium">{--ADMIN_EXTENSION_UPDATED--}</div>';
// Close task
if (!in_array($taskData['status'], array('CLOSED', 'DELETED'))) {
} // END - if
break;
- case 'SUPPORT_MEMBER': // Assign on member's support request
+ case 'MEMBER_SUPPORT': // Assign on member's support request
// @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));
- $OUT .= '<div class="admin_failed medium">' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '</div>';
+ $OUT .= '<div class="notice medium">' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '</div>';
break;
}
break;
$OUT .= loadTemplate('admin_payout_overview_form', true, $content);
} else {
// Problem obtaining payout id
- $OUT .= '<div class="admin_failed medium">{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}</div>';
+ $OUT .= '<div class="notice medium">{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}</div>';
}
} else {
// Extension is not installed
- $OUT .= '<div class="admin_failed medium">{--ADMIN_PAYOUT_NOT_INSTALLED--}</div>';
+ $OUT .= '<div class="notice medium">{--ADMIN_PAYOUT_NOT_INSTALLED--}</div>';
}
break;
$OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
} else {
// Problem obtaining wernis id
- $OUT .= '<div class="admin_failed medium">{--WERNIS_OBTAIN_ID_FAILED--}</div>';
+ $OUT .= '<div class="notice medium">{--WERNIS_OBTAIN_ID_FAILED--}</div>';
}
} else {
// Extension is not installed
- $OUT .= '<div class="admin_failed medium">{--ADMIN_WERNIS_NOT_INSTALLED--}</div>';
+ $OUT .= '<div class="notice medium">{--ADMIN_WERNIS_NOT_INSTALLED--}</div>';
}
break;
break;
case 'MEMBER_ORDER': // Member mail orders
- $OUT .= loadTemplate('admin_task_order', true, $id);
+ $OUT .= loadTemplate('admin_task_order', true, $taskId);
break;
default: // Unknown task type
logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $taskData['task_type']));
- $OUT .= '<div class="admin_failed medium">' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $id) . '</div>';
+ $OUT .= '<div class="notice medium">' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $taskId) . '</div>';
break;
}
$OUT .= '
// Only unassign / delete tasks when there are selected tasks posted
if (!empty($postData['unassign'])) {
// Unassign from tasks
- foreach ($postData['sel'] as $id => $sel) {
+ 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",
- array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
+ array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
}
- } elseif (isset($postData['del'])) {
+ } elseif (isset($postData['delete'])) {
// Delete tasks
- foreach ($postData['sel'] as $id => $sel) {
+ 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($id), getCurrentAdminId()), __FILE__, __LINE__);
+ array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
}
} else {
// Unknown action
$content['task_created'] = generateDateTime($content['task_created'], 2);
// Do we have extension task?
- if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
+ if (isExtensionTask($content)) {
// Load extension row template
$OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content);
} else {
projects / mailer.git / blobdiff