diff options
| author | Gerry Weißbach <gerry.w@gammaproduction.de> | 2014-07-16 08:02:34 +0200 |
|---|---|---|
| committer | Gerry Weißbach <gerry.w@gammaproduction.de> | 2014-07-16 08:02:34 +0200 |
| commit | 0bd5b90b4c1294b3c9abc1977060f971dc2e2744 (patch) | |
| tree | ac79a7402ffef718685f16dbba6692a0c9b5f458 /inc/mail.php | |
| parent | 1858e4d7685782550789fd8c228e55ae319bc37a (diff) | |
| parent | 80679bafa1a5ed611bafc603afd0ae7b2b5954a7 (diff) | |
| download | rpg-0bd5b90b4c1294b3c9abc1977060f971dc2e2744.tar.gz rpg-0bd5b90b4c1294b3c9abc1977060f971dc2e2744.tar.bz2 | |
Merge remote-tracking branch 'splitbrain/master'
Diffstat (limited to 'inc/mail.php')
| -rw-r--r-- | inc/mail.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/inc/mail.php b/inc/mail.php index 0b60c0a5b..9994ac63e 100644 --- a/inc/mail.php +++ b/inc/mail.php @@ -40,6 +40,8 @@ if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '[' function mail_setup(){ global $conf; global $USERINFO; + /** @var Input $INPUT */ + global $INPUT; // auto constructed address $host = @parse_url(DOKU_URL,PHP_URL_HOST); @@ -53,11 +55,8 @@ function mail_setup(){ $replace['@MAIL@'] = $noreply; } - if(!empty($_SERVER['REMOTE_USER'])){ - $replace['@USER@'] = $_SERVER['REMOTE_USER']; - }else{ - $replace['@USER@'] = 'noreply'; - } + // use 'noreply' if no user + $replace['@USER@'] = $INPUT->server->str('REMOTE_USER', 'noreply', true); if(!empty($USERINFO['name'])){ $replace['@NAME@'] = $USERINFO['name']; |