diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-13 16:09:10 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-13 16:09:10 +0000 |
| commit | d1fd694282e3ebaf2046e3aee6a0d5dd92cb6659 (patch) | |
| tree | 36918a361f192687384e8a32edf99104f8eff6f5 /phpBB/privmsg.php | |
| parent | 75fadebad1e17176c82be17c7041846e4a3122df (diff) | |
| download | forums-d1fd694282e3ebaf2046e3aee6a0d5dd92cb6659.tar forums-d1fd694282e3ebaf2046e3aee6a0d5dd92cb6659.tar.gz forums-d1fd694282e3ebaf2046e3aee6a0d5dd92cb6659.tar.bz2 forums-d1fd694282e3ebaf2046e3aee6a0d5dd92cb6659.tar.xz forums-d1fd694282e3ebaf2046e3aee6a0d5dd92cb6659.zip | |
Added global PM disable + modded emailer to allow lang select + re-added back box limits my dumbness removed recently
git-svn-id: file:///svn/phpbb/trunk@1305 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/privmsg.php')
| -rw-r--r-- | phpBB/privmsg.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 17f2636bdb..1b0ff74c66 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -27,6 +27,14 @@ include($phpbb_root_path . 'includes/post.'.$phpEx); include($phpbb_root_path . 'includes/bbcode.'.$phpEx); // +// Is PM disabled? +// +if( !empty($board_config['privmsg_disable']) ) +{ + message_die(GENERAL_MESSAGE, 'PM_disabled'); +} + +// // Var definitions // $html_entities_match = array("#<#", "#>#", "#& #", "#\"#"); @@ -817,7 +825,7 @@ else if( $submit || $refresh || $mode != "" ) { $to_username = $HTTP_POST_VARS['username']; - $sql = "SELECT user_id, user_notify_pm, user_email + $sql = "SELECT user_id, user_notify_pm, user_email, user_lang FROM " . USERS_TABLE . " WHERE username = '" . $to_username . "' AND user_id <> " . ANONYMOUS; @@ -977,7 +985,10 @@ else if( $submit || $refresh || $mode != "" ) include($phpbb_root_path . 'includes/emailer.'.$phpEx); $emailer = new emailer($board_config['smtp_delivery']); - $emailer->use_template("privmsg_notify"); + // + // Attempt to use language setting for recipient + // + $emailer->use_template("privmsg_notify", $to_userdata['user_lang']); $emailer->extra_headers($email_headers); $emailer->email_address($to_userdata['user_email']); |