perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

Merge branch '4.5' of github.com:vichan-devel/Tinyboard into HEAD

Browse source 
Conflicts:
	templates/themes/basic/index.html
This commit is contained in:
czaks 2014-06-20 23:27:34 +02:00
commit 73177fcffc
318 changed files with 3218 additions and 832 deletions
Download patch file Download diff file Expand all files Collapse all files

15
post.php
View file

@ -52,10 +52,19 @@ if (isset($_POST['delete'])) {
$query->execute() or error(db_error($query));
if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
if ($password != '' && $post['password'] != $password)
$thread = false;
if ($config['user_moderation'] && $post['thread']) {
$thread_query = prepare(sprintf("SELECT `time`,`password` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
$thread_query->bindValue(':id', $post['thread'], PDO::PARAM_INT);
$thread_query->execute() or error(db_error($query));
$thread = $thread_query->fetch(PDO::FETCH_ASSOC);
}
if ($password != '' && $post['password'] != $password && (!$thread || $thread['password'] != $password))
error($config['error']['invalidpassword']);
if ($post['time'] > time() - $config['delete_time']) {
if ($post['time'] > time() - $config['delete_time'] && (!$thread || $thread['password'] != $password)) {
error(sprintf($config['error']['delete_too_soon'], until($post['time'] + $config['delete_time'])));
}
@ -632,7 +641,7 @@ if (isset($_POST['delete'])) {
if (!$config['redraw_image'] && $config['use_exiftool']) {
if($error = shell_exec_error('exiftool -overwrite_original -ignoreMinorErrors -q -q -all= ' .
escapeshellarg($upload)))
error('Could not strip EXIF metadata!', null, $error);
error(_('Could not strip EXIF metadata!'), null, $error);
} else {
$image->to($post['file']);
$dont_copy_file = true;