widget/contact: send from given name

[minimedit.git] / widget / contact.php

diff --git a/widget/contact.php b/widget/contact.php
index b50537517d7b68952f50922a53c244b7763e8e91..c6e702234b8d8d00e46258d6c5952a75f0108ac2 100644 (file)
--- a/widget/contact.php
+++ b/widget/contact.php
@@ -2,8 +2,12 @@
 $error = NULL;
 if ($_POST) {
        global $User;
-       if ($User) {
+       if ($User->login) {
                $_REQUEST['login'] = $User->login;
+               $_REQUEST['email'] = $_REQUEST['email'] ?: $User->email;
+       }
+       else {
+               unset($_REQUEST['login']);
        }
        $error = mailform($_REQUEST);
        if (!empty($error)) {
@@ -46,15 +50,18 @@ 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";
+       if ($displayname = @$input['naam']) {
+               $reply = sprintf('"%s" <%s>', addcslashes($displayname, "\\\"\0..\37"), $reply);
+       }
        $header = "From: $reply";
 
        foreach (array(
                '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];
        }