diff options
| author | James Atkinson <thefinn@users.sourceforge.net> | 2001-03-23 01:39:26 +0000 |
|---|---|---|
| committer | James Atkinson <thefinn@users.sourceforge.net> | 2001-03-23 01:39:26 +0000 |
| commit | 483c0dd58167194e48a09b0f65f17f5b89870dcf (patch) | |
| tree | a035dd50f7a2a134d3fbb8d814a6df28dd4f8d5c /phpBB/viewtopic.php | |
| parent | 7c82d91c7656fe3ceadcf2ba9c085cba5f333bb1 (diff) | |
| download | forums-483c0dd58167194e48a09b0f65f17f5b89870dcf.tar forums-483c0dd58167194e48a09b0f65f17f5b89870dcf.tar.gz forums-483c0dd58167194e48a09b0f65f17f5b89870dcf.tar.bz2 forums-483c0dd58167194e48a09b0f65f17f5b89870dcf.tar.xz forums-483c0dd58167194e48a09b0f65f17f5b89870dcf.zip | |
Handing of BBCode and HTML in sigs. BBCode/HTML settings apply to sigs as well as messages
git-svn-id: file:///svn/phpbb/trunk@134 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index e20edb015d..79af70da3a 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -85,7 +85,7 @@ if(!isset($start)) $start = 0; } -$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, r.rank_title, r.rank_image, p.post_time, p.post_id, p.bbcode_uid, pt.post_text +$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_sig, r.rank_title, r.rank_image, p.post_time, p.post_id, p.bbcode_uid, pt.post_text FROM ".POSTS_TABLE." p LEFT JOIN ".USERS_TABLE." u ON p.poster_id = u.user_id LEFT JOIN ".RANKS_TABLE." r ON (u.user_rank = r.rank_id) @@ -148,14 +148,20 @@ for($x = 0; $x < $total_posts; $x++) $message = stripslashes($postrow[$x]["post_text"]); $bbcode_uid = $postrow[$x]['bbcode_uid']; - + $user_sig = stripslashes($postrow[$x]['user_sig']); + if(!$allow_html) { + $user_sig = strip_tags($user_sig); $message = strip_tags($message); } if($allow_bbcode) { // do bbcode stuff here + $sig_uid = make_bbcode_uid(); + $user_sig = bbencode_first_pass($user_sig, $sig_uid); + $user_sig = bbencode_second_pass($user_sig, $sig_uid); + $message = bbencode_second_pass($message, $bbcode_uid); } @@ -172,7 +178,7 @@ for($x = 0; $x < $total_posts; $x++) $color = "#CCCCCC"; } - $message = eregi_replace("\[addsig]$", "<BR>_________________<BR>" . stripslashes($postrow[$x]["user_sig"]), $message); + $message = eregi_replace("\[addsig]$", "<BR>_________________<BR>" . nl2br($user_sig), $message); $template->assign_block_vars("postrow", array("TOPIC_TITLE" => $topic_title, "L_POSTED" => $l_posted, |