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

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index ea7aa7ec30..3884447e0d 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -71,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`,
@@ -96,9 +96,9 @@ 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
@@ -182,7 +182,7 @@ LIMIT 1',
 	}
 
 	// Free the result
-	SQL_FREERESULT($result_user);
+	sqlFreeResult($result_user);
 } else {
 	$whereStatement = '';
 	if (isGetRequestElementSet('letter')) {
@@ -195,10 +195,10 @@ LIMIT 1',
 		// Is a WHERE statement already there?
 		if (!empty($whereStatement)) {
 			// Then append the status column
-			$whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(strtoupper(getRequestElement('status'))));
+			$whereStatement .= sprintf(" AND `status`='%s'", sqlEscapeString(strtoupper(getRequestElement('status'))));
 		} else {
 			// Start a new one
-			$whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(strtoupper(getRequestElement('status'))));
+			$whereStatement = sprintf(" WHERE `status`='%s'", sqlEscapeString(strtoupper(getRequestElement('status'))));
 		}
 
 		// Exclude other users
@@ -232,7 +232,7 @@ LIMIT 1',
 				break;
 
 			default: // Invalid list mode
-				reportBug(__FILE__, __LINE__, sprintf('Invalid do %s detected.', SQL_ESCAPE(getRequestElement('do'))));
+				reportBug(__FILE__, __LINE__, sprintf('Invalid do %s detected.', sqlEscapeString(getRequestElement('do'))));
 				break;
 		} // END - switch
 
@@ -260,7 +260,7 @@ ORDER BY
 	);
 
 	// 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') {
@@ -272,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;
@@ -297,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);
 
@@ -367,10 +367,10 @@ ORDER BY
 		} // 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;
@@ -386,7 +386,7 @@ ORDER BY
 	}
 
 	// Free memory
-	SQL_FREERESULT($result_master);
+	sqlFreeResult($result_master);
 }
 
 // [EOF]