}
// There are uncompleted jobs!
- $type = constant('ADMIN_OVERVIEW_TASK_'.strtoupper(REQUEST_GET('type')).'_TYPE');
+ $type = getMessage('ADMIN_OVERVIEW_TASK_'.strtoupper(REQUEST_GET('type')).'_TYPE');
+ // @TODO Rewrite these templates to one and add $OUT
LOAD_TEMPLATE("admin_overview_header_task", false, array(
'message' => $type,
'type' => REQUEST_GET('type')
));
- $SW = 2;
- while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) {
+ $OUT = ""; $SW = 2;
+ while ($content = SQL_FETCHARRAY($result_tasks)) {
// Init infos
- $infos = "---";
+ $content['infos'] = "---";
// Generate link
- $admin = GENERATE_AID_LINK($admin);
+ $content['assigned_admin'] = GENERATE_AID_LINK($content['assigned_admin']);
// Get admin task
- $type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).'');
+ $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
- $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;
}
// Member assigned with task?
- if ($uid > 0) {
+ 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 {
// Is a system task!
- $uid = "<em>".ADMIN_IS_SYSTEM_TASK."</em>";
+ $content['userid'] = "<em>{--ADMIN_IS_SYSTEM_TASK--}</em>";
}
// 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 an extension task?
- if (($type == "EXTENSION") && (GET_EXT_VERSION($infos) == "")) {
+ if (($content['task_type'] == "EXTENSION") && (GET_EXT_VERSION($content['infos']) == "")) {
// Load extension row template
+ // @TODO Rewrite this to $OUT .= ..., true, ...
LOAD_TEMPLATE("admin_list_task_ext_rows", false, $content);
} else {
// Load default row template
+ // @TODO Rewrite this to $OUT .= ..., true, ...
LOAD_TEMPLATE("admin_list_task_rows", false, $content);
}
SQL_FREERESULT($result_tasks);
// Load footer template
- if (REQUEST_GET('type') == "deleted")
- {
+ if (REQUEST_GET('type') == "deleted") {
// Delete now button
LOAD_TEMPLATE("admin_overview_footer_task");
- }
- else
- {
+ } else {
// Normal footer
LOAD_TEMPLATE("admin_overview_footer");
}