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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 517f0ebdd3..6e8ebaf67d 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -49,7 +49,7 @@ function alpha ($sortby, $colspan, $return=false) {
 	if (isGetRequestParameterSet('mode')) $add .= '&mode='.getRequestParameter('mode');
 
 	/* Creates the list of letters and makes them a link. */
-	$alphabet = explode(',', getMessage('_ALL2') . ',A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,' . getMessage('_OTHERS'));
+	$alphabet = explode(',', 'A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,');
 	$num = count($alphabet) - 1;
 	$OUT = '';
 	while (list($counter, $ltr) = each($alphabet)) {
@@ -101,14 +101,14 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 	elseif (isGetRequestParameterSet('mode')) $add .= '&mode=' . getRequestParameter('mode');
 
 	// Makes order by links..
-	if ($letter == 'front') $letter = '{--_ALL2--}';
+	if ($letter == 'front') $letter = '';
 
 	// Prepare array with all possible sorters
 	$list = array(
-		'userid'      => getMessage('_UID'),
-		'family'      => getMessage('FAMILY'),
-		'email'       => getMessage('EMAIL'),
-		'REMOTE_ADDR' => getMessage('REMOTE_IP')
+		'userid'      => '{--_UID--}',
+		'family'      => '{--FAMILY--}',
+		'email'       => '{--EMAIL--}',
+		'REMOTE_ADDR' => '{--REMOTE_IP--}'
 	);
 
 	// Add nickname if extension is installed
@@ -159,7 +159,7 @@ function addPageNavigation ($numPages, $offset, $showForm, $colspan, $return=fal
 		if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
 			$OUT .= '<strong>-';
 		} else {
-			if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', getMessage('_ALL2'));
+			if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', '');
 			if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
 
 			// Base link
@@ -385,7 +385,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 			// Wrong password!
 			$errorCode = getCode('WRONG_PASS');
 		}
-	} elseif (getUserData('status') != 'CONFIRMED') {
+	} elseif ((isUserDataValid()) && (getUserData('status') != 'CONFIRMED')) {
 		// Create an error code from given status
 		$errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
 
@@ -453,7 +453,7 @@ function doNewUserPassword ($email, $userid) {
 			$message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS, 'nickname' => $userid), $userid);
 
 			// ... and send it away
-			sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
+			sendEmail($userid, '{--GUEST_NEW_PASSWORD--}', $message);
 
 			// Output note to user
 			loadTemplate('admin_settings_saved', false, '{--GUEST_NEW_PASSWORD_SEND--}');