X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=52d2998e15abc677b5e247ad7448b3a85e3cecc0;hb=875fc680630af5fdf69f42e77321d807e182916d;hp=fbd7ada82d83453688b2d74cd76619a6c8acfb1b;hpb=de454a4f3cba4ac73cb9a0bc4dc02f81bdd4e53f;p=mailer.git
diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index fbd7ada82d..52d2998e15 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -38,11 +38,11 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
-} elseif ((!EXT_IS_ACTIVE('user')) || (GET_EXT_VERSION('user') == "")) {
+} elseif ((!EXT_IS_ACTIVE('user')) || (GET_EXT_VERSION('user') == '')) {
// Missing extension!
- addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'user');
+ addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('user'));
return;
}
@@ -52,11 +52,11 @@ ADD_DESCR('admin', __FILE__);
// Init title with "all accounts"
$listHeader = getMessage('ADMIN_ALL_ACCOUNTS');
if (REQUEST_ISSET_GET(('status'))) {
- // Set title according to the "status"
+ // Set title according to the 'status'
$listHeader = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(REQUEST_GET(('status')))));
-} elseif (REQUEST_ISSET_GET(('mode'))) {
+} elseif (REQUEST_ISSET_GET('mode')) {
// Set title according to the "mode"
- $listHeader = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(REQUEST_GET(('mode')))));
+ $listHeader = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(REQUEST_GET('mode'))));
}
// Remember it
@@ -89,13 +89,13 @@ if (EXT_IS_ACTIVE('country')) {
$MORE .= ", country";
}
-// Init unset data (bad that we change $_GET here!)
-if (!REQUEST_ISSET_GET(('letter'))) { REQUEST_SET_GET('letter', getMessage('_ALL2')); }
-if (!REQUEST_ISSET_GET(('sortby'))) { REQUEST_SET_GET('sortby', 'userid'); }
-if (!REQUEST_ISSET_GET(('page'))) { REQUEST_SET_GET('page' , "1"); }
+// Init unset data
+if (!REQUEST_ISSET_GET('letter')) { REQUEST_SET_GET('letter', getMessage('_ALL2')); }
+if (!REQUEST_ISSET_GET('sortby')) { REQUEST_SET_GET('sortby', 'userid'); }
+if (!REQUEST_ISSET_GET('page')) { REQUEST_SET_GET('page' , '1'); }
// Set base URL
-$BASE = "[ 0) $LINKS = $BASE."&what=list_links&uid=".$uid."\">".$LINKS."]";
- if ($DATA['refid'] > 0) $DATA['refid'] = $BASE."&what=list_user&uid=".$DATA['refid']."\">".$DATA['refid']."]";
- if (empty($DATA['last_module'])) $DATA['last_module'] = "---";
- if ($REFS > 0) $REFS = $BASE."&what=list_refs&uid=".$uid."\">".$REFS."]";
- if ($CATS > 0) $CATS = $BASE."&what=list_cats&uid=".$uid."\">".$CATS."]";
+ if ($LINKS > 0) $LINKS = $base."&what=list_links&uid=".$uid."\">".$LINKS."]";
+ if ($DATA['refid'] > 0) $DATA['refid'] = $base."&what=list_user&uid=".$DATA['refid']."\">".$DATA['refid']."]";
+ if (empty($DATA['last_module'])) $DATA['last_module'] = '---';
+ if ($REFS > 0) $REFS = $base."&what=list_refs&uid=".$uid."\">".$REFS."]";
+ if ($CATS > 0) $CATS = $base."&what=list_cats&uid=".$uid."\">".$CATS."]";
// Calculate timestamp for birthday
$stamp = mktime(0, 0, 0, $DATA['birth_month'], $DATA['birth_day'], $DATA['birth_year']);
@@ -129,38 +129,38 @@ LIMIT 1",
// Is this above zero?
if ($stamp > 0) {
// Then use it
- define('_BIRTHDAY', MAKE_DATETIME($stamp, "3"));
+ define('_BIRTHDAY', generateDateTime($stamp, '3'));
} else {
// Zero or below so set zero!
- define('_BIRTHDAY', MAKE_DATETIME(0, "3"));
+ define('_BIRTHDAY', generateDateTime(0, '3'));
}
// Prepare data for template
define('_REFS' , $REFS);
define('_CATS' , $CATS);
define('_LINKS', $LINKS);
- define('_ADMIN_LINKS', MEMBER_ACTION_LINKS($uid, $DATA['status']));
- $DATA['gender'] = TRANSLATE_GENDER($DATA['gender']);
- $DATA['email_link'] = CREATE_EMAIL_LINK($DATA['email'], "user_data");
- $DATA['status'] = TRANSLATE_STATUS($DATA['status']);
- $DATA['last_online'] = MAKE_DATETIME($DATA['last_online'], "0");
- $DATA['used_points'] = TRANSLATE_COMMA($DATA['used_points']);
- if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $BASE."&what=email_details&uid=".$uid."\">".TRANSLATE_COMMA($DATA['emails_sent'])."]";
- $DATA['joined'] = MAKE_DATETIME($DATA['joined'], "0");
- $DATA['last_update'] = MAKE_DATETIME($DATA['last_update'], "0");
- $DATA['last_profile_sent'] = MAKE_DATETIME($DATA['last_profile_sent'], "0");
- $DATA['total'] = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "points"));
- $DATA['locked'] = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "locked_points"));
- $DATA['lock_timestamp'] = MAKE_DATETIME($DATA['lock_timestamp'], "2");
+ define('_ADMIN_LINKS', generateMemberAdminActionLinks($uid, $DATA['status']));
+ $DATA['gender'] = translateGender($DATA['gender']);
+ $DATA['email_link'] = generateMemberEmailLink($DATA['email'], "user_data");
+ $DATA['status'] = translateUserStatus($DATA['status']);
+ $DATA['last_online'] = generateDateTime($DATA['last_online'], '0');
+ $DATA['used_points'] = translateComma($DATA['used_points']);
+ if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $base."&what=email_details&uid=".$uid."\">".translateComma($DATA['emails_sent'])."]";
+ $DATA['joined'] = generateDateTime($DATA['joined'], '0');
+ $DATA['last_update'] = generateDateTime($DATA['last_update'], '0');
+ $DATA['last_profile_sent'] = generateDateTime($DATA['last_profile_sent'], '0');
+ $DATA['total'] = translateComma(GET_TOTAL_DATA($uid, "user_points", "points"));
+ $DATA['locked'] = translateComma(GET_TOTAL_DATA($uid, "user_points", "locked_points"));
+ $DATA['lock_timestamp'] = generateDateTime($DATA['lock_timestamp'], '2');
// Is the lock reason not set?
- if (!isset($DATA['lock_reason'])) $DATA['lock_reason'] = "---";
+ if (!isset($DATA['lock_reason'])) $DATA['lock_reason'] = '---';
// Nickname inclusion?
// @TODO Rewrite these to filters
if (EXT_IS_ACTIVE('nickname')) {
- // Nickname not set or invalid? Then
- if ((empty($DATA['nickname'])) || ($DATA['nickname'] == $uid)) $DATA['nickname'] = "---";
+ // Nickname not set or invalid? Then
+ if ((empty($DATA['nickname'])) || ($DATA['nickname'] == $uid)) $DATA['nickname'] = '---';
} else {
// Extension not found
$DATA['nickname'] = getMessage('EXT_NICKNAME_404');
@@ -169,18 +169,18 @@ LIMIT 1",
// Is the user extension newer?
if (GET_EXT_VERSION('user') >= '0.3.4') {
// Then "translate" the number
- $DATA['rand_confirmed'] = TRANSLATE_COMMA($DATA['rand_confirmed']);
+ $DATA['rand_confirmed'] = translateComma($DATA['rand_confirmed']);
} // END - if
// Clickrate
$DATA['click_rate'] = 0;
if ($DATA['emails_received'] > 0) {
- $DATA['click_rate'] = TRANSLATE_COMMA($DATA['mails_confirmed'] / $DATA['emails_received'] * 100);
+ $DATA['click_rate'] = translateComma($DATA['mails_confirmed'] / $DATA['emails_received'] * 100);
} // END - if
// "Translate" more data
- $DATA['mails_confirmed'] = TRANSLATE_COMMA($DATA['mails_confirmed']);
- $DATA['emails_received'] = TRANSLATE_COMMA($DATA['emails_received']);
+ $DATA['mails_confirmed'] = translateComma($DATA['mails_confirmed']);
+ $DATA['emails_received'] = translateComma($DATA['emails_received']);
// Is the extension 'country' installed?
if (EXT_IS_ACTIVE('country')) {
@@ -188,11 +188,11 @@ LIMIT 1",
$DATA['country'] = COUNTRY_GENERATE_INFO($DATA['country_code']);
} elseif ($DATA['country'] == 0) {
// Zero ID???
- $DATA['country'] = "???";
+ $DATA['country'] = '???';
}
// Load user-details template
- LOAD_TEMPLATE("admin_user_details", false, $uid);
+ LOAD_TEMPLATE('admin_user_details', false, $uid);
} else {
// Account does not exist!
LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), $uid));
@@ -202,11 +202,11 @@ LIMIT 1",
SQL_FREERESULT($result_user);
} else {
$whereStatement = '';
- if ((REQUEST_GET('letter') != getMessage('_ALL2')) && (REQUEST_GET('letter') != getMessage('_OTHERS')) && (REQUEST_ISSET_GET(('letter')))) {
+ if ((REQUEST_GET('letter') != getMessage('_ALL2')) && (REQUEST_GET('letter') != getMessage('_OTHERS')) && (REQUEST_ISSET_GET('letter'))) {
// List only persons w
- $whereStatement = " WHERE family LIKE '".REQUEST_GET('letter')."%'";
+ $whereStatement = " WHERE family LIKE '".REQUEST_GET('letter') . "%'";
} // END - if
- if (REQUEST_GET('sortby') == "family_name") REQUEST_SET_GET('sortby', "family");
+ if (REQUEST_GET('sortby') == 'family_name') REQUEST_SET_GET('sortby', 'family');
// Parse the status or mode parameter
if (REQUEST_ISSET_GET(('status'))) {
@@ -218,7 +218,7 @@ LIMIT 1",
// Start a new one
$whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(strip_tags(strtoupper(REQUEST_GET('status')))));
}
- } elseif (REQUEST_ISSET_GET(('mode'))) {
+ } elseif (REQUEST_ISSET_GET('mode')) {
// Choose what we need to list
switch (REQUEST_GET('mode')) {
case "norefs": // Users w/o refs
@@ -232,13 +232,13 @@ LIMIT 1",
break;
default: // Invalid list mode
- DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", REQUEST_GET(('mode'))));
+ DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", REQUEST_GET('mode')));
break;
}
} // END = if
// Prepare SQL and run it
- $sql = "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 ".REQUEST_GET(('sortby'));
+ $sql = "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 ".REQUEST_GET('sortby');
$result_master = SQL_QUERY($sql, __FILE__, __LINE__);
// Calculate page count (0.5 fixes a bug with page count)
@@ -250,8 +250,8 @@ LIMIT 1",
// Activate the extension please!
$PAGES = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5);
- if (!REQUEST_ISSET_GET(('page'))) REQUEST_SET_GET('page' , "1");
- if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', getConfig('user_limit'));
+ if (!REQUEST_ISSET_GET('page')) REQUEST_SET_GET('page' , '1');
+ if (!REQUEST_ISSET_GET('offset')) REQUEST_SET_GET('offset', getConfig('user_limit'));
// Add limitation to SQL string and run him again
$sql .= " LIMIT ".(REQUEST_GET('offset') * REQUEST_GET('page') - REQUEST_GET('offset')).", ".REQUEST_GET('offset');
@@ -295,17 +295,17 @@ LIMIT 1",
$OUT = ''; $SW = 2;
while ($content = SQL_FETCHARRAY($result)) {
// Set refid link
- if ($content['refid'] > 0) $content['refid'] = ADMIN_USER_PROFILE_LINK($content['refid']);
+ if ($content['refid'] > 0) $content['refid'] = generateUserProfileLink($content['refid']);
// Get number of unconfirmed mails
- $LINKS = GET_TOTAL_DATA($content['userid'], "user_links", "id", 'userid', true);
- if ($LINKS > 0) $LINKS = $BASE."&what=list_links&uid=".$content['userid']."\">".TRANSLATE_COMMA($LINKS)."]";
+ $LINKS = GET_TOTAL_DATA($content['userid'], "user_links", 'id', 'userid', true);
+ if ($LINKS > 0) $LINKS = $base."&what=list_links&uid=".$content['userid']."\">".translateComma($LINKS)."]";
// Set link to sent mails if present
- if ($content['emails_sent'] > 0) $content['emails_sent'] = $BASE."&what=email_details&uid=".$content['userid']."\">".TRANSLATE_COMMA($content['emails_sent'])."]";
+ if ($content['emails_sent'] > 0) $content['emails_sent'] = $base."&what=email_details&uid=".$content['userid']."\">".translateComma($content['emails_sent'])."]";
// Add nickname
- if (empty($content['nickname']) || $content['nickname'] == $content['userid']) $content['nickname'] = "---";
+ if (empty($content['nickname']) || $content['nickname'] == $content['userid']) $content['nickname'] = '---';
// Calculate total points
$pointsTotal = GET_TOTAL_DATA($content['userid'], "user_points", "points") - GET_TOTAL_DATA($content['userid'], "user_data", "used_points");
@@ -318,29 +318,29 @@ LIMIT 1",
// Transfer data to array
$content['sw'] = $SW;
- $content['uid'] = ADMIN_USER_PROFILE_LINK($content['userid']);
- $content['gender'] = TRANSLATE_GENDER($content['gender']);
- $content['email'] = "[".$content['email']."]";
+ $content['uid'] = generateUserProfileLink($content['userid']);
+ $content['gender'] = translateGender($content['gender']);
+ $content['email'] = "[".$content['email']."]";
$content['addr'] = $content['REMOTE_ADDR'];
$content['links'] = $LINKS;
- $content['alinks'] = MEMBER_ACTION_LINKS($content['userid'], $content['status']);
- $content['points'] = TRANSLATE_COMMA($pointsTotal);
- $content['rate'] = TRANSLATE_COMMA($clickRate);
- $content['locked'] = TRANSLATE_COMMA(GET_TOTAL_DATA($content['userid'], "user_points", "locked_points"));
- $content['lock_timestamp'] = MAKE_DATETIME($content['lock_timestamp'], "2");
- $content['status'] = TRANSLATE_STATUS($content['status']);
+ $content['alinks'] = generateMemberAdminActionLinks($content['userid'], $content['status']);
+ $content['points'] = translateComma($pointsTotal);
+ $content['rate'] = translateComma($clickRate);
+ $content['locked'] = translateComma(GET_TOTAL_DATA($content['userid'], "user_points", "locked_points"));
+ $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], '2');
+ $content['status'] = translateUserStatus($content['status']);
// Is the lock reason not set?
- if (!isset($content['lock_reason'])) $content['lock_reason'] = "---";
+ if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
// Is the extension 'country' installed?
// @TODO Rewrite this into a filter
if (EXT_IS_ACTIVE('country')) {
// Then overwrite country information
$content['country'] = COUNTRY_GENERATE_INFO($content['country_code']);
- } elseif ($content['country'] == "") {
+ } elseif ($content['country'] == '') {
// Zero ID???
- $content['country'] = "???";
+ $content['country'] = '???';
}
// Load row template and switch colors