X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=6bb9c7cf42a2754a048800916d21d49af95e2f7b;hb=c5173c4d66be7ec72fbf8051a2097cbb377e87a0;hp=3697eb485fe093da2b6bba0916c5a6d49fb68550;hpb=58bd7e0df5e4bee593b7ad46d66d3b1acbec2886;p=mailer.git
diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 3697eb485f..6bb9c7cf42 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -14,8 +14,6 @@
* $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 *
@@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
if ((!isExtensionInstalled('user')) || (!isExtensionActive('user'))) {
// Missing extension!
@@ -86,9 +84,9 @@ if (isExtensionActive('country')) {
}
// Init unset data
-if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', '{--_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']) . ']';
+ 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,7 +136,7 @@ LIMIT 1",
// 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']) . ']';
+ if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $userid . '%}">}{%pipe,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);
@@ -180,13 +178,13 @@ LIMIT 1",
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
@@ -239,7 +237,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();
@@ -262,25 +260,22 @@ 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']) . ']';
+ if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $content['userid'] . '%}">{%pipe,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'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}]';
// Add nickname
$content['nickname'] = '{--EXT_NICKNAME_404--}';
if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']);
- // Calculate total points
- $content['points'] = countSumTotalData($content['userid'], 'user_points', 'points') - countSumTotalData($content['userid'], 'user_data', 'used_points');
-
// Clickrate
$content['rate'] = '0';
if ($content['emails_received'] > 0) {
@@ -288,14 +283,13 @@ LIMIT 1",
} // 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');
// 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']) . ']';
+ if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]';
// Is the extension 'country' installed?
// @TODO Rewrite this into a filter
@@ -309,7 +303,6 @@ LIMIT 1",
// Load row template and switch colors
$OUT .= loadTemplate('admin_list_user_row', true, $content);
- $SW = 3 - $SW;
} // END - while
// Free memory
@@ -323,12 +316,12 @@ LIMIT 1",
// Init title with "all accounts"
$content['title'] = '{--ADMIN_ALL_ACCOUNTS--}';
- if (isGetRequestParameterSet(('status'))) {
+ if (isGetRequestParameterSet('status')) {
// Set title according to the 'status'
- $content['title'] = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(getRequestParameter(('status')))));
+ $content['title'] = 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'))));
+ $content['title'] = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestParameter('mode')));
}
// Merge more data again