diff --git a/inc/config.php b/inc/config.php
index ccefe1e8..1d3321ce 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -464,10 +464,10 @@
*/
// "Wiki" markup syntax ($config['wiki_markup'] in pervious versions):
- $config['markup'][] = array("/'''([^<]+?)'''/", "\$1");
- $config['markup'][] = array("/''([^<]+?)''/", "\$1");
- $config['markup'][] = array("/\*\*([^<]+?)\*\*/", "\$1");
- $config['markup'][] = array("/^[ |\t]*==([^<]+?)==[ |\t]*$/m", "\$1");
+ $config['markup'][] = array("/'''(.+?)'''/", "\$1");
+ $config['markup'][] = array("/''(.+?)''/", "\$1");
+ $config['markup'][] = array("/\*\*(.+?)\*\*/", "\$1");
+ $config['markup'][] = array("/^[ |\t]*==(.+?)==[ |\t]*$/m", "\$1");
// Highlight PHP code wrapped in tags (PHP 5.3+)
// $config['markup'][] = array(
@@ -477,6 +477,16 @@
// }
// );
+ // Repair markup with HTML Tidy. This may be slower, but it solves nesting mistakes. Tinyboad, at the
+ // time of writing this, can not prevent out-of-order markup tags (eg. "**''test**'') without help from
+ // HTML Tidy.
+ $config['markup_repair_tidy'] = false;
+
+ // Always regenerate markup. This isn't recommended and should only be used for debugging; by default,
+ // Tinyboard only parses post markup when it needs to, and keeps post-markup HTML in the database. This
+ // will significantly impact performance when enabled.
+ $config['always_regenerate_markup'] = false;
+
/*
* ====================
* Image settings
@@ -606,7 +616,7 @@
// Display the aspect ratio of uploaded files.
$config['show_ratio'] = false;
// Display the file's original filename.
- $config['show_filename']= true;
+ $config['show_filename'] = true;
// Display image identification links using regex.info/exif, TinEye and Google Images.
$config['image_identification'] = false;
diff --git a/inc/display.php b/inc/display.php
index 84055d5f..4988cbf5 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -330,6 +330,11 @@ class Post {
$this->modifiers = extract_modifiers($this->body_nomarkup);
+ if ($config['always_regenerate_markup']) {
+ $this->body = $this->body_nomarkup;
+ markup($this->body);
+ }
+
if ($this->mod)
// Fix internal links
// Very complicated regex
@@ -430,6 +435,11 @@ class Thread {
$this->modifiers = extract_modifiers($this->body_nomarkup);
+ if ($config['always_regenerate_markup']) {
+ $this->body = $this->body_nomarkup;
+ markup($this->body);
+ }
+
if ($this->mod)
// Fix internal links
// Very complicated regex
diff --git a/inc/functions.php b/inc/functions.php
index ac1ff10f..379f1cbe 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1312,7 +1312,7 @@ function buildIndex() {
for ($page = 1; $page <= $config['max_pages']; $page++) {
$filename = $board['dir'] . ($page == 1 ? $config['file_index'] : sprintf($config['file_page'], $page));
- if ($config['try_smarter'] && isset($build_pages) && count($build_pages)
+ if ($config['try_smarter'] && isset($build_pages) && !empty($build_pages)
&& !in_array($page, $build_pages) && is_file($filename))
continue;
$content = index($page);
@@ -1360,6 +1360,9 @@ function buildIndex() {
$jsonFilename = $board['dir'] . 'catalog.json';
file_write($jsonFilename, $json);
}
+
+ if ($config['try_smarter'])
+ $build_pages = array();
}
function buildJavascript() {
@@ -1560,6 +1563,9 @@ function markup(&$body, $track_cites = false) {
if ($num_links > $config['max_links'])
error($config['error']['toomanylinks']);
}
+
+ if ($config['markup_repair_tidy'])
+ $body = str_replace(' ', ' ', $body);
if ($config['auto_unicode']) {
$body = unicodify($body);
@@ -1584,29 +1590,41 @@ function markup(&$body, $track_cites = false) {
$skip_chars = 0;
$body_tmp = $body;
-
+
+ $search_cites = array();
+ foreach ($cites as $matches) {
+ $search_cites[] = '`id` = ' . $matches[2][0];
+ }
+ $search_cites = array_unique($search_cites);
+
+ $query = query(sprintf('SELECT `thread`, `id` FROM ``posts_%s`` WHERE ' .
+ implode(' OR ', $search_cites), $board['uri'])) or error(db_error());
+
+ $cited_posts = array();
+ while ($cited = $query->fetch(PDO::FETCH_ASSOC)) {
+ $cited_posts[$cited['id']] = $cited['thread'] ? $cited['thread'] : false;
+ }
+
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->bindValue(':id', $cite);
- $query->execute() or error(db_error($query));
// preg_match_all is not multibyte-safe
foreach ($matches as &$match) {
$match[1] = mb_strlen(substr($body_tmp, 0, $match[1]));
}
- if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+ if (isset($cited_posts[$cite])) {
$replacement = '' .
- '>>' . $cite .
- '';
+ $config['root'] . $board['dir'] . $config['dir']['res'] .
+ ($cited_posts[$cite] ? $cited_posts[$cite] : $cite) . '.html#' . $cite . '">' .
+ '>>' . $cite .
+ '';
$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'])
- $tracked_cites[] = array($board['uri'], $post['id']);
+ $tracked_cites[] = array($board['uri'], $cite);
}
}
}
@@ -1619,6 +1637,66 @@ function markup(&$body, $track_cites = false) {
$skip_chars = 0;
$body_tmp = $body;
+
+ if (isset($cited_posts)) {
+ // Carry found posts from local board >>X links
+ foreach ($cited_posts as $cite => $thread) {
+ $cited_posts[$cite] = $config['root'] . $board['dir'] . $config['dir']['res'] .
+ ($thread ? $thread : $cite) . '.html#' . $cite;
+ }
+
+ $cited_posts = array(
+ $board['uri'] => $cited_posts
+ );
+ } else
+ $cited_posts = array();
+
+ $crossboard_indexes = array();
+ $search_cites_boards = array();
+
+ foreach ($cites as $matches) {
+ $_board = $matches[2][0];
+ $cite = @$matches[3][0];
+
+ if (!isset($search_cites_boards[$_board]))
+ $search_cites_boards[$_board] = array();
+ $search_cites_boards[$_board][] = $cite;
+ }
+
+ $tmp_board = $board['uri'];
+
+ foreach ($search_cites_boards as $_board => $search_cites) {
+ $clauses = array();
+ foreach ($search_cites as $cite) {
+ if (!$cite || isset($cited_posts[$_board][$cite]))
+ continue;
+ $clauses[] = '`id` = ' . $cite;
+ }
+ $clauses = array_unique($clauses);
+
+ if ($board['uri'] != $_board) {
+ if (!openBoard($_board))
+ continue; // Unknown board
+ }
+
+ if (!empty($clauses)) {
+ $cited_posts[$_board] = array();
+
+ $query = query(sprintf('SELECT `thread`, `id` FROM ``posts_%s`` WHERE ' .
+ implode(' OR ', $clauses), $board['uri'])) or error(db_error());
+
+ while ($cite = $query->fetch(PDO::FETCH_ASSOC)) {
+ $cited_posts[$_board][$cite['id']] = $config['root'] . $board['dir'] . $config['dir']['res'] .
+ ($cite['thread'] ? $cite['thread'] : $cite['id']) . '.html#' . $cite['id'];
+ }
+ }
+
+ $crossboard_indexes[$_board] = $config['root'] . $board['dir'] . $config['file_index'];
+ }
+
+ // Restore old board
+ if ($board['uri'] != $tmp_board)
+ openBoard($tmp_board);
foreach ($cites as $matches) {
$_board = $matches[2][0];
@@ -1629,42 +1707,34 @@ function markup(&$body, $track_cites = false) {
$match[1] = mb_strlen(substr($body_tmp, 0, $match[1]));
}
- // Temporarily store board information because it will be overwritten
- $tmp_board = $board['uri'];
-
- // Check if the board exists, and load settings
- if (openBoard($_board)) {
- if ($cite) {
- $query = prepare(sprintf("SELECT `thread`,`id` FROM ``posts_%s`` WHERE `id` = :id LIMIT 1", $board['uri']));
- $query->bindValue(':id', $cite);
- $query->execute() or error(db_error($query));
-
- if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
- $replacement = '' .
- '>>>/' . $_board . '/' . $cite .
- '';
-
- $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]);
-
- if ($track_cites && $config['track_cites'])
- $tracked_cites[] = array($board['uri'], $post['id']);
- }
- } else {
- $replacement = '' .
- '>>>/' . $_board . '/' .
- '';
+ if ($cite) {
+ if (isset($cited_posts[$_board][$cite])) {
+ $link = $cited_posts[$_board][$cite];
+
+ $replacement = '' .
+ '>>>/' . $_board . '/' . $cite .
+ '';
+
$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]);
+
+ if ($track_cites && $config['track_cites'])
+ $tracked_cites[] = array($_board, $cite);
}
+ } elseif(isset($crossboard_indexes[$_board])) {
+ $replacement = '' .
+ '>>>/' . $_board . '/' .
+ '';
+ $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]);
}
-
- // Restore main board settings
- openBoard($tmp_board);
}
}
+
+ $tracked_cites = array_unique($tracked_cites, SORT_REGULAR);
$body = preg_replace("/^\s*>.*$/m", '$0', $body);
@@ -1672,7 +1742,25 @@ function markup(&$body, $track_cites = false) {
$body = preg_replace('/\s+$/', '', $body);
$body = preg_replace("/\n/", '
', $body);
-
+
+ if ($config['markup_repair_tidy']) {
+ $tidy = new tidy();
+ $body = $tidy->repairString($body, array(
+ 'doctype' => 'omit',
+ 'bare' => true,
+ 'literal-attributes' => true,
+ 'indent' => false,
+ 'show-body-only' => true,
+ 'wrap' => 0,
+ 'output-bom' => false,
+ 'output-html' => true,
+ 'newline' => 'LF',
+ 'quiet' => true,
+
+ ), 'utf8');
+ $body = str_replace("\n", '', $body);
+ }
+
return $tracked_cites;
}
@@ -2025,7 +2113,7 @@ function rDNS($ip_addr) {
}
if ($config['cache']['enabled'])
- cache::set('rdns_' . $ip_addr, $host, 3600);
+ cache::set('rdns_' . $ip_addr, $host);
return $host;
}
@@ -2050,7 +2138,7 @@ function DNS($host) {
}
if ($config['cache']['enabled'])
- cache::set('dns_' . $host, $ip_addr !== false ? $ip_addr : '?', 3600);
+ cache::set('dns_' . $host, $ip_addr !== false ? $ip_addr : '?');
return $ip_addr;
}
diff --git a/inc/template.php b/inc/template.php
index 6f85e78b..6d417631 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -35,7 +35,7 @@ function load_twig() {
}
function Element($templateFile, array $options) {
- global $config, $debug, $twig;
+ global $config, $debug, $twig, $build_pages;
if (!$twig)
load_twig();
@@ -51,6 +51,8 @@ function Element($templateFile, array $options) {
unset($debug['start']);
unset($debug['start_debug']);
}
+ if ($config['try_smarter'] && isset($build_pages) && !empty($build_pages))
+ $debug['build_pages'] = $build_pages;
$debug['included'] = get_included_files();
$debug['memory'] = round(memory_get_usage(true) / (1024 * 1024), 2) . ' MiB';
$options['body'] .=
diff --git a/post.php b/post.php
index 867e3595..9fc4be66 100644
--- a/post.php
+++ b/post.php
@@ -684,15 +684,14 @@ if (isset($_POST['delete'])) {
incrementSpamHash($post['antispam_hash']);
}
- if (isset($post['tracked_cites'])) {
+ if (isset($post['tracked_cites']) && !empty($post['tracked_cites'])) {
+ $insert_rows = array();
foreach ($post['tracked_cites'] as $cite) {
- $query = prepare('INSERT INTO ``cites`` VALUES (:board, :post, :target_board, :target)');
- $query->bindValue(':board', $board['uri']);
- $query->bindValue(':post', $id, PDO::PARAM_INT);
- $query->bindValue(':target_board',$cite[0]);
- $query->bindValue(':target', $cite[1], PDO::PARAM_INT);
- $query->execute() or error(db_error($query));
+ $insert_rows[] = '(' .
+ $pdo->quote($board['uri']) . ', ' . (int)$id . ', ' .
+ $pdo->quote($cite[0]) . ', ' . (int)$cite[1] . ')';
}
+ query('INSERT INTO ``cites`` VALUES ' . implode(', ', $insert_rows)) or error(db_error());;
}
if (!$post['op'] && strtolower($post['email']) != 'sage' && !$thread['sage'] && ($config['reply_limit'] == 0 || $numposts['replies']+1 < $config['reply_limit'])) {
diff --git a/templates/posts.sql b/templates/posts.sql
index 1e092985..e41a7f38 100644
--- a/templates/posts.sql
+++ b/templates/posts.sql
@@ -29,6 +29,6 @@ CREATE TABLE IF NOT EXISTS ``posts_{{ board }}`` (
KEY `thread_id` (`thread`,`id`),
KEY `time` (`time`),
FULLTEXT KEY `body` (`body`),
- KEY `ip` (`ip`),
+ KEY `ip` (`ip`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1 ;
\ No newline at end of file