diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-04-13 23:20:26 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-04-13 23:20:26 +0000 |
| commit | 25711806b398fe404c281730adccd5a82793be16 (patch) | |
| tree | 05b163cdd6f8651f785146b29e6b7c344a8ea211 /phpBB | |
| parent | 39dd567f90bb5a4f688301b26e1dfaf691cd53a4 (diff) | |
| download | forums-25711806b398fe404c281730adccd5a82793be16.tar forums-25711806b398fe404c281730adccd5a82793be16.tar.gz forums-25711806b398fe404c281730adccd5a82793be16.tar.bz2 forums-25711806b398fe404c281730adccd5a82793be16.tar.xz forums-25711806b398fe404c281730adccd5a82793be16.zip | |
$message is now processed in its unslashed form. Should not break anything...
git-svn-id: file:///svn/phpbb/trunk@3831 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 11 | ||||
| -rw-r--r-- | phpBB/posting.php | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 9480c153c1..0dd91d4f78 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -783,7 +783,7 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_ { $post_sql = array_merge($post_sql, array( 'post_checksum' => $post_data['message_md5'], - 'post_text' => stripslashes($message), + 'post_text' => $message, 'post_encoding' => $user->lang['ENCODING'] )); } diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 409531305c..568fef2265 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -155,8 +155,10 @@ class parse_message function bbcode_init() { // Always parse [code] first + // [quote] moved to the second position $this->bbcode_array = array( 8 => array('#\[code\](.+\[/code\])#ise' => '$this->bbcode_code("\1")'), + 0 => array('#\[quote(=".*?")?\](.+?)\[/quote\]#ise' => '"[quote:$this->bbcode_uid" . $this->bbcode_quote("\1") . "]\2[/quote:$this->bbcode_uid]"'), 10 => array('#\[email(=.*?)?\](.*?)\[/email\]#ise' => '$this->validate_email("\1", "\2")'), 9 => array('#\[list(=[a-z|0-1]+)?\].*\[/list\]#ise' => '$this->bbcode_list("\0")'), 7 => array('#\[u\](.*?)\[/u\]#is' => '[u:' . $this->bbcode_uid . ']\1[/u:' . $this->bbcode_uid . ']'), @@ -168,8 +170,7 @@ class parse_message => '[img:' . $this->bbcode_uid . ']\1\2[/img:' . $this->bbcode_uid . ']'), 3 => array('#\[url=?(.*?)?\](.*?)\[/url\]#ise' => '$this->validate_url("\1", "\2")'), 2 => array('#\[i\](.*?)\[/i\]#is' => '[i:' . $this->bbcode_uid . ']\1[/i:' . $this->bbcode_uid . ']'), - 1 => array('#\[b\](.*?)\[/b\]#is' => '[b:' . $this->bbcode_uid . ']\1[/b:' . $this->bbcode_uid . ']'), - 0 => array('#\[quote(=".*?")?\](.*?)\[/quote\]#is' => '[quote:' . $this->bbcode_uid . '\1]\2[/quote:' . $this->bbcode_uid . ']') + 1 => array('#\[b\](.*?)\[/b\]#is' => '[b:' . $this->bbcode_uid . ']\1[/b:' . $this->bbcode_uid . ']') ); /************** @@ -183,6 +184,12 @@ class parse_message } + function bbcode_quote($username) + { + // Will do some stuff at some point (will hopefully prevent from breaking out quotes) + return $username; + } + function bbcode_code($in) { $str_from = array('<', '>', '"', ':', '[', ']', '(', ')', '{', '}', '.', '@'); diff --git a/phpBB/posting.php b/phpBB/posting.php index 3bdf57213f..28a70170ba 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -445,7 +445,7 @@ if (($submit) || ($preview) || ($refresh)) $subject = phpbb_strtolower($subject); } - $message_parser->message = (!empty($_POST['message'])) ? trim($_POST['message']) : ''; + $message_parser->message = (!empty($_POST['message'])) ? trim(stripslashes($_POST['message'])) : ''; $username = (!empty($_POST['username'])) ? trim($_POST['username']) : ''; $topic_type = (!empty($_POST['topic_type'])) ? intval($_POST['topic_type']) : POST_NORMAL; $icon_id = (!empty($_POST['icon'])) ? intval($_POST['icon']) : 0; @@ -649,7 +649,7 @@ if (($submit) || ($preview) || ($refresh)) submit_post($mode, $message_parser->message, $subject, $username, $topic_type, $message_parser->bbcode_uid, $poll, $attachment_data, $post_data); } - $post_text = stripslashes($message_parser->message); + $post_text = $message_parser->message; $post_subject = $topic_title = stripslashes($subject); } @@ -674,7 +674,7 @@ if ($preview) include($phpbb_root_path . 'includes/bbcode.' . $phpEx); $bbcode = new bbcode($message_parser->bbcode_uid, $message_parser->bbcode_bitfield); - $preview_message = format_display(stripslashes($message_parser->message), $enable_html, $enable_bbcode, $message_parser->bbcode_uid, $enable_urls, $enable_smilies, $enable_sig); + $preview_message = format_display($message_parser->message, $enable_html, $enable_bbcode, $message_parser->bbcode_uid, $enable_urls, $enable_smilies, $enable_sig); $preview_subject = (sizeof($censors)) ? preg_replace($censors['match'], $censors['replace'], $subject) : $subject; |