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

Fix markup overlapping. Issue #124

Browse Source
This commit is contained in:
Michael Foster 2013-07-26 11:01:13 -04:00
parent 33a1c00bd5
commit 37d5846e4e
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
inc/functions.php
View File

@ -1437,13 +1437,15 @@ function markup(&$body, $track_cites = false) {
$tracked_cites = array(); $tracked_cites = array();
// Cites // Cites
if (isset($board) && preg_match_all('/(^|\s)>>(\d+?)([\s,.)?]|$)/m', $body, $cites)) { if (isset($board) && preg_match_all('/(^|\s)>>(\d+?)([\s,.)?]|$)/m', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
if (count($cites[0]) > $config['max_cites']) { if (count($cites[0]) > $config['max_cites']) {
error($config['error']['toomanycites']); error($config['error']['toomanycites']);
} }
for ($index=0;$index<count($cites[0]);$index++) { $skip_chars = 0;
$cite = $cites[2][$index];
foreach ($cites as $matches) {
$cite = $matches[2][0];
$query = prepare(sprintf("SELECT `thread`,`id` FROM `posts_%s` WHERE `id` = :id LIMIT 1", $board['uri'])); $query = prepare(sprintf("SELECT `thread`,`id` FROM `posts_%s` WHERE `id` = :id LIMIT 1", $board['uri']));
$query->bindValue(':id', $cite); $query->bindValue(':id', $cite);
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
@ -1453,23 +1455,26 @@ 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;' . $cite . '&gt;&gt;' . $cite .
'</a>'; '</a>';
$body = str_replace($cites[0][$index], $cites[1][$index] . $replacement . $cites[3][$index], $body); $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]);
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;\/(\w+?)\/(\d+)?([\s,.)?]|$)/m', $body, $cites)) { if (preg_match_all('/(^|\s)&gt;&gt;&gt;\/(\w+?)\/(\d+)?([\s,.)?]|$)/m', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
if (count($cites[0]) > $config['max_cites']) { if (count($cites[0]) > $config['max_cites']) {
error($config['error']['toomanycross']); error($config['error']['toomanycross']);
} }
for ($index=0;$index<count($cites[0]);$index++) { $skip_chars = 0;
$_board = $cites[2][$index];
$cite = @$cites[3][$index]; foreach ($cites as $matches) {
$_board = $matches[2][0];
$cite = @$matches[3][0];
// 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'];
@ -1486,7 +1491,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 = str_replace($cites[0][$index], $cites[1][$index] . $replacement . $cites[4][$index], $body); $body = 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]);
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']);
@ -1496,7 +1502,8 @@ 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 = str_replace($cites[0][$index], $cites[1][$index] . $replacement . $cites[4][$index], $body); $body = 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]);
} }
} }