X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=54f0fbf5b6cc90896814aed1a55745732bab1f1a;hb=4fe584c2e58ca2babe4141c1f4e8a595ec7a3ee9;hp=d823fd4676e2393291a5e4d31139c963f70a04d8;hpb=59bd8a9805c51c895a92cc12825f4cbdfd792597;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index d823fd4676..54f0fbf5b6 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Standart-Aufgaben-Management ausgeben *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $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 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -44,7 +49,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
// We currently don't want to install an extension so let's find out if we need...
$EXT_LOAD_MODE = "register";
- $JOBS_DONE = true;
+ $jobsDone = true;
// Open the extension directory
$handle = opendir(constant('PATH')."inc/extensions/") or mxchange_die("Cannot read extension directory!");
@@ -76,8 +81,8 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
require(sprintf("%sinc/extensions/ext-%s.php", constant('PATH'), $ext_name));
// Update extension if extension is installed and outdated
- //* DEBUG: */ print "ext={$ext_name},ver={$EXT_VERSION}/".GET_EXT_VERSION($ext_name)."
\n";
- if ($EXT_VERSION > $ext_ver) {
+ //* DEBUG: */ print "ext={$ext_name},ver={EXT_GET_VERSION()}/".GET_EXT_VERSION($ext_name)."
\n";
+ if (EXT_GET_VERSION() > $ext_ver) {
// Update the extension
EXTENSION_UPDATE($ext_name, $ext_ver);
} // END - if
@@ -105,19 +110,18 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC",
if (SQL_NUMROWS($result_tasks) > 0) {
// New jobs found!
- $JOBS_DONE = false;
+ $jobsDone = false;
} // END - if
// Free the result
SQL_FREERESULT($result);
// Return status
- return $JOBS_DONE;
+ return $jobsDone;
}
// Outputs selected tasks
function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
- global $NOTES;
if ((isset($POST['assign'])) && (count($POST['task']) > 0)) {
// Assign / do tasks
$OUT = ""; $SW = 2;
@@ -135,11 +139,11 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
array(GET_CURRENT_ADMIN_ID(), bigintval($tid)), __FILE__, __LINE__);
} // END - if
- $ADD = "";
+ $add = "";
if ($type == "SUPPORT_MEMBER") {
$mode = substr($text, 0, strpos($text, ":"));
$text = substr($text, strpos($text, ":") + 1);
- $ADD = "{--ADMIN_TASK_SUPPORT_MODE--}: ".$mode."";
+ $add = "{--ADMIN_TASK_SUPPORT_MODE--}: ".$mode."";
} // END - if
if ($uid > 0) {
@@ -148,7 +152,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
if (SQL_NUMROWS($result_user) == 1) {
list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
SQL_FREERESULT($result_user);
- $ADD = "{--ADMIN_MEMBER_UID--}: ".ADMIN_USER_PROFILE_LINK($uid)." (".TRANSLATE_GENDER($gender)." ".$sname." ".$fname.")";
+ $add = "{--ADMIN_MEMBER_UID--}: ".ADMIN_USER_PROFILE_LINK($uid)." (".TRANSLATE_GENDER($gender)." ".$sname." ".$fname.")";
} // END - if
} // END - if
@@ -167,10 +171,10 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
$ext_name = substr($subj, 1, strpos($subj, ":") - 1);
if ($type == "EXTENSION") {
// Load SQL commands for registering
- $SQLs = EXTENSION_REGISTER($ext_name, $id, true);
+ REGISTER_EXTENSION($ext_name, $id, true);
// Add notes to text
- $text .= $NOTES;
+ $text .= EXT_GET_NOTES();
// Set title
$title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER');
@@ -183,10 +187,10 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
$ext_ver = substr($ext_ver, 0, strpos($ext_ver, ":"));
// Load SQLs from file
- $SQLs = EXTENSION_UPDATE($ext_name, $ext_ver, true);
+ EXTENSION_UPDATE($ext_name, $ext_ver, true);
// Add notes to text
- $text .= $NOTES;
+ $text .= EXT_GET_NOTES();
// Set title
$title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE');
@@ -196,23 +200,23 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
}
// Add SQLs to a table
- if (empty($SQLs)) $SQLs = array();
+ if (!IS_SQLS_VALID()) INIT_SQLS();
if (empty($title)) $title = "";
if ((!empty($ext_name)) && (GET_EXT_VERSION("sql_patches")) && (getConfig('verbose_sql') == "Y")) {
// Add verbose SQL table
- $text .= EXTENSION_VERBOSE_TABLE($SQLs, $title, " class=\"admin_table top2 left2 right2\"", true, "100%")."
\n";
+ $text .= EXTENSION_VERBOSE_TABLE($title, " class=\"admin_table top2 left2 right2\"", true, "100%")."
\n";
} // END - if
} else {
// Run SQL commands in dry mode but only return the notes
- $SQLs = EXTENSION_UPDATE($ext_name, $ext_ver, true);
- $text .= $NOTES;
+ EXTENSION_UPDATE($ext_name, $ext_ver, true);
+ $text .= EXT_GET_NOTES();
}
// Prepare array for the template
$content = array(
'sw' => $SW,
'subj' => $subj,
- 'add' => $ADD,
+ 'add' => $add,
'text' => $text,
'created' => MAKE_DATETIME($created, "1"),
'extension' => $ext_name
@@ -244,7 +248,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
// Close task but not already closes or deleted or update tasks
if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) {
// Solve the task
- RUN_FILTER('solve_task', $tid);
+ runFilterChain('solve_task', $tid);
} // END - if
}
break;
@@ -256,7 +260,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
// Close task
if (($status != "CLOSED") && ($status != "DELETED")) {
// Solve the task
- RUN_FILTER('solve_task', $tid);
+ runFilterChain('solve_task', $tid);
} // END - if
break;
@@ -266,7 +270,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
{
default: // @TODO Unknown support mode
DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
- $OUT .= "".ADMIN_UNKNOWN_SUPPORT_MODE_1.$mode.ADMIN_UNKNOWN_SUPPORT_MODE_2."
\n";
+ $OUT .= "".sprintf(getMessage('ADMIN_UNKNOWN_SUPPORT_MODE'), $mode)."
\n";
break;
}
break;
@@ -346,7 +350,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
default: // Unknown task type
DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
- $OUT .= "".ADMIN_UNKNOWN_TASK_TYPE_1.$type.ADMIN_UNKNOWN_TASK_TYPE_2.$id.ADMIN_UNKNOWN_TASK_TYPE_3."
\n";
+ $OUT .= "".sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id)."
\n";
break;
}
$OUT .= "
@@ -360,7 +364,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
// Load final template
LOAD_TEMPLATE("admin_overview_list");
} else {
- if ((isset($POST['task'])) && ((sizeof($POST['task']) > 0) || ($POST['task'][0] == "1"))) {
+ if ((isset($POST['task'])) && ((count($POST['task']) > 0) || ($POST['task'][0] == "1"))) {
// Only unassign / delete tasks when there are selected tasks posted
if (!empty($POST['unassign'])) {
// Unassign from tasks
@@ -378,67 +382,66 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
// 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 AND `status`='NEW') ORDER BY task_created DESC",
- array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
+ array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
} // END - if
// There are uncompleted jobs!
- LOAD_TEMPLATE("admin_overview_header");
- $SW = 2;
- while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) {
+ // @TODO Rewrite this to one template and use $OUT = ...
+ $OUT = ""; $SW = 2;
+ while ($content = SQL_FETCHARRAY($result_tasks)) {
// Init infos
- $infos = "---";
+ $content['infos'] = "---";
// Generate assign link
- $admin = GENERATE_AID_LINK($admin);
-
- // Get task type
- $type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).'');
+ $content['assigned_admin'] = GENERATE_AID_LINK($content['assigned_admin']);
- $type2 = substr($text, 0, strpos($text, ":"));
// Generate infos
- switch ($type)
+ switch ($content['task_type'])
{
case "EXTENSION":
case "EXTENSION_UPDATE":
- $infos = substr($subj, 1, strpos($subj, ":") - 1);
+ $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ":") - 1);
break;
}
- if ($uid > 0) {
+ // Get task type
+ $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
+
+ if ($content['userid'] > 0) {
// Member found otherwise it's a system task
- $uid = ADMIN_USER_PROFILE_LINK($uid);
+ $content['userid'] = ADMIN_USER_PROFILE_LINK($content['userid']);
} else {
- $uid = "{--ADMIN_IS_SYSTEM_TASK--}";
+ $content['userid'] = "{--ADMIN_IS_SYSTEM_TASK--}";
}
// Prepare content
- $content = array(
+ // @TODO Rewritings: admin->assigned_admin,uid->userid,type->task_type_msg in template
+ $content = merge_array($content, array(
'sw' => $SW,
- 'id' => $id,
- 'admin' => $admin,
- 'infos' => $infos,
- 'uid' => $uid,
- 'type' => $type_out,
- 'created' => MAKE_DATETIME($created, "2")
- );
+ 'admin' => $content['assigned_admin'],
+ 'uid' => $content['userid'],
+ 'type' => $content['task_type_msg'],
+ 'created' => MAKE_DATETIME($content['task_created'], "2")
+ ));
// Do we have extension task?
- if (($type == "EXTENSION") && (GET_EXT_VERSION($infos) == "")) {
+ if (($content['task_type'] == "EXTENSION") && (GET_EXT_VERSION($content['infos']) == "")) {
// Load extension row template
- LOAD_TEMPLATE("admin_overview_list_ext_rows", false, $content);
+ $OUT .= LOAD_TEMPLATE("admin_overview_list_ext_rows", true, $content);
} else {
// Load default row template
- LOAD_TEMPLATE("admin_overview_list_rows", false, $content);
+ $OUT .= LOAD_TEMPLATE("admin_overview_list_rows", true, $content);
}
// Switch color
$SW = 3 - $SW;
}
+
// Free memory
SQL_FREERESULT($result_tasks);
// Load footer template
- LOAD_TEMPLATE("admin_overview_footer");
+ LOAD_TEMPLATE("admin_overview_table", false, $OUT);
}
}
//