X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=2d6592c839600bcef9fb2f6624cbe27d51cf22a0;hp=53bfce2af9f2f6f2795b85565f41f82a872125cb;hb=adb05fb6876bdca84e73f4ea04998c1400e2cfb7;hpb=a49d1f4613f3f7d47fb57d946e9f7f705bd34a9b
diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 53bfce2af9..2d6592c839 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,20 +84,20 @@ 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', ''); }
+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'] . ']';
-
- // Fix empty module
- if (empty($content['last_module'])) $content['last_module'] = '---';
+ 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 . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]';
+ if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}]';
// Calculate timestamp for birthday
$stamp = mktime(0, 0, 0, $content['birth_month'], $content['birth_day'], $content['birth_year']);
@@ -138,54 +134,50 @@ 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);
$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_points'] = getTotalPoints($content['userid']);
+ $content['locked_points'] = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points');
+
+ // Prepare array for filter
+ $data = array(
+ 'userid' => $content['userid'],
+ 'points' => 0
+ );
+
+ // Run the filter chain
+ $data = runFilterChain('get_own_points', $data);
+
+ // Add more data
+ $content['own_points'] = $data['points'];
$content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
+ $content['nickname'] = '{--EXT_NICKNAME_404--}';
- // Is the lock reason not set?
- if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
+ // Link to email_details if some are sent
+ if ($content['emails_sent'] > 0) {
+ $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">}{%pipe,translateComma=' . $content['emails_sent'] . '%}]';
+ } // END - if
// 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 (getExtensionVersion('user') >= '0.3.4') {
- // Then "translate" the number
- $content['rand_confirmed'] = translateComma($content['rand_confirmed']);
+ if (isExtensionInstalled('nickname')) {
+ $content['nickname'] = getNickname($content['userid']);
} // 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) {
+ } elseif ($content['country'] == '0') {
// Zero id???
$content['country'] = '???';
}
@@ -197,31 +189,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));
+ displayMessage(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 (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,108 +225,98 @@ 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'));
+ displayMessage('{--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) {
+ if (!SQL_HASZERONUMS($result_master)) {
// 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;
+ $OUT = '';
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'] . '%}">{%pipe,translateComma=' . $content['links'] . '%}]';
+ } // END - if
// 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'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}]';
+ } // END - if
// 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['nickname'] = '{--EXT_NICKNAME_404--}';
+ if (isExtensionInstalled('nickname')) {
+ $content['nickname'] = getNickname($content['userid']);
+ } // END - if
// 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'], 'user_refs', 'id', 'userid', true);
+ $content['own_points'] = countSumTotalData($content['userid'], 'user_points', 'points') + countSumTotalData($content['userid'], 'user_points', 'order_points');
+ $content['locked_points'] = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_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'] . ']';
-
- // Is the lock reason not set?
- if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
+ if ($content['refs'] > 0) {
+ $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]';
+ } // END - if
// Is the extension 'country' installed?
// @TODO Rewrite this into a filter
@@ -348,7 +330,6 @@ LIMIT 1",
// Load row template and switch colors
$OUT .= loadTemplate('admin_list_user_row', true, $content);
- $SW = 3 - $SW;
} // END - while
// Free memory
@@ -360,21 +341,14 @@ LIMIT 1",
// Remember all rows
$content['rows'] = $OUT;
- // Init title with "all accounts"
- $content['title'] = getMessage('ADMIN_ALL_ACCOUNTS');
- if (isGetRequestElementSet(('status'))) {
- // Set title according to the 'status'
- $content['title'] = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(getRequestElement(('status')))));
- } elseif (isGetRequestElementSet('mode')) {
- // Set title according to the "mode"
- $content['title'] = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(getRequestElement('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'));
+ displayMessage('{--ADMIN_NO_NONE_REGISTERED--}');
}
// Free memory