mirror of
https://github.com/vichan-devel/vichan.git
synced 2024-12-18 02:16:03 +01:00
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
This commit is contained in:
Marcin Łabanowski
commit
82fb733906
@ -366,6 +366,10 @@
|
||||
$config['field_disable_name'] = false;
|
||||
// When true, no email will be able to be set.
|
||||
$config['field_disable_email'] = false;
|
||||
// When true, no subject will be able to be set.
|
||||
$config['field_disable_subject'] = false;
|
||||
// When true, no subject will be able to be set in replies.
|
||||
$config['field_disable_reply_subject'] = false;
|
||||
// When true, a blank password will be used for files (not usable for deletion).
|
||||
$config['field_disable_password'] = false;
|
||||
|
||||
@ -468,8 +472,10 @@
|
||||
// Maximum image dimensions
|
||||
$config['max_width'] = 10000;
|
||||
$config['max_height'] = $config['max_width']; // 1:1
|
||||
// Reject dupliate image uploads
|
||||
// Reject duplicate image uploads
|
||||
$config['image_reject_repost'] = true;
|
||||
// Reject duplicate image uploads within the same thread. Doesn't change anything if image_reject_repost is true.
|
||||
$config['image_reject_repost_in_thread'] = false;
|
||||
|
||||
// Display the aspect ratio in a post's file info
|
||||
$config['show_ratio'] = false;
|
||||
@ -704,6 +710,7 @@
|
||||
$config['error']['maxsize'] = _('The file was too big.');
|
||||
$config['error']['invalidzip'] = _('Invalid archive!');
|
||||
$config['error']['fileexists'] = _('That file <a href="%s">already exists</a>!');
|
||||
$config['error']['fileexistsinthread'] = _('That file <a href="%s">already exists</a> in this thread!');
|
||||
$config['error']['delete_too_soon'] = _('You\'ll have to wait another %s before deleting that.');
|
||||
$config['error']['mime_exploit'] = _('MIME type detection XSS exploit (IE) detected; post discarded.');
|
||||
$config['error']['invalid_embed'] = _('Couldn\'t make sense of the URL of the video you tried to embed.');
|
||||
|
||||
@ -155,6 +155,11 @@ function truncate($body, $url, $max_lines = false, $max_chars = false) {
|
||||
$max_lines = $config['body_truncate'];
|
||||
if ($max_chars === false)
|
||||
$max_chars = $config['body_truncate_char'];
|
||||
|
||||
// We don't want to risk truncating in the middle of an HTML comment.
|
||||
// It's easiest just to remove them all first.
|
||||
$body = preg_replace('/<!--.*?-->/s', '', $body);
|
||||
|
||||
$original_body = $body;
|
||||
|
||||
$lines = substr_count($body, '<br/>');
|
||||
@ -165,7 +170,7 @@ function truncate($body, $url, $max_lines = false, $max_chars = false) {
|
||||
$body = $m[0];
|
||||
}
|
||||
|
||||
$body = substr($body, 0, $max_chars);
|
||||
$body = mb_substr($body, 0, $max_chars);
|
||||
|
||||
if ($body != $original_body) {
|
||||
// Remove any corrupt tags at the end
|
||||
@ -190,8 +195,11 @@ function truncate($body, $url, $max_lines = false, $max_chars = false) {
|
||||
// remove broken HTML entity at the end (if existent)
|
||||
$body = preg_replace('/&[^;]+$/', '', $body);
|
||||
|
||||
$tags_no_close_needed = array("colgroup", "dd", "dt", "li", "optgroup", "option", "p", "tbody", "td", "tfoot", "th", "thead", "tr", "br", "img");
|
||||
|
||||
// Close any open tags
|
||||
foreach ($tags as &$tag) {
|
||||
if (!in_array($tag, $tags_no_close_needed))
|
||||
$body .= "</{$tag}>";
|
||||
}
|
||||
} else {
|
||||
@ -208,7 +216,7 @@ function truncate($body, $url, $max_lines = false, $max_chars = false) {
|
||||
function secure_link_confirm($text, $title, $confirm_message, $href) {
|
||||
global $config;
|
||||
|
||||
return '<a onclick="if (confirm(\'' . htmlentities(addslashes($confirm_message)) . '\')) document.location=\'?/' . htmlentities(addslashes($href . '/' . make_secure_link_token($href))) . '\';return false;" title="' . htmlentities($title) . '" href="?/' . $href . '">' . $text . '</a>';
|
||||
return '<a onclick="if (event.which==2) return true;if (confirm(\'' . htmlentities(addslashes($confirm_message)) . '\')) document.location=\'?/' . htmlentities(addslashes($href . '/' . make_secure_link_token($href))) . '\';return false;" title="' . htmlentities($title) . '" href="?/' . $href . '">' . $text . '</a>';
|
||||
}
|
||||
function secure_link($href) {
|
||||
return $href . '/' . make_secure_link_token($href);
|
||||
@ -342,8 +350,8 @@ class Thread {
|
||||
// Fix internal links
|
||||
// Very complicated regex
|
||||
$this->body = preg_replace(
|
||||
'/<a(([a-zA-Z]+="[^"]+")|[a-zA-Z]+=[a-zA-Z]+|\s)*href="' . preg_quote($config['root'], '/') . '(' . sprintf(preg_quote($config['board_path'], '/'), '\w+') . ')/',
|
||||
'<a href="?/$3',
|
||||
'/<a((([a-zA-Z]+="[^"]+")|[a-zA-Z]+=[a-zA-Z]+|\s)*)href="' . preg_quote($config['root'], '/') . '(' . sprintf(preg_quote($config['board_path'], '/'), '\w+') . ')/',
|
||||
'<a $1href="?/$4',
|
||||
$this->body
|
||||
);
|
||||
}
|
||||
|
||||
@ -527,7 +527,7 @@ function checkFlood($post) {
|
||||
|
||||
$query = prepare(sprintf("SELECT * FROM `posts_%s` WHERE (`ip` = :ip AND `time` >= :floodtime) OR (`ip` = :ip AND `body` != '' AND `body` = :body AND `time` >= :floodsameiptime) OR (`body` != '' AND `body` = :body AND `time` >= :floodsametime) LIMIT 1", $board['uri']));
|
||||
$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
|
||||
$query->bindValue(':body', $post['body'], PDO::PARAM_INT);
|
||||
$query->bindValue(':body', $post['body']);
|
||||
$query->bindValue(':floodtime', time()-$config['flood_time'], PDO::PARAM_INT);
|
||||
$query->bindValue(':floodsameiptime', time()-$config['flood_time_ip'], PDO::PARAM_INT);
|
||||
$query->bindValue(':floodsametime', time()-$config['flood_time_same'], PDO::PARAM_INT);
|
||||
@ -697,7 +697,7 @@ function threadExists($id) {
|
||||
|
||||
function post(array $post) {
|
||||
global $pdo, $board;
|
||||
$query = prepare(sprintf("INSERT INTO `posts_%s` VALUES ( NULL, :thread, :subject, :email, :name, :trip, :capcode, :body, :body_nomarkup, :time, :time, :thumb, :thumbwidth, :thumbheight, :file, :width, :height, :filesize, :filename, :filehash, :password, :ip, :sticky, :locked, 0, :embed)", $board['uri']));
|
||||
$query = prepare(sprintf("INSERT INTO `posts_%s` (`id`, `thread`, `subject`, `email`, `name`, `trip`, `capcode`, `body`, `body_nomarkup`, `time`, `bump`, `thumb`, `thumbwidth`, `thumbheight`, `file`, `filewidth`, `fileheight`, `filesize`, `filename`, `filehash`, `password`, `ip`, `sticky`, `locked`, `sage`, `embed`) VALUES ( NULL, :thread, :subject, :email, :name, :trip, :capcode, :body, :body_nomarkup, :time, :time, :thumb, :thumbwidth, :thumbheight, :file, :width, :height, :filesize, :filename, :filehash, :password, :ip, :sticky, :locked, 0, :embed)", $board['uri']));
|
||||
|
||||
// Basic stuff
|
||||
if (!empty($post['subject'])) {
|
||||
@ -1651,6 +1651,20 @@ function getPostByHash($hash) {
|
||||
return false;
|
||||
}
|
||||
|
||||
function getPostByHashInThread($hash, $thread) {
|
||||
global $board;
|
||||
$query = prepare(sprintf("SELECT `id`,`thread` FROM `posts_%s` WHERE `filehash` = :hash AND ( `thread` = :thread OR `id` = :thread )", $board['uri']));
|
||||
$query->bindValue(':hash', $hash, PDO::PARAM_STR);
|
||||
$query->bindValue(':thread', $thread, PDO::PARAM_INT);
|
||||
$query->execute() or error(db_error($query));
|
||||
|
||||
if ($post = $query->fetch()) {
|
||||
return $post;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function undoImage(array $post) {
|
||||
if (!$post['has_file'])
|
||||
return;
|
||||
|
||||
@ -64,6 +64,7 @@ function mod_confirm($request) {
|
||||
}
|
||||
|
||||
function mod_logout() {
|
||||
global $config;
|
||||
destroyCookies();
|
||||
|
||||
header('Location: ?/', true, $config['redirect_http']);
|
||||
@ -706,7 +707,7 @@ function mod_sticky($board, $unsticky, $post) {
|
||||
$query->bindValue(':sticky', $unsticky ? 0 : 1);
|
||||
$query->execute() or error(db_error($query));
|
||||
if ($query->rowCount()) {
|
||||
modLog(($unlock ? 'Unstickied' : 'Stickied') . " thread #{$post}");
|
||||
modLog(($unsticky ? 'Unstickied' : 'Stickied') . " thread #{$post}");
|
||||
buildThread($post);
|
||||
buildIndex();
|
||||
}
|
||||
@ -728,7 +729,7 @@ function mod_bumplock($board, $unbumplock, $post) {
|
||||
$query->bindValue(':bumplock', $unbumplock ? 0 : 1);
|
||||
$query->execute() or error(db_error($query));
|
||||
if ($query->rowCount()) {
|
||||
modLog(($unlock ? 'Unbumplocked' : 'Bumplocked') . " thread #{$post}");
|
||||
modLog(($unbumplock ? 'Unbumplocked' : 'Bumplocked') . " thread #{$post}");
|
||||
buildThread($post);
|
||||
buildIndex();
|
||||
}
|
||||
@ -1067,13 +1068,6 @@ function mod_deletefile($board, $post) {
|
||||
// Record the action
|
||||
modLog("Deleted file from post #{$post}");
|
||||
|
||||
$query = prepare(sprintf('SELECT `thread` FROM `posts_%s` WHERE `id` = :id', $board));
|
||||
$query->bindValue(':id', $post);
|
||||
$query->execute() or error(db_error($query));
|
||||
$thread = $query->fetchColumn();
|
||||
|
||||
// Rebuild thread
|
||||
buildThread($thread ? $thread : $post);
|
||||
// Rebuild board
|
||||
buildIndex();
|
||||
|
||||
@ -1106,7 +1100,7 @@ function mod_deletebyip($boardName, $post, $global = false) {
|
||||
|
||||
$query = '';
|
||||
foreach ($boards as $_board) {
|
||||
$query .= sprintf("SELECT `id`, '%s' AS `board` FROM `posts_%s` WHERE `ip` = :ip UNION ALL ", $_board['uri'], $_board['uri']);
|
||||
$query .= sprintf("SELECT `thread`, `id`, '%s' AS `board` FROM `posts_%s` WHERE `ip` = :ip UNION ALL ", $_board['uri'], $_board['uri']);
|
||||
}
|
||||
$query = preg_replace('/UNION ALL $/', '', $query);
|
||||
|
||||
@ -1117,18 +1111,27 @@ function mod_deletebyip($boardName, $post, $global = false) {
|
||||
if ($query->rowCount() < 1)
|
||||
error($config['error']['invalidpost']);
|
||||
|
||||
$boards = array();
|
||||
set_time_limit($config['mod']['rebuild_timelimit']);
|
||||
|
||||
$threads_to_rebuild = array();
|
||||
$threads_deleted = array();
|
||||
while ($post = $query->fetch()) {
|
||||
openBoard($post['board']);
|
||||
$boards[] = $post['board'];
|
||||
|
||||
deletePost($post['id'], false);
|
||||
deletePost($post['id'], false, false);
|
||||
|
||||
if ($post['thread'])
|
||||
$threads_to_rebuild[$post['board']][$post['thread']] = true;
|
||||
else
|
||||
$threads_deleted[$post['board']][$post['id']] = true;
|
||||
}
|
||||
|
||||
$boards = array_unique($boards);
|
||||
|
||||
foreach ($boards as $_board) {
|
||||
foreach ($threads_to_rebuild as $_board => $_threads) {
|
||||
openBoard($_board);
|
||||
foreach ($_threads as $_thread => $_dummy) {
|
||||
if ($_dummy && !isset($threads_deleted[$_board][$_thread]))
|
||||
buildThread($_thread);
|
||||
}
|
||||
buildIndex();
|
||||
}
|
||||
|
||||
@ -1460,6 +1463,8 @@ function mod_rebuild() {
|
||||
error($config['error']['noaccess']);
|
||||
|
||||
if (isset($_POST['rebuild'])) {
|
||||
set_time_limit($config['mod']['rebuild_timelimit']);
|
||||
|
||||
$log = array();
|
||||
$boards = listBoards();
|
||||
$rebuilt_scripts = array();
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
// Installation/upgrade file
|
||||
define('VERSION', 'v0.9.6-dev-6');
|
||||
define('VERSION', 'v0.9.6-dev-7');
|
||||
|
||||
require 'inc/functions.php';
|
||||
|
||||
@ -222,6 +222,11 @@ if (file_exists($config['has_installed'])) {
|
||||
foreach ($boards as $board) {
|
||||
query(sprintf("ALTER TABLE `posts_%s` CHANGE `id` `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT", $board['uri'])) or error(db_error());
|
||||
}
|
||||
case 'v0.9.6-dev-6':
|
||||
foreach ($boards as &$_board) {
|
||||
query(sprintf("CREATE INDEX `thread_id` ON `posts_%s` (`thread`, `id`)", $_board['uri'])) or error(db_error());
|
||||
query(sprintf("ALTER TABLE `posts_%s` DROP INDEX `thread`", $_board['uri'])) or error(db_error());
|
||||
}
|
||||
case false:
|
||||
// Update version number
|
||||
file_write($config['has_installed'], VERSION);
|
||||
|
||||
49
post.php
49
post.php
@ -140,7 +140,7 @@ if (isset($_POST['delete'])) {
|
||||
header('Location: ' . $root . $board['dir'] . $config['file_index'], true, $config['redirect_http']);
|
||||
} elseif (isset($_POST['post'])) {
|
||||
|
||||
if (!isset($_POST['subject'], $_POST['body'], $_POST['board']))
|
||||
if (!isset($_POST['body'], $_POST['board']))
|
||||
error($config['error']['bot']);
|
||||
|
||||
if (!isset($_POST['name']))
|
||||
@ -149,6 +149,9 @@ if (isset($_POST['delete'])) {
|
||||
if (!isset($_POST['email']))
|
||||
$_POST['email'] = '';
|
||||
|
||||
if (!isset($_POST['subject']))
|
||||
$_POST['subject'] = '';
|
||||
|
||||
if (!isset($_POST['password']))
|
||||
$_POST['password'] = '';
|
||||
|
||||
@ -277,6 +280,9 @@ if (isset($_POST['delete'])) {
|
||||
|
||||
if ($config['field_disable_password'])
|
||||
$_POST['password'] = '';
|
||||
|
||||
if ($config['field_disable_subject'] || (!$post['op'] && $config['field_disable_reply_subject']))
|
||||
$_POST['subject'] = '';
|
||||
}
|
||||
|
||||
// Check for a file
|
||||
@ -413,27 +419,6 @@ if (isset($_POST['delete'])) {
|
||||
|
||||
require_once 'inc/image.php';
|
||||
|
||||
if ($config['thumb_method'] == 'imagick') {
|
||||
// This is tricky, because Imagick won't let us find
|
||||
// an image's dimensions without loading it all into
|
||||
// memory first, unlike GD which provides the
|
||||
// getimagesize() to do exactly that. This section
|
||||
// is why GD is required, even when using Imagick
|
||||
// instead. There doesn't seem to be an alternative.
|
||||
// Necessary for security, as Imagick even ignores
|
||||
// PHP's memory limit.
|
||||
|
||||
// first try GD's getimagesize()
|
||||
if ($size = @getimagesize($upload)) {
|
||||
if ($size[0] > $config['max_width'] || $size[1] > $config['max_height']) {
|
||||
|
||||
error($config['error']['maxsize']);
|
||||
}
|
||||
} else {
|
||||
// GD failed
|
||||
// TODO?
|
||||
}
|
||||
} else {
|
||||
// find dimensions of an image using GD
|
||||
if (!$size = @getimagesize($upload)) {
|
||||
error($config['error']['invalidimg']);
|
||||
@ -441,7 +426,6 @@ if (isset($_POST['delete'])) {
|
||||
if ($size[0] > $config['max_width'] || $size[1] > $config['max_height']) {
|
||||
error($config['error']['maxsize']);
|
||||
}
|
||||
}
|
||||
|
||||
// create image object
|
||||
$image = new Image($upload, $post['extension']);
|
||||
@ -506,7 +490,9 @@ if (isset($_POST['delete'])) {
|
||||
}
|
||||
}
|
||||
|
||||
if ($post['has_file'] && $config['image_reject_repost'] && $p = getPostByHash($post['filehash'])) {
|
||||
if ($post['has_file']) {
|
||||
if ($config['image_reject_repost']) {
|
||||
if ($p = getPostByHash($post['filehash'])) {
|
||||
undoImage($post);
|
||||
error(sprintf($config['error']['fileexists'],
|
||||
$post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root'] .
|
||||
@ -518,6 +504,21 @@ if (isset($_POST['delete'])) {
|
||||
)
|
||||
));
|
||||
}
|
||||
} else if (!$post['op'] && $config['image_reject_repost_in_thread']) {
|
||||
if ($p = getPostByHashInThread($post['filehash'], $post['thread'])) {
|
||||
undoImage($post);
|
||||
error(sprintf($config['error']['fileexistsinthread'],
|
||||
$post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root'] .
|
||||
$board['dir'] . $config['dir']['res'] .
|
||||
($p['thread'] ?
|
||||
$p['thread'] . '.html#' . $p['id']
|
||||
:
|
||||
$p['id'] . '.html'
|
||||
)
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasPermission($config['mod']['postunoriginal'], $board['uri']) && $config['robot_enable'] && checkRobot($post['body_nomarkup'])) {
|
||||
undoImage($post);
|
||||
|
||||
@ -27,12 +27,18 @@
|
||||
</td>
|
||||
</tr>{% endif %}
|
||||
<tr>
|
||||
<th>
|
||||
{% if not (config.field_disable_subject or (id and config.field_disable_reply_subject)) or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri)) %}<th>
|
||||
{% trans %}Subject{% endtrans %}
|
||||
{{ antibot.html() }}
|
||||
</th>
|
||||
<td>
|
||||
<input style="float:left;" type="text" name="subject" size="25" maxlength="100" autocomplete="off">
|
||||
{% else %}<th>
|
||||
{% trans %}Submit{% endtrans %}
|
||||
{{ antibot.html() }}
|
||||
</th>
|
||||
<td>
|
||||
{% endif %}
|
||||
<input accesskey="s" style="margin-left:2px;" type="submit" name="post" value="{% if id %}{{ config.button_reply }}{% else %}{{ config.button_newtopic }}{% endif %}" />{% if config.spoiler_images %} <input id="spoiler" name="spoiler" type="checkbox"> <label for="spoiler">{% trans %}Spoiler Image{% endtrans %}</label>{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
, {{ post.ratio }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if config.show_filename %}
|
||||
{% if config.show_filename and post.filename %}
|
||||
,
|
||||
{% if post.filename|length > config.max_filename_display %}
|
||||
<span title="{{ post.filename }}">{{ post.filename|truncate(config.max_filename_display) }}</span>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
, {{ post.ratio }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if config.show_filename %}
|
||||
{% if config.show_filename and post.filename %}
|
||||
,
|
||||
{% if post.filename|length > config.max_filename_display %}
|
||||
<span title="{{ post.filename }}">{{ post.filename|truncate(config.max_filename_display) }}</span>
|
||||
|
||||
@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `posts_{{ board }}` (
|
||||
`sage` int(1) NOT NULL,
|
||||
`embed` text,
|
||||
UNIQUE KEY `id` (`id`),
|
||||
KEY `thread` (`thread`),
|
||||
KEY `thread_id` (`thread`, `id`),
|
||||
KEY `time` (`time`),
|
||||
FULLTEXT KEY `body` (`body`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user