diff options
| author | Michael Foster <savetheinternet@tinyboard.org> | 2013-07-31 21:24:17 -0400 |
|---|---|---|
| committer | Michael Foster <savetheinternet@tinyboard.org> | 2013-07-31 21:24:17 -0400 |
| commit | ea2b8cce077a092e0cbf136f9a45158668cc5ecf (patch) | |
| tree | 13a8ecffd00d47ec68e57cda190fb7342fb1ac58 /inc/mod | |
| parent | a5312ebe897036e89db57480abb0ae617a2bcb38 (diff) | |
Bugfix: HTML injection in post editing (introduces and fixes yet another bug)
Diffstat (limited to 'inc/mod')
| -rw-r--r-- | inc/mod/pages.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/inc/mod/pages.php b/inc/mod/pages.php index 7edc0ee6..2808dc56 100644 --- a/inc/mod/pages.php +++ b/inc/mod/pages.php @@ -1222,7 +1222,7 @@ function mod_ban_post($board, $delete, $post, $token = false) { $_POST['message'] = str_replace('%LENGTH%', strtoupper($length_english), $_POST['message']); $query = prepare(sprintf('UPDATE `posts_%s` SET `body_nomarkup` = CONCAT(`body_nomarkup`, :body_nomarkup) WHERE `id` = :id', $board)); $query->bindValue(':id', $post); - $query->bindValue(':body_nomarkup', sprintf("\n<tinyboard ban message>%s</tinyboard>", $_POST['message'])); + $query->bindValue(':body_nomarkup', sprintf("\n<tinyboard ban message>%s</tinyboard>", utf8tohtml($_POST['message']))); $query->execute() or error(db_error($query)); rebuildPost($post); @@ -1298,10 +1298,13 @@ function mod_edit_post($board, $edit_raw_html, $postID) { header('Location: ?/' . sprintf($config['board_path'], $board) . $config['dir']['res'] . sprintf($config['file_page'], $post['thread'] ? $post['thread'] : $postID) . '#' . $postID, true, $config['redirect_http']); } else { if ($config['minify_html']) { - $post['body_nomarkup'] = str_replace("\n", '
', $post['body_nomarkup']); - $post['body'] = str_replace("\n", '
', $post['body']); + // $post['body_nomarkup'] = str_replace("\n", '
', $post['body_nomarkup']); + // $post['body'] = str_replace("\n", '
', $post['body']); } + // Minifying this page causes an issue with newlines in the textarea. This is a temporary solution. + $config['minify_html'] = false; + mod_page(_('Edit post'), 'mod/edit_post_form.html', array('token' => $security_token, 'board' => $board, 'raw' => $edit_raw_html, 'post' => $post)); } } |