diff options
| author | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-13 15:29:49 +0100 |
|---|---|---|
| committer | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-13 15:29:49 +0100 |
| commit | 14928129ac979d50664cff367377db5364f8e663 (patch) | |
| tree | c244ebec8400361b7f084503f3ae40b2142647d5 /inc/mail.php | |
| parent | bcb79ff3b3b63c74a93cdf4762fa0cd1bb28d17a (diff) | |
| parent | ebb29737d32bc331541f78a1a47f33ba33919938 (diff) | |
| download | rpg-14928129ac979d50664cff367377db5364f8e663.tar.gz rpg-14928129ac979d50664cff367377db5364f8e663.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/mail.php')
| -rw-r--r-- | inc/mail.php | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/inc/mail.php b/inc/mail.php index 38232d110..fb163585a 100644 --- a/inc/mail.php +++ b/inc/mail.php @@ -30,7 +30,39 @@ if(!defined('QUOTEDPRINTABLE_EOL')) define('QUOTEDPRINTABLE_EOL',"\015\012"); if (!defined('RFC2822_ATEXT')) define('RFC2822_ATEXT',"0-9a-zA-Z!#$%&'*+/=?^_`{|}~-"); if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '['.RFC2822_ATEXT.']+(?:\.['.RFC2822_ATEXT.']+)*@(?i:[0-9a-z][0-9a-z-]*\.)+(?i:[a-z]{2,4}|museum|travel)'); +/** + * Prepare mailfrom replacement patterns + * + * @author Andreas Gohr <andi@splitbrain.org> + */ +function mail_setup(){ + global $conf; + global $INFO; + + $replace = array(); + + if(!empty($INFO['userinfo']['mail'])){ + $replace['@MAIL@'] = $INFO['userinfo']['mail']; + }else{ + $replace['@MAIL@'] = 'noreply@'.parse_url(DOKU_URL,PHP_URL_HOST); + } + if(!empty($_SERVER['REMOTE_USER'])){ + $replace['@USER@'] = $_SERVER['REMOTE_USER']; + }else{ + $replace['@USER@'] = 'noreply'; + } + + if(!empty($INFO['userinfo']['name'])){ + $replace['@NAME@'] = $INFO['userinfo']['name']; + }else{ + $replace['@NAME@'] = ''; + } + + $conf['mailfrom'] = str_replace(array_keys($replace), + array_values($replace), + $conf['mailfrom']); +} /** * UTF-8 autoencoding replacement for PHPs mail function |