X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=b8ce9527871867eb46d178d62a55612f51cfb3c6;hb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;hp=c10ec781d71edebef4de70d8331e55b80a0fb945;hpb=76fd13e5938a334f08e43893eb9a4ff49f72bf07;p=mailer.git diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index c10ec781d7..b8ce952787 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -72,7 +72,7 @@ if (isExtensionInstalledAndNewer('user', '0.3.4')) { // Add lock reason? if (isExtensionInstalledAndNewer('user', '0.3.5')) { // Add them... - $MORE .= ", `lock_reason`, UNIX_TIMESTAMP(`lock_timestamp`) AS lock_timestamp"; + $MORE .= ", `lock_reason`, UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`"; } // END - if } // END - if @@ -119,9 +119,9 @@ LIMIT 1", // Add links to the numbers if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $userid . '%}">' . $content['links'] . ']'; - if ($content['refid'] > 0) $content['refid'] = $base . '&what=list_user&userid=' . $content['refid'] . '%}">'.$content['refid'] . ']'; - if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">' . $content['refs'] . ']'; - if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">' . $content['cats'] . ']'; + if (isValidUserId($content['refid'])) $content['refid'] = $base . '&what=list_user&userid=' . $content['refid'] . '%}">'.$content['refid'] . ']'; + if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">' . translateComma($content['refs']) . ']'; + if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">' . translateComma($content['cats']) . ']'; // Fix empty module if (empty($content['last_module'])) $content['last_module'] = '---'; @@ -139,15 +139,14 @@ LIMIT 1", } // Prepare data for template - $content['admin_links'] = generateMemberAdminActionLinks($userid, $content['status']); $content['email_link'] = generateEmailLink($content['email'], 'user_data'); $content['last_online'] = generateDateTime($content['last_online'], 0); if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $userid . '%}">' . translateComma($content['emails_sent']) . ']'; $content['joined'] = generateDateTime($content['joined'], 0); $content['last_update'] = generateDateTime($content['last_update'], 0); $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0); - $content['total'] = translateComma(countSumTotalData($userid, 'user_points', 'points')); - $content['locked'] = translateComma(countSumTotalData($userid, 'user_points', 'locked_points')); + $content['total'] = countSumTotalData($userid, 'user_points', 'points'); + $content['locked'] = countSumTotalData($userid, 'user_points', 'locked_points'); $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2); // Is the lock reason not set? @@ -160,19 +159,13 @@ LIMIT 1", if ((empty($content['nickname'])) || ($content['nickname'] == $userid)) $content['nickname'] = '---'; } else { // Extension not found - $content['nickname'] = getMessage('EXT_NICKNAME_404'); + $content['nickname'] = '{--EXT_NICKNAME_404--}'; } - // Is the user extension newer? - if (isExtensionInstalledAndNewer('user', '0.3.4')) { - // Then "translate" the number - $content['rand_confirmed'] = translateComma($content['rand_confirmed']); - } // END - if - // Clickrate $content['click_rate'] = '0'; if ($content['emails_received'] > 0) { - $content['click_rate'] = translateComma($content['mails_confirmed'] / $content['emails_received'] * 100); + $content['click_rate'] = ($content['mails_confirmed'] / $content['emails_received'] * 100); } // END - if // Is the extension 'country' installed? @@ -243,11 +236,11 @@ LIMIT 1", // Calculate page count (0.5 fixes a bug with page count) if (getConfig('user_limit') == '0') { setConfigEntry('user_limit', 100); - loadTemplate('admin_settings_saved', false, getMessage('EXTENSION_WARNING_USER_LIMIT')); + loadTemplate('admin_settings_saved', false, '{--EXTENSION_WARNING_USER_LIMIT--}'); } // END - if // Activate the extension please! - $PAGES = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5); + $numPages = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5); if (!isGetRequestParameterSet('page')) setGetRequestParameter('page' , 1); if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getConfig('user_limit')); @@ -267,8 +260,8 @@ LIMIT 1", $templateContent['sort_links'] = addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'), ($colspan + 1), true); $templateContent['page_nav'] = ''; - if ($PAGES > 1) { - $templateContent['page_nav'] = addPageNavigation($PAGES, getConfig('user_limit'), true, $colspan, true); + if ($numPages > 1) { + $templateContent['page_nav'] = addPageNavigation($numPages, getConfig('user_limit'), true, $colspan, true); } // END - if // Column with nickname when nickname extension is present @@ -285,9 +278,6 @@ LIMIT 1", // Merge more data in $content = merge_array($content, $templateContent); - // Set refid link - if ($content['refid'] > 0) $content['refid'] = generateUserProfileLink($content['refid']); - // Get number of unconfirmed mails $content['links'] = countSumTotalData($content['userid'], 'user_links', 'id', 'userid', true); if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $content['userid'] . '%}">' . translateComma($content['links']) . ']'; @@ -309,19 +299,13 @@ LIMIT 1", // Transfer data to array $content['sw'] = $SW; - $content['userid_link'] = generateUserProfileLink($content['userid']); - $content['gender'] = translateGender($content['gender']); $content['email'] = '[' . $content['email'] . ']'; - $content['alinks'] = generateMemberAdminActionLinks($content['userid'], $content['status']); - $content['points'] = translateComma($content['points']); - $content['rate'] = translateComma($content['rate']); - $content['locked'] = translateComma(countSumTotalData($content['userid'], 'user_points', 'locked_points')); $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2); - $content['status'] = translateUserStatus($content['status']); $content['refs'] = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true); + $content['locked'] = countSumTotalData($content['userid'], 'user_points', 'locked_points'); // If we have at least one referal, make it clickable to referal list - if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">' . $content['refs'] . ']'; + if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">' . translateComma($content['refs']) . ']'; // Is the lock reason not set? if (!isset($content['lock_reason'])) $content['lock_reason'] = '---'; @@ -351,7 +335,7 @@ LIMIT 1", $content['rows'] = $OUT; // Init title with "all accounts" - $content['title'] = getMessage('ADMIN_ALL_ACCOUNTS'); + $content['title'] = '{--ADMIN_ALL_ACCOUNTS--}'; if (isGetRequestParameterSet(('status'))) { // Set title according to the 'status' $content['title'] = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(getRequestParameter(('status'))))); @@ -367,7 +351,7 @@ LIMIT 1", loadTemplate('admin_list_user', false, $content); } else { // No one as registered so far! :-( - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_NONE_REGISTERED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_NONE_REGISTERED--}'); } // Free memory