X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=3884447e0d0c8219d8a915d78251dee9610ae0cb;hp=d721f6f0f03ce092ab0799c09a3400d253398630;hb=155492a5b96cec674846973a8524238b0365a848;hpb=6560179e7c8dc565485503f374d4e31f333ffd0e

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index d721f6f0f0..3884447e0d 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,29 +44,26 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Init variables
-$MORE = '';
+$moreColumns = '';
 
 // Add lock reason?
 if (isExtensionInstalledAndNewer('user', '0.3.5')) {
 	// Add them...
-	$MORE .= ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
+	$moreColumns .= ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
 } // END - if
 
 // Is the extension 'country' installed?
 if (isExtensionActive('country')) {
 	// Add country code
-	$MORE .= ',`country_code`';
-} else {
-	// Add direct value
-	$MORE .= ',`country`';
-}
+	$moreColumns .= ',`country_code`';
+} // END - if
 
 // Init unset data
 if (!isGetRequestElementSet('letter')) { setGetRequestElement('letter', '');       }
 if (!isGetRequestElementSet('sortby')) { setGetRequestElement('sortby', 'userid'); }
 if (!isGetRequestElementSet('page'))   { setGetRequestElement('page'  , 1);        }
 
-// Set base URL
+// Set base HTML
 $base = '[<a href="{%url=modules.php?module=admin';
 
 if (isGetRequestElementSet('userid')) {
@@ -74,7 +71,7 @@ if (isGetRequestElementSet('userid')) {
 	$userid = bigintval(getRequestElement('userid'));
 
 	// Does the account exists?
-	$result_user = SQL_QUERY_ESC("SELECT
+	$result_user = sqlQueryEscaped('SELECT
 	`userid`,
 	`country`,
 	`email`,
@@ -90,22 +87,23 @@ if (isGetRequestElementSet('userid')) {
 	`notified`,
 	`emails_received`,
 	`mails_confirmed`
-	".$MORE."
+	' . $moreColumns . '
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
 	`userid`=%s
-LIMIT 1",
+LIMIT 1',
 		array($userid), __FILE__, __LINE__);
 
 	// User found?
-	if (SQL_NUMROWS($result_user) == 1) {
+	if (sqlNumRows($result_user) == 1) {
 		// Account found
-		$content  = SQL_FETCHARRAY($result_user);
+		$content  = sqlFetchArray($result_user);
 
 		// Get count/sum of refs, selected categories, unconfirmed mails
+		// @TODO Refacture these old link generation to functions
 		$content['refs']  = countSumTotalData($userid, 'refsystem', 'counter');
-		$content['cats']  = countSumTotalData($userid, 'user_cats', 'id', 'userid', true);
+		$content['cats']  = countSumTotalData($userid, 'user_cats', 'id', 'userid', TRUE);
 		$content['links'] = getTotalUnconfirmedMails($userid);
 
 		// Add links to the numbers
@@ -116,10 +114,11 @@ LIMIT 1",
 			$content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['refs'] . '%}</a>]';
 		} // END - if
 		if ($content['cats']  > 0) {
-			$content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}</a>]';
+			$content['cats']  = $base . '&amp;what=list_user_cats&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}</a>]';
 		} // END - if
 
 		// Calculate timestamp for birthday
+		// @TODO Refacture birth_foo to avoid uni* timetstamps as older members cannot be greeded correctly
 		$stamp = mktime(0, 0, 0, $content['birth_month'], $content['birth_day'], $content['birth_year']);
 
 		// Is this above zero?
@@ -176,14 +175,14 @@ LIMIT 1",
 		$content['userid'] = $userid;
 
 		// Load user-details template
-		loadTemplate('admin_user_details', false, $content);
+		loadTemplate('admin_user_details', FALSE, $content);
 	} else {
 		// Account does not exist!
 		displayMessage('{%message,ADMIN_MEMBER_404=' . $userid . '%}');
 	}
 
 	// Free the result
-	SQL_FREERESULT($result_user);
+	sqlFreeResult($result_user);
 } else {
 	$whereStatement = '';
 	if (isGetRequestElementSet('letter')) {
@@ -196,11 +195,14 @@ LIMIT 1",
 		// 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'", sqlEscapeString(strtoupper(getRequestElement('status'))));
 		} else {
 			// Start a new one
-			$whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestElement('status')))));
+			$whereStatement = sprintf(" WHERE `status`='%s'", sqlEscapeString(strtoupper(getRequestElement('status'))));
 		}
