harmacist/vichan
1
0
Fork 0
forked from GithubBackups/vichan
Code Pull Requests Activity

Merge pull request #819 from Zankaria/minor-format

Browse Source 
Assorted PHP refactoring
This commit is contained in:
Lorenzo Yario 2024-10-08 20:11:41 -07:00 committed by GitHub
commit 88a81a6d74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 476 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
inc/display.php
View File

@ -9,7 +9,7 @@ if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
exit; exit;
} }
/* /*
joaoptm78@gmail.com joaoptm78@gmail.com
http://www.php.net/manual/en/function.filesize.php#100097 http://www.php.net/manual/en/function.filesize.php#100097
*/ */
@ -21,7 +21,7 @@ function format_bytes($size) {
function doBoardListPart($list, $root, &$boards) { function doBoardListPart($list, $root, &$boards) {
global $config; global $config;
$body = ''; $body = '';
foreach ($list as $key => $board) { foreach ($list as $key => $board) {
if (is_array($board)) if (is_array($board))
@ -34,21 +34,21 @@ function doBoardListPart($list, $root, &$boards) {
if (isset ($boards[$board])) { if (isset ($boards[$board])) {
$title = ' title="'.$boards[$board].'"'; $title = ' title="'.$boards[$board].'"';
} }
$body .= ' <a href="' . $root . $board . '/' . $config['file_index'] . '"'.$title.'>' . $board . '</a> /'; $body .= ' <a href="' . $root . $board . '/' . $config['file_index'] . '"'.$title.'>' . $board . '</a> /';
} }
} }
} }
$body = preg_replace('/\/$/', '', $body); $body = preg_replace('/\/$/', '', $body);
return $body; return $body;
} }
function createBoardlist($mod=false) { function createBoardlist($mod=false) {
global $config; global $config;
if (!isset($config['boards'])) return array('top'=>'','bottom'=>''); if (!isset($config['boards'])) return array('top'=>'','bottom'=>'');
$xboards = listBoards(); $xboards = listBoards();
$boards = array(); $boards = array();
foreach ($xboards as $val) { foreach ($xboards as $val) {
@ -59,12 +59,12 @@ function createBoardlist($mod=false) {
if ($config['boardlist_wrap_bracket'] && !preg_match('/\] $/', $body)) if ($config['boardlist_wrap_bracket'] && !preg_match('/\] $/', $body))
$body = '[' . $body . ']'; $body = '[' . $body . ']';
$body = trim($body); $body = trim($body);
// Message compact-boardlist.js faster, so that page looks less ugly during loading // Message compact-boardlist.js faster, so that page looks less ugly during loading
$top = "<script type='text/javascript'>if (typeof do_boardlist != 'undefined') do_boardlist();</script>"; $top = "<script type='text/javascript'>if (typeof do_boardlist != 'undefined') do_boardlist();</script>";
return array( return array(
'top' => '<div class="boardlist">' . $body . '</div>' . $top, 'top' => '<div class="boardlist">' . $body . '</div>' . $top,
'bottom' => '<div class="boardlist bottom">' . $body . '</div>' 'bottom' => '<div class="boardlist bottom">' . $body . '</div>'
@ -73,12 +73,12 @@ function createBoardlist($mod=false) {
function error($message, $priority = true, $debug_stuff = []) { function error($message, $priority = true, $debug_stuff = []) {
global $board, $mod, $config, $db_error; global $board, $mod, $config, $db_error;
if ($config['syslog'] && $priority !== false) { if ($config['syslog'] && $priority !== false) {
// Use LOG_NOTICE instead of LOG_ERR or LOG_WARNING because most error message are not significant. // Use LOG_NOTICE instead of LOG_ERR or LOG_WARNING because most error message are not significant.
_syslog($priority !== true ? $priority : LOG_NOTICE, $message); _syslog($priority !== true ? $priority : LOG_NOTICE, $message);
} }
if (defined('STDIN')) { if (defined('STDIN')) {
// Running from CLI // Running from CLI
echo('Error: ' . $message . "\n"); echo('Error: ' . $message . "\n");
@ -113,7 +113,7 @@ function error($message, $priority = true, $debug_stuff = []) {
}; };
if ($debug_stuff) if ($debug_stuff)
$debug_stuff = array_filter($debug_stuff, $debug_callback); $debug_stuff = array_filter($debug_stuff, $debug_callback);
die(Element($config['file_page_template'], array( die(Element($config['file_page_template'], array(
@ -132,7 +132,7 @@ function error($message, $priority = true, $debug_stuff = []) {
function loginForm($error=false, $username=false, $redirect=false) { function loginForm($error=false, $username=false, $redirect=false) {
global $config; global $config;
die(Element($config['file_page_template'], array( die(Element($config['file_page_template'], array(
'index' => $config['root'], 'index' => $config['root'],
'title' => _('Login'), 'title' => _('Login'),
@ -149,34 +149,34 @@ function loginForm($error=false, $username=false, $redirect=false) {
function pm_snippet($body, $len=null) { function pm_snippet($body, $len=null) {
global $config; global $config;
if (!isset($len)) if (!isset($len))
$len = &$config['mod']['snippet_length']; $len = &$config['mod']['snippet_length'];
// Replace line breaks with some whitespace // Replace line breaks with some whitespace
$body = preg_replace('@<br/?>@i', ' ', $body); $body = preg_replace('@<br/?>@i', ' ', $body);
// Strip tags // Strip tags
$body = strip_tags($body); $body = strip_tags($body);
// Unescape HTML characters, to avoid splitting them in half // Unescape HTML characters, to avoid splitting them in half
$body = html_entity_decode($body, ENT_COMPAT, 'UTF-8'); $body = html_entity_decode($body, ENT_COMPAT, 'UTF-8');
// calculate strlen() so we can add "..." after if needed // calculate strlen() so we can add "..." after if needed
$strlen = mb_strlen($body); $strlen = mb_strlen($body);
$body = mb_substr($body, 0, $len); $body = mb_substr($body, 0, $len);
// Re-escape the characters. // Re-escape the characters.
return '<em>' . utf8tohtml($body) . ($strlen > $len ? '&hellip;' : '') . '</em>'; return '<em>' . utf8tohtml($body) . ($strlen > $len ? '&hellip;' : '') . '</em>';
} }
function capcode($cap) { function capcode($cap) {
global $config; global $config;
if (!$cap) if (!$cap)
return false; return false;
$capcode = array(); $capcode = array();
if (isset($config['custom_capcode'][$cap])) { if (isset($config['custom_capcode'][$cap])) {
if (is_array($config['custom_capcode'][$cap])) { if (is_array($config['custom_capcode'][$cap])) {
@ -191,59 +191,59 @@ function capcode($cap) {
} else { } else {
$capcode['cap'] = sprintf($config['capcode'], $cap); $capcode['cap'] = sprintf($config['capcode'], $cap);
} }
return $capcode; return $capcode;
} }
function truncate($body, $url, $max_lines = false, $max_chars = false) { function truncate($body, $url, $max_lines = false, $max_chars = false) {
global $config; global $config;
if ($max_lines === false) if ($max_lines === false)
$max_lines = $config['body_truncate']; $max_lines = $config['body_truncate'];
if ($max_chars === false) if ($max_chars === false)
$max_chars = $config['body_truncate_char']; $max_chars = $config['body_truncate_char'];
// We don't want to risk truncating in the middle of an HTML comment. // We don't want to risk truncating in the middle of an HTML comment.
// It's easiest just to remove them all first. // It's easiest just to remove them all first.
$body = preg_replace('/<!--.*?-->/s', '', $body); $body = preg_replace('/<!--.*?-->/s', '', $body);
$original_body = $body; $original_body = $body;
$lines = substr_count($body, '<br/>'); $lines = substr_count($body, '<br/>');
// Limit line count // Limit line count
if ($lines > $max_lines) { if ($lines > $max_lines) {
if (preg_match('/(((.*?)<br\/>){' . $max_lines . '})/', $body, $m)) if (preg_match('/(((.*?)<br\/>){' . $max_lines . '})/', $body, $m))
$body = $m[0]; $body = $m[0];
} }
$body = mb_substr($body, 0, $max_chars); $body = mb_substr($body, 0, $max_chars);
if ($body != $original_body) { if ($body != $original_body) {
// Remove any corrupt tags at the end // Remove any corrupt tags at the end
$body = preg_replace('/<([\w]+)?([^>]*)?$/', '', $body); $body = preg_replace('/<([\w]+)?([^>]*)?$/', '', $body);
// Open tags // Open tags
if (preg_match_all('/<([\w]+)[^>]*>/', $body, $open_tags)) { if (preg_match_all('/<([\w]+)[^>]*>/', $body, $open_tags)) {
$tags = array(); $tags = array();
for ($x=0;$x<count($open_tags[0]);$x++) { for ($x=0;$x<count($open_tags[0]);$x++) {
if (!preg_match('/\/(\s+)?>$/', $open_tags[0][$x])) if (!preg_match('/\/(\s+)?>$/', $open_tags[0][$x]))
$tags[] = $open_tags[1][$x]; $tags[] = $open_tags[1][$x];
} }
// List successfully closed tags // List successfully closed tags
if (preg_match_all('/(<\/([\w]+))>/', $body, $closed_tags)) { if (preg_match_all('/(<\/([\w]+))>/', $body, $closed_tags)) {
for ($x=0;$x<count($closed_tags[0]);$x++) { for ($x=0;$x<count($closed_tags[0]);$x++) {
unset($tags[array_search($closed_tags[2][$x], $tags)]); unset($tags[array_search($closed_tags[2][$x], $tags)]);
} }
} }
// remove broken HTML entity at the end (if existent) // remove broken HTML entity at the end (if existent)
$body = preg_replace('/&[^;]+$/', '', $body); $body = preg_replace('/&[^;]+$/', '', $body);
$tags_no_close_needed = array("colgroup", "dd", "dt", "li", "optgroup", "option", "p", "tbody", "td", "tfoot", "th", "thead", "tr", "br", "img"); $tags_no_close_needed = array("colgroup", "dd", "dt", "li", "optgroup", "option", "p", "tbody", "td", "tfoot", "th", "thead", "tr", "br", "img");
// Close any open tags // Close any open tags
foreach ($tags as &$tag) { foreach ($tags as &$tag) {
if (!in_array($tag, $tags_no_close_needed)) if (!in_array($tag, $tags_no_close_needed))
@ -253,10 +253,10 @@ function truncate($body, $url, $max_lines = false, $max_chars = false) {
// remove broken HTML entity at the end (if existent) // remove broken HTML entity at the end (if existent)
$body = preg_replace('/&[^;]*$/', '', $body); $body = preg_replace('/&[^;]*$/', '', $body);
} }
$body .= '<span class="toolong">'.sprintf(_('Post too long. Click <a href="%s">here</a> to view the full text.'), $url).'</span>'; $body .= '<span class="toolong">'.sprintf(_('Post too long. Click <a href="%s">here</a> to view the full text.'), $url).'</span>';
} }
return $body; return $body;
} }
@ -266,21 +266,21 @@ function bidi_cleanup($data) {
$explicits = '\xE2\x80\xAA|\xE2\x80\xAB|\xE2\x80\xAD|\xE2\x80\xAE'; $explicits = '\xE2\x80\xAA|\xE2\x80\xAB|\xE2\x80\xAD|\xE2\x80\xAE';
$pdf = '\xE2\x80\xAC'; $pdf = '\xE2\x80\xAC';
preg_match_all("!$explicits!", $data, $m1, PREG_OFFSET_CAPTURE | PREG_SET_ORDER); preg_match_all("!$explicits!", $data, $m1, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
preg_match_all("!$pdf!", $data, $m2, PREG_OFFSET_CAPTURE | PREG_SET_ORDER); preg_match_all("!$pdf!", $data, $m2, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
if (count($m1) || count($m2)){ if (count($m1) || count($m2)){
$p = array(); $p = array();
foreach ($m1 as $m){ $p[$m[0][1]] = 'push'; } foreach ($m1 as $m){ $p[$m[0][1]] = 'push'; }
foreach ($m2 as $m){ $p[$m[0][1]] = 'pop'; } foreach ($m2 as $m){ $p[$m[0][1]] = 'pop'; }
ksort($p); ksort($p);
$offset = 0; $offset = 0;
$stack = 0; $stack = 0;
foreach ($p as $pos => $type){ foreach ($p as $pos => $type){
if ($type == 'push'){ if ($type == 'push'){
$stack++; $stack++;
}else{ }else{
@ -294,15 +294,15 @@ function bidi_cleanup($data) {
} }
} }
} }
# now add some pops if your stack is bigger than 0 # now add some pops if your stack is bigger than 0
for ($i=0; $i<$stack; $i++){ for ($i=0; $i<$stack; $i++){
$data .= "\xE2\x80\xAC"; $data .= "\xE2\x80\xAC";
} }
return $data; return $data;
} }
return $data; return $data;
} }
@ -317,24 +317,24 @@ function secure_link($href) {
function embed_html($link) { function embed_html($link) {
global $config; global $config;
foreach ($config['embedding'] as $embed) { foreach ($config['embedding'] as $embed) {
if ($html = preg_replace($embed[0], $embed[1], $link)) { if ($html = preg_replace($embed[0], $embed[1], $link)) {
if ($html == $link) if ($html == $link)
continue; // Nope continue; // Nope
$html = str_replace('%%tb_width%%', $config['embed_width'], $html); $html = str_replace('%%tb_width%%', $config['embed_width'], $html);
$html = str_replace('%%tb_height%%', $config['embed_height'], $html); $html = str_replace('%%tb_height%%', $config['embed_height'], $html);
return $html; return $html;
} }
} }
if ($link[0] == '<') { if ($link[0] == '<') {
// Prior to v0.9.6-dev-8, HTML code for embedding was stored in the database instead of the link. // Prior to v0.9.6-dev-8, HTML code for embedding was stored in the database instead of the link.
return $link; return $link;
} }
return 'Embedding error.'; return 'Embedding error.';
} }
@ -343,7 +343,7 @@ class Post {
global $config; global $config;
if (!isset($root)) if (!isset($root))
$root = &$config['root']; $root = &$config['root'];
foreach ($post as $key => $value) { foreach ($post as $key => $value) {
$this->{$key} = $value; $this->{$key} = $value;
} }
@ -367,22 +367,22 @@ class Post {
} }
} }
} }
$this->subject = utf8tohtml($this->subject); $this->subject = utf8tohtml($this->subject);
$this->name = utf8tohtml($this->name); $this->name = utf8tohtml($this->name);
$this->mod = $mod; $this->mod = $mod;
$this->root = $root; $this->root = $root;
if ($this->embed) if ($this->embed)
$this->embed = embed_html($this->embed); $this->embed = embed_html($this->embed);
$this->modifiers = extract_modifiers($this->body_nomarkup); $this->modifiers = extract_modifiers($this->body_nomarkup);
if ($config['always_regenerate_markup']) { if ($config['always_regenerate_markup']) {
$this->body = $this->body_nomarkup; $this->body = $this->body_nomarkup;
markup($this->body); markup($this->body);
} }
if ($this->mod) if ($this->mod)
// Fix internal links // Fix internal links
// Very complicated regex // Very complicated regex
@ -394,14 +394,25 @@ class Post {
} }
public function link($pre = '', $page = false) { public function link($pre = '', $page = false) {
global $config, $board; global $config, $board;
return $this->root . $board['dir'] . $config['dir']['res'] . link_for((array)$this, $page == '50') . '#' . $pre . $this->id; return $this->root . $board['dir'] . $config['dir']['res'] . link_for((array)$this, $page == '50') . '#' . $pre . $this->id;
} }
public function build($index=false) { public function build($index=false) {
global $board, $config; global $board, $config;
return Element($config['file_post_reply'], array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index, 'mod' => $this->mod)); $options = [
'config' => $config,
'board' => $board,
'post' => &$this,
'index' => $index,
'mod' => $this->mod
];
if ($this->mod) {
$options['pm'] = create_pm_header();
}
return Element($config['file_post_reply'], $options);
} }
}; };
@ -410,14 +421,14 @@ class Thread {
global $config; global $config;
if (!isset($root)) if (!isset($root))
$root = &$config['root']; $root = &$config['root'];
foreach ($post as $key => $value) { foreach ($post as $key => $value) {
$this->{$key} = $value; $this->{$key} = $value;
} }
if (isset($this->files)) if (isset($this->files))
$this->files = is_string($this->files) ? json_decode($this->files) : $this->files; $this->files = is_string($this->files) ? json_decode($this->files) : $this->files;
$this->subject = utf8tohtml($this->subject); $this->subject = utf8tohtml($this->subject);
$this->name = utf8tohtml($this->name); $this->name = utf8tohtml($this->name);
$this->mod = $mod; $this->mod = $mod;
@ -427,17 +438,17 @@ class Thread {
$this->posts = array(); $this->posts = array();
$this->omitted = 0; $this->omitted = 0;
$this->omitted_images = 0; $this->omitted_images = 0;
if ($this->embed) if ($this->embed)
$this->embed = embed_html($this->embed); $this->embed = embed_html($this->embed);
$this->modifiers = extract_modifiers($this->body_nomarkup); $this->modifiers = extract_modifiers($this->body_nomarkup);
if ($config['always_regenerate_markup']) { if ($config['always_regenerate_markup']) {
$this->body = $this->body_nomarkup; $this->body = $this->body_nomarkup;
markup($this->body); markup($this->body);
} }
if ($this->mod) if ($this->mod)
// Fix internal links // Fix internal links
// Very complicated regex // Very complicated regex
@ -449,7 +460,7 @@ class Thread {
} }
public function link($pre = '', $page = false) { public function link($pre = '', $page = false) {
global $config, $board; global $config, $board;
return $this->root . $board['dir'] . $config['dir']['res'] . link_for((array)$this, $page == '50') . '#' . $pre . $this->id; return $this->root . $board['dir'] . $config['dir']['res'] . link_for((array)$this, $page == '50') . '#' . $pre . $this->id;
} }
public function add(Post $post) { public function add(Post $post) {
@ -460,15 +471,27 @@ class Thread {
} }
public function build($index=false, $isnoko50=false) { public function build($index=false, $isnoko50=false) {
global $board, $config, $debug; global $board, $config, $debug;
$hasnoko50 = $this->postCount() >= $config['noko50_min']; $hasnoko50 = $this->postCount() >= $config['noko50_min'];
event('show-thread', $this); event('show-thread', $this);
$options = [
'config' => $config,
'board' => $board,
'post' => &$this,
'index' => $index,
'hasnoko50' => $hasnoko50,
'isnoko50' => $isnoko50,
'mod' => $this->mod
];
if ($this->mod) {
$options['pm'] = create_pm_header();
}
$file = ($index && $config['file_board']) ? $config['file_post_thread_fileboard'] : $config['file_post_thread']; $file = ($index && $config['file_board']) ? $config['file_post_thread_fileboard'] : $config['file_post_thread'];
$built = Element($file, array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index, 'hasnoko50' => $hasnoko50, 'isnoko50' => $isnoko50, 'mod' => $this->mod)); $built = Element($file, $options);
return $built; return $built;
} }
}; };

34
inc/functions.php
View File

@ -1301,7 +1301,14 @@ function index($page, $mod=false, $brief = false) {
} }
if ($config['file_board']) { if ($config['file_board']) {
$body = Element($config['file_fileboard'], array('body' => $body, 'mod' => $mod)); $options = [
'body' => $body,
'mod' => $mod
];
if ($mod) {
$options['pm'] = create_pm_header();
}
$body = Element($config['file_fileboard'], $options);
} }
return array( return array(
@ -1620,7 +1627,7 @@ function incrementSpamHash($hash) {
} }
function buildIndex($global_api = "yes") { function buildIndex($global_api = "yes") {
global $board, $config, $build_pages; global $board, $config, $build_pages, $mod;
$catalog_api_action = generation_strategy('sb_api', array($board['uri'])); $catalog_api_action = generation_strategy('sb_api', array($board['uri']));
@ -1692,6 +1699,9 @@ function buildIndex($global_api = "yes") {
$content['pages'][$page-1]['selected'] = true; $content['pages'][$page-1]['selected'] = true;
$content['btn'] = getPageButtons($content['pages']); $content['btn'] = getPageButtons($content['pages']);
$content['antibot'] = $antibot; $content['antibot'] = $antibot;
if ($mod) {
$content['pm'] = create_pm_header();
}
file_write($filename, Element($config['file_board_index'], $content)); file_write($filename, Element($config['file_board_index'], $content));
} }
@ -2274,7 +2284,7 @@ function buildThread($id, $return = false, $mod = false) {
$hasnoko50 = $thread->postCount() >= $config['noko50_min']; $hasnoko50 = $thread->postCount() >= $config['noko50_min'];
$antibot = $mod || $return ? false : create_antibot($board['uri'], $id); $antibot = $mod || $return ? false : create_antibot($board['uri'], $id);
$body = Element($config['file_thread'], array( $options = [
'board' => $board, 'board' => $board,
'thread' => $thread, 'thread' => $thread,
'body' => $thread->build(), 'body' => $thread->build(),
@ -2286,7 +2296,12 @@ function buildThread($id, $return = false, $mod = false) {
'antibot' => $antibot, 'antibot' => $antibot,
'boardlist' => createBoardlist($mod), 'boardlist' => createBoardlist($mod),
'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index']) 'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index'])
)); ];
if ($mod) {
$options['pm'] = create_pm_header();
}
$body = Element($config['file_thread'], $options);
// json api // json api
if ($config['api']['enabled'] && !$mod) { if ($config['api']['enabled'] && !$mod) {
@ -2323,7 +2338,7 @@ function buildThread($id, $return = false, $mod = false) {
} }
function buildThread50($id, $return = false, $mod = false, $thread = null, $antibot = false) { function buildThread50($id, $return = false, $mod = false, $thread = null, $antibot = false) {
global $board, $config, $build_pages; global $board, $config;
$id = round($id); $id = round($id);
if ($antibot) if ($antibot)
@ -2381,7 +2396,7 @@ function buildThread50($id, $return = false, $mod = false, $thread = null, $anti
$hasnoko50 = $thread->postCount() >= $config['noko50_min']; $hasnoko50 = $thread->postCount() >= $config['noko50_min'];
$body = Element($config['file_thread'], array( $options = [
'board' => $board, 'board' => $board,
'thread' => $thread, 'thread' => $thread,
'body' => $thread->build(false, true), 'body' => $thread->build(false, true),
@ -2393,7 +2408,12 @@ function buildThread50($id, $return = false, $mod = false, $thread = null, $anti
'antibot' => $mod ? false : ($antibot ? $antibot : create_antibot($board['uri'], $id)), 'antibot' => $mod ? false : ($antibot ? $antibot : create_antibot($board['uri'], $id)),
'boardlist' => createBoardlist($mod), 'boardlist' => createBoardlist($mod),
'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index']) 'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index'])
)); ];
if ($mod) {
$options['pm'] = create_pm_header();
}
$body = Element($config['file_thread'], $options);
if ($return) { if ($return) {
return $body; return $body;

491
inc/mod/pages.php
View File

@ -11,34 +11,41 @@ defined('TINYBOARD') or exit;
function _link_or_copy(string $target, string $link): bool { function _link_or_copy(string $target, string $link): bool {
if (!link($target, $link)) { if (!link($target, $link)) {
error_log("Failed to link() $target to $link. Falling back to copy()"); error_log("Failed to link() $target to $link. Falling back to copy()");
return copy($target, $link); return copy($target, $link);
} }
return true; return true;
} }
function mod_page($title, $template, $args, $subtitle = false) { function mod_page($title, $template, $args, $mod, $subtitle = false) {
global $config, $mod; global $config;
echo Element($config['file_page_template'], array( $options = [
'config' => $config, 'config' => $config,
'mod' => $mod, 'mod' => $mod,
'hide_dashboard_link' => $template == $config['file_mod_dashboard'], 'hide_dashboard_link' => $template == $config['file_mod_dashboard'],
'title' => $title, 'title' => $title,
'subtitle' => $subtitle, 'subtitle' => $subtitle,
'boardlist' => createBoardlist($mod), 'boardlist' => createBoardlist($mod),
'body' => Element($template, 'body' => Element(
array_merge( $template,
array('config' => $config, 'mod' => $mod), array_merge(
$args [ 'config' => $config, 'mod' => $mod ],
) $args
) )
) )
); ];
if ($mod) {
$options['pm'] = create_pm_header();
}
echo Element($config['file_page_template'], $options);
} }
function mod_login(Context $ctx, $redirect = false) { function mod_login(Context $ctx, $redirect = false) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
$args = []; $args = [];
@ -72,12 +79,21 @@ function mod_login(Context $ctx, $redirect = false) {
if (isset($_POST['username'])) if (isset($_POST['username']))
$args['username'] = $_POST['username']; $args['username'] = $_POST['username'];
mod_page(_('Login'), $config['file_mod_login'], $args); mod_page(_('Login'), $config['file_mod_login'], $args, $mod);
} }
function mod_confirm(Context $ctx, $request) { function mod_confirm(Context $ctx, $request) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
mod_page(_('Confirm action'), $config['file_mod_confim'], array('request' => $request, 'token' => make_secure_link_token($request))); mod_page(
_('Confirm action'),
$config['file_mod_confim'],
[
'request' => $request,
'token' => make_secure_link_token($request)
],
$mod
);
} }
function mod_logout(Context $ctx) { function mod_logout(Context $ctx) {
@ -179,7 +195,7 @@ function mod_dashboard(Context $ctx) {
$args['logout_token'] = make_secure_link_token('logout'); $args['logout_token'] = make_secure_link_token('logout');
mod_page(_('Dashboard'), $config['file_mod_dashboard'], $args); mod_page(_('Dashboard'), $config['file_mod_dashboard'], $args, $mod);
} }
function mod_search_redirect(Context $ctx) { function mod_search_redirect(Context $ctx) {
@ -206,7 +222,7 @@ function mod_search_redirect(Context $ctx) {
} }
function mod_search(Context $ctx, $type, $search_query_escaped, $page_no = 1) { function mod_search(Context $ctx, $type, $search_query_escaped, $page_no = 1) {
global $pdo, $config; global $pdo, $config, $mod;
if (!hasPermission($config['mod']['search'])) if (!hasPermission($config['mod']['search']))
error($config['error']['noaccess']); error($config['error']['noaccess']);
@ -351,17 +367,22 @@ function mod_search(Context $ctx, $type, $search_query_escaped, $page_no = 1) {
// $results now contains the search results // $results now contains the search results
mod_page(_('Search results'), $config['file_mod_search_results'], array( mod_page(
'search_type' => $type, _('Search results'),
'search_query' => $search_query, $config['file_mod_search_results'],
'search_query_escaped' => $search_query_escaped, [
'result_count' => $result_count, 'search_type' => $type,
'results' => $results 'search_query' => $search_query,
)); 'search_query_escaped' => $search_query_escaped,
'result_count' => $result_count,
'results' => $results
],
$mod
);
} }
function mod_edit_board(Context $ctx, $boardName) { function mod_edit_board(Context $ctx, $boardName) {
global $board, $config; global $board, $config, $mod;
if (!openBoard($boardName)) if (!openBoard($boardName))
error($config['error']['noboard']); error($config['error']['noboard']);
@ -455,15 +476,20 @@ function mod_edit_board(Context $ctx, $boardName) {
header('Location: ?/', true, $config['redirect_http']); header('Location: ?/', true, $config['redirect_http']);
} else { } else {
mod_page(sprintf('%s: ' . $config['board_abbreviation'], _('Edit board'), $board['uri']), $config['file_mod_board'], array( mod_page(
'board' => $board, sprintf('%s: ' . $config['board_abbreviation'], _('Edit board'), $board['uri']),
'token' => make_secure_link_token('edit/' . $board['uri']) $config['file_mod_board'],
)); [
'board' => $board,
'token' => make_secure_link_token('edit/' . $board['uri'])
],
$mod
);
} }
} }
function mod_new_board(Context $ctx) { function mod_new_board(Context $ctx) {
global $board; global $board, $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!hasPermission($config['mod']['newboard'])) if (!hasPermission($config['mod']['newboard']))
@ -511,7 +537,7 @@ function mod_new_board(Context $ctx) {
if (!openBoard($_POST['uri'])) if (!openBoard($_POST['uri']))
error(_("Couldn't open board after creation.")); error(_("Couldn't open board after creation."));
$query = Element('posts.sql', array('board' => $board['uri'])); $query = Element('posts.sql', [ 'board' => $board['uri'] ]);
if (mysql_version() < 50503) if (mysql_version() < 50503)
$query = preg_replace('/(CHARSET=|CHARACTER SET )utf8mb4/', '$1utf8', $query); $query = preg_replace('/(CHARSET=|CHARACTER SET )utf8mb4/', '$1utf8', $query);
@ -529,7 +555,15 @@ function mod_new_board(Context $ctx) {
header('Location: ?/' . $board['uri'] . '/' . $config['file_index'], true, $config['redirect_http']); header('Location: ?/' . $board['uri'] . '/' . $config['file_index'], true, $config['redirect_http']);
} }
mod_page(_('New board'), $config['file_mod_board'], array('new' => true, 'token' => make_secure_link_token('new-board'))); mod_page(
_('New board'),
$config['file_mod_board'],
[
'new' => true,
'token' => make_secure_link_token('new-board')
],
$mod
);
} }
function mod_noticeboard(Context $ctx, $page_no = 1) { function mod_noticeboard(Context $ctx, $page_no = 1) {
@ -581,11 +615,16 @@ function mod_noticeboard(Context $ctx, $page_no = 1) {
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
$count = $query->fetchColumn(); $count = $query->fetchColumn();
mod_page(_('Noticeboard'), $config['file_mod_noticeboard'], array( mod_page(
'noticeboard' => $noticeboard, _('Noticeboard'),
'count' => $count, $config['file_mod_noticeboard'],
'token' => make_secure_link_token('noticeboard') [
)); 'noticeboard' => $noticeboard,
'count' => $count,
'token' => make_secure_link_token('noticeboard')
],
$mod
);
} }
function mod_noticeboard_delete(Context $ctx, $id) { function mod_noticeboard_delete(Context $ctx, $id) {
@ -651,7 +690,16 @@ function mod_news(Context $ctx, $page_no = 1) {
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
$count = $query->fetchColumn(); $count = $query->fetchColumn();
mod_page(_('News'), $config['file_mod_news'], array('news' => $news, 'count' => $count, 'token' => make_secure_link_token('edit_news'))); mod_page(
_('News'),
$config['file_mod_news'],
[
'news' => $news,
'count' => $count,
'token' => make_secure_link_token('edit_news')
],
$mod
);
} }
function mod_news_delete(Context $ctx, $id) { function mod_news_delete(Context $ctx, $id) {
@ -670,6 +718,7 @@ function mod_news_delete(Context $ctx, $id) {
} }
function mod_log(Context $ctx, $page_no = 1) { function mod_log(Context $ctx, $page_no = 1) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if ($page_no < 1) if ($page_no < 1)
@ -691,10 +740,11 @@ function mod_log(Context $ctx, $page_no = 1) {
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
$count = $query->fetchColumn(); $count = $query->fetchColumn();
mod_page(_('Moderation log'), $config['file_mod_log'], array('logs' => $logs, 'count' => $count)); mod_page(_('Moderation log'), $config['file_mod_log'], [ 'logs' => $logs, 'count' => $count ], $mod);
} }
function mod_user_log(Context $ctx, $username, $page_no = 1) { function mod_user_log(Context $ctx, $username, $page_no = 1) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if ($page_no < 1) if ($page_no < 1)
@ -718,10 +768,11 @@ function mod_user_log(Context $ctx, $username, $page_no = 1) {
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
$count = $query->fetchColumn(); $count = $query->fetchColumn();
mod_page(_('Moderation log'), $config['file_mod_log'], array('logs' => $logs, 'count' => $count, 'username' => $username)); mod_page(_('Moderation log'), $config['file_mod_log'], [ 'logs' => $logs, 'count' => $count, 'username' => $username ], $mod);
} }
function mod_board_log(Context $ctx, $board, $page_no = 1, $hide_names = false, $public = false) { function mod_board_log(Context $ctx, $board, $page_no = 1, $hide_names = false, $public = false) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if ($page_no < 1) if ($page_no < 1)
@ -754,7 +805,18 @@ function mod_board_log(Context $ctx, $board, $page_no = 1, $hide_names = false,
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
$count = $query->fetchColumn(); $count = $query->fetchColumn();
mod_page(_('Board log'), $config['file_mod_log'], array('logs' => $logs, 'count' => $count, 'board' => $board, 'hide_names' => $hide_names, 'public' => $public)); mod_page(
_('Board log'),
$config['file_mod_log'],
[
'logs' => $logs,
'count' => $count,
'board' => $board,
'hide_names' => $hide_names,
'public' => $public
],
$mod
);
} }
function mod_view_catalog(Context $ctx, $boardName) { function mod_view_catalog(Context $ctx, $boardName) {
@ -785,6 +847,7 @@ function mod_view_board(Context $ctx, $boardName, $page_no = 1) {
$page['btn'] = getPageButtons($page['pages'], true); $page['btn'] = getPageButtons($page['pages'], true);
$page['mod'] = true; $page['mod'] = true;
$page['config'] = $config; $page['config'] = $config;
$page['pm'] = create_pm_header();
echo Element($config['file_board_index'], $page); echo Element($config['file_board_index'], $page);
} }
@ -934,10 +997,11 @@ function mod_ip(Context $ctx, $cip) {
$args['security_token'] = make_secure_link_token('IP/' . $cip); $args['security_token'] = make_secure_link_token('IP/' . $cip);
mod_page(sprintf('%s: %s', _('IP'), htmlspecialchars($cip)), $config['file_mod_view_ip'], $args, $args['hostname']); mod_page(sprintf('%s: %s', _('IP'), htmlspecialchars($cip)), $config['file_mod_view_ip'], $args, $mod, $args['hostname']);
} }
function mod_edit_ban(Context $ctx, $ban_id) { function mod_edit_ban(Context $ctx, $ban_id) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!hasPermission($config['mod']['edit_ban'])) if (!hasPermission($config['mod']['edit_ban']))
@ -983,18 +1047,18 @@ function mod_edit_ban(Context $ctx, $ban_id) {
$args['token'] = make_secure_link_token('edit_ban/' . $ban_id); $args['token'] = make_secure_link_token('edit_ban/' . $ban_id);
mod_page(_('Edit ban'), 'mod/edit_ban.html', $args); mod_page(_('Edit ban'), 'mod/edit_ban.html', $args, $mod);
} }
function mod_ban(Context $ctx) { function mod_ban(Context $ctx) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!hasPermission($config['mod']['ban'])) if (!hasPermission($config['mod']['ban']))
error($config['error']['noaccess']); error($config['error']['noaccess']);
if (!isset($_POST['ip'], $_POST['reason'], $_POST['length'], $_POST['board'])) { if (!isset($_POST['ip'], $_POST['reason'], $_POST['length'], $_POST['board'])) {
mod_page(_('New ban'), $config['file_mod_ban_form'], array('token' => make_secure_link_token('ban'))); mod_page(_('New ban'), $config['file_mod_ban_form'], [ 'token' => make_secure_link_token('ban') ], $mod);
return; return;
} }
@ -1028,17 +1092,22 @@ function mod_bans(Context $ctx) {
foreach ($unban as $id) { foreach ($unban as $id) {
Bans::delete($id, true, $mod['boards'], true); Bans::delete($id, true, $mod['boards'], true);
} }
Vichan\Functions\Theme\rebuild_themes('bans'); Vichan\Functions\Theme\rebuild_themes('bans');
header('Location: ?/bans', true, $config['redirect_http']); header('Location: ?/bans', true, $config['redirect_http']);
return; return;
} }
mod_page(_('Ban list'), $config['file_mod_ban_list'], array( mod_page(
'mod' => $mod, _('Ban list'),
'boards' => json_encode($mod['boards']), $config['file_mod_ban_list'],
'token' => make_secure_link_token('bans'), [
'token_json' => make_secure_link_token('bans.json') 'mod' => $mod,
)); 'boards' => json_encode($mod['boards']),
'token' => make_secure_link_token('bans'),
'token_json' => make_secure_link_token('bans.json')
],
$mod
);
} }
function mod_bans_json(Context $ctx) { function mod_bans_json(Context $ctx) {
@ -1055,7 +1124,7 @@ function mod_bans_json(Context $ctx) {
} }
function mod_ban_appeals(Context $ctx) { function mod_ban_appeals(Context $ctx) {
global $board; global $board, $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!hasPermission($config['mod']['view_ban_appeals'])) if (!hasPermission($config['mod']['view_ban_appeals']))
@ -1125,10 +1194,15 @@ function mod_ban_appeals(Context $ctx) {
} }
} }
mod_page(_('Ban appeals'), $config['file_mod_ban_appeals'], array( mod_page(
'ban_appeals' => $ban_appeals, _('Ban appeals'),
'token' => make_secure_link_token('ban-appeals') $config['file_mod_ban_appeals'],
)); [
'ban_appeals' => $ban_appeals,
'token' => make_secure_link_token('ban-appeals')
],
$mod
);
} }
function mod_lock(Context $ctx, $board, $unlock, $post) { function mod_lock(Context $ctx, $board, $unlock, $post) {
@ -1232,7 +1306,7 @@ function mod_bumplock(Context $ctx, $board, $unbumplock, $post) {
} }
function mod_move_reply(Context $ctx, $originBoard, $postID) { function mod_move_reply(Context $ctx, $originBoard, $postID) {
global $board, $config; global $board, $config, $mod;
if (!openBoard($originBoard)) if (!openBoard($originBoard))
error($config['error']['noboard']); error($config['error']['noboard']);
@ -1321,20 +1395,27 @@ function mod_move_reply(Context $ctx, $originBoard, $postID) {
// redirect // redirect
header('Location: ?/' . sprintf($config['board_path'], $board['uri']) . $config['dir']['res'] . link_for($post) . '#' . $newID, true, $config['redirect_http']); header('Location: ?/' . sprintf($config['board_path'], $board['uri']) . $config['dir']['res'] . link_for($post) . '#' . $newID, true, $config['redirect_http']);
} }
else { else {
$boards = listBoards(); $boards = listBoards();
$security_token = make_secure_link_token($originBoard . '/move_reply/' . $postID); $security_token = make_secure_link_token($originBoard . '/move_reply/' . $postID);
mod_page(_('Move reply'), $config['file_mod_move_reply'], array('post' => $postID, 'board' => $originBoard, 'boards' => $boards, 'token' => $security_token)); mod_page(
_('Move reply'),
$config['file_mod_move_reply'],
[
'post' => $postID,
'board' => $originBoard,
'boards' => $boards,
'token' => $security_token
],
$mod
);
} }
} }
function mod_move(Context $ctx, $originBoard, $postID) { function mod_move(Context $ctx, $originBoard, $postID) {
global $board, $config, $pdo; global $board, $config, $pdo, $mod;
if (!openBoard($originBoard)) if (!openBoard($originBoard))
error($config['error']['noboard']); error($config['error']['noboard']);
@ -1514,7 +1595,7 @@ function mod_move(Context $ctx, $originBoard, $postID) {
'op' => false 'op' => false
); );
$spost['body'] = $spost['body_nomarkup'] = sprintf($config['mod']['shadow_mesage'], '>>>/' . $targetBoard . '/' . $newID); $spost['body'] = $spost['body_nomarkup'] = sprintf($config['mod']['shadow_mesage'], '>>>/' . $targetBoard . '/' . $newID);
markup($spost['body']); markup($spost['body']);
@ -1540,10 +1621,21 @@ function mod_move(Context $ctx, $originBoard, $postID) {
$security_token = make_secure_link_token($originBoard . '/move/' . $postID); $security_token = make_secure_link_token($originBoard . '/move/' . $postID);
mod_page(_('Move thread'), $config['file_mod_move'], array('post' => $postID, 'board' => $originBoard, 'boards' => $boards, 'token' => $security_token)); mod_page(
_('Move thread'),
$config['file_mod_move'],
[
'post' => $postID,
'board' => $originBoard,
'boards' => $boards,
'token' => $security_token
],
$mod
);
} }
function mod_ban_post(Context $ctx, $board, $delete, $post, $token = false) { function mod_ban_post(Context $ctx, $board, $delete, $post, $token = false) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!openBoard($board)) if (!openBoard($board))
@ -1610,10 +1702,11 @@ function mod_ban_post(Context $ctx, $board, $delete, $post, $token = false) {
'token' => $security_token 'token' => $security_token
); );
mod_page(_('New ban'), $config['file_mod_ban_form'], $args); mod_page(_('New ban'), $config['file_mod_ban_form'], $args, $mod);
} }
function mod_edit_post(Context $ctx, $board, $edit_raw_html, $postID) { function mod_edit_post(Context $ctx, $board, $edit_raw_html, $postID) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!openBoard($board)) if (!openBoard($board))
@ -1686,7 +1779,17 @@ function mod_edit_post(Context $ctx, $board, $edit_raw_html, $postID) {
$post['body'] = str_replace("\t", '&#09;', $post['body']); $post['body'] = str_replace("\t", '&#09;', $post['body']);
} }
mod_page(_('Edit post'), $config['file_mod_edit_post_form'], array('token' => $security_token, 'board' => $board, 'raw' => $edit_raw_html, 'post' => $post)); mod_page(
_('Edit post'),
$config['file_mod_edit_post_form'],
[
'token' => $security_token,
'board' => $board,
'raw' => $edit_raw_html,
'post' => $post
],
$mod
);
} }
} }
@ -1974,16 +2077,21 @@ function mod_user(Context $ctx, $uid) {
$user['boards'] = explode(',', $user['boards']); $user['boards'] = explode(',', $user['boards']);
mod_page(_('Edit user'), $config['file_mod_user'], array( mod_page(
'user' => $user, _('Edit user'),
'logs' => $log, $config['file_mod_user'],
'boards' => listBoards(), [
'token' => make_secure_link_token('users/' . $user['id']) 'user' => $user,
)); 'logs' => $log,
'boards' => listBoards(),
'token' => make_secure_link_token('users/' . $user['id'])
],
$mod
);
} }
function mod_user_new(Context $ctx) { function mod_user_new(Context $ctx) {
global $pdo, $config; global $pdo, $config, $mod;
if (!hasPermission($config['mod']['createusers'])) if (!hasPermission($config['mod']['createusers']))
error($config['error']['noaccess']); error($config['error']['noaccess']);
@ -2031,11 +2139,21 @@ function mod_user_new(Context $ctx) {
return; return;
} }
mod_page(_('New user'), $config['file_mod_user'], array('new' => true, 'boards' => listBoards(), 'token' => make_secure_link_token('users/new'))); mod_page(
_('New user'),
$config['file_mod_user'],
[
'new' => true,
'boards' => listBoards(),
'token' => make_secure_link_token('users/new')
],
$mod
);
} }
function mod_users(Context $ctx) { function mod_users(Context $ctx) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!hasPermission($config['mod']['manageusers'])) if (!hasPermission($config['mod']['manageusers']))
@ -2053,7 +2171,7 @@ function mod_users(Context $ctx) {
$user['demote_token'] = make_secure_link_token("users/{$user['id']}/demote"); $user['demote_token'] = make_secure_link_token("users/{$user['id']}/demote");
} }
mod_page(sprintf('%s (%d)', _('Manage users'), count($users)), $config['file_mod_users'], array('users' => $users)); mod_page(sprintf('%s (%d)', _('Manage users'), count($users)), $config['file_mod_users'], [ 'users' => $users ], $mod);
} }
function mod_user_promote(Context $ctx, $uid, $action) { function mod_user_promote(Context $ctx, $uid, $action) {
@ -2143,14 +2261,19 @@ function mod_pm(Context $ctx, $id, $reply = false) {
if (!$pm['to_username']) if (!$pm['to_username'])
error($config['error']['404']); // deleted? error($config['error']['404']); // deleted?
mod_page(sprintf('%s %s', _('New PM for'), $pm['to_username']), $config['file_mod_new_pm'], array( mod_page(
'username' => $pm['username'], sprintf('%s %s', _('New PM for'), $pm['to_username']),
'id' => $pm['sender'], $config['file_mod_new_pm'],
'message' => quote($pm['message']), [
'token' => make_secure_link_token('new_PM/' . $pm['username']) 'username' => $pm['username'],
)); 'id' => $pm['sender'],
'message' => quote($pm['message']),
'token' => make_secure_link_token('new_PM/' . $pm['username'])
],
$mod
);
} else { } else {
mod_page(sprintf('%s &ndash; #%d', _('Private message'), $id), $config['file_mod_pm'], $pm); mod_page(sprintf('%s &ndash; #%d', _('Private message'), $id), $config['file_mod_pm'], $pm, $mod);
} }
} }
@ -2172,10 +2295,15 @@ function mod_inbox(Context $ctx) {
$message['snippet'] = pm_snippet($message['message']); $message['snippet'] = pm_snippet($message['message']);
} }
mod_page(sprintf('%s (%s)', _('PM inbox'), count($messages) > 0 ? $unread . ' unread' : 'empty'), $config['file_mod_inbox'], array( mod_page(
'messages' => $messages, sprintf('%s (%s)', _('PM inbox'), count($messages) > 0 ? $unread . ' unread' : 'empty'),
'unread' => $unread $config['file_mod_inbox'],
)); [
'messages' => $messages,
'unread' => $unread
],
$mod
);
} }
@ -2221,15 +2349,20 @@ function mod_new_pm(Context $ctx, $username) {
header('Location: ?/', true, $config['redirect_http']); header('Location: ?/', true, $config['redirect_http']);
} }
mod_page(sprintf('%s %s', _('New PM for'), $username), $config['file_mod_new_pm'], array( mod_page(
'username' => $username, sprintf('%s %s', _('New PM for'), $username),
'id' => $id, $config['file_mod_new_pm'],
'token' => make_secure_link_token('new_PM/' . $username) [
)); 'username' => $username,
'id' => $id,
'token' => make_secure_link_token('new_PM/' . $username)
],
$mod
);
} }
function mod_rebuild(Context $ctx) { function mod_rebuild(Context $ctx) {
global $twig; global $twig, $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!hasPermission($config['mod']['rebuild'])) if (!hasPermission($config['mod']['rebuild']))
@ -2291,14 +2424,19 @@ function mod_rebuild(Context $ctx) {
} }
} }
mod_page(_('Rebuild'), $config['file_mod_rebuilt'], array('logs' => $log)); mod_page(_('Rebuild'), $config['file_mod_rebuilt'], [ 'logs' => $log ], $mod);
return; return;
} }
mod_page(_('Rebuild'), $config['file_mod_rebuild'], array( mod_page(
'boards' => listBoards(), _('Rebuild'),
'token' => make_secure_link_token('rebuild') $config['file_mod_rebuild'],
)); [
'boards' => listBoards(),
'token' => make_secure_link_token('rebuild')
],
$mod
);
} }
function mod_reports(Context $ctx) { function mod_reports(Context $ctx) {
@ -2358,6 +2496,7 @@ function mod_reports(Context $ctx) {
'report' => $report, 'report' => $report,
'config' => $config, 'config' => $config,
'mod' => $mod, 'mod' => $mod,
'pm' => create_pm_header(),
'token' => make_secure_link_token('reports/' . $report['id'] . '/dismiss'), 'token' => make_secure_link_token('reports/' . $report['id'] . '/dismiss'),
'token_all' => make_secure_link_token('reports/' . $report['id'] . '/dismiss&all'), 'token_all' => make_secure_link_token('reports/' . $report['id'] . '/dismiss&all'),
'token_post' => make_secure_link_token('reports/'. $report['id'] . '/dismiss&post'), 'token_post' => make_secure_link_token('reports/'. $report['id'] . '/dismiss&post'),
@ -2382,7 +2521,15 @@ function mod_reports(Context $ctx) {
$count++; $count++;
} }
mod_page(sprintf('%s (%d)', _('Report queue'), $count), $config['file_mod_reports'], array('reports' => $body, 'count' => $count)); mod_page(
sprintf('%s (%d)', _('Report queue'), $count),
$config['file_mod_reports'],
[
'reports' => $body,
'count' => $count
],
$mod
);
} }
function mod_report_dismiss(Context $ctx, $id, $action) { function mod_report_dismiss(Context $ctx, $id, $action) {
@ -2479,13 +2626,16 @@ function mod_recent_posts(Context $ctx, $lim) {
$last_time = $post['time']; $last_time = $post['time'];
} }
echo mod_page(_('Recent posts'), $config['file_mod_recent_posts'], array( echo mod_page(
_('Recent posts'),
$config['file_mod_recent_posts'],
[
'posts' => $posts, 'posts' => $posts,
'limit' => $limit, 'limit' => $limit,
'last_time' => $last_time 'last_time' => $last_time
) ],
$mod
); );
} }
function mod_config(Context $ctx, $board_config = false) { function mod_config(Context $ctx, $board_config = false) {
@ -2525,14 +2675,19 @@ function mod_config(Context $ctx, $board_config = false) {
} }
$instance_config = str_replace("\n", '&#010;', utf8tohtml($instance_config)); $instance_config = str_replace("\n", '&#010;', utf8tohtml($instance_config));
mod_page(_('Config editor'), $config['file_mod_config_editor_php'], array( mod_page(
'php' => $instance_config, _('Config editor'),
'readonly' => $readonly, $config['file_mod_config_editor_php'],
'boards' => listBoards(), [
'board' => $board_config, 'php' => $instance_config,
'file' => $config_file, 'readonly' => $readonly,
'token' => make_secure_link_token('config' . ($board_config ? '/' . $board_config : '')) 'boards' => listBoards(),
)); 'board' => $board_config,
'file' => $config_file,
'token' => make_secure_link_token('config' . ($board_config ? '/' . $board_config : ''))
],
$mod
);
return; return;
} }
@ -2609,6 +2764,7 @@ function mod_config(Context $ctx, $board_config = false) {
<p style="text-align:center">You may proceed with these changes manually by copying and pasting the following code to the end of <strong>' . $config_file . '</strong>:</p> <p style="text-align:center">You may proceed with these changes manually by copying and pasting the following code to the end of <strong>' . $config_file . '</strong>:</p>
<textarea style="width:700px;height:370px;margin:auto;display:block;background:white;color:black" readonly>' . $config_append . '</textarea> <textarea style="width:700px;height:370px;margin:auto;display:block;background:white;color:black" readonly>' . $config_append . '</textarea>
'; ';
$page['pm'] = create_pm_header();
echo Element($config['file_page_template'], $page); echo Element($config['file_page_template'], $page);
exit; exit;
} }
@ -2619,17 +2775,22 @@ function mod_config(Context $ctx, $board_config = false) {
exit; exit;
} }
mod_page(_('Config editor') . ($board_config ? ': ' . sprintf($config['board_abbreviation'], $board_config) : ''), mod_page(
$config['file_mod_config_editor'], array( _('Config editor') . ($board_config ? ': ' . sprintf($config['board_abbreviation'], $board_config) : ''),
$config['file_mod_config_editor'],
[
'boards' => listBoards(), 'boards' => listBoards(),
'board' => $board_config, 'board' => $board_config,
'conf' => $conf, 'conf' => $conf,
'file' => $config_file, 'file' => $config_file,
'token' => make_secure_link_token('config' . ($board_config ? '/' . $board_config : '')) 'token' => make_secure_link_token('config' . ($board_config ? '/' . $board_config : ''))
)); ],
$mod
);
} }
function mod_themes_list(Context $ctx) { function mod_themes_list(Context $ctx) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!hasPermission($config['mod']['themes'])) if (!hasPermission($config['mod']['themes']))
@ -2657,13 +2818,19 @@ function mod_themes_list(Context $ctx) {
$theme['uninstall_token'] = make_secure_link_token('themes/' . $theme_name . '/uninstall'); $theme['uninstall_token'] = make_secure_link_token('themes/' . $theme_name . '/uninstall');
} }
mod_page(_('Manage themes'), $config['file_mod_themes'], array( mod_page(
'themes' => $themes, _('Manage themes'),
'themes_in_use' => $themes_in_use, $config['file_mod_themes'],
)); [
'themes' => $themes,
'themes_in_use' => $themes_in_use,
],
$mod
);
} }
function mod_theme_configure(Context $ctx, $theme_name) { function mod_theme_configure(Context $ctx, $theme_name) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!hasPermission($config['mod']['themes'])) if (!hasPermission($config['mod']['themes']))
@ -2726,23 +2893,33 @@ function mod_theme_configure(Context $ctx, $theme_name) {
// Build themes // Build themes
Vichan\Functions\Theme\rebuild_themes('all'); Vichan\Functions\Theme\rebuild_themes('all');
mod_page(sprintf(_($result ? 'Installed theme: %s' : 'Installation failed: %s'), $theme['name']), $config['file_mod_theme_installed'], array( mod_page(
'theme_name' => $theme_name, sprintf(_($result ? 'Installed theme: %s' : 'Installation failed: %s'), $theme['name']),
'theme' => $theme, $config['file_mod_theme_installed'],
'result' => $result, [
'message' => $message 'theme_name' => $theme_name,
)); 'theme' => $theme,
'result' => $result,
'message' => $message
],
$mod
);
return; return;
} }
$settings = Vichan\Functions\Theme\theme_settings($theme_name); $settings = Vichan\Functions\Theme\theme_settings($theme_name);
mod_page(sprintf(_('Configuring theme: %s'), $theme['name']), $config['file_mod_theme_config'], array( mod_page(
'theme_name' => $theme_name, sprintf(_('Configuring theme: %s'), $theme['name']),
'theme' => $theme, $config['file_mod_theme_config'],
'settings' => $settings, [
'token' => make_secure_link_token('themes/' . $theme_name) 'theme_name' => $theme_name,
)); 'theme' => $theme,
'settings' => $settings,
'token' => make_secure_link_token('themes/' . $theme_name)
],
$mod
);
} }
function mod_theme_uninstall(Context $ctx, $theme_name) { function mod_theme_uninstall(Context $ctx, $theme_name) {
@ -2763,6 +2940,7 @@ function mod_theme_uninstall(Context $ctx, $theme_name) {
} }
function mod_theme_rebuild(Context $ctx, $theme_name) { function mod_theme_rebuild(Context $ctx, $theme_name) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!hasPermission($config['mod']['themes'])) if (!hasPermission($config['mod']['themes']))
@ -2770,9 +2948,14 @@ function mod_theme_rebuild(Context $ctx, $theme_name) {
Vichan\Functions\Theme\rebuild_theme($theme_name, 'all'); Vichan\Functions\Theme\rebuild_theme($theme_name, 'all');
mod_page(sprintf(_('Rebuilt theme: %s'), $theme_name), $config['file_mod_theme_rebuilt'], array( mod_page(
'theme_name' => $theme_name, sprintf(_('Rebuilt theme: %s'), $theme_name),
)); $config['file_mod_theme_rebuilt'],
[
'theme_name' => $theme_name,
],
$mod
);
} }
// This needs to be done for `secure` CSRF prevention compatibility, otherwise the $board will be read in as the token if editing global pages. // This needs to be done for `secure` CSRF prevention compatibility, otherwise the $board will be read in as the token if editing global pages.
@ -2869,7 +3052,13 @@ function mod_edit_page(Context $ctx, $id) {
$fn = (isset($board['uri']) ? ($board['uri'] . '/') : '') . $page['name'] . '.html'; $fn = (isset($board['uri']) ? ($board['uri'] . '/') : '') . $page['name'] . '.html';
$body = "<div class='ban'>$write</div>"; $body = "<div class='ban'>$write</div>";
$html = Element($config['file_page_template'], array('config' => $config, 'boardlist' => createBoardlist(), 'body' => $body, 'title' => utf8tohtml($page['title']))); $html = Element($config['file_page_template'], [
'config' => $config,
'boardlist' => createBoardlist(),
'body' => $body,
'title' => utf8tohtml($page['title']),
'pm' => create_pm_header()
]);
file_write($fn, $html); file_write($fn, $html);
} }
@ -2880,7 +3069,17 @@ function mod_edit_page(Context $ctx, $id) {
$content = $query->fetchColumn(); $content = $query->fetchColumn();
} }
mod_page(sprintf(_('Editing static page: %s'), $page['name']), $config['file_mod_edit_page'], array('page' => $page, 'token' => make_secure_link_token("edit_page/$id"), 'content' => prettify_textarea($content), 'board' => $board)); mod_page(
sprintf(_('Editing static page: %s'), $page['name']),
$config['file_mod_edit_page'],
[
'page' => $page,
'token' => make_secure_link_token("edit_page/$id"),
'content' => prettify_textarea($content),
'board' => $board
],
$mod
);
} }
function mod_pages(Context $ctx, $board = false) { function mod_pages(Context $ctx, $board = false) {
@ -2935,11 +3134,20 @@ function mod_pages(Context $ctx, $board = false) {
$p['delete_token'] = make_secure_link_token('edit_pages/delete/' . $p['name'] . ($board ? ('/' . $board) : '')); $p['delete_token'] = make_secure_link_token('edit_pages/delete/' . $p['name'] . ($board ? ('/' . $board) : ''));
} }
mod_page(_('Pages'), $config['file_mod_pages'], array('pages' => $pages, 'token' => make_secure_link_token('edit_pages' . ($board ? ('/' . $board) : '')), 'board' => $board)); mod_page(
_('Pages'),
$config['file_mod_pages'],
[
'pages' => $pages,
'token' => make_secure_link_token('edit_pages' . ($board ? ('/' . $board) : '')),
'board' => $board
],
$mod
);
} }
function mod_debug_antispam(Context $ctx) { function mod_debug_antispam(Context $ctx) {
global $pdo, $config; global $pdo, $config, $mod;
$args = []; $args = [];
@ -2972,11 +3180,11 @@ function mod_debug_antispam(Context $ctx) {
$query = query('SELECT * FROM ``antispam`` ' . ($where ? "WHERE $where" : '') . ' ORDER BY `created` DESC LIMIT 20') or error(db_error()); $query = query('SELECT * FROM ``antispam`` ' . ($where ? "WHERE $where" : '') . ' ORDER BY `created` DESC LIMIT 20') or error(db_error());
$args['recent'] = $query->fetchAll(PDO::FETCH_ASSOC); $args['recent'] = $query->fetchAll(PDO::FETCH_ASSOC);
mod_page(_('Debug: Anti-spam'), $config['file_mod_debug_antispam'], $args); mod_page(_('Debug: Anti-spam'), $config['file_mod_debug_antispam'], $args, $mod);
} }
function mod_debug_recent_posts(Context $ctx) { function mod_debug_recent_posts(Context $ctx) {
global $pdo, $config; global $pdo, $config, $mod;
$limit = 500; $limit = 500;
@ -3006,10 +3214,11 @@ function mod_debug_recent_posts(Context $ctx) {
} }
} }
mod_page(_('Debug: Recent posts'), $config['file_mod_debug_recent_posts'], array('posts' => $posts, 'flood_posts' => $flood_posts)); mod_page(_('Debug: Recent posts'), $config['file_mod_debug_recent_posts'], [ 'posts' => $posts, 'flood_posts' => $flood_posts ], $mod);
} }
function mod_debug_sql(Context $ctx) { function mod_debug_sql(Context $ctx) {
global $mod;
$config = $ctx->get('config'); $config = $ctx->get('config');
if (!hasPermission($config['mod']['debug_sql'])) if (!hasPermission($config['mod']['debug_sql']))
@ -3030,5 +3239,5 @@ function mod_debug_sql(Context $ctx) {
} }
} }
mod_page(_('Debug: SQL'), $config['file_mod_debug_sql'], $args); mod_page(_('Debug: SQL'), $config['file_mod_debug_sql'], $args, $mod);
} }

