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

Refactor post.php: split upload file hashing to a function

Browse Source
This commit is contained in:
Zankaria 2024-01-16 18:01:13 +00:00
parent 15cce3a31f
commit d02c4eb31d
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
post.php
View File

@ -5,6 +5,39 @@
require_once 'inc/bootstrap.php'; require_once 'inc/bootstrap.php';
/**
* Utility functions
*/
/**
* Get the md5 hash of the file.
*
* @param array $config instance configuration.
* @param string $file file to the the md5 of.
* @return string|false
*/
function md5_hash_of_file($config, $path) {
$cmd = false;
if ($config['bsd_md5']) {
$cmd = '/sbin/md5 -r';
}
if ($config['gnu_md5']) {
$cmd = 'md5sum';
}
if ($cmd) {
$output = shell_exec_error($cmd . " " . escapeshellarg($path));
$output = explode(' ', $output);
return $output[0];
} else {
return md5_file($path);
}
}
/**
* Method handling functions
*/
$dropped_post = false; $dropped_post = false;
// Is it a post coming from NNTP? Let's extract it and pretend it's a normal post. // Is it a post coming from NNTP? Let's extract it and pretend it's a normal post.
@ -837,12 +870,7 @@ if (isset($_POST['delete'])) {
$post['tracked_cites'] = markup($post['body'], true); $post['tracked_cites'] = markup($post['body'], true);
if ($post['has_file']) { if ($post['has_file']) {
$md5cmd = false;
if ($config['bsd_md5']) $md5cmd = '/sbin/md5 -r';
if ($config['gnu_md5']) $md5cmd = 'md5sum';
$allhashes = ''; $allhashes = '';
foreach ($post['files'] as $key => &$file) { foreach ($post['files'] as $key => &$file) {
@ -863,14 +891,7 @@ if (isset($_POST['delete'])) {
if (!is_readable($upload)) if (!is_readable($upload))
error($config['error']['nomove']); error($config['error']['nomove']);
if ($md5cmd) { $hash = md5_hash_of_file($config, $upload);
$output = shell_exec_error($md5cmd . " " . escapeshellarg($upload));
$output = explode(' ', $output);
$hash = $output[0];
}
else {
$hash = md5_file($upload);
}
$file['hash'] = $hash; $file['hash'] = $hash;
$allhashes .= $hash; $allhashes .= $hash;