X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/0cc681d32bf51c485d54e49f50dd1d0f74b35974..v2.6-9-g3da476bb04:/auth.inc.php?ds=sidebyside

diff --git a/auth.inc.php b/auth.inc.php
index 94f0dcc..4916ab1 100644
--- a/auth.inc.php
+++ b/auth.inc.php
@@ -1,4 +1,19 @@
 <?php
+function login_password_verify($input, $test)
+{
+	if (substr($test, 0, 1) != '$') {
+		# plaintext match for uncrypted passwords
+		return $input === $test;
+	}
+	return password_verify($input, $test);
+}
+
+function login_setcookie()
+{
+	global $User;
+	return setcookie('login', $User['auth'], 0, '/');
+}
+
 function login($inuser, $inpass = NULL)
 {
 	if (empty($inuser)) return;
@@ -7,7 +22,7 @@ function login($inuser, $inpass = NULL)
 	}
 
 	# find password data by user name
-	$userdir = 'login/'.strtolower($inuser);
+	$userdir = 'profile/'.strtolower($inuser);
 	$pwfile = "$userdir/.passwd";
 	if (!file_exists($pwfile)) return;
 	$usertest = trim(file_get_contents($pwfile));
@@ -16,12 +31,7 @@ function login($inuser, $inpass = NULL)
 	# verify password
 	$authhash = md5($usertest);
 	if (isset($inpass)) {
-		if (substr($usertest, 0, 1) == '$') {
-			if (!password_verify($inpass, $usertest)) return;
-		}
-		else {
-			if ($inpass !== $usertest) return;
-		}
+		if (!login_password_verify($inpass, $usertest)) return;
 	}
 	else {
 		if ($inauth !== $authhash) return;
@@ -35,7 +45,9 @@ function login($inuser, $inpass = NULL)
 
 	return [
 		'name'  => $inuser,
+		'dir'   => $userdir,
 		'admin' => file_exists("$userdir/.admin"),
+		'pass'  => $usertest,
 		'auth'  => "$inuser:$authhash",
 	];
 }