X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/883cbf88d41cfa5b7cc3af95c8e07cb9f21625f6..HEAD:/login/mailpass.inc.php

diff --git a/login/mailpass.inc.php b/login/mailpass.inc.php
index 6138ceb..77314a4 100644
--- a/login/mailpass.inc.php
+++ b/login/mailpass.inc.php
@@ -1,9 +1,10 @@
 <?php
 function userbymail($email)
 {
+	$email = strtolower($email);
 	foreach (glob("profile/*") as $useropt) {
 		if ($mailopt = @file_get_contents("$useropt/email.txt")
-		and rtrim($mailopt) == $email) {
+		and strtolower(rtrim($mailopt)) == $email) {
 			return substr($useropt, strlen('profile/'));
 		}
 	}
@@ -14,15 +15,17 @@ function mailtoken($email)
 {
 	$found = userbymail($email);
 	if (!$found) return FALSE;
+	$user = new User("profile/$found");
+	if (empty($user)) return FALSE;
 
 	$token = substr(sha1('$Random'.rand()), 0, 10);
 	if (!file_put_contents("profile/$found/.token", $token))
 		throw new Exception("could not store token for $found");
 
-	$sitename = $_SERVER['HTTP_HOST'];
+	$sitename = preg_replace('/^www\./', '', $_SERVER['HTTP_HOST']);
 	$sitelink = 'https://'.$sitename;
 	$rep = [
-		'[[user]]' => $found,
+		'[[user]]' => $user->name ?: $found,
 		'[[link]]' => "$sitelink/login/pass?token=$found:$token",
 		'[[site]]' => $sitename,
 	];
@@ -31,8 +34,10 @@ function mailtoken($email)
 	$mailbody = str_replace(array_keys($rep), array_values($rep), $mailbody);
 	if (!$mailbody) throw new Exception('empty mail body');
 	$mailsub = "Wachtwoord-reset voor $sitename";
+	$mailhead = "From: $sitename <info@$sitename>";
+	$rcpt = "$found <$email>";
 
-	return mail($email, $mailsub, $mailbody);
+	return mail($rcpt, $mailsub, $mailbody, $mailhead);
 	return TRUE;
 }