Changeset 137

Show
Ignore:
Timestamp:
2008-03-15 09:43:02 (10 months ago)
Author:
hannes
Message:

setting full mail headers everywhere (ticket #76)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/classes/pages/Lostpassword.php

    r20 r137  
    5757                        Member::setPassword($row->memberid, $p->get()); 
    5858                        // send mail 
    59                         @mail($email, $SETTINGS['forumname'] . ' - ' . $LANG['Lost_Password'], str_replace(Array('%membername%', '%password%'), Array($row->membername, $p->get()), $LANG['lost_password_mail']), 'From: ' . $SETTINGS['forumadminemail']); 
     59                        @mail($email, $SETTINGS['forumname'] . ' - ' . $LANG['Lost_Password'], str_replace(Array('%membername%', '%password%'), Array($row->membername, $p->get()), $LANG['lost_password_mail']), 'From: ' . $SETTINGS['forumadminemail'] . "\nContent-Type: text/plain; charset=" . $SETTINGS['encoding'] . "\nMIME-Version: 1.0"); 
    6060                        $div = $this->html->body->addChild('div', $LANG['new_password_sent']); 
    6161                        $div->addAttribute('class', 'message'); 
  • trunk/classes/pages/Mail.php

    r27 r137  
    6767                        } 
    6868                        // send mail 
    69                         if (@mail($row2->memberemail, $subject, $post . "\n\n-------------\n" . $LANG['mail_sent_through_forum'], 'From: "' . $row->membername . '" <' . $row->memberemail . '>')) { 
     69                        if (@mail($row2->memberemail, $subject, $post . "\n\n-------------\n" . $LANG['mail_sent_through_forum'], 'From: "' . $row->membername . '" <' . $row->memberemail . ">\nContent-Type: text/plain; charset=" . $SETTINGS['encoding'] . "\nMIME-Version: 1.0")) { 
    7070                            // back to user's language 
    7171                            include('lang/' . $language . '.php'); 
  • trunk/classes/pages/Page.php

    r126 r137  
    382382            $q = NULL; 
    383383            // send it 
    384             @mail($row->receipient, $row->subject, $row->body, 'From: '.$SETTINGS['forumadminemail']); 
     384            @mail($row->receipient, $row->subject, $row->body, 'From: '.$SETTINGS['forumadminemail'] . "\nContent-Type: text/plain; charset=" . $SETTINGS['encoding'] . "\nMIME-Version: 1.0"); 
    385385            // delete mail from 'to do' list 
    386386            $q = $C->prepare('DELETE FROM ' . $SETTINGS['dbtableprefix'] . 'mails WHERE id=:id'); 
  • trunk/classes/pages/Register.php

    r35 r137  
    131131                            $q = NULL; 
    132132                            // send e-mail 
    133                             @mail($email, $SETTINGS['forumname'] . ' - ' . $LANG['Registration'], str_replace('%password%', $p->get(), $LANG['welcome_mail']), 'From: ' . $SETTINGS['forumadminemail']); 
     133                            @mail($email, $SETTINGS['forumname'] . ' - ' . $LANG['Registration'], str_replace('%password%', $p->get(), $LANG['welcome_mail']), 'From: ' . $SETTINGS['forumadminemail'] . "\nContent-Type: text/plain; charset=" . $SETTINGS['encoding'] . "\nMIME-Version: 1.0"); 
    134134                            $div = $this->html->body->addChild('div', $LANG['registration_success']); 
    135135                            $div->addAttribute('class', 'message');