X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=c10ec781d71edebef4de70d8331e55b80a0fb945;hp=3d497c18d38997f88cee2b8e059ab9c41bcdf637;hb=76fd13e5938a334f08e43893eb9a4ff49f72bf07;hpb=bc72f913ef9ef26f4103d3deddb4d8be5337a1e5
diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 3d497c18d3..c10ec781d7 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -18,6 +18,7 @@
* 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 *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -64,12 +65,12 @@ if (isExtensionActive('nickname')) {
}
// Add random confirmed if extension version matches
-if (getExtensionVersion('user') >= '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";
} // END - if
@@ -85,16 +86,16 @@ if (isExtensionActive('country')) {
}
// Init unset data
-if (!isGetRequestElementSet('letter')) { setGetRequestElement('letter', getMessage('_ALL2')); }
-if (!isGetRequestElementSet('sortby')) { setGetRequestElement('sortby', 'userid'); }
-if (!isGetRequestElementSet('page')) { setGetRequestElement('page' , 1); }
+if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', getMessage('_ALL2')); }
+if (!isGetRequestParameterSet('sortby')) { setGetRequestParameter('sortby', 'userid'); }
+if (!isGetRequestParameterSet('page')) { setGetRequestParameter('page' , 1); }
// Set base URL
$base = '[ 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);
@@ -166,7 +164,7 @@ LIMIT 1",
}
// Is the user extension newer?
- if (getExtensionVersion('user') >= '0.3.4') {
+ if (isExtensionInstalledAndNewer('user', '0.3.4')) {
// Then "translate" the number
$content['rand_confirmed'] = translateComma($content['rand_confirmed']);
} // END - if
@@ -177,10 +175,6 @@ LIMIT 1",
$content['click_rate'] = translateComma($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
@@ -204,24 +198,24 @@ LIMIT 1",
SQL_FREERESULT($result_user);
} else {
$whereStatement = '';
- if ((getRequestElement('letter') != getMessage('_ALL2')) && (getRequestElement('letter') != getMessage('_OTHERS')) && (isGetRequestElementSet('letter'))) {
+ if ((getRequestParameter('letter') != getMessage('_ALL2')) && (getRequestParameter('letter') != getMessage('_OTHERS')) && (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,14 +227,14 @@ 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
@@ -255,46 +249,42 @@ LIMIT 1",
// Activate the extension please!
$PAGES = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5);
- if (!isGetRequestElementSet('page')) setGetRequestElement('page' , 1);
- if (!isGetRequestElementSet('offset')) setGetRequestElement('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) {
// 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', '');
- }
+ $templateContent['page_nav'] = addPageNavigation($PAGES, 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;
while ($content = SQL_FETCHARRAY($result)) {
+ // Merge more data in
+ $content = merge_array($content, $templateContent);
+
// Set refid link
if ($content['refid'] > 0) $content['refid'] = generateUserProfileLink($content['refid']);
@@ -321,7 +311,7 @@ LIMIT 1",
$content['sw'] = $SW;
$content['userid_link'] = generateUserProfileLink($content['userid']);
$content['gender'] = translateGender($content['gender']);
- $content['email'] = '[' . $content['email'] . ']';
+ $content['email'] = '[' . $content['email'] . ']';
$content['alinks'] = generateMemberAdminActionLinks($content['userid'], $content['status']);
$content['points'] = translateComma($content['points']);
$content['rate'] = translateComma($content['rate']);
@@ -362,14 +352,17 @@ LIMIT 1",
// Init title with "all accounts"
$content['title'] = getMessage('ADMIN_ALL_ACCOUNTS');
- if (isGetRequestElementSet(('status'))) {
+ if (isGetRequestParameterSet(('status'))) {
// Set title according to the 'status'
- $content['title'] = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(getRequestElement(('status')))));
- } elseif (isGetRequestElementSet('mode')) {
+ $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(getRequestElement('mode'))));
+ $content['title'] = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(getRequestParameter('mode'))));
}
+ // Merge more data again
+ $content = merge_array($content, $templateContent);
+
// Load main template
loadTemplate('admin_list_user', false, $content);
} else {