X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=5c8220c82393724919674abd414c5c35aa03569d;hp=480eea6662ea5e57fc419fbbf86e3daa8fb83c64;hb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 480eea6662..5c8220c823 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -1,7 +1,7 @@ = '0.3.4') { +if (isExtensionInstalledAndNewer('user', '0.3.4')) { // Add it... $MORE .= ", `rand_confirmed`"; // Add lock reason? - if (getExtensionVersion('user') >= '0.3.5') { + 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 @@ -85,16 +86,16 @@ if (isExtensionActive('country')) { } // Init unset data -if (!isGetRequestElementSet('letter')) { setRequestGetElement('letter', getMessage('_ALL2')); } -if (!isGetRequestElementSet('sortby')) { setRequestGetElement('sortby', 'userid'); } -if (!isGetRequestElementSet('page')) { setRequestGetElement('page' , '1'); } +if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', getMessage('_ALL2')); } +if (!isGetRequestParameterSet('sortby')) { setGetRequestParameter('sortby', 'userid'); } +if (!isGetRequestParameterSet('page')) { setGetRequestParameter('page' , 1); } // Set base URL -$base = '[ 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 ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $userid . '%}">' . $content['links'] . ']'; + 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'] = '---'; @@ -131,26 +132,22 @@ LIMIT 1", // Is this above zero? if ($stamp > 0) { // Then use it - $content['birthday'] = generateDateTime($stamp, '3'); + $content['birthday'] = generateDateTime($stamp, 3); } else { // Zero or below so set zero! - $content['birthday'] = generateDateTime(0, '3'); + $content['birthday'] = generateDateTime(0, 3); } // 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'); - $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['lock_timestamp'] = generateDateTime($content['lock_timestamp'], '2'); + $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'] = 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'] = '---'; @@ -165,28 +162,18 @@ LIMIT 1", $content['nickname'] = getMessage('EXT_NICKNAME_404'); } - // Is the user extension newer? - if (getExtensionVersion('user') >= '0.3.4') { - // Then "translate" the number - $content['rand_confirmed'] = translateComma($content['rand_confirmed']); - } // END - if - // Clickrate - $content['click_rate'] = 0; + $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 - // "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 $content['country'] = generateCountryInfo($content['country_code']); - } elseif ($content['country'] == 0) { - // Zero ID??? + } elseif ($content['country'] == '0') { + // Zero id??? $content['country'] = '???'; } @@ -197,31 +184,31 @@ LIMIT 1", loadTemplate('admin_user_details', false, $content); } else { // Account does not exist! - loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), $userid)); + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', $userid)); } // Free the result SQL_FREERESULT($result_user); } else { $whereStatement = ''; - if ((getRequestElement('letter') != getMessage('_ALL2')) && (getRequestElement('letter') != getMessage('_OTHERS')) && (isGetRequestElementSet('letter'))) { + if ((getRequestParameter('letter') != getMessage('_ALL2')) && (getRequestParameter('letter') != getMessage('_OTHERS')) && (isGetRequestParameterSet('letter'))) { // List only persons w - $whereStatement = " WHERE `family` LIKE '".getRequestElement('letter') . "%'"; + $whereStatement = " WHERE `family` LIKE '".getRequestParameter('letter') . "%'"; } // END - if // Parse the status or mode parameter - if (isGetRequestElementSet(('status'))) { + if (isGetRequestParameterSet(('status'))) { // Is a WHERE statement already there? if (!empty($whereStatement)) { // Then append the status column - $whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestElement('status'))))); + $whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestParameter('status'))))); } else { // Start a new one - $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestElement('status'))))); + $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestParameter('status'))))); } - } elseif (isGetRequestElementSet('mode')) { + } elseif (isGetRequestParameterSet('mode')) { // Choose what we need to list - switch (getRequestElement('mode')) { + switch (getRequestParameter('mode')) { case 'norefs': // Users w/o refs if (!empty($whereStatement)) { // Add AND statement @@ -233,105 +220,92 @@ LIMIT 1", break; default: // Invalid list mode - logDebugMessage(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestElement('mode'))); + logDebugMessage(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestParameter('mode'))); break; } // END - switch } // END - if // Generate master query string $sql = sprintf("SELECT `userid`, `gender`, `surname`, `family`, `email`, `REMOTE_ADDR`, `refid`, `status`, `emails_sent`, `mails_confirmed`, `emails_received`" . $MORE . " FROM `{?_MYSQL_PREFIX?}_user_data`" . $whereStatement . " ORDER BY `%s` ASC", - getRequestElement('sortby') + getRequestParameter('sortby') ); // Prepare SQL and run it $result_master = SQL_QUERY($sql, __FILE__, __LINE__); // Calculate page count (0.5 fixes a bug with page count) - if (getConfig('user_limit') == 0) { + 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 (!isGetRequestElementSet('page')) setRequestGetElement('page' , '1'); - if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', getConfig('user_limit')); + 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 ".(getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')).", ".getRequestElement('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(getRequestElement('sortby'), $colspan, true)); - define('__SORT_LINKS', addSortLinks(getRequestElement('letter'), getRequestElement('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', " {--NICKNAME--}"); - } else { - // Not found - define('__NICKNAME_TH', ''); - } + $templateContent['nickname_th'] = '{--NICKNAME--}'; + } // END - if // Load all users $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { - // Set refid link - if ($content['refid'] > 0) $content['refid'] = generateUserProfileLink($content['refid']); + // Merge more data in + $content = merge_array($content, $templateContent); // 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']) . ']'; + if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $content['userid'] . '%}">' . translateComma($content['links']) . ']'; // Set link to sent mails if present - if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '">' . translateComma($content['emails_sent']) . ']'; + 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'] = '---'; // Calculate total points - $pointsTotal = countSumTotalData($content['userid'], 'user_points', 'points') - countSumTotalData($content['userid'], 'user_data', 'used_points'); + $content['points'] = countSumTotalData($content['userid'], 'user_points', 'points') - countSumTotalData($content['userid'], 'user_data', 'used_points'); // Clickrate - $clickRate = 0; + $content['rate'] = '0'; if ($content['emails_received'] > 0) { - $clickRate = $content['mails_confirmed'] / $content['emails_received'] * 100; + $content['rate'] = $content['mails_confirmed'] / $content['emails_received'] * 100; } // END - if // 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($pointsTotal); - $content['rate'] = translateComma($clickRate); - $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'], 'refsystem', 'counter'); + $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'); // 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'] = '---'; @@ -342,7 +316,7 @@ LIMIT 1", // Then overwrite country information $content['country'] = generateCountryInfo($content['country_code']); } elseif ($content['country'] == '') { - // Zero ID??? + // Zero id??? $content['country'] = '???'; } @@ -362,19 +336,22 @@ LIMIT 1", // Init title with "all accounts" $content['title'] = getMessage('ADMIN_ALL_ACCOUNTS'); - if (isGetRequestElementSet(('status'))) { + if (isGetRequestParameterSet(('status'))) { // Set title according to the 'status' - $content['title'] = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(getRequestElement(('status'))))); - } elseif (isGetRequestElementSet('mode')) { + $content['title'] = getMessage(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(getRequestElement('mode')))); + $content['title'] = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(getRequestParameter('mode')))); } + // Merge more data again + $content = merge_array($content, $templateContent); + // Load main template 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