X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=d721f6f0f03ce092ab0799c09a3400d253398630;hp=91f225c556313a4dc4f285f8dc757120764c8ff4;hb=6560179e7c8dc565485503f374d4e31f333ffd0e;hpb=0f3a135204757cc8750262871c8e62c42300acb4
diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 91f225c556..d721f6f0f0 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -16,8 +16,8 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -55,27 +55,42 @@ if (isExtensionInstalledAndNewer('user', '0.3.5')) {
// Is the extension 'country' installed?
if (isExtensionActive('country')) {
// Add country code
- $MORE .= ', `country_code`';
+ $MORE .= ',`country_code`';
} else {
// Add direct value
- $MORE .= ', `country`';
+ $MORE .= ',`country`';
}
// Init unset data
-if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', ''); }
-if (!isGetRequestParameterSet('sortby')) { setGetRequestParameter('sortby', 'userid'); }
-if (!isGetRequestParameterSet('page')) { setGetRequestParameter('page' , 1); }
+if (!isGetRequestElementSet('letter')) { setGetRequestElement('letter', ''); }
+if (!isGetRequestElementSet('sortby')) { setGetRequestElement('sortby', 'userid'); }
+if (!isGetRequestElementSet('page')) { setGetRequestElement('page' , 1); }
// Set base URL
$base = '[ 0) $content['links'] = $base . '&what=list_links&userid=' . $userid . '%}">' . $content['links'] . ']';
- 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'] . '%}]';
+ if ($content['links'] > 0) {
+ $content['links'] = $base . '&what=list_links&userid=' . $userid . '%}">' . $content['links'] . ']';
+ } // END - if
+ if ($content['refs'] > 0) {
+ $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]';
+ } // END - if
+ if ($content['cats'] > 0) {
+ $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}]';
+ } // END - if
// Calculate timestamp for birthday
$stamp = mktime(0, 0, 0, $content['birth_month'], $content['birth_day'], $content['birth_year']);
@@ -116,7 +137,6 @@ LIMIT 1",
$content['joined'] = generateDateTime($content['joined'], '2');
$content['last_update'] = generateDateTime($content['last_update'], '2');
$content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], '2');
- $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
@@ -166,24 +186,24 @@ LIMIT 1",
SQL_FREERESULT($result_user);
} else {
$whereStatement = '';
- if (isGetRequestParameterSet('letter')) {
+ if (isGetRequestElementSet('letter')) {
// List only persons w
- $whereStatement = " WHERE `family` LIKE '".getRequestParameter('letter') . "%%'";
+ $whereStatement = " WHERE `family` LIKE '".getRequestElement('letter') . "%%'";
} // END - if
// Parse the status or mode parameter
- if (isGetRequestParameterSet('status')) {
+ if (isGetRequestElementSet('status')) {
// Is a WHERE statement already there?
if (!empty($whereStatement)) {
// Then append the status column
- $whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestParameter('status')))));
+ $whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestElement('status')))));
} else {
// Start a new one
- $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestParameter('status')))));
+ $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestElement('status')))));
}
- } elseif (isGetRequestParameterSet('mode')) {
+ } elseif (isGetRequestElementSet('do')) {
// Choose what we need to list
- switch (getRequestParameter('mode')) {
+ switch (getRequestElement('do')) {
case 'norefs': // Users w/o refs
if (!empty($whereStatement)) {
// Add AND statement
@@ -194,7 +214,7 @@ LIMIT 1",
}
break;
- case 'random_refid': // Users available for random referal id
+ case 'random_refid': // Users available for random referral id
if (!empty($whereStatement)) {
// Add AND statement
$whereStatement .= ' AND `rand_confirmed` >= {?user_min_confirmed?}';
@@ -204,43 +224,65 @@ LIMIT 1",
}
break;
+ case 'testers': // Test accounts
+ // Add statement through filter
+ $whereStatement = runFilterChain('user_inclusion_sql', $whereStatement);
+ break;
+
default: // Invalid list mode
- debug_report_bug(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestParameter('mode')));
+ reportBug(__FILE__, __LINE__, sprintf("Invalid do %s detected.", SQL_ESCAPE(secureString(getRequestElement('do')))));
break;
} // END - switch
+
+ // If it is not 'testers', add exclusion SQL
+ if (getRequestElement('do') != 'testers') {
+ // Exclude tester users
+ $whereStatement = runFilterChain('user_exclusion_sql', $whereStatement);
+ } // END - if
} // END - if
// Generate master query string
- $sql = sprintf("SELECT `userid`,`email`,`emails_sent`,`mails_confirmed`,`emails_received`" . $MORE . " FROM `{?_MYSQL_PREFIX?}_user_data`" . $whereStatement . " ORDER BY `%s` ASC",
- getRequestParameter('sortby')
+ $sql = sprintf("SELECT
+ `userid`,
+ `email`,
+ `emails_sent`,
+ `mails_confirmed`,
+ `emails_received`
+ " . $MORE . "
+FROM
+ `{?_MYSQL_PREFIX?}_user_data`
+" . $whereStatement . "
+ORDER BY
+ `%s` ASC",
+ getRequestElement('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') {
+ // Is the user limit zero?
+ if (getUserLimit() == '0') {
+ // Then set it to default ...
setConfigEntry('user_limit', 100);
+
+ // ... but output warning
displayMessage('{--EXTENSION_WARNING_USER_LIMIT--}');
} // END - if
- // Activate the extension please!
- $numPages = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5);
+ // Calculate page count (0.5 fixes a bug with page count)
+ $numPages = round(SQL_NUMROWS($result_master) / getUserLimit() + 0.5);
- if (!isGetRequestParameterSet('page')) setGetRequestParameter('page' , 1);
- if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getConfig('user_limit'));
+ if (!isGetRequestElementSet('page')) setGetRequestElement('page' , 1);
+ if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getUserLimit());
// Add limitation to SQL string and run him again
- $sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset');
+ $sql .= ' LIMIT ' . (getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset');
$result = SQL_QUERY($sql, __FILE__, __LINE__);
// Are there some entries?
if (!SQL_HASZERONUMS($result_master)) {
- // We have some (new?) registrations!
- $templateContent['user_count'] = getTotalConfirmedUser();
-
// Sorting links and number of pages
- $templateContent['sort_links'] = addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'));
+ $templateContent['sort_links'] = addSortLinks(getRequestElement('letter'), getRequestElement('sortby'));
$templateContent['num_pages'] = $numPages;
// Column with nickname when nickname extension is present
@@ -278,10 +320,32 @@ LIMIT 1",
$content['email'] = '[' . $content['email'] . ']';
$content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], '2');
$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
+ // Prepare array for filter
+ $data = array(
+ 'userid' => $content['userid'],
+ 'points' => 0
+ );
+
+ // Run the filter chain
+ $data = runFilterChain('get_own_points', $data);
+
+ // Copy points
+ $content['own_points'] = $data['points'];
+
+ // Prepare array for filter again
+ $data = array(
+ 'userid' => $content['userid'],
+ 'points' => 0
+ );
+
+ // Run the filter chain
+ $data = runFilterChain('get_locked_points', $data);
+
+ // Copy points
+ $content['locked_points'] = $data['points'];
+
+ // If we have at least one referral, make it clickable to referral list
if ($content['refs'] > 0) {
$content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]';
} // END - if