diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-26 14:07:33 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-26 14:07:33 +0000 |
| commit | 1d3f1cee552ed6986e6109ad1e5df432d4c944f4 (patch) | |
| tree | 0e7829718db8bf797fb1e1b6cff80e526ba8b43c /phpBB/posting.php | |
| parent | 8e50e5eb4e9ffc37e1d97aa39c22295086212f6a (diff) | |
| download | forums-1d3f1cee552ed6986e6109ad1e5df432d4c944f4.tar forums-1d3f1cee552ed6986e6109ad1e5df432d4c944f4.tar.gz forums-1d3f1cee552ed6986e6109ad1e5df432d4c944f4.tar.bz2 forums-1d3f1cee552ed6986e6109ad1e5df432d4c944f4.tar.xz forums-1d3f1cee552ed6986e6109ad1e5df432d4c944f4.zip | |
Fixes various issues inc. bugs #485538, #485323 and an incorrect conversion of some accented chars (thanks Ashe for noting it)
git-svn-id: file:///svn/phpbb/trunk@1453 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 54338a16e7..fc68d7b67b 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -38,10 +38,10 @@ function clean_words($entry, &$stopword_list, &$synonym_list) static $later_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "); static $sgml_match = array(" ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ"); - static $sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "i", "i", "i", "i", "i", "i", "u", "u", "u", "u", "y", "t", "y"); + static $sgml_replace = array(" ", "s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y"); static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ"); - static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "i", "i", "i", "i", "i", "i", "u", "u", "u", "u", "y", "t", "y"); + static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y"); $entry = " " . stripslashes(strip_tags(strtolower($entry))) . " "; @@ -579,8 +579,8 @@ function topic_review($topic_id, $is_inline_review) // Do some initial checks, set basic variables, // etc. // -$html_entities_match = array("#<#", "#>#", "#& #", "#\"#"); -$html_entities_replace = array("<", ">", "& ", """); +$html_entities_match = array("#&#", "#<#", "#>#", "#\"#"); +$html_entities_replace = array("&", "<", ">", """); $submit = ( isset($HTTP_POST_VARS['submit']) ) ? TRUE : 0; $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : 0; @@ -2160,7 +2160,7 @@ else if( $preview || $refresh || $error ) // $post_username = ( isset($HTTP_POST_VARS['username']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['username']))) : ""; $post_subject = ( isset($HTTP_POST_VARS['subject']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['subject']))) : ""; - $post_message = ( isset($HTTP_POST_VARS['message']) ) ? trim(stripslashes($HTTP_POST_VARS['message'])) : ""; + $post_message = ( isset($HTTP_POST_VARS['message']) ) ? trim($HTTP_POST_VARS['message']) : ""; $post_message = preg_replace('#<textarea>#si', '<textarea>', $post_message); $poll_title = ( isset($HTTP_POST_VARS['poll_title']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['poll_title']))) : ""; @@ -2354,7 +2354,7 @@ else $post_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $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($html_entities_match, $html_entities_replace, $post_message); $post_message = preg_replace('#</textarea>#si', '</textarea>', $post_message); // @@ -2480,13 +2480,15 @@ if( $preview && !$error ) $replacement_word = array(); $result = obtain_word_list($orig_word, $replacement_word); + if( $bbcode_on ) { $bbcode_uid = make_bbcode_uid(); } $preview_subject = $post_subject; - $preview_message = prepare_message($post_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid); + $preview_message = stripslashes(prepare_message($post_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid)); + $post_message = stripslashes(preg_replace($html_entities_match, $html_entities_replace, $post_message)); // // Finalise processing as per viewtopic |