X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=517f0ebdd3bac261128c507becdce894c5515509;hp=ca86a9b5f88182e50c2ba16fd2ad19bf97755b92;hb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;hpb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index ca86a9b5f8..517f0ebdd3 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -64,14 +64,20 @@ function alpha ($sortby, $colspan, $return=false) {
 		}
 
 		if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
-			$OUT .= '&nbsp;]<br />[&nbsp;';
+			$OUT .= ']<br />[';
 		} elseif ( $counter != $num ) {
-			$OUT .= '&nbsp;|&nbsp;';
+			$OUT .= '|';
 		}
 	} // END - while
 
+	// Prepare content
+	$content = array (
+		'colspan2'        => $colspan,
+		'alpha_selection' => $OUT
+	);
+
 	// Load template
-	$OUT = loadTemplate('admin_list_user_alpha', true, $OUT);
+	$OUT = loadTemplate('admin_list_user_alpha', true, $content);
 	if ($return === true) {
 		// Return generated code
 		return $OUT;
@@ -95,7 +101,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 	elseif (isGetRequestParameterSet('mode')) $add .= '&amp;mode=' . getRequestParameter('mode');
 
 	// Makes order by links..
-	if ($letter == 'front') $letter = getMessage('_ALL2');
+	if ($letter == 'front') $letter = '{--_ALL2--}';
 
 	// Prepare array with all possible sorters
 	$list = array(
@@ -107,18 +113,20 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 
 	// Add nickname if extension is installed
 	if (isExtensionActive('nickname')) {
-		$list['nickname'] = getMessage('NICKNAME');
+		$list['nickname'] = '{--NICKNAME--}';
 	} // END - if
 
 	foreach ($list as $sort => $title) {
 		if ($sortby == $sort) {
-			$OUT .= '<strong>' . $title . '</strong>&nbsp;|&nbsp;';
+			$OUT .= '<strong>' . $title . '</strong>|';
 		} else {
-			$OUT .= '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;letter=' . $letter . '&amp;sortby=' . $sort.$add . '%}">' . $title . '</a>&nbsp;|&nbsp;';
+			$OUT .= '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;letter=' . $letter . '&amp;sortby=' . $sort . $add . '%}">' . $title . '</a>|';
 		}
 	} // END - foreach
 
+	// Add list and colspan
 	$content['list'] = substr($OUT, 0, -13);
+	$content['colspan2'] = $colspan;
 
 	// Load template
 	$OUT = loadTemplate('admin_list_user_sort', true, $content);
@@ -134,7 +142,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 }
 
 // Add page navigation
-function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false) {
+function addPageNavigation ($numPages, $offset, $showForm, $colspan, $return=false) {
 	// @TODO These two constants are no longer used, maybe we reactivate this code?
 	//if ($showForm === true) {
 	//	// Load form for changing number of lines
@@ -147,7 +155,7 @@ function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false)
 	//}
 
 	$OUT = '';
-	for ($page = 1; $page <= $pages; $page++) {
+	for ($page = 1; $page <= $numPages; $page++) {
 		if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
 			$OUT .= '<strong>-';
 		} else {
@@ -173,11 +181,12 @@ function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false)
 			$OUT .= '</a>';
 		}
 
-		if ($page < $pages) $OUT .= '&nbsp;|&nbsp;';
+		if ($page < $numPages) $OUT .= '|';
 	} // END - for
 
-	// Remember the list
-	$content['list'] = $OUT;
+	// Remember the list and colspan
+	$content['list']     = $OUT;
+	$content['colspan2'] = $colspan;
 
 	// Load template
 	$OUT = loadTemplate('admin_list_user_pagenav', true, $content);
@@ -230,7 +239,7 @@ function determineRandomReferalId () {
 	// Is the extension version fine?
 	if (isExtensionInstalledAndNewer('user', '0.3.4')) {
 		// Get all user ids
-		$totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, " AND `rand_confirmed` >= ".getConfig('user_min_confirmed')."");
+		$totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, " AND `rand_confirmed` >= {?user_min_confirmed?}");
 
 		// Do we have at least one?
 		if ($totalUsers > 0) {
@@ -447,7 +456,7 @@ function doNewUserPassword ($email, $userid) {
 			sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
 
 			// Output note to user
-			loadTemplate('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND'));
+			loadTemplate('admin_settings_saved', false, '{--GUEST_NEW_PASSWORD_SEND--}');
 		} else {
 			// Account is locked or unconfirmed
 			$errorCode = generateErrorCodeFromUserStatus($status);