X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=0b8b56becdb2463777a43bf48c5af4d685107e10;hb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c;hp=cb91f5fae926f83aa34542649434b41dda81a2fa;hpb=76b1b077bda73310c536f658d3a9bb5e12232f39;p=mailer.git diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index cb91f5fae9..0b8b56becd 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -93,9 +93,9 @@ function outputStandardOverview (&$result_tasks) { 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 @@ -152,8 +152,11 @@ LIMIT 1", if ($adminId == '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($tid) + ), __FILE__, __LINE__); } // END - if $add = ''; @@ -161,7 +164,7 @@ LIMIT 1", 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 // Is a userid assign? @@ -172,7 +175,7 @@ LIMIT 1", $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($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!'); @@ -203,7 +206,7 @@ LIMIT 1", // Is this non-productive? if (isExtensionProductive() === false) { // Issue warning - $text .= loadTemplate('admin_settings_saved', true, sprintf(getMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE'), $ext_name)); + $text .= loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name)); } // END - if // Set current extension name @@ -287,7 +290,7 @@ LIMIT 1", )); } else { // Task is closed so nothing is todo - $OUT .= "
    {--ADMIN_EXT_ALREADY_REGISTERED--}
    \n"; + $OUT .= '
    {--ADMIN_EXT_ALREADY_REGISTERED--}
    '; // Close task but not already closed, solved, deleted or update tasks if ((!in_array($status, array('CLOSED','DELETED','SOLVED'))) && ($type != 'EXTENSION_UPDATE')) { @@ -299,7 +302,7 @@ LIMIT 1", 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')) { @@ -313,7 +316,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; @@ -321,7 +324,7 @@ 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", + $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__); list($pid) = SQL_FETCHROW($result_pay); SQL_FREERESULT($result_pay); @@ -337,11 +340,11 @@ LIMIT 1", $OUT .= loadTemplate('admin_payout_overview_form', true, $content); } else { // Problem obtaining payout id - $OUT .= "
    {--PAYOUT_OBTAIN_ID_FAILED--}
    \n"; + $OUT .= '
    {--PAYOUT_OBTAIN_ID_FAILED--}
    '; } } else { // Extension is not installed - $OUT .= "
    {--ADMIN_PAYOUT_NOT_INSTALLED--}
    \n"; + $OUT .= '
    {--ADMIN_PAYOUT_NOT_INSTALLED--}
    '; } break; @@ -362,11 +365,11 @@ LIMIT 1", $OUT .= loadTemplate('admin_wernis_overview_form', true, $content); } else { // Problem obtaining wernis id - $OUT .= "
    {--WERNIS_OBTAIN_ID_FAILED--}
    \n"; + $OUT .= '
    {--WERNIS_OBTAIN_ID_FAILED--}
    '; } } else { // Extension is not installed - $OUT .= "
    {--ADMIN_WERNIS_NOT_INSTALLED--}
    \n"; + $OUT .= '
    {--ADMIN_WERNIS_NOT_INSTALLED--}
    '; } break; @@ -380,12 +383,12 @@ LIMIT 1", default: // Unknown task type logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type)); - $OUT .= "
    ".sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id)."
    \n"; + $OUT .= '
    ' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id) . '
    '; break; } - $OUT .= " -   -\n"; + $OUT .= ' + +'; } // END - if // Free result @@ -409,7 +412,7 @@ LIMIT 1", } elseif (isset($postData['del'])) { // Delete tasks 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", + 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 { @@ -447,7 +450,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