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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 012ff2c6b4..517f0ebdd3 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -101,7 +101,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 	elseif (isGetRequestParameterSet('mode')) $add .= '&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(
@@ -113,7 +113,7 @@ 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) {
@@ -142,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
@@ -155,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 {
@@ -181,11 +181,12 @@ function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false)
 			$OUT .= '</a>';
 		}
 
-		if ($page < $pages) $OUT .= '|';
+		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);
@@ -455,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);