diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-11-05 11:18:31 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-11-05 11:18:31 +0100 |
| commit | 5ec3fefc5fc0983d6fdc0efdaed2e78e0d09a868 (patch) | |
| tree | fbc212097c9c0abc1f6d5100ca1c39239dc77aa0 /inc/media.php | |
| parent | 317d85c9da899f7720469b4831116604488ba503 (diff) | |
| download | rpg-5ec3fefc5fc0983d6fdc0efdaed2e78e0d09a868.tar.gz rpg-5ec3fefc5fc0983d6fdc0efdaed2e78e0d09a868.tar.bz2 | |
handle mailfrom replacements in a central place FS#2091
Diffstat (limited to 'inc/media.php')
| -rw-r--r-- | inc/media.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/inc/media.php b/inc/media.php index 3dacd12b7..69441352b 100644 --- a/inc/media.php +++ b/inc/media.php @@ -407,14 +407,9 @@ function media_notify($id,$file,$mime){ $text = str_replace('@MEDIA@',ml($id,'',true,'&',true),$text); $text = str_replace('@SIZE@',filesize_h(filesize($file)),$text); - $from = $conf['mailfrom']; - $from = str_replace('@USER@',$_SERVER['REMOTE_USER'],$from); - $from = str_replace('@NAME@',$INFO['userinfo']['name'],$from); - $from = str_replace('@MAIL@',$INFO['userinfo']['mail'],$from); - $subject = '['.$conf['title'].'] '.$lang['mail_upload'].' '.$id; - mail_send($conf['notify'],$subject,$text,$from); + mail_send($conf['notify'],$subject,$text,$conf['mailfrom']); } /** |