X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=ecd876f699d3f4ea85a1714e916b560e2f291327;hb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;hp=d2d02ed497daf56004acd4d11dba01ab7cfef839;hpb=5b794a32b30ec5322765c89a22c4c27aece94a42;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index d2d02ed497..ecd876f699 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -1,7 +1,7 @@
");
+ //* DEBUG: */ debugOutput($ext_name.'='.$ext_ver);
// Update extension if extension is installed and outdated
- //* DEBUG: */ outputHtml('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)."
");
+ //* DEBUG: */ debugOutput('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name));
if (getThisExtensionVersion() > $ext_ver) {
// Update the extension
updateExtension($ext_name, $ext_ver);
} // END - if
- if (isset($GLOBALS['cache_array']['active_extensions'][$ext_name])) {
+ if (isset($GLOBALS['cache_array']['always_active'][$ext_name])) {
// Maybe we want to keept the current extension active?
- if (($GLOBALS['cache_array']['active_extensions'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) {
+ if (($GLOBALS['cache_array']['always_active'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) {
// Reactivate this extension!
doActivateExtension($ext_name);
} // END - if
@@ -134,7 +132,7 @@ ORDER BY
function outputSeletectedTasks ($postData, $result_tasks) {
if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) {
// Assign / do tasks
- $OUT = ''; $SW = 2;
+ $OUT = '';
foreach ($postData['sel'] as $id => $sel) {
$result_task = SQL_QUERY_ESC("SELECT
`id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
@@ -143,83 +141,89 @@ FROM
WHERE
`id`=%s AND (`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW'))
LIMIT 1",
- array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
+ array(
+ bigintval($id),
+ getCurrentAdminId()
+ ), __FILE__, __LINE__);
// Task is found?
if (SQL_NUMROWS($result_task) == 1) {
- // Task is valid...
- list($tid, $userid, $type, $subj, $text, $created, $status, $adminId) = SQL_FETCHROW($result_task);
+ // Task is valid so load it's data
+ $taskData = SQL_FETCHARRAY($result_task);
- if ($adminId == '0') {
+ if ($taskData['assigned_admin'] == '0') {
// Assgin current admin to unassgigned task
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s LIMIT 1",
- array(getCurrentAdminId(), bigintval($tid)), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin`=0 LIMIT 1",
+ array(
+ getCurrentAdminId(),
+ bigintval($taskData['id'])
+ ), __FILE__, __LINE__);
} // END - if
$add = '';
// @TODO Rewrite this to a filter
- if ($type == 'SUPPORT_MEMBER') {
- $mode = substr($text, 0, strpos($text, ':'));
- $text = substr($text, strpos($text, ':') + 1);
- $add = "
{--ADMIN_TASK_SUPPORT_MODE--}: ".$mode."";
+ if ($taskData['task_type'] == 'SUPPORT_MEMBER') {
+ $mode = substr($taskData['text'], 0, strpos($taskData['text'], ':'));
+ $taskData['text'] = substr($taskData['text'], strpos($taskData['text'], ':') + 1);
+ $add = '{--ADMIN_TASK_SUPPORT_MODE--}: ' . $mode . '';
} // END - if
// Is a userid assign?
- if ($userid > 0) {
+ if ($taskData['userid'] > 0) {
// Then load his data!
- if (fetchUserData($userid)) {
+ if (fetchUserData($taskData['userid'])) {
// Fetch row
$content = getUserDataArray();
// Generate HTML list entry
- $add = "{--ADMIN_MEMBER_UID--}: ".generateUserProfileLink($userid, 'user_data')." (".translateGender($content['gender'])." ".$content['surname']." ".$content['family'].")";
+ $add = '{--ADMIN_MEMBER_UID--}: ' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . ')';
} else {
// Invalid userid, so log and zero it
- logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $userid . ' -> not found!');
- $userid = '0';
+ logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $taskData['userid'] . ' -> not found!');
+ $taskData['userid'] = '0';
}
} // END - if
// Decode entities of the text
- $text = decodeEntities($text);
+ $taskData['text'] = decodeEntities($taskData['text']);
// Compile and insert text from task into table template
- $text = loadTemplate('admin_extensions_text', true, $text);
+ $taskData['text'] = loadTemplate('admin_extensions_text', true, $taskData['text']);
// Initialize variables (no title for SQL commands by default)
$ext_name = ''; $ext_ver = '';
- $title = getMessage('TASK_NO_TITLE');
+ $title = '{--TASK_NO_TITLE--}';
// Shall I list SQL commands assigned to an extension installation or update task?
if ((getConfig('verbose_sql') == 'Y')) {
// Extract extension name from subject
- $ext_name = substr($subj, 1, strpos($subj, ':') - 1);
+ $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
// Update task or extension task?
- if (($type == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
+ if (($taskData['task_type'] == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
// Load SQL commands for registering in dry-run
registerExtension($ext_name, $id, true);
// Is this non-productive?
if (isExtensionProductive() === false) {
// Issue warning
- $text .= loadTemplate('admin_settings_saved', true, sprintf(getMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE'), $ext_name));
+ $taskData['text'] .= loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name));
} // END - if
// Set current extension name
setCurrentExtensionName($ext_name);
// Add notes to text
- $text .= getExtensionNotes();
+ $taskData['text'] .= getExtensionNotes();
// Set title
- $title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER');
- } elseif ($type == 'EXTENSION_UPDATE') {
+ $title = '{--ADMIN_SQLS_EXECUTED_ON_REGISTER--}';
+ } elseif ($taskData['task_type'] == 'EXTENSION_UPDATE') {
// Prepare extension name and version
$ext_name = substr($ext_name, 7);
$ext_name = substr($ext_name, 0, strpos($ext_name, '-'));
$test = '[UPDATE-' . $ext_name . '-';
- $ext_ver = substr($subj, strlen($test));
+ $ext_ver = substr($taskData['subject'], strlen($test));
$ext_ver = substr($ext_ver, 0, strpos($ext_ver, ':'));
// Load SQLs from file
@@ -229,19 +233,19 @@ LIMIT 1",
setCurrentExtensionName($ext_name);
// Add notes to text
- $text .= getExtensionNotes();
+ $taskData['text'] .= getExtensionNotes();
// Set title
- $title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE');
+ $title = '{--ADMIN_SQLS_EXECUTED_ON_UPDATE--}';
} else {
// Remove extension's name
$ext_name = '';
}
// Add SQLs to a table
- if ((!empty($ext_name)) && (getExtensionVersion('sql_patches')) && (getConfig('verbose_sql') == 'Y')) {
+ if ((!empty($ext_name)) && (isExtensionInstalled('sql_patches')) && (getConfig('verbose_sql') == 'Y')) {
// Add verbose SQL table
- $text .= addExtensionVerboseSqlTable($title, " class=\"admin_table top2 left2 right2\"", true, '100%') . "
\n";
+ $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . "
\n";
} // END - if
} elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
// Run SQL commands in dry mode but only return the notes
@@ -251,60 +255,59 @@ LIMIT 1",
setCurrentExtensionName($ext_name);
// Get notes
- $text .= getExtensionNotes();
+ $taskData['text'] .= getExtensionNotes();
} else {
// This should not normally happen!
- debug_report_bug('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! sql_patches=' . getExtensionVersion('sql_patches') . '/verbose_sql=' . getConfig('verbose_sql'));
}
// Prepare array for the template
$content = array(
- 'sw' => $SW,
- 'subject' => $subj,
- 'add' => $add,
- 'text' => $text,
- 'created' => generateDateTime($created, 1),
- 'extension' => $ext_name
+ 'subject' => $taskData['subject'],
+ 'add' => $add,
+ 'text' => $taskData['text'],
+ 'task_created' => generateDateTime($taskData['task_created'], 1),
+ 'extension' => $ext_name
);
// Load template
$OUT .= loadTemplate('admin_overview_row', true, $content);
// Which task do we actually have here?
- // @TODO Rewrite this to something with include files
- switch ($type) {
+ // @TODO Rewrite this to something with include files and/or filter
+ switch ($taskData['task_type']) {
case 'EXTENSION': // Install new extensions
- $ext_name = substr($subj, 1, strpos($subj, ':') - 1);
+ $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
- $OUT .= loadTemplate('admin_ext_reg_form', true, array(
+ $OUT .= loadTemplate('admin_extension_reg_form', true, array(
'id' => bigintval($id),
'ext_name' => $ext_name
));
} else {
// Task is closed so nothing is todo
- $OUT .= "{--ADMIN_EXT_ALREADY_REGISTERED--}
\n";
+ $OUT .= '{--ADMIN_EXTENSION_ALREADY_REGISTERED--}
';
- // Close task but not already closes or deleted or update tasks
- if ((!in_array($status, array('CLOSED','DELETED','SOLVED'))) && ($type != 'EXTENSION_UPDATE')) {
+ // 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')) {
// Solve the task
- runFilterChain('solve_task', $tid);
+ runFilterChain('solve_task', $taskData['id']);
} // END - if
}
break;
case 'EXTENSION_UPDATE': // Extension update
// Extension updates are installed automatically
- $OUT .= "{--ADMIN_EXTENSION_UPDATED--}
\n";
+ $OUT .= '{--ADMIN_EXTENSION_UPDATED--}
';
// Close task
- if (($status != 'CLOSED') && ($status != 'DELETED')) {
+ if (!in_array($taskData['status'], array('CLOSED', 'DELETED'))) {
// Solve the task
- runFilterChain('solve_task', $tid);
+ runFilterChain('solve_task', $taskData['id']);
} // END - if
break;
@@ -313,7 +316,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 .= "".sprintf(getMessage('ADMIN_UNKNOWN_SUPPORT_MODE'), $mode)."
\n";
+ $OUT .= '' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '
';
break;
}
break;
@@ -321,8 +324,8 @@ LIMIT 1",
case 'PAYOUT_REQUEST': // Payout requests
if (isExtensionActive('payout')) {
// Extension is installed so let him send a notification to the user
- $result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `userid`=%s AND payout_timestamp=%s LIMIT 1",
- array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
+ $result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `userid`=%s AND `payout_timestamp`=%s LIMIT 1",
+ array(bigintval($taskData['userid']), bigintval($taskData['task_created'])), __FILE__, __LINE__);
list($pid) = SQL_FETCHROW($result_pay);
SQL_FREERESULT($result_pay);
@@ -330,16 +333,18 @@ LIMIT 1",
// Payout id can be obtained
$content = array(
'pid' => $pid,
- 'tid' => $tid,
+ 'tid' => $taskData['id'],
);
+
+ // Load template
$OUT .= loadTemplate('admin_payout_overview_form', true, $content);
} else {
// Problem obtaining payout id
- $OUT .= "{--PAYOUT_OBTAIN_ID_FAILED--}
\n";
+ $OUT .= '{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}
';
}
} else {
// Extension is not installed
- $OUT .= "{--ADMIN_PAYOUT_NOT_INSTALLED--}
\n";
+ $OUT .= '{--ADMIN_PAYOUT_NOT_INSTALLED--}
';
}
break;
@@ -347,7 +352,7 @@ LIMIT 1",
if (isExtensionActive('wernis')) {
// Extension is installed so let him send a notification to the user
$result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_wernis` WHERE `userid`=%s AND wernis_timestamp=%s LIMIT 1",
- array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
+ array(bigintval($taskData['userid']), bigintval($taskData['task_created'])), __FILE__, __LINE__);
list($pid) = SQL_FETCHROW($result_pay);
SQL_FREERESULT($result_pay);
@@ -355,21 +360,21 @@ LIMIT 1",
// Payout id can be obtained
$content = array(
'pid' => $pid,
- 'tid' => $tid,
+ 'tid' => $taskData['id'],
);
$OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
} else {
// Problem obtaining wernis id
- $OUT .= "{--WERNIS_OBTAIN_ID_FAILED--}
\n";
+ $OUT .= '{--WERNIS_OBTAIN_ID_FAILED--}
';
}
} else {
// Extension is not installed
- $OUT .= "{--ADMIN_WERNIS_NOT_INSTALLED--}
\n";
+ $OUT .= '{--ADMIN_WERNIS_NOT_INSTALLED--}
';
}
break;
case 'HOLIDAY_REQUEST': // Holiday requests
- $OUT .= loadTemplate('admin_task_holiday', true, $userid);
+ $OUT .= loadTemplate('admin_task_holiday', true, $taskData['userid']);
break;
case 'MEMBER_ORDER': // Member mail orders
@@ -377,20 +382,17 @@ LIMIT 1",
break;
default: // Unknown task type
- logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
- $OUT .= "".sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id)."
\n";
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $taskData['task_type']));
+ $OUT .= '' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $id) . '
';
break;
}
- $OUT .= "
- |
-\n";
+ $OUT .= '
+
+';
} // END - if
// Free result
SQL_FREERESULT($result_task);
-
- // Switch colors
- $SW = 3 - $SW;
} // END - foreach
// Load final template
@@ -407,12 +409,12 @@ LIMIT 1",
} elseif (isset($postData['del'])) {
// Delete tasks
foreach ($postData['sel'] as $id => $sel) {
- SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND assigned_admin IN (%s,0) LIMIT 1",
+ 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__);
}
} else {
// Unknown action
- debug_report_bug(sprintf("Unknown task action performed. data=%s
", print_r($postData, true)));
+ debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=%s
", print_r($postData, true)));
}
// Update query
@@ -421,13 +423,10 @@ LIMIT 1",
} // END - if
// There are uncompleted jobs!
- $OUT = ''; $SW = 2;
+ $OUT = '';
while ($content = SQL_FETCHARRAY($result_tasks)) {
// Init infos
- $content['infos'] = '---';
-
- // Generate assign link
- $content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
+ $content['infos'] = '';
// Generate infos
// @TODO Try to move this in includes
@@ -439,23 +438,17 @@ LIMIT 1",
}
// Get task type
- $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
+ $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
- if ($content['userid'] > 0) {
+ if (isValidUserId($content['userid'])) {
// Member found otherwise it's a system task
$content['userid'] = generateUserProfileLink($content['userid']);
} else {
- $content['userid'] = "{--ADMIN_IS_SYSTEM_TASK--}";
+ $content['userid'] = '{--ADMIN_IS_SYSTEM_TASK--}';
}
- // Prepare content
- $content = merge_array($content, array(
- 'sw' => $SW,
- 'assigned_admin' => $content['assigned_admin'],
- 'userid' => $content['userid'],
- 'task_type_msg' => $content['task_type_msg'],
- 'created' => generateDateTime($content['task_created'], 2)
- ));
+ // Add/translate some content
+ $content['task_created'] = generateDateTime($content['task_created'], 2);
// Do we have extension task?
if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
@@ -465,9 +458,6 @@ LIMIT 1",
// Load default row template
$OUT .= loadTemplate('admin_overview_list_rows', true, $content);
}
-
- // Switch color
- $SW = 3 - $SW;
} // END - while
// Free memory