global $User;
if ($User) {
$_REQUEST['login'] = $User->login;
+ $_REQUEST['email'] = $_REQUEST['email'] ?: $User->email;
+ }
+ else {
+ unset($_REQUEST['login']);
}
$error = mailform($_REQUEST);
if (!empty($error)) {
}
}
- $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";