Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2025-02-20 20:51:50 +01:00
Code Releases Wiki Activity

Add MD5 for individual files to the API

Browse Source
This commit is contained in:
BkPHcgQL3V 2014-10-22 06:53:29 +00:00
parent 4267da837a
commit d398a49fc6
3 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inc/api.php
View File

@ -85,13 +85,13 @@ class Api {
}
}
private function translateFile($file, $post, &$apiPost) {
private function translateFile($file, &$apiPost) {
$this->translateFields($this->fileFields, $file, $apiPost);
$apiPost['filename'] = @substr($file->name, 0, strrpos($file->name, '.'));
$dotPos = strrpos($file->file, '.');
$apiPost['ext'] = substr($file->file, $dotPos);
$apiPost['tim'] = substr($file->file, 0, $dotPos);
$apiPost['md5'] = base64_encode(hex2bin($post->filehash));
$apiPost['md5'] = base64_encode(hex2bin($file->hash));
}
private function translatePost($post, $threadsPage = false) {
@ -116,17 +116,16 @@ class Api {
}
// Handle files
// Note: 4chan only supports one file, so only the first file is taken into account for 4chan-compatible API.
if (isset($post->files) && $post->files && !$threadsPage) {
$file = $post->files[0];
$this->translateFile($file, $post, $apiPost);
$this->translateFile($file, $apiPost);
if (sizeof($post->files) > 1) {
$extra_files = array();
foreach ($post->files as $i => $f) {
if ($i == 0) continue;
$extra_file = array();
$this->translateFile($f, $post, $extra_file);
$this->translateFile($f, $extra_file);
$extra_files[] = $extra_file;
}

7
inc/display.php
View File

@ -354,8 +354,13 @@ class Post {
$this->{$key} = $value;
}
if (isset($this->files) && $this->files)
if (isset($this->files) && $this->files) {
$this->files = json_decode($this->files);
// Compatibility for posts before individual file hashing
foreach ($this->files as &$file)
if (!isset($file->hash))
$file->hash = $this->filehash;
}
$this->subject = utf8tohtml($this->subject);
$this->name = utf8tohtml($this->name);

38
post.php
View File

@ -577,6 +577,7 @@ elseif (isset($_POST['post'])) {
if ($post['has_file']) {
$allhashes = '';
foreach ($post['files'] as $key => &$file) {
if (!in_array($file['extension'], $config['allowed_ext']) && !in_array($file['extension'], $config['allowed_ext_files']))
error($config['error']['unknownext']);
@ -586,33 +587,26 @@ elseif (isset($_POST['post'])) {
// Truncate filename if it is too long
$file['filename'] = mb_substr($file['filename'], 0, $config['max_filename_len']);
if (!isset($filenames)) {
$filenames = escapeshellarg($file['tmp_name']);
} else {
$filenames .= (' ' . escapeshellarg($file['tmp_name']));
}
$upload = $file['tmp_name'];
if (!is_readable($upload))
error($config['error']['nomove']);
}
$md5cmd = $config['bsd_md5'] ? 'md5 -r' : 'md5sum';
if( ($output = shell_exec_error("cat $filenames | $md5cmd")) !== false ) {
$explodedvar = explode(' ', $output);
$hash = $explodedvar[0];
$post['filehash'] = $hash;
}
elseif ($config['max_images'] === 1) {
$post['filehash'] = md5_file($upload);
}
else {
$str_to_hash = '';
foreach (explode(' ', $filenames) as $i => $f) {
$str_to_hash .= file_get_contents($f);
$md5cmd = $config['bsd_md5'] ? 'md5 -r' : 'md5sum';
if( ($output = shell_exec_error("cat " . escapeshellarg($upload) . " | $md5cmd")) !== false ) {
$explodedvar = explode(' ', $output);
$hash = $explodedvar[0];
} else {
$hash = md5_file($upload);
}
$post['filehash'] = md5($str_to_hash);
$file['hash'] = $hash;
$allhashes .= $hash;
}
if (count($post['files']) == 1) {
$post['filehash'] = $hash;
} else {
$post['filehash'] = md5($allhashes);
}
}