X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/7134dfe52977665aadbd817f85f1f751c3738c04..4d2e4e3ea2eeeae35b3c904e45774bb3a302fd3b:/auth.inc.php

diff --git a/auth.inc.php b/auth.inc.php
index b20331a..030a394 100644
--- a/auth.inc.php
+++ b/auth.inc.php
@@ -1,4 +1,21 @@
 <?php
+date_default_timezone_set('Europe/Amsterdam');
+
+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 +24,7 @@ function login($inuser, $inpass = NULL)
 	}
 
 	# find password data by user name
-	$userdir = 'login/'.strtolower($inuser);
+	$userdir = 'profile/'.preg_replace('/[^a-z0-9]+/', '-', strtolower($inuser));
 	$pwfile = "$userdir/.passwd";
 	if (!file_exists($pwfile)) return;
 	$usertest = trim(file_get_contents($pwfile));
@@ -16,7 +33,7 @@ function login($inuser, $inpass = NULL)
 	# verify password
 	$authhash = md5($usertest);
 	if (isset($inpass)) {
-		if (!password_verify($inpass, $usertest)) return;
+		if (!login_password_verify($inpass, $usertest)) return;
 	}
 	else {
 		if ($inauth !== $authhash) return;
@@ -24,9 +41,15 @@ function login($inuser, $inpass = NULL)
 
 	if (function_exists('apache_note')) apache_note('user', $inuser);
 
+	if ($log = @fopen("$userdir/last.log", 'w')) {
+		fwrite($log, "{$_SERVER['REMOTE_ADDR']} {$_SERVER['HTTP_USER_AGENT']}\n");
+	}
+
 	return [
 		'name'  => $inuser,
+		'dir'   => $userdir,
 		'admin' => file_exists("$userdir/.admin"),
+		'pass'  => $usertest,
 		'auth'  => "$inuser:$authhash",
 	];
 }