X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=e5d3f0cdcb582432029dad0c73e11306daa4b2ab;hp=ffc910af656ca27fb05e486eea73676982476da0;hb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;hpb=a58bc1bbba1400ebc78f906a5c18881ff9b15fe4 diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index ffc910af65..e5d3f0cdcb 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -1,7 +1,7 @@ \n"; + if ((substr($file, 0, 4) == 'ext-') && (substr($file, -4) == '.php')) { // Possible newly installed extension found so we extract extension's name $ext_name = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!! @@ -64,49 +67,57 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) { $result = false; // Check if extension is installed or not - $ext_ver = GET_EXT_VERSION($ext_name); + $extInstalled = (isExtensionInstalled($ext_name) && (isExtensionActive($ext_name))); // Is the extension not yet installed? - if (empty($ext_ver)) { + if ($extInstalled === false) { // Generate subject line $ext_subj = sprintf("[%s:]", $ext_name); // We maybe want to install an extension so let's test-drive it... - if (LOAD_EXTENSION($ext_name, $EXT_LOAD_MODE)) { + if (loadExtension($ext_name, getExtensionMode(), '', true)) { // Create a task for newly installed extension - CREATE_NEW_EXTENSION_TASK(GET_CURRENT_ADMIN_ID(), $ext_subj, $ext_name); + createNewExtensionTask(getCurrentAdminId(), $ext_subj, $ext_name); } // END - if } else { // Test-drive extension in update mode - require(sprintf("%sinc/extensions/ext-%s.php", constant('PATH'), $ext_name)); + loadExtension($ext_name, 'test'); + + // Get extension version + $ext_ver = getExtensionVersion($ext_name); + //* DEBUG: */ debugOutput($ext_name.'='.$ext_ver); // Update extension if extension is installed and outdated - //* DEBUG: */ print "ext={$ext_name},ver={EXT_GET_VERSION()}/".GET_EXT_VERSION($ext_name)."
\n"; - if (EXT_GET_VERSION() > $ext_ver) { + //* DEBUG: */ debugOutput('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)); + if (getThisExtensionVersion() > $ext_ver) { // Update the extension - EXTENSION_UPDATE($ext_name, $ext_ver); + 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") && (!EXT_IS_ACTIVE($ext_name))) { + if (($GLOBALS['cache_array']['always_active'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) { // Reactivate this extension! - ACTIVATE_EXTENSION($ext_name); + doActivateExtension($ext_name); } // END - if } // END - if } } // END - if - } // END - while - - // Close directory handle - closedir($handle); + } // END - foreach // 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') -ORDER BY userid DESC, task_type DESC, subject, 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 + `userid` DESC, + `task_type` DESC, + `subject` ASC, + `task_created` DESC", + array(getCurrentAdminId()), __FILE__, __LINE__); if (SQL_NUMROWS($result_tasks) > 0) { // New jobs found! @@ -121,331 +132,360 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", } // Outputs selected tasks -function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { - if ((isset($POST['assign'])) && (count($POST['task']) > 0)) { +function outputSeletectedTasks ($postData, $result_tasks) { + if ((isset($postData['assign'])) && (count($postData['sel']) > 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", - array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__); + $OUT = ''; $SW = 2; + foreach ($postData['sel'] 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", + array( + bigintval($id), + getCurrentAdminId() + ), __FILE__, __LINE__); + + // Task is found? if (SQL_NUMROWS($result_task) == 1) { - // Task is valid... - list($tid, $uid, $type, $subj, $text, $created, $status, $aid) = SQL_FETCHROW($result_task); - SQL_FREERESULT($result_task); + // Task is valid so load it's data + $taskData = SQL_FETCHARRAY($result_task); - if ($aid == "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(GET_CURRENT_ADMIN_ID(), 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 = ""; - if ($type == "SUPPORT_MEMBER") { - $mode = substr($text, 0, strpos($text, ":")); - $text = substr($text, strpos($text, ":") + 1); - $ADD = "
  • {--ADMIN_TASK_SUPPORT_MODE--}: ".$mode."
    • "; + $add = ''; + // @TODO Rewrite this to a filter + 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 - if ($uid > 0) { - $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", - array(bigintval($uid)), __FILE__, __LINE__); - 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.")
    • "; - } // END - if + // Is a userid assign? + if ($taskData['userid'] > 0) { + // Then load his data! + if (fetchUserData($taskData['userid'])) { + // Fetch row + $content = getUserDataArray(); + + // Generate HTML list entry + $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=' . $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 = LOAD_TEMPLATE("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 = ""; - $title = getMessage('TASK_NO_TITLE'); + $ext_name = ''; $ext_ver = ''; + $title = '{--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 - SET_SQLS(EXTENSION_REGISTER($ext_name, $id, true)); + if ((getConfig('verbose_sql') == 'Y')) { + // Extract extension name from subject + $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1); + + // Update task or extension task? + 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 .= EXT_GET_NOTES(); + $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($ext_ver, 0, strpos($ext_ver, ":")); + $ext_name = substr($ext_name, 0, strpos($ext_name, '-')); + $test = '[UPDATE-' . $ext_name . '-'; + $ext_ver = substr($taskData['subject'], strlen($test)); + $ext_ver = substr($ext_ver, 0, strpos($ext_ver, ':')); // Load SQLs from file - EXTENSION_UPDATE($ext_name, $ext_ver, true); + updateExtension($ext_name, $ext_ver, true); + + // Set current extension name + setCurrentExtensionName($ext_name); // Add notes to text - $text .= EXT_GET_NOTES(); + $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 = ""; + $ext_name = ''; } // Add SQLs to a table - if (!IS_SQLS_VALID()) INIT_SQLS(); - if (empty($title)) $title = ""; - if ((!empty($ext_name)) && (GET_EXT_VERSION("sql_patches")) && (getConfig('verbose_sql') == "Y")) { + if ((!empty($ext_name)) && (isExtensionInstalled('sql_patches')) && (getConfig('verbose_sql') == 'Y')) { // Add verbose SQL table - $text .= EXTENSION_VERBOSE_TABLE($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 - } else { + } elseif ((!empty($ext_name)) && (!empty($ext_ver))) { // Run SQL commands in dry mode but only return the notes - EXTENSION_UPDATE($ext_name, $ext_ver, true); - $text .= EXT_GET_NOTES(); + updateExtension($ext_name, $ext_ver, true); + + // Set current extension name + setCurrentExtensionName($ext_name); + + // Get notes + $taskData['text'] .= getExtensionNotes(); + } else { + // This should not normally happen! + 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, - 'subj' => $subj, - 'add' => $ADD, - 'text' => $text, - 'created' => MAKE_DATETIME($created, "1"), + 'subject' => $taskData['subject'], + 'add' => $add, + 'text' => $taskData['text'], + 'created' => generateDateTime($taskData['task_created'], 1), 'extension' => $ext_name ); // Load template - $OUT .= LOAD_TEMPLATE("admin_overview_row", true, $content); + $OUT .= loadTemplate('admin_overview_row', true, $content); // Which task do we actually have here? - // @TODO Rewrite this to something with include files - switch ($type) - { - 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__); - $lines = SQL_NUMROWS($result_lines); - SQL_FREERESULT($result_lines); - if ($lines == "0") { - // New extension found - $OUT .= LOAD_TEMPLATE("admin_ext_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"; + // @TODO Rewrite this to something with include files and/or filter + switch ($taskData['task_type']) { + case 'EXTENSION': // Install new extensions + $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( + 'id' => bigintval($id), + 'ext_name' => $ext_name + )); + } else { + // Task is closed so nothing is todo + $OUT .= '
    {--ADMIN_EXTENSION_ALREADY_REGISTERED--}
    '; + + // 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', $taskData['id']); + } // END - if + } + break; + + case 'EXTENSION_UPDATE': // Extension update + // Extension updates are installed automatically + $OUT .= '
    {--ADMIN_EXTENSION_UPDATED--}
    '; - // Close task but not already closes or deleted or update tasks - if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) { + // Close task + if (!in_array($taskData['status'], array('CLOSED', 'DELETED'))) { // 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"; - - // Close task - if (($status != "CLOSED") && ($status != "DELETED")) { - // Solve the task - runFilterChain('solve_task', $tid); - } // END - if - break; + 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 - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode)); - $OUT .= "
    ".ADMIN_UNKNOWN_SUPPORT_MODE_1.$mode.ADMIN_UNKNOWN_SUPPORT_MODE_2."
    \n"; + 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 + logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode)); + $OUT .= '
    ' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '
    '; + break; + } break; - } - break; - case "PAYOUT_REQUEST": // Payout requests - if (EXT_IS_ACTIVE("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($uid), bigintval($created)), __FILE__, __LINE__); - list($pid) = SQL_FETCHROW($result_pay); - SQL_FREERESULT($result_pay); - - if ((!empty($pid)) && ($pid > 0)) { - // Payout ID can be obtained - $content = array( - 'pid' => $pid, - 'tid' => $tid, - ); - $OUT .= LOAD_TEMPLATE("admin_payout_overview_form", true, $content); + 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($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 + $content = array( + 'pid' => $pid, + 'tid' => $taskData['id'], + ); + + // Load template + $OUT .= loadTemplate('admin_payout_overview_form', true, $content); + } else { + // Problem obtaining payout id + $OUT .= '
    {--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}
    '; + } } else { - // Problem obtaining payout ID - $OUT .= "
    ".PAYOUT_OBTAIN_ID_FAILED."
    \n"; + // Extension is not installed + $OUT .= '
    {--ADMIN_PAYOUT_NOT_INSTALLED--}
    '; } - } else { - // Extension is not installed - $OUT .= "
    {--ADMIN_PAYOUT_NOT_INSTALLED--}
    \n"; - } - break; + break; - case "WERNIS_REQUEST": // Wernis requests - if (EXT_IS_ACTIVE("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($uid), bigintval($created)), __FILE__, __LINE__); - list($pid) = SQL_FETCHROW($result_pay); - SQL_FREERESULT($result_pay); - - if ((!empty($pid)) && ($pid > 0)) { - // Payout ID can be obtained - $content = array( - 'pid' => $pid, - 'tid' => $tid, - ); - $OUT .= LOAD_TEMPLATE("admin_wernis_overview_form", true, $content); + case 'WERNIS_REQUEST': // Wernis requests + 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($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 + $content = array( + 'pid' => $pid, + 'tid' => $taskData['id'], + ); + $OUT .= loadTemplate('admin_wernis_overview_form', true, $content); + } else { + // Problem obtaining wernis id + $OUT .= '
    {--WERNIS_OBTAIN_ID_FAILED--}
    '; + } } else { - // Problem obtaining wernis ID - $OUT .= "
    {--WERNIS_OBTAIN_ID_FAILED--}
    \n"; + // Extension is not installed + $OUT .= '
    {--ADMIN_WERNIS_NOT_INSTALLED--}
    '; } - } else { - // Extension is not installed - $OUT .= "
    {--ADMIN_WERNIS_NOT_INSTALLED--}
    \n"; - } - break; + break; - case "HOLIDAY_REQUEST": // Holiday requests - $OUT .= LOAD_TEMPLATE("admin_task_holiday", true, $uid); - break; + case 'HOLIDAY_REQUEST': // Holiday requests + $OUT .= loadTemplate('admin_task_holiday', true, $taskData['userid']); + break; - case "NL_UNSUBSCRIBE": // Newsletter unsubscriptions - $result = SQL_QUERY_ESC("SELECT nl_timespan FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", - array(bigintval($uid)), __FILE__, __LINE__); - list($span) = SQL_FETCHROW($result); - SQL_FREERESULT($result); - - if ($span > 0) { - // Undone unscubscribe request - $content = array( - 'uid' => $uid, - 'id' => $tid - ); - $OUT .= LOAD_TEMPLATE("admin_newsletter_tsk", true, $content); - } else { - // Already unsubscribed - $OUT .= "
    ".ADMIN_NL_UNSUBSCRIBE_ALREADY."
    \n"; - } - break; + case 'MEMBER_ORDER': // Member mail orders + $OUT .= loadTemplate('admin_task_order', true, $id); + break; - default: // Unknown task type - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type)); - $OUT .= "
    ".ADMIN_UNKNOWN_TASK_TYPE_1.$type.ADMIN_UNKNOWN_TASK_TYPE_2.$id.ADMIN_UNKNOWN_TASK_TYPE_3."
    \n"; - break; + default: // Unknown task type + 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 - define('__TASK_ROWS', $OUT); // Load final template - LOAD_TEMPLATE("admin_overview_list"); + loadTemplate('admin_overview_list', false, $OUT); } else { - if ((isset($POST['task'])) && ((count($POST['task']) > 0) || ($POST['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($POST['unassign'])) { + if (!empty($postData['unassign'])) { // Unassign from tasks - foreach ($POST['task'] 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), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__); + 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($POST['del'])) { + } elseif (isset($postData['del'])) { // Delete tasks - foreach ($POST['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", - array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__); + 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 { + // Unknown action + debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=
    %s
    ", print_r($postData, true))); } // 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(getCurrentAdminId()), __FILE__, __LINE__); } // END - if // There are uncompleted jobs! - // @TODO Rewrite this to one template and use $OUT = ... - LOAD_TEMPLATE("admin_overview_header"); - $OUT = ""; $SW = 2; + $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result_tasks)) { // Init infos - $content['infos'] = "---"; + $content['infos'] = '---'; // Generate assign link - $content['assigned_admin'] = GENERATE_AID_LINK($content['assigned_admin']); + $content['assigned_admin'] = generateAdminLink($content['assigned_admin']); // Generate infos - switch ($content['task_type']) - { - case "EXTENSION": - case "EXTENSION_UPDATE": - $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ":") - 1); - break; + // @TODO Try to move this in includes + switch ($content['task_type']) { + case 'EXTENSION': + case 'EXTENSION_UPDATE': + $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1); + break; } // 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'] = ADMIN_USER_PROFILE_LINK($content['userid']); + $content['userid'] = generateUserProfileLink($content['userid']); } else { - $content['userid'] = "{--ADMIN_IS_SYSTEM_TASK--}"; + $content['userid'] = '{--ADMIN_IS_SYSTEM_TASK--}'; } // Prepare content - // @TODO Rewritings: admin->assigned_admin,uid->userid,type->task_type_msg in template $content = merge_array($content, array( - 'sw' => $SW, - 'admin' => $content['assigned_admin'], - 'uid' => $content['userid'], - 'type' => $content['task_type_msg'], - 'created' => MAKE_DATETIME($content['task_created'], "2") + 'sw' => $SW, + 'assigned_admin' => $content['assigned_admin'], + 'userid' => $content['userid'], + 'task_type_msg' => $content['task_type_msg'], + 'created' => generateDateTime($content['task_created'], 2) )); // Do we have extension task? - if (($content['task_type'] == "EXTENSION") && (GET_EXT_VERSION($content['infos']) == "")) { + if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) { // Load extension row template - // @TODO Rewrite this to $OUT .= ..., true, ... - LOAD_TEMPLATE("admin_overview_list_ext_rows", false, $content); + $OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content); } else { // Load default row template - // @TODO Rewrite this to $OUT .= ..., true, ... - LOAD_TEMPLATE("admin_overview_list_rows", false, $content); + $OUT .= loadTemplate('admin_overview_list_rows', true, $content); } // Switch color $SW = 3 - $SW; - } + } // END - while // Free memory SQL_FREERESULT($result_tasks); // Load footer template - LOAD_TEMPLATE("admin_overview_footer"); + loadTemplate('admin_overview_table', false, $OUT); } } -// + +// [EOF] ?>