X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=ea55318c742f50953db9136389231c95b3bf189c;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hp=188f07abe2d1b4e8f7736cad9a20dee8546c2362;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 188f07abe2..ea55318c74 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -38,8 +38,6 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
}
function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
- global $cacheArray, $_CONFIG;
-
// 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'",
array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
@@ -49,7 +47,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
$JOBS_DONE = true;
// Open the extension directory
- $handle = opendir(PATH."inc/extensions/") or mxchange_die("Cannot read extension directory!");
+ $handle = opendir(constant('PATH')."inc/extensions/") or mxchange_die("Cannot read extension directory!");
while ($file = readdir($handle)) {
// Is this file an extension?
if ((substr($file, 0, 4) == "ext-") && (substr($file, -4) == ".php")) {
@@ -75,18 +73,18 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
} // END - if
} else {
// Test-drive extension in update mode
- require(sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name));
+ 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
- if (isset($cacheArray['active_extensions'][$ext_name])) {
+ if (isset($GLOBALS['cache_array']['active_extensions'][$ext_name])) {
// Maybe we want to keept the current extension active?
- if (($cacheArray['active_extensions'][$ext_name] == "Y") && (!EXT_IS_ACTIVE($ext_name))) {
+ if (($GLOBALS['cache_array']['active_extensions'][$ext_name] == "Y") && (!EXT_IS_ACTIVE($ext_name))) {
// Reactivate this extension!
ACTIVATE_EXTENSION($ext_name);
} // END - if
@@ -101,7 +99,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$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
FROM `{!_MYSQL_PREFIX!}_task_system`
-WHERE assigned_admin='%s' OR (assigned_admin='0' AND status='NEW')
+WHERE assigned_admin='%s' OR (assigned_admin='0' AND `status`='NEW')
ORDER BY userid DESC, task_type DESC, subject, task_created DESC",
array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
@@ -119,12 +117,12 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC",
// Outputs selected tasks
function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
- global $_CONFIG, $NOTES;
+ global $NOTES;
if ((isset($POST['assign'])) && (count($POST['task']) > 0)) {
// Assign / do tasks
$OUT = ""; $SW = 2;
foreach ($POST['task'] as $id => $sel) {
- $result_task = SQL_QUERY_ESC("SELECT id, userid, task_type, subject, text, task_created, status, assigned_admin FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s AND (assigned_admin='%s' OR (assigned_admin='0' AND status='NEW')) LIMIT 1",
+ $result_task = SQL_QUERY_ESC("SELECT id, userid, task_type, subject, text, task_created, status, assigned_admin FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s AND (assigned_admin='%s' OR (assigned_admin='0' AND `status`='NEW')) LIMIT 1",
array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
if (SQL_NUMROWS($result_task) == 1) {
// Task is valid...
@@ -141,7 +139,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
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) {
@@ -150,32 +148,32 @@ 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
// Decode entities of the text
- $text = html_entity_decode($text);
+ $text = decodeEntities($text);
// Compile and insert text from task into table template
$text = LOAD_TEMPLATE("admin_extensions_text", true, $text);
// Initialize variables (no title for SQL commands by default)
$ext_name = "";
- $title = TASK_NO_TITLE;
+ $title = getMessage('TASK_NO_TITLE');
// Shall I list SQL commands assigned to an extension installation or update task?
if (((GET_EXT_VERSION("sql_patches") != '') && (getConfig('verbose_sql') == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
$ext_name = substr($subj, 1, strpos($subj, ":") - 1);
if ($type == "EXTENSION") {
// Load SQL commands for registering
- $SQLs = EXTENSION_REGISTER($ext_name, $id, true);
+ SET_SQLS(EXTENSION_REGISTER($ext_name, $id, true));
// Add notes to text
$text .= $NOTES;
// Set title
- $title = ADMIN_SQLS_EXECUTED_ON_REGISTER;
+ $title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER');
} elseif ($type == "EXTENSION_UPDATE") {
// Prepare extension name and version
$ext_name = substr($ext_name, 7);
@@ -185,28 +183,28 @@ 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;
// Set title
- $title = ADMIN_SQLS_EXECUTED_ON_UPDATE;
+ $title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE');
} else {
// Remove extension's name
$ext_name = "";
}
// 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);
+ EXTENSION_UPDATE($ext_name, $ext_ver, true);
$text .= $NOTES;
}
@@ -230,7 +228,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
case "EXTENSION": // Install new extensions
$ext_name = substr($subj, 1, strpos($subj, ":") - 1);
$result_lines = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
- array($ext_name), __FILE__, __LINE__);
+ array($ext_name), __FILE__, __LINE__);
$lines = SQL_NUMROWS($result_lines);
SQL_FREERESULT($result_lines);
if ($lines == "0") {
@@ -241,28 +239,29 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
));
} else {
// Task is closed so nothing is todo
- $OUT .= "".ADMIN_EXT_ALREADY_REGISTERED."
\n";
+ $OUT .= "{--ADMIN_EXT_ALREADY_REGISTERED--}
\n";
// 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;
case "EXTENSION_UPDATE": // Extension update
// Extension updates are installed automatically
- $OUT .= "".ADMIN_EXTENSION_UPDATED."
\n";
+ $OUT .= "{--ADMIN_EXTENSION_UPDATED--}
\n";
// Close task
if (($status != "CLOSED") && ($status != "DELETED")) {
// Solve the task
- RUN_FILTER('solve_task', $tid);
+ runFilterChain('solve_task', $tid);
} // END - if
break;
case "SUPPORT_MEMBER": // Assign on member's support request
+ // @TODO This may also be rewritten to include files
switch ($mode)
{
default: // @TODO Unknown support mode
@@ -293,7 +292,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
}
} else {
// Extension is not installed
- $OUT .= "".ADMIN_PAYOUT_NOT_INSTALLED."
\n";
+ $OUT .= "{--ADMIN_PAYOUT_NOT_INSTALLED--}
\n";
}
break;
@@ -314,11 +313,11 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
$OUT .= LOAD_TEMPLATE("admin_wernis_overview_form", true, $content);
} else {
// Problem obtaining wernis ID
- $OUT .= "".WERNIS_OBTAIN_ID_FAILED."
\n";
+ $OUT .= "{--WERNIS_OBTAIN_ID_FAILED--}
\n";
}
} else {
// Extension is not installed
- $OUT .= "".ADMIN_WERNIS_NOT_INSTALLED."
\n";
+ $OUT .= "{--ADMIN_WERNIS_NOT_INSTALLED--}
\n";
}
break;
@@ -361,7 +360,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,73 +377,65 @@ 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__);
+ $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__);
} // END - if
// There are uncompleted jobs!
+ // @TODO Rewrite this to one template and use $OUT = ...
LOAD_TEMPLATE("admin_overview_header");
- $SW = 2;
- while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) {
- $infos = "---";
- if ($admin == "0") {
- // No admin currently is assigned
- $admin = "".ADMIN_NO_ADMIN_ASSIGNED."
";
- } else {
- // Load admin's data
- $login = GET_ADMIN_LOGIN($admin);
- if ($login != "***") {
- // Admin found
- $admin = "".$login."";
- } else {
- // Maybe deleted?
- $admin = "".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."
";
- }
- }
+ $OUT = ""; $SW = 2;
+ while ($content = SQL_FETCHARRAY($result_tasks)) {
+ // Init infos
+ $content['infos'] = "---";
- // Get task type
- $type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).'');
+ // Generate assign link
+ $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
+ // @TODO Rewrite this to $OUT .= ..., true, ...
LOAD_TEMPLATE("admin_overview_list_ext_rows", false, $content);
} else {
// Load default row template
+ // @TODO Rewrite this to $OUT .= ..., true, ...
LOAD_TEMPLATE("admin_overview_list_rows", false, $content);
}
// Switch color
$SW = 3 - $SW;
}
+
// Free memory
SQL_FREERESULT($result_tasks);