contact: fix login indicator, omit unresolved host names

diff --git a/contact.php b/contact.php
index c55ec0c033081af57341d891810722feb10aa547..691ff41679ef97f5fe719911b08be7998c2ee515 100644 (file)
--- a/contact.php
+++ b/contact.php
@@ -1,6 +1,7 @@
 <?php
 $error = NULL;
 if ($_POST) {
 <?php
 $error = NULL;
 if ($_POST) {

+       global $User;

        if (!empty($User)) {
                $_REQUEST['login'] = $User['name'];
        }
        if (!empty($User)) {
                $_REQUEST['login'] = $User['name'];
        }


@@ -49,7 +50,9 @@ switch ($source) {
        }
 
        $origin = $_SERVER['REMOTE_ADDR'];
        }
 
        $origin = $_SERVER['REMOTE_ADDR'];

-       $origin .= sprintf(' (%s)', gethostbyaddr($origin));
+       if ($resolved = @gethostbyaddr($origin) and $resolved !== $origin) {
+               $origin .= sprintf(' (%s)', gethostbyaddr($origin));
+       }

        $body = "Ingevuld vanaf $origin:\r\n\r\n";
 
        foreach ($input as $k => $v) {
        $body = "Ingevuld vanaf $origin:\r\n\r\n";
 
        foreach ($input as $k => $v) {