X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=0c861764522ffd981c4a34001ed85d600346c553;hp=b8ce9527871867eb46d178d62a55612f51cfb3c6;hb=0fada672e2066043b76ed5d57f852f451a49a3a3;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc
diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index b8ce952787..0c86176452 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -14,11 +14,9 @@
* $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 *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -43,52 +41,31 @@ 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', 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['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'] = '---';
+ 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']);
@@ -132,35 +105,38 @@ 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['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);
-
- // Is the lock reason not set?
- if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
-
- // 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'] = '{--EXT_NICKNAME_404--}';
- }
+ $content['last_online'] = generateDateTime($content['last_online'], '0');
+ $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_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);
+
+ // 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';
@@ -184,20 +160,20 @@ 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 ((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
- if (isGetRequestParameterSet(('status'))) {
+ if (isGetRequestParameterSet('status')) {
// Is a WHERE statement already there?
if (!empty($whereStatement)) {
// Then append the status column
@@ -212,21 +188,31 @@ LIMIT 1",
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 referal 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;
default: // Invalid list mode
- logDebugMessage(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestParameter('mode')));
+ debug_report_bug(__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",
+ $sql = sprintf("SELECT `userid`, `email`, `emails_sent`, `mails_confirmed`, `emails_received`" . $MORE . " FROM `{?_MYSQL_PREFIX?}_user_data`" . $whereStatement . " ORDER BY `%s` ASC",
getRequestParameter('sortby')
);
@@ -236,7 +222,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, '{--EXTENSION_WARNING_USER_LIMIT--}');
+ displayMessage('{--EXTENSION_WARNING_USER_LIMIT--}');
} // END - if
// Activate the extension please!
@@ -250,7 +236,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();
@@ -273,42 +259,39 @@ 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);
// 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
- if ((empty($content['nickname'])) || ($content['nickname'] == $content['userid'])) $content['nickname'] = '---';
-
- // Calculate total points
- $content['points'] = countSumTotalData($content['userid'], 'user_points', 'points') - countSumTotalData($content['userid'], 'user_data', 'used_points');
+ 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['sw'] = $SW;
$content['email'] = '[' . $content['email'] . ']';
$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');
+ $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'] . '%}">' . translateComma($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
@@ -322,7 +305,6 @@ LIMIT 1",
// Load row template and switch colors
$OUT .= loadTemplate('admin_list_user_row', true, $content);
- $SW = 3 - $SW;
} // END - while
// Free memory
@@ -334,16 +316,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'] = 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(getRequestParameter('mode'))));
- }
-
// Merge more data again
$content = merge_array($content, $templateContent);
@@ -351,7 +323,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