X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=d823fd4676e2393291a5e4d31139c963f70a04d8;hb=45465772fed386cbfa0c1df9677cbd9134ac5819;hp=301f3bc35fc7c62d16df9458558bf31baad5d2ad;hpb=d508f875d53a7b2e75f02e66b37be3cf30451276;p=mailer.git diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 301f3bc35f..d823fd4676 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -38,8 +38,6 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) { - global $cacheArray, $_CONFIG; - // First check for solved and not assigned tasks and assign them to current admin SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin='%s' WHERE assigned_admin < 1 AND status != 'NEW'", array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__); @@ -49,7 +47,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) { $JOBS_DONE = true; // Open the extension directory - $handle = opendir(PATH."inc/extensions/") or mxchange_die("Cannot read extension directory!"); + $handle = opendir(constant('PATH')."inc/extensions/") or mxchange_die("Cannot read extension directory!"); while ($file = readdir($handle)) { // Is this file an extension? if ((substr($file, 0, 4) == "ext-") && (substr($file, -4) == ".php")) { @@ -75,7 +73,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) { } // END - if } else { // Test-drive extension in update mode - LOAD_INC(sprintf("inc/extensions/ext-%s.php", $ext_name)); + require(sprintf("%sinc/extensions/ext-%s.php", constant('PATH'), $ext_name)); // Update extension if extension is installed and outdated //* DEBUG: */ print "ext={$ext_name},ver={$EXT_VERSION}/".GET_EXT_VERSION($ext_name)."
\n"; @@ -84,9 +82,9 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) { EXTENSION_UPDATE($ext_name, $ext_ver); } // END - if - if (isset($cacheArray['active_extensions'][$ext_name])) { + if (isset($GLOBALS['cache_array']['active_extensions'][$ext_name])) { // Maybe we want to keept the current extension active? - if (($cacheArray['active_extensions'][$ext_name] == "Y") && (!EXT_IS_ACTIVE($ext_name))) { + if (($GLOBALS['cache_array']['active_extensions'][$ext_name] == "Y") && (!EXT_IS_ACTIVE($ext_name))) { // Reactivate this extension! ACTIVATE_EXTENSION($ext_name); } // END - if @@ -119,7 +117,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", // Outputs selected tasks function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { - global $_CONFIG, $NOTES; + global $NOTES; if ((isset($POST['assign'])) && (count($POST['task']) > 0)) { // Assign / do tasks $OUT = ""; $SW = 2; @@ -141,7 +139,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { 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 if ($uid > 0) { @@ -150,19 +148,19 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { 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.")
    • "; + $ADD = "
  • {--ADMIN_MEMBER_UID--}: ".ADMIN_USER_PROFILE_LINK($uid)." (".TRANSLATE_GENDER($gender)." ".$sname." ".$fname.")
    • "; } // END - if } // END - if // Decode entities of the text - $text = html_entity_decode($text); + $text = decodeEntities($text); // Compile and insert text from task into table template $text = LOAD_TEMPLATE("admin_extensions_text", true, $text); // Initialize variables (no title for SQL commands by default) $ext_name = ""; - $title = TASK_NO_TITLE; + $title = getMessage('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"))) { @@ -175,7 +173,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { $text .= $NOTES; // Set title - $title = ADMIN_SQLS_EXECUTED_ON_REGISTER; + $title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER'); } elseif ($type == "EXTENSION_UPDATE") { // Prepare extension name and version $ext_name = substr($ext_name, 7); @@ -191,7 +189,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { $text .= $NOTES; // Set title - $title = ADMIN_SQLS_EXECUTED_ON_UPDATE; + $title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE'); } else { // Remove extension's name $ext_name = ""; @@ -230,7 +228,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { 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__); + array($ext_name), __FILE__, __LINE__); $lines = SQL_NUMROWS($result_lines); SQL_FREERESULT($result_lines); if ($lines == "0") { @@ -241,7 +239,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { )); } else { // Task is closed so nothing is todo - $OUT .= "
    {!ADMIN_EXT_ALREADY_REGISTERED!}
    \n"; + $OUT .= "
    {--ADMIN_EXT_ALREADY_REGISTERED--}
    \n"; // Close task but not already closes or deleted or update tasks if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) { @@ -253,7 +251,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { case "EXTENSION_UPDATE": // Extension update // Extension updates are installed automatically - $OUT .= "
    {!ADMIN_EXTENSION_UPDATED!}
    \n"; + $OUT .= "
    {--ADMIN_EXTENSION_UPDATED--}
    \n"; // Close task if (($status != "CLOSED") && ($status != "DELETED")) { @@ -263,6 +261,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { 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 @@ -293,7 +292,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { } } else { // Extension is not installed - $OUT .= "
    {!ADMIN_PAYOUT_NOT_INSTALLED!}
    \n"; + $OUT .= "
    {--ADMIN_PAYOUT_NOT_INSTALLED--}
    \n"; } break; @@ -314,11 +313,11 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { $OUT .= LOAD_TEMPLATE("admin_wernis_overview_form", true, $content); } else { // Problem obtaining wernis ID - $OUT .= "
    {!WERNIS_OBTAIN_ID_FAILED!}
    \n"; + $OUT .= "
    {--WERNIS_OBTAIN_ID_FAILED--}
    \n"; } } else { // Extension is not installed - $OUT .= "
    {!ADMIN_WERNIS_NOT_INSTALLED!}
    \n"; + $OUT .= "
    {--ADMIN_WERNIS_NOT_INSTALLED--}
    \n"; } break; @@ -386,21 +385,11 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { LOAD_TEMPLATE("admin_overview_header"); $SW = 2; while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) { + // Init infos $infos = "---"; - if ($admin == "0") { - // No admin currently is assigned - $admin = "
    {!ADMIN_NO_ADMIN_ASSIGNED!}
    "; - } else { - // Load admin's data - $login = GET_ADMIN_LOGIN($admin); - if ($login != "***") { - // Admin found - $admin = "".$login.""; - } else { - // Maybe deleted? - $admin = "
    ".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."
    "; - } - } + + // Generate assign link + $admin = GENERATE_AID_LINK($admin); // Get task type $type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).''); @@ -419,7 +408,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { // Member found otherwise it's a system task $uid = ADMIN_USER_PROFILE_LINK($uid); } else { - $uid = "{!ADMIN_IS_SYSTEM_TASK!}"; + $uid = "{--ADMIN_IS_SYSTEM_TASK--}"; } // Prepare content