X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=9586233e835ad9db0a8664566aed5fd1fe1cee5f;hb=72ac9f672704438aabc4f4bada7f5c3b40499f1a;hp=ebd9c8377bbe5a37d8a274aa9d89f35d99b5ab09;hpb=618048c5fb61f84848cf37abe3972cd509cdac04;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index ebd9c8377b..9586233e83 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -1,7 +1,7 @@
0)) {
+ if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) {
// Assign / do tasks
$OUT = ''; $SW = 2;
- foreach ($postData['task'] as $id => $sel) {
+ foreach ($postData['sel'] as $id => $sel) {
$result_task = SQL_QUERY_ESC("SELECT
`id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
FROM
@@ -150,10 +150,13 @@ LIMIT 1",
// Task is valid...
list($tid, $userid, $type, $subj, $text, $created, $status, $adminId) = SQL_FETCHROW($result_task);
- if ($adminId == 0) {
+ if ($adminId == '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($tid)
+ ), __FILE__, __LINE__);
} // END - if
$add = '';
@@ -161,30 +164,23 @@ LIMIT 1",
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
// Is a userid assign?
if ($userid > 0) {
// Then load his data!
- // @TODO Can this SQL be encapsulated in a function, so all similar queries can be rewritten?
- $result_user = SQL_QUERY_ESC("SELECT `gender`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
- array(bigintval($userid)), __FILE__, __LINE__);
-
- // Entry found?
- if (SQL_NUMROWS($result_user) == 1) {
+ if (fetchUserData($userid)) {
// Fetch row
- $content = SQL_FETCHARRAY($result_user);
+ $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($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;
+ $userid = '0';
}
-
- // Free result
- SQL_FREERESULT($result_user);
} // END - if
// Decode entities of the text
@@ -204,9 +200,15 @@ LIMIT 1",
// Update task or extension task?
if (($type == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
- // Load SQL commands for registering
+ // 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, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name));
+ } // END - if
+
// Set current extension name
setCurrentExtensionName($ext_name);
@@ -240,9 +242,9 @@ LIMIT 1",
}
// 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";
+ $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
@@ -272,7 +274,7 @@ LIMIT 1",
$OUT .= loadTemplate('admin_overview_row', true, $content);
// Which task do we actually have here?
- // @TODO Rewrite this to something with include files
+ // @TODO Rewrite this to something with include files and/or filter
switch ($type) {
case 'EXTENSION': // Install new extensions
$ext_name = substr($subj, 1, strpos($subj, ':') - 1);
@@ -280,7 +282,7 @@ LIMIT 1",
array($ext_name), __FILE__, __LINE__);
$lines = SQL_NUMROWS($result_lines);
SQL_FREERESULT($result_lines);
- if ($lines == 0) {
+ if ($lines == '0') {
// New extension found
$OUT .= loadTemplate('admin_ext_reg_form', true, array(
'id' => bigintval($id),
@@ -288,9 +290,9 @@ LIMIT 1",
));
} else {
// Task is closed so nothing is todo
- $OUT .= "{--ADMIN_EXT_ALREADY_REGISTERED--}
\n";
+ $OUT .= '{--ADMIN_EXT_ALREADY_REGISTERED--}
';
- // Close task but not already closes or deleted or update tasks
+ // Close task but not already closed, solved, deleted or update tasks
if ((!in_array($status, array('CLOSED','DELETED','SOLVED'))) && ($type != 'EXTENSION_UPDATE')) {
// Solve the task
runFilterChain('solve_task', $tid);
@@ -300,7 +302,7 @@ LIMIT 1",
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')) {
@@ -314,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;
@@ -322,25 +324,27 @@ 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",
+ $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__);
list($pid) = SQL_FETCHROW($result_pay);
SQL_FREERESULT($result_pay);
if ((!empty($pid)) && ($pid > 0)) {
- // Payout ID can be obtained
+ // Payout id can be obtained
$content = array(
'pid' => $pid,
'tid' => $tid,
);
+
+ // Load template
$OUT .= loadTemplate('admin_payout_overview_form', true, $content);
} else {
- // Problem obtaining payout ID
- $OUT .= "{--PAYOUT_OBTAIN_ID_FAILED--}
\n";
+ // Problem obtaining payout id
+ $OUT .= '{--PAYOUT_OBTAIN_ID_FAILED--}
';
}
} else {
// Extension is not installed
- $OUT .= "{--ADMIN_PAYOUT_NOT_INSTALLED--}
\n";
+ $OUT .= '{--ADMIN_PAYOUT_NOT_INSTALLED--}
';
}
break;
@@ -348,24 +352,24 @@ 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($userid), bigintval($created)), __FILE__, __LINE__);
list($pid) = SQL_FETCHROW($result_pay);
SQL_FREERESULT($result_pay);
if ((!empty($pid)) && ($pid > 0)) {
- // Payout ID can be obtained
+ // Payout id can be obtained
$content = array(
'pid' => $pid,
'tid' => $tid,
);
$OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
} else {
- // Problem obtaining wernis ID
- $OUT .= "{--WERNIS_OBTAIN_ID_FAILED--}
\n";
+ // Problem obtaining wernis id
+ $OUT .= '{--WERNIS_OBTAIN_ID_FAILED--}
';
}
} else {
// Extension is not installed
- $OUT .= "{--ADMIN_WERNIS_NOT_INSTALLED--}
\n";
+ $OUT .= '{--ADMIN_WERNIS_NOT_INSTALLED--}
';
}
break;
@@ -379,12 +383,12 @@ LIMIT 1",
default: // Unknown task type
logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
- $OUT .= "".sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id)."
\n";
+ $OUT .= '' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id) . '
';
break;
}
- $OUT .= "
- |
-\n";
+ $OUT .= '
+
+';
} // END - if
// Free result
@@ -397,18 +401,18 @@ LIMIT 1",
// Load final template
loadTemplate('admin_overview_list', false, $OUT);
} else {
- if ((isset($postData['task'])) && ((count($postData['task']) > 0) || ($postData['task'][0] == 1))) {
+ if ((isset($postData['sel'])) && ((count($postData['sel']) > 0) || ($postData['sel'][0] == 1))) {
// Only unassign / delete tasks when there are selected tasks posted
if (!empty($postData['unassign'])) {
// Unassign from tasks
- foreach ($postData['task'] as $id => $sel) {
+ foreach ($postData['sel'] as $id => $sel) {
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
}
} elseif (isset($postData['del'])) {
// Delete tasks
- foreach ($postData['task'] 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",
+ 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",
array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
}
} else {
@@ -446,7 +450,7 @@ LIMIT 1",
// 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