kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Markup/quote fix for multibyte

Browse Source
This commit is contained in:
Michael Foster 2013-07-31 03:12:06 -04:00
parent 90b82b1a06
commit 37d769646b
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
inc/functions.php
View File

@ -297,6 +297,10 @@ function sprintf3($str, $vars, $delim = '%') {
array_values($replaces), $str); array_values($replaces), $str);
} }
function mb_substr_replace($string, $replacement, $start, $length) {
return mb_substr($string, 0, $start) . $replacement . mb_substr($string, $start + $length);
}
function setupBoard($array) { function setupBoard($array) {
global $board, $config; global $board, $config;
@ -1451,6 +1455,7 @@ function markup(&$body, $track_cites = false) {
} }
$skip_chars = 0; $skip_chars = 0;
$body_tmp = $body;
foreach ($cites as $matches) { foreach ($cites as $matches) {
$cite = $matches[2][0]; $cite = $matches[2][0];
@ -1458,20 +1463,26 @@ function markup(&$body, $track_cites = false) {
$query->bindValue(':id', $cite); $query->bindValue(':id', $cite);
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
// preg_replace is not multibyte-safe
foreach ($matches as &$match) {
$match[1] = mb_strlen(substr($body_tmp, 0, $match[1]));
}
if ($post = $query->fetch()) { if ($post = $query->fetch()) {
$replacement = '<a onclick="highlightReply(\''.$cite.'\');" href="' . $replacement = '<a onclick="highlightReply(\''.$cite.'\');" href="' .
$config['root'] . $board['dir'] . $config['dir']['res'] . ($post['thread']?$post['thread']:$post['id']) . '.html#' . $cite . '">' . $config['root'] . $board['dir'] . $config['dir']['res'] . ($post['thread']?$post['thread']:$post['id']) . '.html#' . $cite . '">' .
'&gt;&gt;' . $cite . '&gt;&gt;' . $cite .
'</a>'; '</a>';
$body = substr_replace($body, $matches[1][0] . $replacement . $matches[3][0], $matches[0][1] + $skip_chars, mb_strlen($matches[0][0]));
$skip_chars += mb_strlen($matches[1][0] . $replacement . $matches[3][0]) - mb_strlen($matches[0][0]);
$body = mb_substr_replace($body, $matches[1][0] . $replacement . $matches[3][0], $matches[0][1] + $skip_chars, mb_strlen($matches[0][0]));
$skip_chars += mb_strlen($matches[1][0] . $replacement . $matches[3][0]) - mb_strlen($matches[0][0]);
if ($track_cites && $config['track_cites']) if ($track_cites && $config['track_cites'])
$tracked_cites[] = array($board['uri'], $post['id']); $tracked_cites[] = array($board['uri'], $post['id']);
} }
} }
} }
// Cross-board linking // Cross-board linking
if (preg_match_all('/(^|\s)&gt;&gt;&gt;\/(' . $config['board_regex'] . 'f?)\/(\d+)?([\s,.)?]|$)/um', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) { if (preg_match_all('/(^|\s)&gt;&gt;&gt;\/(' . $config['board_regex'] . 'f?)\/(\d+)?([\s,.)?]|$)/um', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
if (count($cites[0]) > $config['max_cites']) { if (count($cites[0]) > $config['max_cites']) {
@ -1479,11 +1490,17 @@ function markup(&$body, $track_cites = false) {
} }
$skip_chars = 0; $skip_chars = 0;
$body_tmp = $body;
foreach ($cites as $matches) { foreach ($cites as $matches) {
$_board = $matches[2][0]; $_board = $matches[2][0];
$cite = @$matches[3][0]; $cite = @$matches[3][0];
// preg_replace is not multibyte-safe
foreach ($matches as &$match) {
$match[1] = mb_strlen(substr($body_tmp, 0, $match[1]));
}
// Temporarily store board information because it will be overwritten // Temporarily store board information because it will be overwritten
$tmp_board = $board['uri']; $tmp_board = $board['uri'];
@ -1499,7 +1516,8 @@ function markup(&$body, $track_cites = false) {
$config['root'] . $board['dir'] . $config['dir']['res'] . ($post['thread']?$post['thread']:$post['id']) . '.html#' . $cite . '">' . $config['root'] . $board['dir'] . $config['dir']['res'] . ($post['thread']?$post['thread']:$post['id']) . '.html#' . $cite . '">' .
'&gt;&gt;&gt;/' . $_board . '/' . $cite . '&gt;&gt;&gt;/' . $_board . '/' . $cite .
'</a>'; '</a>';
$body = substr_replace($body, $matches[1][0] . $replacement . $matches[4][0], $matches[0][1] + $skip_chars, mb_strlen($matches[0][0]));
$body = mb_substr_replace($body, $matches[1][0] . $replacement . $matches[4][0], $matches[0][1] + $skip_chars, mb_strlen($matches[0][0]));
$skip_chars += mb_strlen($matches[1][0] . $replacement . $matches[4][0]) - mb_strlen($matches[0][0]); $skip_chars += mb_strlen($matches[1][0] . $replacement . $matches[4][0]) - mb_strlen($matches[0][0]);
if ($track_cites && $config['track_cites']) if ($track_cites && $config['track_cites'])
@ -1510,7 +1528,7 @@ function markup(&$body, $track_cites = false) {
$config['root'] . $board['dir'] . $config['file_index'] . '">' . $config['root'] . $board['dir'] . $config['file_index'] . '">' .
'&gt;&gt;&gt;/' . $_board . '/' . '&gt;&gt;&gt;/' . $_board . '/' .
'</a>'; '</a>';
$body = substr_replace($body, $matches[1][0] . $replacement . $matches[4][0], $matches[0][1] + $skip_chars, mb_strlen($matches[0][0])); $body = mb_substr_replace($body, $matches[1][0] . $replacement . $matches[4][0], $matches[0][1] + $skip_chars, mb_strlen($matches[0][0]));
$skip_chars += mb_strlen($matches[1][0] . $replacement . $matches[4][0]) - mb_strlen($matches[0][0]); $skip_chars += mb_strlen($matches[1][0] . $replacement . $matches[4][0]) - mb_strlen($matches[0][0]);
} }
} }