forked from leftypol/leftypol
Compare commits
1 commit
config
...
ffmpeg-fix
| Author | SHA1 | Date | |
|---|---|---|---|
|
6ae47061cd |
17 changed files with 114 additions and 309 deletions
|
|
@ -1,28 +0,0 @@
|
|||
<?php
|
||||
namespace Vichan\Data\Driver;
|
||||
|
||||
defined('TINYBOARD') or exit;
|
||||
|
||||
|
||||
/**
|
||||
* Log via the php function error_log.
|
||||
*/
|
||||
class ErrorLogLogDriver implements LogDriver {
|
||||
use LogTrait;
|
||||
|
||||
private string $name;
|
||||
private int $level;
|
||||
|
||||
public function __construct(string $name, int $level) {
|
||||
$this->name = $name;
|
||||
$this->level = $level;
|
||||
}
|
||||
|
||||
public function log(int $level, string $message): void {
|
||||
if ($level <= $this->level) {
|
||||
$lv = $this->levelToString($level);
|
||||
$line = "{$this->name} $lv: $message";
|
||||
\error_log($line, 0, null, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
<?php
|
||||
namespace Vichan\Data\Driver;
|
||||
|
||||
defined('TINYBOARD') or exit;
|
||||
|
||||
|
||||
/**
|
||||
* Log to a file.
|
||||
*/
|
||||
class FileLogDriver implements LogDriver {
|
||||
use LogTrait;
|
||||
|
||||
private string $name;
|
||||
private int $level;
|
||||
private mixed $fd;
|
||||
|
||||
public function __construct(string $name, int $level, string $file_path) {
|
||||
/*
|
||||
* error_log is slow as hell in it's 3rd mode, so use fopen + file locking instead.
|
||||
* https://grobmeier.solutions/performance-ofnonblocking-write-to-files-via-php-21082009.html
|
||||
*
|
||||
* Whatever file appending is atomic is contentious:
|
||||
* - There are no POSIX guarantees: https://stackoverflow.com/a/7237901
|
||||
* - But linus suggested they are on linux, on some filesystems: https://web.archive.org/web/20151201111541/http://article.gmane.org/gmane.linux.kernel/43445
|
||||
* - But it doesn't seem to be always the case: https://www.notthewizard.com/2014/06/17/are-files-appends-really-atomic/
|
||||
*
|
||||
* So we just use file locking to be sure.
|
||||
*/
|
||||
|
||||
$this->fd = \fopen($file_path, 'a');
|
||||
if ($this->fd === false) {
|
||||
throw new \RuntimeException("Unable to open log file at $file_path");
|
||||
}
|
||||
|
||||
$this->name = $name;
|
||||
$this->level = $level;
|
||||
|
||||
// In some cases PHP does not run the destructor.
|
||||
\register_shutdown_function([$this, 'close']);
|
||||
}
|
||||
|
||||
public function __destruct() {
|
||||
$this->close();
|
||||
}
|
||||
|
||||
public function log(int $level, string $message): void {
|
||||
if ($level <= $this->level) {
|
||||
$lv = $this->levelToString($level);
|
||||
$line = "{$this->name} $lv: $message\n";
|
||||
\flock($this->fd, LOCK_EX);
|
||||
\fwrite($this->fd, $line);
|
||||
\fflush($this->fd);
|
||||
\flock($this->fd, LOCK_UN);
|
||||
}
|
||||
}
|
||||
|
||||
public function close() {
|
||||
\flock($this->fd, LOCK_UN);
|
||||
\fclose($this->fd);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?php
|
||||
namespace Vichan\Data\Driver;
|
||||
|
||||
defined('TINYBOARD') or exit;
|
||||
|
||||
|
||||
interface LogDriver {
|
||||
public const EMERG = \LOG_EMERG;
|
||||
public const ERROR = \LOG_ERR;
|
||||
public const WARNING = \LOG_WARNING;
|
||||
public const NOTICE = \LOG_NOTICE;
|
||||
public const INFO = \LOG_INFO;
|
||||
public const DEBUG = \LOG_DEBUG;
|
||||
|
||||
/**
|
||||
* Log a message if the level of relevancy is at least the minimum.
|
||||
*
|
||||
* @param int $level Message level. Use Log interface constants.
|
||||
* @param string $message The message to log.
|
||||
*/
|
||||
public function log(int $level, string $message): void;
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
<?php
|
||||
namespace Vichan\Data\Driver;
|
||||
|
||||
defined('TINYBOARD') or exit;
|
||||
|
||||
|
||||
trait LogTrait {
|
||||
public static function levelToString(int $level): string {
|
||||
switch ($level) {
|
||||
case LogDriver::EMERG:
|
||||
return 'EMERG';
|
||||
case LogDriver::ERROR:
|
||||
return 'ERROR';
|
||||
case LogDriver::WARNING:
|
||||
return 'WARNING';
|
||||
case LogDriver::NOTICE:
|
||||
return 'NOTICE';
|
||||
case LogDriver::INFO:
|
||||
return 'INFO';
|
||||
case LogDriver::DEBUG:
|
||||
return 'DEBUG';
|
||||
default:
|
||||
throw new \InvalidArgumentException('Not a logging level');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
<?php
|
||||
namespace Vichan\Data\Driver;
|
||||
|
||||
defined('TINYBOARD') or exit;
|
||||
|
||||
|
||||
/**
|
||||
* Log to php's standard error file stream.
|
||||
*/
|
||||
class StderrLogDriver implements LogDriver {
|
||||
use LogTrait;
|
||||
|
||||
private string $name;
|
||||
private int $level;
|
||||
|
||||
public function __construct(string $name, int $level) {
|
||||
$this->name = $name;
|
||||
$this->level = $level;
|
||||
}
|
||||
|
||||
public function log(int $level, string $message): void {
|
||||
if ($level <= $this->level) {
|
||||
$lv = $this->levelToString($level);
|
||||
\fwrite(\STDERR, "{$this->name} $lv: $message\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
<?php
|
||||
namespace Vichan\Data\Driver;
|
||||
|
||||
defined('TINYBOARD') or exit;
|
||||
|
||||
/**
|
||||
* Log to syslog.
|
||||
*/
|
||||
class SyslogLogDriver implements LogDriver {
|
||||
private int $level;
|
||||
|
||||
public function __construct(string $name, int $level, bool $print_stderr) {
|
||||
$flags = \LOG_ODELAY;
|
||||
if ($print_stderr) {
|
||||
$flags |= \LOG_PERROR;
|
||||
}
|
||||
|
||||
if (!\openlog($name, $flags, \LOG_USER)) {
|
||||
throw new \RuntimeException('Unable to open syslog');
|
||||
}
|
||||
|
||||
$this->level = $level;
|
||||
}
|
||||
|
||||
public function log(int $level, string $message): void {
|
||||
if ($level <= $this->level) {
|
||||
if (isset($_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_METHOD'], $_SERVER['REQUEST_URI'])) {
|
||||
// CGI
|
||||
\syslog($level, "$message - client: {$_SERVER['REMOTE_ADDR']}, request: \"{$_SERVER['REQUEST_METHOD']} {$_SERVER['REQUEST_URI']}\"");
|
||||
} else {
|
||||
\syslog($level, $message);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -63,29 +63,9 @@
|
|||
// been generated. This keeps the script from querying the database and causing strain when not needed.
|
||||
$config['has_installed'] = '.installed';
|
||||
|
||||
// Deprecated, use 'log_system'.
|
||||
// Use syslog() for logging all error messages and unauthorized login attempts.
|
||||
$config['syslog'] = false;
|
||||
|
||||
$config['log_system'] = [
|
||||
/*
|
||||
* Log all error messages and unauthorized login attempts.
|
||||
* Can be "syslog", "error_log" (default), "file", or "stderr".
|
||||
*/
|
||||
'type' => 'error_log',
|
||||
// The application name used by the logging system. Defaults to "tinyboard" for backwards compatibility.
|
||||
'name' => 'tinyboard',
|
||||
/*
|
||||
* Only relevant if 'log_system' is set to "syslog". If true, double print the logs also in stderr. Defaults to
|
||||
* false.
|
||||
*/
|
||||
'syslog_stderr' => false,
|
||||
/*
|
||||
* Only relevant if "log_system" is set to `file`. Sets the file that vichan will log to. Defaults to
|
||||
* '/var/log/vichan.log'.
|
||||
*/
|
||||
'file_path' => '/var/log/vichan.log',
|
||||
];
|
||||
|
||||
// Use `host` via shell_exec() to lookup hostnames, avoiding query timeouts. May not work on your system.
|
||||
// Requires safe_mode to be disabled.
|
||||
$config['dns_system'] = false;
|
||||
|
|
@ -943,6 +923,10 @@
|
|||
// Location of thumbnail to use for deleted images.
|
||||
$config['image_deleted'] = 'static/deleted.png';
|
||||
|
||||
// When a thumbnailed image is going to be the same (in dimension), just copy the entire file and use
|
||||
// that as a thumbnail instead of resizing/redrawing.
|
||||
$config['minimum_copy_resize'] = false;
|
||||
|
||||
// Maximum image upload size in bytes.
|
||||
$config['max_filesize'] = 10 * 1024 * 1024; // 10MB
|
||||
// Maximum image dimensions.
|
||||
|
|
@ -981,6 +965,15 @@
|
|||
// Set this to true if you're using Linux and you can execute `md5sum` binary.
|
||||
$config['gnu_md5'] = false;
|
||||
|
||||
// Use Tesseract OCR to retrieve text from images, so you can use it as a spamfilter.
|
||||
$config['tesseract_ocr'] = false;
|
||||
|
||||
// Tesseract parameters
|
||||
$config['tesseract_params'] = '';
|
||||
|
||||
// Tesseract preprocess command
|
||||
$config['tesseract_preprocess_command'] = 'convert -monochrome %s -';
|
||||
|
||||
// Number of posts in a "View Last X Posts" page
|
||||
$config['noko50_count'] = 50;
|
||||
// Number of posts a thread needs before it gets a "View Last X Posts" page.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
namespace Vichan;
|
||||
|
||||
use Vichan\Data\Driver\CacheDriver;
|
||||
use Vichan\Data\{IpNoteQueries, ReportQueries, UserPostQueries};
|
||||
use Vichan\Data\Driver\{CacheDriver, ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver};
|
||||
|
||||
defined('TINYBOARD') or exit;
|
||||
|
||||
|
|
@ -31,34 +31,6 @@ class Context {
|
|||
function build_context(array $config): Context {
|
||||
return new Context([
|
||||
'config' => $config,
|
||||
LogDriver::class => function($c) {
|
||||
$config = $c->get('config');
|
||||
|
||||
$name = $config['log_system']['name'];
|
||||
$level = $config['debug'] ? LogDriver::DEBUG : LogDriver::NOTICE;
|
||||
$backend = $config['log_system']['type'];
|
||||
|
||||
$legacy_syslog = isset($config['syslog']) && $config['syslog'];
|
||||
|
||||
// Check 'syslog' for backwards compatibility.
|
||||
if ($legacy_syslog || $backend === 'syslog') {
|
||||
$log_driver = new SyslogLogDriver($name, $level, $config['log_system']['syslog_stderr']);
|
||||
if ($legacy_syslog) {
|
||||
$log_driver->log(LogDriver::NOTICE, 'The configuration setting \'syslog\' is deprecated. Please use \'log_system\' instead');
|
||||
}
|
||||
return $log_driver;
|
||||
} elseif ($backend === 'file') {
|
||||
return new FileLogDriver($name, $level, $config['log_system']['file_path']);
|
||||
} elseif ($backend === 'stderr') {
|
||||
return new StderrLogDriver($name, $level);
|
||||
} elseif ($backend === 'error_log') {
|
||||
return new ErrorLogLogDriver($name, $level);
|
||||
} else {
|
||||
$log_driver = new ErrorLogLogDriver($name, $level);
|
||||
$log_driver->log(LogDriver::ERROR, "Unknown 'log_system' value '$backend', using 'error_log' default");
|
||||
return $log_driver;
|
||||
}
|
||||
},
|
||||
CacheDriver::class => function($c) {
|
||||
// Use the global for backwards compatibility.
|
||||
return \cache::getCache();
|
||||
|
|
|
|||
|
|
@ -84,13 +84,28 @@ function is_valid_webm($ffprobe_out) {
|
|||
}
|
||||
} elseif ($extension === 'mp4' || stristr($ffprobe_out['format']['format_name'], 'mp4')) {
|
||||
// If the video is not h264 or (there is audio but it's not aac).
|
||||
if (($ffprobe_out['streams'][$videoidx]['codec_name'] != 'h264') || ((count($trackmap['audioat']) > 0) && ($ffprobe_out['streams'][$trackmap['audioat'][0]]['codec_name'] != 'aac'))) {
|
||||
return [
|
||||
'error' => [
|
||||
'code' => 2,
|
||||
'msg' => $config['error']['invalidwebm'] . ' [h264/aac check]'
|
||||
]
|
||||
];
|
||||
if ($ffprobe_out['streams'][$videoidx]['codec_name'] != 'h264') {
|
||||
if (!isset($ffprobe_out['streams'][0]['codec_name'])) {
|
||||
return [
|
||||
'error' => [
|
||||
'code' => 2,
|
||||
'msg' => $config['error']['invalidwebm']
|
||||
]
|
||||
];
|
||||
}
|
||||
|
||||
$video_codec = $ffprobe_out['streams'][0]['codec_name'];
|
||||
|
||||
$audio_codec = $ffprobe_out['streams'][1]['codec_name'] ?? null;
|
||||
|
||||
if ($video_codec !== 'h264' || ($audio_codec && $audio_codec !== 'aac')) {
|
||||
return [
|
||||
'error' => [
|
||||
'code' => 2,
|
||||
'msg' => $config['error']['invalidwebm']
|
||||
]
|
||||
];
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return [
|
||||
|
|
|
|||
|
|
@ -4,19 +4,16 @@
|
|||
*/
|
||||
use Vichan\Context;
|
||||
use Vichan\Data\{IpNoteQueries, UserPostQueries, ReportQueries};
|
||||
use Vichan\Data\Driver\LogDriver;
|
||||
use Vichan\Functions\Net;
|
||||
|
||||
defined('TINYBOARD') or exit;
|
||||
|
||||
function _link_or_copy_factory(Context $ctx): callable {
|
||||
return function(string $target, string $link) use ($ctx) {
|
||||
if (!\link($target, $link)) {
|
||||
$ctx->get(LogDriver::class)->log(LogDriver::NOTICE, "Failed to link() $target to $link. FAlling back to copy()");
|
||||
return \copy($target, $link);
|
||||
}
|
||||
return true;
|
||||
};
|
||||
function _link_or_copy(string $target, string $link): bool {
|
||||
if (!link($target, $link)) {
|
||||
error_log("Failed to link() $target to $link. FAlling back to copy()");
|
||||
return copy($target, $link);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function mod_page($title, $template, $args, $subtitle = false) {
|
||||
|
|
@ -57,7 +54,8 @@ function mod_login(Context $ctx, $redirect = false) {
|
|||
if (!isset($_POST['username'], $_POST['password']) || $_POST['username'] == '' || $_POST['password'] == '') {
|
||||
$args['error'] = $config['error']['invalid'];
|
||||
} elseif (!login($_POST['username'], $_POST['password'])) {
|
||||
$ctx->get(LogDriver::class)->log(LogDriver::INFO, 'Unauthorized login attempt!');
|
||||
if ($config['syslog'])
|
||||
_syslog(LOG_WARNING, 'Unauthorized login attempt!');
|
||||
|
||||
$args['error'] = $config['error']['invalid'];
|
||||
} else {
|
||||
|
|
@ -1491,9 +1489,8 @@ function mod_move(Context $ctx, $originBoard, $postID) {
|
|||
if ($targetBoard === $originBoard)
|
||||
error(_('Target and source board are the same.'));
|
||||
|
||||
$_link_or_copy = _link_or_copy_factory($ctx);
|
||||
// link() if leaving a shadow thread behind; else, rename().
|
||||
$clone = $shadow ? $_link_or_copy : 'rename';
|
||||
$clone = $shadow ? '_link_or_copy' : 'rename';
|
||||
|
||||
// indicate that the post is a thread
|
||||
$post['op'] = true;
|
||||
|
|
@ -1787,8 +1784,7 @@ function mod_merge(Context $ctx, $originBoard, $postID) {
|
|||
$op = $post;
|
||||
$op['id'] = $newID;
|
||||
|
||||
$_link_or_copy = _link_or_copy_factory($ctx);
|
||||
$clone = $shadow ? $_link_or_copy : 'rename';
|
||||
$clone = $shadow ? '_link_or_copy' : 'rename';
|
||||
|
||||
if ($post['has_file']) {
|
||||
// copy image
|
||||
|
|
|
|||
|
|
@ -104,10 +104,8 @@ function buildMenu(e) {
|
|||
|
||||
function addButton(post) {
|
||||
var $ele = $(post);
|
||||
// Use unicode code with ascii variant selector
|
||||
// https://stackoverflow.com/questions/37906969/how-to-prevent-ios-from-converting-ascii-into-emoji
|
||||
$ele.find('input.delete').after(
|
||||
$('<a>', {href: '#', class: 'post-btn', title: 'Post menu'}).text('\u{25B6}\u{fe0e}')
|
||||
$('<a>', {href: '#', class: 'post-btn', title: 'Post menu'}).text('►')
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
78
post.php
78
post.php
|
|
@ -5,7 +5,6 @@
|
|||
|
||||
use Vichan\Context;
|
||||
use Vichan\Data\ReportQueries;
|
||||
use Vichan\Data\Driver\LogDriver;
|
||||
|
||||
require_once 'inc/bootstrap.php';
|
||||
|
||||
|
|
@ -355,7 +354,7 @@ function db_select_ban_appeals($ban_id)
|
|||
|
||||
$dropped_post = false;
|
||||
|
||||
function handle_nntpchan(Context $ctx)
|
||||
function handle_nntpchan()
|
||||
{
|
||||
global $config;
|
||||
if ($_SERVER['REMOTE_ADDR'] != $config['nntpchan']['trusted_peer']) {
|
||||
|
|
@ -434,7 +433,7 @@ function handle_nntpchan(Context $ctx)
|
|||
if ($ct == 'text/plain') {
|
||||
$content = file_get_contents("php://input");
|
||||
} elseif ($ct == 'multipart/mixed' || $ct == 'multipart/form-data') {
|
||||
$ctx->get(LogDriver::class)->log(LogDriver::DEBUG, 'MM: Files: ' . print_r($GLOBALS, true));
|
||||
_syslog(LOG_INFO, "MM: Files: " . print_r($GLOBALS, true)); // Debug
|
||||
|
||||
$content = '';
|
||||
|
||||
|
|
@ -611,8 +610,8 @@ function handle_delete(Context $ctx)
|
|||
modLog("User at $ip deleted his own post #$id");
|
||||
}
|
||||
|
||||
$ctx->get(LogDriver::class)->log(
|
||||
LogDriver::INFO,
|
||||
_syslog(
|
||||
LOG_INFO,
|
||||
'Deleted post: ' .
|
||||
'/' . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $post['thread'] ? $post['thread'] : $id) . ($post['thread'] ? '#' . $id : '')
|
||||
);
|
||||
|
|
@ -700,7 +699,9 @@ function handle_report(Context $ctx)
|
|||
foreach ($report as $id) {
|
||||
$post = db_select_post_minimal($board['uri'], $id);
|
||||
if ($post === false) {
|
||||
$ctx->get(LogDriver::class)->log(LogDriver::INFO, "Failed to report non-existing post #{$id} in {$board['dir']}");
|
||||
if ($config['syslog']) {
|
||||
_syslog(LOG_INFO, "Failed to report non-existing post #{$id} in {$board['dir']}");
|
||||
}
|
||||
error($config['error']['nopost']);
|
||||
}
|
||||
|
||||
|
|
@ -715,12 +716,13 @@ function handle_report(Context $ctx)
|
|||
error($error);
|
||||
}
|
||||
|
||||
$ctx->get(LogDriver::class)->log(
|
||||
LogDriver::INFO,
|
||||
'Reported post: ' .
|
||||
'/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($post['thread'] ? '#' . $id : '') .
|
||||
' for "' . $reason . '"'
|
||||
);
|
||||
if ($config['syslog'])
|
||||
_syslog(
|
||||
LOG_INFO,
|
||||
'Reported post: ' .
|
||||
'/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($post['thread'] ? '#' . $id : '') .
|
||||
' for "' . $reason . '"'
|
||||
);
|
||||
|
||||
$report_queries->add($_SERVER['REMOTE_ADDR'], $board['uri'], $id, $reason);
|
||||
|
||||
|
|
@ -1402,13 +1404,13 @@ function handle_post(Context $ctx)
|
|||
$file['thumbwidth'] = $size[0];
|
||||
$file['thumbheight'] = $size[1];
|
||||
} elseif (
|
||||
(($config['strip_exif'] && isset($file['exif_stripped']) && $file['exif_stripped']) || !$config['strip_exif']) &&
|
||||
$config['minimum_copy_resize'] &&
|
||||
$image->size->width <= $config['thumb_width'] &&
|
||||
$image->size->height <= $config['thumb_height'] &&
|
||||
$file['extension'] == ($config['thumb_ext'] ? $config['thumb_ext'] : $file['extension'])
|
||||
) {
|
||||
// Copy, because there's nothing to resize
|
||||
copy($file['tmp_name'], $file['thumb']);
|
||||
coopy($file['tmp_name'], $file['thumb']);
|
||||
|
||||
$file['thumbwidth'] = $image->size->width;
|
||||
$file['thumbheight'] = $image->size->height;
|
||||
|
|
@ -1551,6 +1553,35 @@ function handle_post(Context $ctx)
|
|||
}
|
||||
}
|
||||
|
||||
if ($config['tesseract_ocr'] && $file['thumb'] != 'file') {
|
||||
// Let's OCR it!
|
||||
$fname = $file['tmp_name'];
|
||||
|
||||
if ($file['height'] > 500 || $file['width'] > 500) {
|
||||
$fname = $file['thumb'];
|
||||
}
|
||||
|
||||
if ($fname == 'spoiler') {
|
||||
// We don't have that much CPU time, do we?
|
||||
} else {
|
||||
$tmpname = __DIR__ . "/tmp/tesseract/" . rand(0, 10000000);
|
||||
|
||||
// Preprocess command is an ImageMagick b/w quantization
|
||||
$error = shell_exec_error(sprintf($config['tesseract_preprocess_command'], escapeshellarg($fname)) . " | " .
|
||||
'tesseract stdin ' . escapeshellarg($tmpname) . ' ' . $config['tesseract_params']);
|
||||
$tmpname .= ".txt";
|
||||
|
||||
$value = @file_get_contents($tmpname);
|
||||
@unlink($tmpname);
|
||||
|
||||
if ($value && trim($value)) {
|
||||
// This one has an effect, that the body is appended to a post body. So you can write a correct
|
||||
// spamfilter.
|
||||
$post['body_nomarkup'] .= "<tinyboard ocr image $key>" . htmlspecialchars($value) . "</tinyboard>";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!isset($dont_copy_file) || !$dont_copy_file) {
|
||||
if (isset($file['file_tmp'])) {
|
||||
if (!@rename($file['tmp_name'], $file['file'])) {
|
||||
|
|
@ -1598,6 +1629,11 @@ function handle_post(Context $ctx)
|
|||
}
|
||||
}
|
||||
|
||||
// Do filters again if OCRing
|
||||
if ($config['tesseract_ocr'] && !hasPermission($config['mod']['bypass_filters'], $board['uri']) && !$dropped_post) {
|
||||
do_filters($ctx, $post);
|
||||
}
|
||||
|
||||
if (!hasPermission($config['mod']['postunoriginal'], $board['uri']) && $config['robot_enable'] && checkRobot($post['body_nomarkup']) && !$dropped_post) {
|
||||
undoImage($post);
|
||||
if ($config['robot_mute']) {
|
||||
|
|
@ -1747,10 +1783,10 @@ function handle_post(Context $ctx)
|
|||
|
||||
buildThread($post['op'] ? $id : $post['thread']);
|
||||
|
||||
$ctx->get(LogDriver::class)->log(
|
||||
LogDriver::INFO,
|
||||
'New post: /' . $board['dir'] . $config['dir']['res'] . link_for($post) . (!$post['op'] ? '#' . $id : '')
|
||||
);
|
||||
if ($config['syslog']) {
|
||||
_syslog(LOG_INFO, 'New post: /' . $board['dir'] . $config['dir']['res'] .
|
||||
link_for($post) . (!$post['op'] ? '#' . $id : ''));
|
||||
}
|
||||
|
||||
if (!$post['mod']) {
|
||||
header('X-Associated-Content: "' . $redirect . '"');
|
||||
|
|
@ -1843,17 +1879,17 @@ function handle_appeal(Context $ctx)
|
|||
displayBan($ban);
|
||||
}
|
||||
|
||||
$ctx = Vichan\build_context($config);
|
||||
|
||||
// Is it a post coming from NNTP? Let's extract it and pretend it's a normal post.
|
||||
if (isset($_GET['Newsgroups'])) {
|
||||
if ($config['nntpchan']['enabled']) {
|
||||
handle_nntpchan($ctx);
|
||||
handle_nntpchan();
|
||||
} else {
|
||||
error("NNTPChan: NNTPChan support is disabled");
|
||||
}
|
||||
}
|
||||
|
||||
$ctx = Vichan\build_context($config);
|
||||
|
||||
if (isset($_POST['delete'])) {
|
||||
handle_delete($ctx);
|
||||
} elseif (isset($_POST['report'])) {
|
||||
|
|
|
|||
BIN
static/banners/just-monika-opt.webp
Normal file
BIN
static/banners/just-monika-opt.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
|
|
@ -380,7 +380,6 @@ form table tr td div.center {
|
|||
|
||||
.file {
|
||||
float: left;
|
||||
min-width: 100px;
|
||||
}
|
||||
|
||||
.file:not(.multifile) .post-image {
|
||||
|
|
@ -391,10 +390,6 @@ form table tr td div.center {
|
|||
float: none;
|
||||
}
|
||||
|
||||
.file.multifile {
|
||||
margin: 0 10px 0 0;
|
||||
}
|
||||
|
||||
.file.multifile > p {
|
||||
width: 0px;
|
||||
min-width: 100%;
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
border-width: 2px;
|
||||
margin-right: 15px;
|
||||
}
|
||||
|
||||
|
||||
.introduction {
|
||||
grid-column: 2 / 9;
|
||||
grid-row: 1;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
.content {
|
||||
grid-column: 2 / 9;
|
||||
grid-row: 2;
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
gap: 20px;
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
|
||||
.modlog {
|
||||
width: 50%;
|
||||
text-align: left;
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
li a.system {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
||||
@media (max-width:768px) {
|
||||
body{
|
||||
display: grid;
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
height: 100vh;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
.introduction {
|
||||
grid-column: 1;
|
||||
grid-row: 1;
|
||||
|
|
@ -96,18 +96,17 @@
|
|||
grid-column: 1;
|
||||
grid-row: 3;
|
||||
width: 100%;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
|
||||
.modlog {
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
|
||||
table {
|
||||
table-layout: fixed;
|
||||
}
|
||||
|
||||
|
||||
table.modlog tr th {
|
||||
white-space: normal;
|
||||
word-wrap: break-word;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
.home-description {
|
||||
margin: 20px auto 0 auto;
|
||||
text-align: center;
|
||||
max-width: 700px;
|
||||
max-width: 700px;"
|
||||
}
|
||||
</style>
|
||||
{{ boardlist.top }}
|
||||
|
|
|
|||
0
tmp/tesseract/.gitkeep
Normal file
0
tmp/tesseract/.gitkeep
Normal file
Loading…
Add table
Add a link
Reference in a new issue