X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=b4ae79de664cd86b439ddd437777afaab53b494b;hp=62984ecaf587b59b5694a155e6760796e2a00f16;hb=c3b4eaf29946349ff058691db2dcb615a5379bb2;hpb=ad6b1626cb65625166344063a3bb849029bed920
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 62984ecaf5..b4ae79de66 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.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 *
@@ -40,7 +38,7 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!isAdmin())) {
die();
-}
+} // END - if
// @TODO This function does also check for uncompleted tasks
function outputStandardOverview (&$result_tasks) {
@@ -72,7 +70,7 @@ function outputStandardOverview (&$result_tasks) {
// Is the extension not yet installed?
if ($extInstalled === false) {
// We maybe want to install an extension so let's test-drive it...
- if (loadExtension($ext_name, getExtensionMode(), '', true)) {
+ if (loadExtension($ext_name, getExtensionMode(), '0.0', true)) {
// Create a task for newly installed extension (we ignore the task id here)
createNewExtensionTask($ext_name);
} // END - if
@@ -207,7 +205,7 @@ LIMIT 1",
// 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
@@ -245,7 +243,7 @@ LIMIT 1",
// Add SQLs to a table
if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
// Add verbose SQL table
- $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . '
';
+ $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="table top left right"', true, '100%');
} // END - if
} elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
// Run SQL commands in dry mode but only return the notes
@@ -286,7 +284,7 @@ LIMIT 1",
));
} else {
// Extension is already installed
- $OUT .= '{--ADMIN_EXTENSION_ALREADY_REGISTERED--}
';
+ $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')) {
@@ -298,7 +296,7 @@ LIMIT 1",
case 'EXTENSION_UPDATE': // Extension update
// Extension updates are installed automatically
- $OUT .= '{--ADMIN_EXTENSION_UPDATED--}
';
+ $OUT .= '{--ADMIN_EXTENSION_UPDATED--}
';
// Close task
if (!in_array($taskData['status'], array('CLOSED', 'DELETED'))) {
@@ -312,7 +310,7 @@ LIMIT 1",
switch ($mode) {
default: // @TODO Unknown support mode
logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
- $OUT .= '' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '
';
+ $OUT .= '' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '
';
break;
}
break;
@@ -336,11 +334,11 @@ LIMIT 1",
$OUT .= loadTemplate('admin_payout_overview_form', true, $content);
} else {
// Problem obtaining payout id
- $OUT .= '{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}
';
+ $OUT .= '{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}
';
}
} else {
// Extension is not installed
- $OUT .= '{--ADMIN_PAYOUT_NOT_INSTALLED--}
';
+ $OUT .= '{--ADMIN_PAYOUT_NOT_INSTALLED--}
';
}
break;
@@ -361,11 +359,11 @@ LIMIT 1",
$OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
} else {
// Problem obtaining wernis id
- $OUT .= '{--WERNIS_OBTAIN_ID_FAILED--}
';
+ $OUT .= '{--WERNIS_OBTAIN_ID_FAILED--}
';
}
} else {
// Extension is not installed
- $OUT .= '{--ADMIN_WERNIS_NOT_INSTALLED--}
';
+ $OUT .= '{--ADMIN_WERNIS_NOT_INSTALLED--}
';
}
break;
@@ -379,7 +377,7 @@ LIMIT 1",
default: // Unknown task type
logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $taskData['task_type']));
- $OUT .= '' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $taskId) . '
';
+ $OUT .= '' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $taskId) . '
';
break;
}
$OUT .= '
@@ -402,7 +400,7 @@ LIMIT 1",
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
}
- } elseif (isset($postData['del'])) {
+ } elseif (isset($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",
@@ -447,12 +445,9 @@ LIMIT 1",
$content['task_created'] = generateDateTime($content['task_created'], 2);
// Do we have extension task?
- if ((isExtensionTask($content)) && (isExtensionProductive($content['infos']))) {
+ if (isExtensionTask($content)) {
// Load extension row template
$OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content);
- } elseif ((isExtensionTask($content)) && (!isExtensionProductive($content['infos']))) {
- // Load extension row template
- $OUT .= loadTemplate('admin_overview_list_ext2_rows', true, $content);
} else {
// Load default row template
$OUT .= loadTemplate('admin_overview_list_rows', true, $content);