+
+		// Exclude other users
+		$whereStatement = runFilterChain('user_exclusion_sql', $whereStatement);
 	} elseif (isGetRequestElementSet('do')) {
 		// Choose what we need to list
 		switch (getRequestElement('do')) {
@@ -230,7 +232,7 @@ LIMIT 1",
 				break;
 
 			default: // Invalid list mode
-				reportBug(__FILE__, __LINE__, sprintf("Invalid do %s detected.", SQL_ESCAPE(secureString(getRequestElement('do')))));
+				reportBug(__FILE__, __LINE__, sprintf('Invalid do %s detected.', sqlEscapeString(getRequestElement('do'))));
 				break;
 		} // END - switch
 
@@ -242,23 +244,23 @@ LIMIT 1",
 	} // END - if
 
 	// Generate master query string
-	$sql = sprintf("SELECT
+	$sql = sprintf('SELECT
 	`userid`,
 	`email`,
 	`emails_sent`,
 	`mails_confirmed`,
 	`emails_received`
-	" . $MORE . "
+	' . $moreColumns . '
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
-" . $whereStatement . "
+' . $whereStatement . '
 ORDER BY
-	`%s` ASC",
+	`%s` ASC',
 		getRequestElement('sortby')
 	);
 
 	// Prepare SQL and run it
-	$result_master = SQL_QUERY($sql, __FILE__, __LINE__);
+	$result_master = sqlQuery($sql, __FILE__, __LINE__);
 
 	// Is the user limit zero?
 	if (getUserLimit() == '0') {
@@ -270,17 +272,17 @@ ORDER BY
 	} // END - if
 
 	// Calculate page count (0.5 fixes a bug with page count)
-	$numPages = round(SQL_NUMROWS($result_master) / getUserLimit() + 0.5);
+	$numPages = round(sqlNumRows($result_master) / getUserLimit() + 0.5);
 
 	if (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 1);
 	if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getUserLimit());
 
 	// Add limitation to SQL string and run him again
 	$sql .= ' LIMIT ' . (getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset');
-	$result = SQL_QUERY($sql, __FILE__, __LINE__);
+	$result = sqlQuery($sql, __FILE__, __LINE__);
 
 	// Are there some entries?
-	if (!SQL_HASZERONUMS($result_master)) {
+	if (!ifSqlHasZeroNums($result_master)) {
 		// Sorting links and number of pages
 		$templateContent['sort_links'] = addSortLinks(getRequestElement('letter'), getRequestElement('sortby'));
 		$templateContent['num_pages'] = $numPages;
@@ -295,7 +297,7 @@ ORDER BY
 
 		// Load all users
 		$OUT = '';
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($content = sqlFetchArray($result)) {
 			// Merge more data in
 			$content = merge_array($content, $templateContent);
 
@@ -319,7 +321,7 @@ ORDER BY
 			// Transfer data to array
 			$content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
 			$content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], '2');
-			$content['refs']           = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true);
+			$content['refs']           = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', TRUE);
 
 			// Prepare array for filter
 			$data = array(
@@ -361,14 +363,14 @@ ORDER BY
 			}
 
 			// Load row template and switch colors
-			$OUT .= loadTemplate('admin_list_user_row', true, $content);
+			$OUT .= loadTemplate('admin_list_user_row', TRUE, $content);
 		} // END - while
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 
 		// Free some memory
-		SQL_FREERESULT($result_master);
+		sqlFreeResult($result_master);
 
 		// Remember all rows
 		$content['rows'] = $OUT;
@@ -377,14 +379,14 @@ ORDER BY
 		$content = merge_array($content, $templateContent);
 
 		// Load main template
-		loadTemplate('admin_list_user', false, $content);
+		loadTemplate('admin_list_user', FALSE, $content);
 	} else {
 		// No one as registered so far! :-(
 		displayMessage('{--ADMIN_NO_NONE_REGISTERED--}');
 	}
 
 	// Free memory
-	SQL_FREERESULT($result_master);
+	sqlFreeResult($result_master);
 }
 
 // [EOF]