git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
edit/page: indicate edit replacements in data-dyn attributes
[minimedit.git]
/
widget
/
contact.php
diff --git
a/widget/contact.php
b/widget/contact.php
index b50537517d7b68952f50922a53c244b7763e8e91..a4fccda1a0ca8aead4f0b5f106653696cf05e043 100644
(file)
--- a/
widget/contact.php
+++ b/
widget/contact.php
@@
-2,8
+2,12
@@
$error = NULL;
if ($_POST) {
global $User;
$error = NULL;
if ($_POST) {
global $User;
- if ($User) {
+ if ($User
->login
) {
$_REQUEST['login'] = $User->login;
$_REQUEST['login'] = $User->login;
+ $_REQUEST['email'] = $_REQUEST['email'] ?: $User->email;
+ }
+ else {
+ unset($_REQUEST['login']);
}
$error = mailform($_REQUEST);
if (!empty($error)) {
}
$error = mailform($_REQUEST);
if (!empty($error)) {
@@
-46,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";
? $input['email'] : "noreply@$domain";
$header = "From: $reply";
@@
-54,7
+58,7
@@
switch ($source) {
'X-Accept-Language' => 'HTTP_ACCEPT_LANGUAGE',
'User-Agent' => 'HTTP_USER_AGENT',
) as $mailhdr => $serverhdr) {
'X-Accept-Language' => 'HTTP_ACCEPT_LANGUAGE',
'User-Agent' => 'HTTP_USER_AGENT',
) as $mailhdr => $serverhdr) {
- if (
!$_SERVER[$serverhdr]
) continue;
+ if (
empty($_SERVER[$serverhdr])
) continue;
$header .= "\r\n$mailhdr: ".$_SERVER[$serverhdr];
}
$header .= "\r\n$mailhdr: ".$_SERVER[$serverhdr];
}