1 files changed, 4 insertions, 2 deletions
diff --git a/inc/media.php b/inc/media.php
index 2ea77d34c..d4aa751bd 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -401,11 +401,13 @@ function media_notify($id,$file,$mime){
     global $conf;
     if(empty($conf['notify'])) return; //notify enabled?
 
+    $ip = clientIP();
+
     $text = rawLocale('uploadmail');
     $text = str_replace('@DATE@',strftime($conf['dformat']),$text);
     $text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text);
-    $text = str_replace('@IPADDRESS@',$_SERVER['REMOTE_ADDR'],$text);
-    $text = str_replace('@HOSTNAME@',gethostbyaddr($_SERVER['REMOTE_ADDR']),$text);
+    $text = str_replace('@IPADDRESS@',$ip,$text);
+    $text = str_replace('@HOSTNAME@',gethostsbyaddrs($ip),$text);
     $text = str_replace('@DOKUWIKIURL@',DOKU_URL,$text);
     $text = str_replace('@USER@',$_SERVER['REMOTE_USER'],$text);
     $text = str_replace('@MIME@',$mime,$text);