4
inc/template.php
View File

@ -34,10 +34,6 @@ function Element($templateFile, array $options) {
if (!$twig) if (!$twig)
load_twig(); load_twig();
if (function_exists('create_pm_header') && ((isset($options['mod']) && $options['mod']) || isset($options['__mod'])) && !preg_match('!^mod/!', $templateFile)) {
$options['pm'] = create_pm_header();
}
if (isset($options['body']) && $config['debug']) { if (isset($options['body']) && $config['debug']) {
$_debug = $debug; $_debug = $debug;

8
mod.php
View File

@ -161,7 +161,7 @@ foreach ($pages as $uri => $handler) {
if ($secure_post_only) if ($secure_post_only)
error($config['error']['csrf']); error($config['error']['csrf']);
else { else {
mod_confirm(substr($query, 1)); mod_confirm($ctx, substr($query, 1));
exit; exit;
} }
} }
@ -184,10 +184,8 @@ foreach ($pages as $uri => $handler) {
$debug['time']['parse_mod_req'] = '~' . round((microtime(true) - $parse_start_time) * 1000, 2) . 'ms'; $debug['time']['parse_mod_req'] = '~' . round((microtime(true) - $parse_start_time) * 1000, 2) . 'ms';
} }
if (is_array($matches)) { // We don't want to call named parameters (PHP 8).
// we don't want to call named parameters (PHP 8) $matches = array_values($matches);
$matches = array_values($matches);
}
if (is_string($handler)) { if (is_string($handler)) {
if ($handler[0] == ':') { if ($handler[0] == ':') {