X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=68560831e64a9892585cf086426aecfcbc5e5821;hp=891d19cfec49742bc32b9a466ca7f9e91afa9f9c;hb=7f5ffcc103a856b8867ac5739dcf0a3b6710413a;hpb=29385a0483bbcbbe940a32a49d488b1d5add15c5

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 891d19cfec..68560831e6 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -77,29 +77,36 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
 	// First of all, no admin login is found
 	$ret = '404';
 
-	// Then we need to lookup the login name by getting the admin hash
-	$adminHash = getAdminHash($adminLogin);
-
-	// If this is fine, we can continue
-	if ($adminHash != '-1') {
-		// Get admin id and set it as current
-		setCurrentAdminId(getAdminId($adminLogin));
-
-		// Now, we need to encode the password in the same way the one is encoded in database
-		$testHash = generateHash($adminPassword, $adminHash);
-
-		// If they both match, the login data is valid
-		if ($testHash == $adminHash) {
-			// All fine
-			$ret = 'done';
-		} else {
-			// Set status
-			$ret = 'pass';
-		}
+	// Get admin id from login
+	$adminId = getAdminId($adminLogin);
+
+	// Continue only with found admin ids
+	if ($adminId > 0) {
+		// Then we need to lookup the login name by getting the admin hash
+		$adminHash = getAdminHash($adminId);
+
+		// If this is fine, we can continue
+		if ($adminHash != '-1') {
+			// Get admin id and set it as current
+			setCurrentAdminId($adminId);
+
+			// Now, we need to encode the password in the same way the one is encoded in database
+			$testHash = generateHash($adminPassword, $adminHash);
+
+			// If they both match, the login data is valid
+			if ($testHash == $adminHash) {
+				// All fine
+				$ret = 'done';
+			} else {
+				// Set status
+				$ret = 'pass';
+			}
+		} // END - if
 	} // END - if
 
 	// Prepare data array
 	$data = array(
+		'id'         => $adminId,
 		'login'      => $adminLogin,
 		'plain_pass' => $adminPassword,
 		'pass_hash'  => $adminHash
@@ -161,7 +168,7 @@ function doAdminAction () {
 	$action = getActionFromModuleWhat(getModule(), $what);
 
 	// Define admin login name and id number
-	$content['login'] = getSession('admin_login');
+	$content['login'] = getAdminLogin(getSession('admin_id'));
 	$content['id']    = getCurrentAdminId();
 
 	// Preload templates