diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/privmsg.php | 17 | ||||
| -rw-r--r-- | phpBB/templates/PSO/privmsgs_posting_body.tpl | 6 |
2 files changed, 16 insertions, 7 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index b1ce1074e4..9d39f3b282 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -674,7 +674,7 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") { if($to_userdata['user_notify_pm'] && !empty($to_userdata['user_email'])) { - //mail($to_userdata['user_email'], $lang['Notification_subject'], $email_msg, "From: ".$board_config['board_email_from']."\r\n"); + @mail($to_userdata['user_email'], $lang['Notification_subject'], $email_msg, "From: ".$board_config['board_email_from']."\r\n"); } } @@ -782,7 +782,7 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") if($board_config['allow_html']) { - $html_status = $lang['HTML'] . $lang['is_ON']; + $html_status = $lang['ON']; $html_toggle = '<input type="checkbox" name="disable_html" '; if($disable_html) { @@ -792,12 +792,12 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") } else { - $html_status = $lang['HTML'] . $lang['is_OFF']; + $html_status = $lang['OFF']; } if($board_config['allow_bbcode']) { - $bbcode_status = $lang['BBCode'] . $lang['is_ON']; + $bbcode_status = $lang['ON']; $bbcode_toggle = '<input type="checkbox" name="disable_bbcode" '; if($disable_bbcode) { @@ -812,6 +812,7 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") if($board_config['allow_smilies']) { + $smilies_status = $lang['ON']; $smile_toggle = '<input type="checkbox" name="disable_smile" '; if($disable_smilies) { @@ -819,6 +820,10 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") } $smile_toggle .= "> " . $lang['Disable'] . $lang['Smilies'] . $lang['in_this_post']; } + else + { + $smilies_status = $lang['OFF']; + } $sig_toggle = '<input type="checkbox" name="attach_sig" '; if($attach_sig) @@ -864,6 +869,7 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") "MESSAGE_INPUT" => $message_input, "HTML_STATUS" => $html_status, "HTML_TOGGLE" => $html_toggle, + "SMILIES_STATUS" => $smilies_status, "SMILE_TOGGLE" => $smile_toggle, "SIG_TOGGLE" => $sig_toggle, "NOTIFY_TOGGLE" => $notify_toggle, @@ -879,6 +885,9 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") "L_POST_A" => $post_a, "L_FIND_USERNAME" => $lang['Find_username'], "L_FIND" => $lang['Find'], + "L_HTML_IS" => $lang['HTML'] . " " . $lang['is'], + "L_BBCODE_IS" => $lang['BBCode'] . " " . $lang['is'], + "L_SMILIES_ARE" => $lang['Smilies'] . " " . $lang['are'], "S_ALPHA_SELECT" => $user_alpha_select, "S_NAMES_SELECT" => $user_names_select, diff --git a/phpBB/templates/PSO/privmsgs_posting_body.tpl b/phpBB/templates/PSO/privmsgs_posting_body.tpl index 7364cab2d7..6add177752 100644 --- a/phpBB/templates/PSO/privmsgs_posting_body.tpl +++ b/phpBB/templates/PSO/privmsgs_posting_body.tpl @@ -14,10 +14,10 @@ function insertCode(formObj, selectObj){ </script> <table width="80%" cellpadding="1" cellspacing="0" border="0" align="center"> - <tr><form action="{S_POST_ACTION}" method="POST" onSubmit="return submit_check_alert(this);"> + <tr><form action="{S_POST_ACTION}" method="POST"> <td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%"> <tr> - <th class="secondary" colspan="2"><b>{L_POST_A}</b></td> + <td class="cat" colspan="2"><span class="cattitle"><b>{L_POST_A}</b></span></td> </tr> <tr> <td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td> @@ -28,7 +28,7 @@ function insertCode(formObj, selectObj){ <td class="row2"><span class="courier">{SUBJECT_INPUT}</span></td> </tr> <tr> - <td class="row1"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br><br><span class="gensmall">{HTML_STATUS}<br>{BBCODE_STATUS}</span></td> + <td class="row1"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br><br><span class="gensmall">{L_HTML_IS} <u>{HTML_STATUS}</u><br>{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br>{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td> <td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> <td><span class="gen">{MESSAGE_INPUT}</span></td> |