X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=a6e033567a2374c6f2b854cdec95287ecc7ec46e;hp=0870dccdc8a1d0dad250a631799bc7ca5f902ef7;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 0870dccdc8..a6e033567a 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -1,7 +1,7 @@ "); // Update extension if extension is installed and outdated - //* DEBUG: */ outputHtml("ext={$ext_name},ver={getThisExtensionVersion()}/".getExtensionVersion($ext_name)."
"); + //* DEBUG: */ outputHtml('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 @@ -132,10 +133,10 @@ ORDER BY // Outputs selected tasks function outputSeletectedTasks ($postData, $result_tasks) { - if ((isset($postData['assign'])) && (count($postData['task']) > 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 @@ -143,55 +144,54 @@ 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! - // @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($taskData['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($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'; } - - // Free result - SQL_FREERESULT($result_user); } // 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 = ''; @@ -200,27 +200,33 @@ LIMIT 1", // 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))) { - // Load SQL commands for registering + 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 + $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') { + } 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 @@ -230,7 +236,7 @@ LIMIT 1", setCurrentExtensionName($ext_name); // Add notes to text - $text .= getExtensionNotes(); + $taskData['text'] .= getExtensionNotes(); // Set title $title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE'); @@ -240,9 +246,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"; + $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 @@ -252,7 +258,7 @@ 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')); @@ -261,10 +267,10 @@ LIMIT 1", // Prepare array for the template $content = array( 'sw' => $SW, - 'subj' => $subj, + 'subject' => $taskData['subject'], 'add' => $add, - 'text' => $text, - 'created' => generateDateTime($created, '1'), + 'text' => $taskData['text'], + 'created' => generateDateTime($taskData['task_created'], 1), 'extension' => $ext_name ); @@ -272,10 +278,10 @@ LIMIT 1", $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); @@ -288,24 +294,24 @@ LIMIT 1", )); } 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; @@ -314,7 +320,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 +328,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", - 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); if ((!empty($pid)) && ($pid > 0)) { - // Payout ID can be obtained + // 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"; + // 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,39 +356,43 @@ 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); if ((!empty($pid)) && ($pid > 0)) { - // Payout ID can be obtained + // 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"; + // 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; 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 + $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"; + 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 @@ -393,18 +405,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 { @@ -442,7 +454,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 @@ -451,7 +463,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?