X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=61ace388a9a9cb568cf3613645feb40265198a43;hb=00974432ffe0ed217b993e1ea5aaaac7dc31e82b;hp=b27461d4645e9e5c50346d5ac6b5fc11ffae6cc7;hpb=e45e218c4f629ec63f0788cab231bfc88b3fa46e;p=mailer.git diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index b27461d464..61ace388a9 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -140,11 +140,8 @@ LIMIT 1", // Prepare data for template $content['admin_links'] = generateMemberAdminActionLinks($userid, $content['status']); - $content['gender'] = translateGender($content['gender']); $content['email_link'] = generateEmailLink($content['email'], 'user_data'); - $content['status'] = translateUserStatus($content['status']); $content['last_online'] = generateDateTime($content['last_online'], 0); - $content['used_points'] = translateComma($content['used_points']); 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); @@ -178,10 +175,6 @@ LIMIT 1", $content['click_rate'] = translateComma($content['mails_confirmed'] / $content['emails_received'] * 100); } // END - if - // "Translate" more data - $content['mails_confirmed'] = translateComma($content['mails_confirmed']); - $content['emails_received'] = translateComma($content['emails_received']); - // Is the extension 'country' installed? if (isExtensionActive('country')) { // Then overwrite country information @@ -254,48 +247,44 @@ LIMIT 1", } // 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')); // Add limitation to SQL string and run him again - $sql .= " LIMIT ".(getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')).", ".getRequestParameter('offset'); + $sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset'); $result = SQL_QUERY($sql, __FILE__, __LINE__); - // Count all confirmed users - $user_count = countSumTotalData('CONFIRMED','user_data','userid','status',true); - // Are there some entries? if (SQL_NUMROWS($result_master) > 0) { // We have some (new?) registrations! - define('__COLSPAN2' , ($colspan + 2)); - define('__USER_CNT' , $user_count); + $templateContent['colspan2'] = ($colspan + 2); + $templateContent['user_count'] = getTotalConfirmedUser(); // Sorting links - define('__ALPHA_SORT', alpha(getRequestParameter('sortby'), $colspan, true)); - define('__SORT_LINKS', addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'), $colspan, true)); + $templateContent['alpha_sort'] = alpha(getRequestParameter('sortby'), ($colspan + 1), true); + $templateContent['sort_links'] = addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'), ($colspan + 1), true); + $templateContent['page_nav'] = ''; - if ($PAGES > 1) { - define('__PAGE_NAV', addPageNavigation($PAGES, getConfig('user_limit'), true, $colspan, true)); - } else { - // No page navigation is required - define('__PAGE_NAV', ''); - } + if ($numPages > 1) { + $templateContent['page_nav'] = addPageNavigation($numPages, getConfig('user_limit'), true, $colspan, true); + } // END - if // Column with nickname when nickname extension is present - // @TODO Rewrite this into a filter + // @TODO Rewrite this into a filter + $templateContent['nickname_th'] = ''; if (isExtensionActive('nickname')) { // Nickname extension found - define('__NICKNAME_TH', "