mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 16:15:22 +02:00
Code Issues Releases Wiki Activity

Fix bug #486674 and removed superfluous/commented lines for html treatment

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@1477 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-11-29 12:46:16 +00:00
parent f0b14e59ee
commit 87f818b4ef
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/posting.php
View File

@ -661,6 +661,7 @@ if( $cancel )
$redirect = "index.$phpEx"; $redirect = "index.$phpEx";
$post_append = ""; $post_append = "";
} }
header("HTTP/1.0 302 Redirect");
header("Location:" . append_sid($redirect) . $post_append, true); header("Location:" . append_sid($redirect) . $post_append, true);
} }
// //
@ -985,6 +986,7 @@ if( !$is_auth[$is_auth_type] )
break; break;
} }
header("HTTP/1.0 302 Redirect");
header("Location: " . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true)); header("Location: " . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true));
} }
@ -1822,6 +1824,7 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error )
} }
else else
{ {
header("HTTP/1.0 302 Redirect");
header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true)); header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true));
} }
} }
@ -2366,7 +2369,6 @@ else
$post_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $post_message); $post_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $post_message);
$post_message = str_replace("<br />", "\n", $post_message); $post_message = str_replace("<br />", "\n", $post_message);
// $post_message = preg_replace($html_entities_match, $html_entities_replace, $post_message);
$post_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $post_message); $post_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $post_message);
// //

24
phpBB/privmsg.php
View File

@ -37,8 +37,8 @@ if( !empty($board_config['privmsg_disable']) )
// //
// Var definitions // Var definitions
// //
$html_entities_match = array("#<#", "#>#", "#& #", "#\"#"); $html_entities_match = array("#&#", "#<#", "#>#", "#\"#");
$html_entities_replace = array("&lt;", "&gt;", "&amp; ", "&quot;"); $html_entities_replace = array("&amp;", "&lt;", "&gt;", "&quot;");
// //
// Parameters // 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']))) : ""; $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_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', '&lt;textarea&gt;', $privmsg_message); $privmsg_message = preg_replace('#<textarea>#si', '&lt;textarea&gt;', $privmsg_message);
// //
@ -1217,7 +1217,7 @@ else if( $submit || $refresh || $mode != "" )
if( $mode == "edit" ) 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 FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u
WHERE pm.privmsgs_id = $privmsg_id WHERE pm.privmsgs_id = $privmsg_id
AND pmt.privmsgs_text_id = pm.privmsgs_id AND pmt.privmsgs_text_id = pm.privmsgs_id
@ -1237,10 +1237,10 @@ else if( $submit || $refresh || $mode != "" )
$privmsg_subject = $privmsg['privmsgs_subject']; $privmsg_subject = $privmsg['privmsgs_subject'];
$privmsg_message = $privmsg['privmsgs_text']; $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 = str_replace("<br />", "\n", $privmsg_message);
$privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message);
$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message); $privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);
$user_sig = $privmsg['user_sig']; $user_sig = $privmsg['user_sig'];
@ -1252,7 +1252,7 @@ else if( $submit || $refresh || $mode != "" )
else if( $mode == "reply" || $mode == "quote" ) 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 FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u
WHERE pm.privmsgs_id = $privmsg_id WHERE pm.privmsgs_id = $privmsg_id
AND pmt.privmsgs_text_id = pm.privmsgs_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 = $db->sql_fetchrow($pm_reply_status);
$privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject']; $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_username = $privmsg['username'];
$to_userid = $privmsg['user_id']; $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 = str_replace("<br />", "\n", $privmsg_message);
$privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message);
$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message); $privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);
if( $mode == "quote" ) 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]"; $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]"; $privmsg_message = "[quote=\"" . $to_username . "\"]\n" . $privmsg_message . "\n[/quote]";
@ -1319,7 +1318,8 @@ else if( $submit || $refresh || $mode != "" )
$bbcode_uid = make_bbcode_uid(); $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 // Finalise processing as per viewtopic