X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=6665a4ab1bdfcf667fec47a4386cee8a56d8b119;hp=b4ae79de664cd86b439ddd437777afaab53b494b;hb=330dbb3e2b34450cd1665497506455e195a0a166;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2 diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index b4ae79de66..6665a4ab1b 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -8,7 +8,7 @@ * -------------------------------------------------------------------- * * Short description : Output standard task management * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Standart-Aufgaben-Management ausgeben * + * Kurzbeschreibung : Standard-Aufgaben-Management ausgeben * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -70,7 +70,7 @@ function outputStandardOverview (&$result_tasks) { // Is the extension not yet installed? if ($extInstalled === false) { // We maybe want to install an extension so let's test-drive it... - if (loadExtension($ext_name, getExtensionMode(), '0.0', true)) { + if (loadExtension($ext_name, getExtensionMode(), '0.0.0', true)) { // Create a task for newly installed extension (we ignore the task id here) createNewExtensionTask($ext_name); } // END - if @@ -106,7 +106,7 @@ function outputStandardOverview (&$result_tasks) { FROM `{?_MYSQL_PREFIX?}_task_system` WHERE - `assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW') + `assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `userid` DESC, `task_type` DESC, @@ -115,7 +115,7 @@ ORDER BY array(getCurrentAdminId()), __FILE__, __LINE__); if (!SQL_HASZERONUMS($result_tasks)) { - // New jobs found! + // New jobs found $jobsDone = false; } // END - if @@ -137,7 +137,7 @@ function outputSeletectedTasks ($postData, $result_tasks) { FROM `{?_MYSQL_PREFIX?}_task_system` WHERE - `id`=%s AND (`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW')) + `id`=%s AND (`assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW')) LIMIT 1", array( bigintval($taskId), @@ -151,7 +151,7 @@ LIMIT 1", 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 AND `assigned_admin`=0 LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin`=NULL LIMIT 1", array( getCurrentAdminId(), bigintval($taskData['id']) @@ -174,10 +174,10 @@ LIMIT 1", $content = getUserDataArray(); // Generate HTML list entry - $add = '
  • {--ADMIN_MEMBER_UID--}: ' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . ')
    • '; + $add = '
  • {--ADMIN_MEMBER_USERID--}: ' . generateUserProfileLink($taskData['userid'], 'user_data') . ' ({%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . ')
    • '; } else { // Invalid userid, so log and zero it - logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $taskData['userid'] . ' -> not found!'); + logDebugMessage(__FUNCTION__, __LINE__, 'fetchUserData() failed: userid=' . $taskData['userid'] . ' not found.'); $taskData['userid'] = '0'; } } // END - if @@ -205,7 +205,7 @@ LIMIT 1", // Is this non-productive? if (isExtensionProductive() === false) { // Issue warning - $taskData['text'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name)) . $taskData['text']; + $taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=', $ext_name . '%}', true) . $taskData['text']; } // END - if // Set current extension name @@ -310,9 +310,9 @@ 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 .= '
    ' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '
    '; + $OUT .= '
    {%message,ADMIN_UNKNOWN_SUPPORT_MODE=' . $mode . '%}
    '; break; - } + } // END - switch break; case 'PAYOUT_REQUEST': // Payout requests @@ -397,22 +397,22 @@ LIMIT 1", if (!empty($postData['unassign'])) { // Unassign from tasks foreach ($postData['sel'] as $taskId => $sel) { - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=NULL WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1", array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__); - } + } // END - foreach } elseif (isset($postData['delete'])) { // Delete tasks foreach ($postData['sel'] as $taskId => $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($taskId), getCurrentAdminId()), __FILE__, __LINE__); - } + } // END - foreach } 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", + $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 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `task_created` DESC", array(getCurrentAdminId()), __FILE__, __LINE__); } // END - if @@ -429,10 +429,7 @@ LIMIT 1", case 'EXTENSION_UPDATE': $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1); break; - } - - // Get task type - $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}'; + } // END - switch if (isValidUserId($content['userid'])) { // Member found otherwise it's a system task