diff options
author | Dominik Eckelmann <deckelmann@gmail.com> | 2011-11-19 14:44:48 +0100 |
---|---|---|
committer | Dominik Eckelmann <deckelmann@gmail.com> | 2011-11-19 14:44:48 +0100 |
commit | 402e0951b7e3ccf567702515bfe0b09cca8a5a93 (patch) | |
tree | b5c4526d2d7ca1482fe8a67aa12125b065c478be /inc/auth.php | |
parent | 5446f3ffde77013d4eaea1fb166bcbd905a777a4 (diff) | |
parent | 1017f6f159386699a10d2529c50fb5e28b5c1889 (diff) | |
download | rpg-402e0951b7e3ccf567702515bfe0b09cca8a5a93.tar.gz rpg-402e0951b7e3ccf567702515bfe0b09cca8a5a93.tar.bz2 |
Merge branch 'master' of github.com:dom-mel/dokuwiki
Diffstat (limited to 'inc/auth.php')
-rw-r--r-- | inc/auth.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/inc/auth.php b/inc/auth.php index a52c14731..87e5b5580 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -673,8 +673,14 @@ function auth_sendPassword($user,$password){ $text = str_replace('@PASSWORD@',$password,$text); $text = str_replace('@TITLE@',$conf['title'],$text); + if(empty($conf['mailprefix'])) { + $subject = $lang['regpwmail']; + } else { + $subject = '['.$conf['mailprefix'].'] '.$lang['regpwmail']; + } + return mail_send($userinfo['name'].' <'.$userinfo['mail'].'>', - $lang['regpwmail'], + $subject, $text, $conf['mailfrom']); } @@ -912,8 +918,14 @@ function act_resendpwd(){ $text = str_replace('@TITLE@',$conf['title'],$text); $text = str_replace('@CONFIRM@',$url,$text); + if(empty($conf['mailprefix'])) { + $subject = $lang['regpwmail']; + } else { + $subject = '['.$conf['mailprefix'].'] '.$lang['regpwmail']; + } + if(mail_send($userinfo['name'].' <'.$userinfo['mail'].'>', - $lang['regpwmail'], + $subject, $text, $conf['mailfrom'])){ msg($lang['resendpwdconfirm'],1); |