X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=6e78f65d9ed415c7212aca5c781a81967c9f2432;hb=e5dde615db05fb62ebe91bd1c030f40c9b91fe17;hp=87e9901869dc176511512f618ea9776eaf6b6b5e;hpb=32933a97e4462c232a794fc33bd91f01ff997cb9;p=mailer.git diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 87e9901869..6e78f65d9e 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 @@ -86,9 +86,9 @@ if (isExtensionActive('country')) { } // Init unset data -if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', getMessage('_ALL2')); } -if (!isGetRequestParameterSet('sortby')) { setGetRequestParameter('sortby', 'userid'); } -if (!isGetRequestParameterSet('page')) { setGetRequestParameter('page' , 1); } +if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', ''); } +if (!isGetRequestParameterSet('sortby')) { setGetRequestParameter('sortby', 'userid'); } +if (!isGetRequestParameterSet('page')) { setGetRequestParameter('page' , 1); } // Set base URL $base = '[ 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'] = '---'; - // Calculate timestamp for birthday $stamp = mktime(0, 0, 0, $content['birth_month'], $content['birth_day'], $content['birth_year']); @@ -139,40 +136,25 @@ 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? - if (!isset($content['lock_reason'])) $content['lock_reason'] = '---'; + $content['nickname'] = '{--EXT_NICKNAME_404--}'; // Nickname inclusion? // @TODO Rewrite these to filters - if (isExtensionActive('nickname')) { - // Nickname not set or invalid? Then - if ((empty($content['nickname'])) || ($content['nickname'] == $userid)) $content['nickname'] = '---'; - } else { - // Extension not found - $content['nickname'] = getMessage('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 + if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']); // 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? @@ -198,9 +180,9 @@ LIMIT 1", SQL_FREERESULT($result_user); } else { $whereStatement = ''; - if ((getRequestParameter('letter') != getMessage('_ALL2')) && (getRequestParameter('letter') != getMessage('_OTHERS')) && (isGetRequestParameterSet('letter'))) { + if (isGetRequestParameterSet('letter')) { // List only persons w - $whereStatement = " WHERE `family` LIKE '".getRequestParameter('letter') . "%'"; + $whereStatement = " WHERE `family` LIKE '".getRequestParameter('letter') . "%%'"; } // END - if // Parse the status or mode parameter @@ -243,7 +225,7 @@ 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! @@ -257,7 +239,7 @@ LIMIT 1", $result = SQL_QUERY($sql, __FILE__, __LINE__); // Are there some entries? - if (SQL_NUMROWS($result_master) > 0) { + if (!SQL_HASZERONUMS($result_master)) { // We have some (new?) registrations! $templateContent['colspan2'] = ($colspan + 2); $templateContent['user_count'] = getTotalConfirmedUser(); @@ -280,7 +262,7 @@ LIMIT 1", } // END - if // Load all users - $OUT = ''; $SW = 2; + $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { // Merge more data in $content = merge_array($content, $templateContent); @@ -293,7 +275,8 @@ LIMIT 1", if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">' . translateComma($content['emails_sent']) . ']'; // Add nickname - if ((empty($content['nickname'])) || ($content['nickname'] == $content['userid'])) $content['nickname'] = '---'; + $content['nickname'] = '{--EXT_NICKNAME_404--}'; + if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']); // Calculate total points $content['points'] = countSumTotalData($content['userid'], 'user_points', 'points') - countSumTotalData($content['userid'], 'user_data', 'used_points'); @@ -305,9 +288,7 @@ LIMIT 1", } // END - if // Transfer data to array - $content['sw'] = $SW; $content['email'] = '[' . $content['email'] . ']'; - $content['alinks'] = generateMemberAdminActionLinks($content['userid'], $content['status']); $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2); $content['refs'] = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true); $content['locked'] = countSumTotalData($content['userid'], 'user_points', 'locked_points'); @@ -315,9 +296,6 @@ LIMIT 1", // 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'] . '%}">' . translateComma($content['refs']) . ']'; - // Is the lock reason not set? - if (!isset($content['lock_reason'])) $content['lock_reason'] = '---'; - // Is the extension 'country' installed? // @TODO Rewrite this into a filter if (isExtensionActive('country')) { @@ -330,7 +308,6 @@ LIMIT 1", // Load row template and switch colors $OUT .= loadTemplate('admin_list_user_row', true, $content); - $SW = 3 - $SW; } // END - while // Free memory @@ -343,13 +320,13 @@ 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'))))); + $content['title'] = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestParameter(('status')))); } elseif (isGetRequestParameterSet('mode')) { // Set title according to the "mode" - $content['title'] = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(getRequestParameter('mode')))); + $content['title'] = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestParameter('mode'))); } // Merge more data again @@ -359,7 +336,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