X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=d721f6f0f03ce092ab0799c09a3400d253398630;hp=53e8a7c6579596445c0874cd80a63d755c7f0100;hb=6560179e7c8dc565485503f374d4e31f333ffd0e;hpb=a226d81121cb96048b1ed85fd8584a87d435b0db
diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 53e8a7c657..d721f6f0f0 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -14,12 +14,10 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 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 *
@@ -43,63 +41,56 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
-
-if ((!isExtensionInstalled('user')) || (!isExtensionActive('user'))) {
- // Missing extension!
- loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('user'));
- return;
-} // END - if
+addYouAreHereLink('admin', __FILE__);
// Init variables
$MORE = '';
-$colspan = 4;
-
-// Add nickname if extension is found&active
-// @TODO Rewrite these if-blocks in a filter
-if (isExtensionActive('nickname')) {
- // Add nickname
- $MORE .= ", `nickname`";
-} else {
- $MORE .= ", `userid`";
-}
-
-// Add random confirmed if extension version matches
-if (isExtensionInstalledAndNewer('user', '0.3.4')) {
- // Add it...
- $MORE .= ", `rand_confirmed`";
- // Add lock reason?
- if (isExtensionInstalledAndNewer('user', '0.3.5')) {
- // Add them...
- $MORE .= ", `lock_reason`, UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`";
- } // END - if
+// Add lock reason?
+if (isExtensionInstalledAndNewer('user', '0.3.5')) {
+ // Add them...
+ $MORE .= ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
} // END - if
// 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 (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']) . ']';
+ 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']);
@@ -129,27 +125,37 @@ LIMIT 1",
// Is this above zero?
if ($stamp > 0) {
// Then use it
- $content['birthday'] = generateDateTime($stamp, 3);
+ $content['birthday'] = generateDateTime($stamp, '2');
} else {
// Zero or below so set zero!
- $content['birthday'] = generateDateTime(0, 3);
+ $content['birthday'] = generateDateTime(0, '2');
}
// Prepare data for template
$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'] = countSumTotalData($userid, 'user_points', 'points');
- $content['locked'] = countSumTotalData($userid, 'user_points', 'locked_points');
- $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
- $content['nickname'] = '{--EXT_NICKNAME_404--}';
-
- // Nickname inclusion?
- // @TODO Rewrite these to filters
- if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']);
+ $content['last_online'] = generateDateTime($content['last_online'], '2');
+ $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['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');
+
+ // 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
// Clickrate
$content['click_rate'] = '0';
@@ -173,85 +179,111 @@ LIMIT 1",
loadTemplate('admin_user_details', false, $content);
} else {
// Account does not exist!
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', $userid));
+ displayMessage('{%message,ADMIN_MEMBER_404=' . $userid . '%}');
}
// Free the result
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
- $whereStatement .= " AND `refid`=0";
+ $whereStatement .= ' AND (`refid`=0 OR `refid` IS NULL)';
} else {
// Add WHERE statement
- $whereStatement = " WHERE `refid`=0";
+ $whereStatement = ' WHERE (`refid`=0 OR `refid` IS NULL)';
}
break;
+ case 'random_refid': // Users available for random referral id
+ if (!empty($whereStatement)) {
+ // Add AND statement
+ $whereStatement .= ' AND `rand_confirmed` >= {?user_min_confirmed?}';
+ } else {
+ // Add WHERE statement
+ $whereStatement = ' WHERE `rand_confirmed` >= {?user_min_confirmed?}';
+ }
+ break;
+
+ case 'testers': // Test accounts
+ // Add statement through filter
+ $whereStatement = runFilterChain('user_inclusion_sql', $whereStatement);
+ break;
+
default: // Invalid list mode
- logDebugMessage(__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`, `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",
- 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);
- loadTemplate('admin_settings_saved', false, '{--EXTENSION_WARNING_USER_LIMIT--}');
+
+ // ... 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['colspan2'] = ($colspan + 2);
- $templateContent['user_count'] = getTotalConfirmedUser();
-
- // Sorting links
- $templateContent['alpha_sort'] = alpha(getRequestParameter('sortby'), ($colspan + 1), true);
- $templateContent['sort_links'] = addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'), ($colspan + 1), true);
- $templateContent['page_nav'] = '';
-
- if ($numPages > 1) {
- $templateContent['page_nav'] = addPageNavigation($numPages, getConfig('user_limit'), true, $colspan, true);
- } // END - if
+ // Sorting links and number of pages
+ $templateContent['sort_links'] = addSortLinks(getRequestElement('letter'), getRequestElement('sortby'));
+ $templateContent['num_pages'] = $numPages;
// Column with nickname when nickname extension is present
// @TODO Rewrite this into a filter
@@ -268,33 +300,55 @@ LIMIT 1",
$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']) . ']';
+ $content['links'] = getTotalUnconfirmedMails($content['userid']);
+ 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']) . ']';
-
- // Add nickname
- $content['nickname'] = '{--EXT_NICKNAME_404--}';
- if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']);
-
- // Calculate total points
- $content['points'] = getTotalPoints($content['userid']);
+ if ($content['emails_sent'] > 0) {
+ $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}]';
+ } // END - if
- // Clickrate
- $content['rate'] = '0';
+ // Click rate
+ $content['click_rate'] = '0';
if ($content['emails_received'] > 0) {
- $content['rate'] = $content['mails_confirmed'] / $content['emails_received'] * 100;
+ $content['click_rate'] = $content['mails_confirmed'] / $content['emails_received'] * 100;
} // END - if
// Transfer data to array
$content['email'] = '[' . $content['email'] . ']';
- $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
+ $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'] . '%}">' . translateComma($content['refs']) . ']';
+ // 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
// Is the extension 'country' installed?
// @TODO Rewrite this into a filter
@@ -319,16 +373,6 @@ LIMIT 1",
// Remember all rows
$content['rows'] = $OUT;
- // Init title with "all accounts"
- $content['title'] = '{--ADMIN_ALL_ACCOUNTS--}';
- if (isGetRequestParameterSet('status')) {
- // Set title according to the 'status'
- $content['title'] = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestParameter('status')));
- } elseif (isGetRequestParameterSet('mode')) {
- // Set title according to the "mode"
- $content['title'] = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestParameter('mode')));
- }
-
// Merge more data again
$content = merge_array($content, $templateContent);
@@ -336,7 +380,7 @@ LIMIT 1",
loadTemplate('admin_list_user', false, $content);
} else {
// No one as registered so far! :-(
- loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_NONE_REGISTERED--}');
+ displayMessage('{--ADMIN_NO_NONE_REGISTERED--}');
}
// Free memory