Changeset 381

Show
Ignore:
Timestamp:
2009-11-23 16:33:59 (2 years ago)
Author:
hannes
Message:

some corrections in the new message notification (e-mail)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/classes/pages/Messenger.php

    r339 r381  
    308308                                        } 
    309309                                        // send mail 
    310                                         @mail($row->memberemail, $LANG['new_message_subject'], str_replace(Array('%membername%', '%user%', '%messageid%', '%title%'), Array($row->membername, $_SESSION['memberid'], $_new_id, $title), $LANG['new_message_body']), 'From: ' . $SETTINGS['forumadminemail']); 
     310                                        @mail($row->memberemail, $LANG['new_message_subject'], str_replace(Array('%membername%', '%user%', '%messageid%', '%title%'), Array($row->membername, $_SESSION['membername'], $_new_id, $title), $LANG['new_message_body']), 'From: ' . $SETTINGS['forumadminemail'] . "\nContent-Type: text/plain; charset=" . $SETTINGS['encoding'] . "\nMIME-Version: 1.0"); 
    311311                                        // back to user's language 
    312312                                        @include('includes/lang/' . $LANGUAGE . '.php'); 

  • trunk/includes/lang/de.php

    r367 r381  
    413413$LANG['bans_updated'] = 'Verbannungen gespeichert'; 
    414414$LANG['maintainance_mode_set'] = 'Die Administratoren haben das Board in den Verwaltungsmodus gesetzt. Das bedeutet, dass nur die Administratoren selbst es momentan benutzen können. Bitte versuchen Sie es später nochmal.'; 
    415 $LANG['new_message_body'] = "Hallo %membername%,\n\n%user% hat Ihnen auf " . $SETTINGS['forumname'] . " eine neue private Nachricht geschickt. Der Betreff ist %title%.\n\nSie können mit diesem Link direkt zu der Nachricht springen: http://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath'] . $F->link('messenger') . "?id=%messageid%\n\n" . $SETTINGS['forumadmin'] . "\nhttp://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath']; 
     415$LANG['new_message_body'] = "Hallo %membername%,\n\n%user% hat Ihnen auf " . $SETTINGS['forumname'] . " eine neue private Nachricht geschickt. Der Betreff ist \"%title%\".\n\nSie können mit diesem Link direkt zu der Nachricht springen: http://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath'] . $F->link('messenger') . "id=%messageid%\n\n" . $SETTINGS['forumadmin'] . "\nhttp://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath']; 
    416416$LANG['welcome_mail'] = 'Hallo und willkommen auf ' . $SETTINGS['forumname'] . "!\n\nIhr Passwort ist %password%\n\nHiermit können Sie sich nun einloggen und Ihre Profileinstellungen ändern..\n\n" . $SETTINGS['forumadmin'] . "\nhttp://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath']; 
    417417$LANG['lost_password_mail'] = "Hallo %membername%,\n\njemand (hoffentlich Sie selbst) hat um eine Rücksetzung Ihres Passworts auf " . $SETTINGS['forumname'] . " gebeten.\n\nDies ist jenes neue Passwort: %password%\n\nSie können es nun benutzen, um es zum Beispiel wieder zu Ihrem Wunschpasswort zu ändern.\n\n" . $SETTINGS['forumadmin'] . "\nhttp://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath']; 

  • trunk/includes/lang/en.php

    r367 r381  
    414414$LANG['bans_updated'] = 'Bans updated'; 
    415415$LANG['maintainance_mode_set'] = 'The administrators have put the board into maintenance mode. That means only the admins themselves can use it right now. Please check back later.'; 
    416 $LANG['new_message_body'] = "%membername%,\n\n%user% has sent you a new private message over at " . $SETTINGS['forumname'] . ". The subject is %title%.\n\nYou can jump directly to the message using this link: http://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath'] . $F->link('messenger') . "?id=%messageid%\n\n" . $SETTINGS['forumadmin'] . "\nhttp://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath']; 
     416$LANG['new_message_body'] = "%membername%,\n\n%user% has sent you a new private message over at " . $SETTINGS['forumname'] . ". The subject is \"%title%\".\n\nYou can jump directly to the message using this link: http://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath'] . $F->link('messenger') . "id=%messageid%\n\n" . $SETTINGS['forumadmin'] . "\nhttp://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath']; 
    417417$LANG['welcome_mail'] = 'Hello and welcome to ' . $SETTINGS['forumname'] . "!\n\nYour initial password is %password%\n\nYou can now use it to log in and change your profile settings.\n\n" . $SETTINGS['forumadmin'] . "\nhttp://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath']; 
    418418$LANG['lost_password_mail'] = "%membername%,\n\nsomebody (hopefully you) has requested a new password for your account over at " . $SETTINGS['forumname'] . ".\n\nThis is said password: %password%\n\nUse it to log in and change it to whatever you like.\n\n" . $SETTINGS['forumadmin'] . "\nhttp://" . $_SERVER['SERVER_NAME'] . $SETTINGS['webpath'];