diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-29 12:46:16 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-29 12:46:16 +0000 |
| commit | 87f818b4ef8cae643e73185c3ded432977553d3d (patch) | |
| tree | 6f2f3c962bde7d8083996171be58a95b0faa0070 /phpBB/privmsg.php | |
| parent | f0b14e59eec46323eb78af1872955fa8e086f507 (diff) | |
| download | forums-87f818b4ef8cae643e73185c3ded432977553d3d.tar forums-87f818b4ef8cae643e73185c3ded432977553d3d.tar.gz forums-87f818b4ef8cae643e73185c3ded432977553d3d.tar.bz2 forums-87f818b4ef8cae643e73185c3ded432977553d3d.tar.xz forums-87f818b4ef8cae643e73185c3ded432977553d3d.zip | |
Fix bug #486674 and removed superfluous/commented lines for html treatment
git-svn-id: file:///svn/phpbb/trunk@1477 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/privmsg.php')
| -rw-r--r-- | phpBB/privmsg.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 985d13b400..721339c28f 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -37,8 +37,8 @@ if( !empty($board_config['privmsg_disable']) ) // // Var definitions // -$html_entities_match = array("#<#", "#>#", "#& #", "#\"#"); -$html_entities_replace = array("<", ">", "& ", """); +$html_entities_match = array("#&#", "#<#", "#>#", "#\"#"); +$html_entities_replace = array("&", "<", ">", """); // // Parameters @@ -1111,7 +1111,7 @@ else if( $submit || $refresh || $mode != "" ) // $to_username = ( isset($HTTP_POST_VARS['username']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['username']))) : ""; $privmsg_subject = ( isset($HTTP_POST_VARS['subject']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['subject']))) : ""; - $privmsg_message = ( isset($HTTP_POST_VARS['message']) ) ? trim(stripslashes($HTTP_POST_VARS['message'])) : ""; + $privmsg_message = ( isset($HTTP_POST_VARS['message']) ) ? trim($HTTP_POST_VARS['message']) : ""; $privmsg_message = preg_replace('#<textarea>#si', '<textarea>', $privmsg_message); // @@ -1217,7 +1217,7 @@ else if( $submit || $refresh || $mode != "" ) if( $mode == "edit" ) { - $sql = "SELECT pm.privmsgs_id, pm.privmsgs_subject, pmt.privmsgs_text, u.username, u.user_id, u.user_sig + $sql = "SELECT pm.privmsgs_id, pm.privmsgs_subject, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id, u.user_sig FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u WHERE pm.privmsgs_id = $privmsg_id AND pmt.privmsgs_text_id = pm.privmsgs_id @@ -1237,10 +1237,10 @@ else if( $submit || $refresh || $mode != "" ) $privmsg_subject = $privmsg['privmsgs_subject']; $privmsg_message = $privmsg['privmsgs_text']; + $privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid']; - $privmsg_message = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $privmsg_message); + $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message); $privmsg_message = str_replace("<br />", "\n", $privmsg_message); - $privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message); $privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message); $user_sig = $privmsg['user_sig']; @@ -1252,7 +1252,7 @@ else if( $submit || $refresh || $mode != "" ) else if( $mode == "reply" || $mode == "quote" ) { - $sql = "SELECT pm.privmsgs_subject, pm.privmsgs_date, pmt.privmsgs_text, u.username, u.user_id + $sql = "SELECT pm.privmsgs_subject, pm.privmsgs_date, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u WHERE pm.privmsgs_id = $privmsg_id AND pmt.privmsgs_text_id = pm.privmsgs_id @@ -1270,19 +1270,18 @@ else if( $submit || $refresh || $mode != "" ) $privmsg = $db->sql_fetchrow($pm_reply_status); $privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject']; + $privmsg_message = $privmsg['privmsgs_text']; + $privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid']; $to_username = $privmsg['username']; $to_userid = $privmsg['user_id']; - $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $privmsg_message); + $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message); $privmsg_message = str_replace("<br />", "\n", $privmsg_message); - $privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message); $privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message); if( $mode == "quote" ) { - $privmsg_message = $privmsg['privmsgs_text']; - $msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]"; $privmsg_message = "[quote=\"" . $to_username . "\"]\n" . $privmsg_message . "\n[/quote]"; @@ -1319,7 +1318,8 @@ else if( $submit || $refresh || $mode != "" ) $bbcode_uid = make_bbcode_uid(); } - $preview_message = prepare_message($privmsg_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid); + $preview_message = stripslashes(prepare_message($privmsg_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid)); + $privmsg_message = stripslashes(preg_replace($html_entities_match, $html_entities_replace, $privmsg_message)); // // Finalise processing as per viewtopic |