Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-24 07:30:10 +01:00
Code Releases Wiki Activity

Merge branch 'staging' of https://github.com/vichan-devel/vichan into staging

Browse Source
This commit is contained in:
Fredrick Brennan 2014-04-29 15:20:42 -04:00
commit 8e81c8c669
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
inc/lib/webm/posthandler.php
View File

@ -5,43 +5,43 @@
function postHandler($post) {
global $board, $config;
if ($post->has_file && $post->extension == 'webm') {
if ($post->has_file) foreach ($post->files as &$file) if ($file->extension == 'webm') {
require_once dirname(__FILE__) . '/videodata.php';
$videoDetails = videoData($post->file_path);
$videoDetails = videoData($file->file_path);
if (!isset($videoDetails['container']) || $videoDetails['container'] != 'webm') return "not a WebM file";
// Set thumbnail
$thumbName = $board['dir'] . $config['dir']['thumb'] . $post->file_id . '.webm';
$thumbName = $board['dir'] . $config['dir']['thumb'] . $file->file_id . '.webm';
if ($config['spoiler_images'] && isset($_POST['spoiler'])) {
// Use spoiler thumbnail
$post->thumb = 'spoiler';
$file->thumb = 'spoiler';
$size = @getimagesize($config['spoiler_image']);
$post->thumbwidth = $size[0];
$post->thumbheight = $size[1];
$file->thumbwidth = $size[0];
$file->thumbheight = $size[1];
} elseif (isset($videoDetails['frame']) && $thumbFile = fopen($thumbName, 'wb')) {
// Use single frame from video as pseudo-thumbnail
fwrite($thumbFile, $videoDetails['frame']);
fclose($thumbFile);
$post->thumb = $post->file_id . '.webm';
$file->thumb = $file->file_id . '.webm';
} else {
// Fall back to file thumbnail
$post->thumb = 'file';
$file->thumb = 'file';
}
unset($videoDetails['frame']);
// Set width and height
if (isset($videoDetails['width']) && isset($videoDetails['height'])) {
$post->width = $videoDetails['width'];
$post->height = $videoDetails['height'];
if ($post->thumb != 'file' && $post->thumb != 'spoiler') {
$file->width = $videoDetails['width'];
$file->height = $videoDetails['height'];
if ($file->thumb != 'file' && $file->thumb != 'spoiler') {
$thumbMaxWidth = $post->op ? $config['thumb_op_width'] : $config['thumb_width'];
$thumbMaxHeight = $post->op ? $config['thumb_op_height'] : $config['thumb_height'];
if ($videoDetails['width'] > $thumbMaxWidth || $videoDetails['height'] > $thumbMaxHeight) {
$post->thumbwidth = min($thumbMaxWidth, intval(round($videoDetails['width'] * $thumbMaxHeight / $videoDetails['height'])));
$post->thumbheight = min($thumbMaxHeight, intval(round($videoDetails['height'] * $thumbMaxWidth / $videoDetails['width'])));
$file->thumbwidth = min($thumbMaxWidth, intval(round($videoDetails['width'] * $thumbMaxHeight / $videoDetails['height'])));
$file->thumbheight = min($thumbMaxHeight, intval(round($videoDetails['height'] * $thumbMaxWidth / $videoDetails['width'])));
} else {
$post->thumbwidth = $videoDetails['width'];
$post->thumbheight = $videoDetails['height'];
$file->thumbwidth = $videoDetails['width'];
$file->thumbheight = $videoDetails['height'];
}
}
}

1
js/post-hider.js
View File

@ -1 +0,0 @@
hide-threads.js

2
js/wPaint

@ -1 +1 @@
Subproject commit 2c272dffca0f3d7b7163bd82ba15629f54409278
Subproject commit 15bae4a9181ddb283c1cad0979c44cefd4f15a44

2
js/wpaint.js
View File

@ -83,7 +83,7 @@ oekaki.init = function() {
stop: function(event,ui) {
$("#wpaintdiv").wPaint("resize");
},
alsoResize: "#wpaintdiv, #wpaintdiv canvas",
alsoResize: "#wpaintdiv",
});
$('#wpaintctr .ui-resizable-se').css({'height':'12px', 'width':'12px'});

9
post.php
View File

@ -320,6 +320,7 @@ if (isset($_POST['delete'])) {
$_FILES['file'] = array(
'name' => basename($url_without_params),
'tmp_name' => $post['file_tmp'],
'file_tmp' => true,
'error' => 0,
'size' => filesize($post['file_tmp'])
);
@ -704,7 +705,7 @@ if (isset($_POST['delete'])) {
chmod($file['file'], 0644);
} elseif (!@move_uploaded_file($file['tmp_name'], $file['file']))
error($config['error']['nomove']);
}
}
}
if ($config['image_reject_repost']) {
@ -757,7 +758,11 @@ if (isset($_POST['delete'])) {
}
$post = (object)$post;
if ($error = event('post', $post)) {
$post->files = array_map(function($a) { return (object)$a; }, $post->files);
$error = event('post', $post);
$post->files = array_map(function($a) { return (array)$a; }, $post->files);
if ($error) {
undoImage((array)$post);
error($error);
}