X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=a58ac8611f270bb6f4fc06c7af0a4376f981006e;hp=97679cc87bc51d8c332a4131d6cedc76529d2a68;hb=3c0c6ad28a250c08b3fe8b166c589d0d49441ad3;hpb=392c181338f84b2e0e0fdfbd304b1ca9d8da077e diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 97679cc87b..a58ac8611f 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 @@ -167,24 +167,17 @@ LIMIT 1", // 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'].")
    • "; } 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 +197,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, sprintf(getMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE'), $ext_name)); + } // END - if + // Set current extension name setCurrentExtensionName($ext_name); @@ -261,10 +260,10 @@ LIMIT 1", // Prepare array for the template $content = array( 'sw' => $SW, - 'subj' => $subj, + 'subject' => $subj, 'add' => $add, 'text' => $text, - 'created' => generateDateTime($created, '1'), + 'created' => generateDateTime($created, 1), 'extension' => $ext_name ); @@ -272,7 +271,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); @@ -290,7 +289,7 @@ LIMIT 1", // Task is closed so nothing is todo $OUT .= "
    {--ADMIN_EXT_ALREADY_REGISTERED--}
    \n"; - // 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); @@ -328,14 +327,16 @@ LIMIT 1", 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 + // Problem obtaining payout id $OUT .= "
    {--PAYOUT_OBTAIN_ID_FAILED--}
    \n"; } } else { @@ -348,19 +349,19 @@ 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 + // Problem obtaining wernis id $OUT .= "
    {--WERNIS_OBTAIN_ID_FAILED--}
    \n"; } } else { @@ -373,6 +374,10 @@ LIMIT 1", $OUT .= loadTemplate('admin_task_holiday', true, $userid); break; + case 'MEMBER_ORDER': // Member mail orders + $OUT .= loadTemplate('admin_task_order', true, $id); + 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"; @@ -393,17 +398,17 @@ 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) { + 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__); } @@ -451,7 +456,7 @@ LIMIT 1", 'assigned_admin' => $content['assigned_admin'], 'userid' => $content['userid'], 'task_type_msg' => $content['task_type_msg'], - 'created' => generateDateTime($content['task_created'], '2') + 'created' => generateDateTime($content['task_created'], 2) )); // Do we have extension task?