X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/5ee0e5fcab7c55065de6603833ea6f5e86ac2d32..6f67c60627918b9ef956914c63cb7290b7e2de13:/widget/contact.php

diff --git a/widget/contact.php b/widget/contact.php
index ed0a082..b7e073f 100644
--- a/widget/contact.php
+++ b/widget/contact.php
@@ -2,7 +2,7 @@
 $error = NULL;
 if ($_POST) {
 	global $User;
-	if ($User) {
+	if ($User->login) {
 		$_REQUEST['login'] = $User->login;
 		$_REQUEST['email'] = $_REQUEST['email'] ?: $User->email;
 	}
@@ -50,7 +50,7 @@ switch ($source) {
 	}
 }
 
-	$reply = preg_match('/\A\w+@\w+\.[a-z]+\z/', @$input['email'])
+	$reply = preg_match('/\A[^\s\'@]{1,64}@[.a-zA-Z0-9-]{4,63}\z/', @$input['email'])
 		? $input['email'] : "noreply@$domain";
 	$header = "From: $reply";