streamlined hash detection

This commit is contained in:
Christian Haschek
2021-11-11 19:17:21 +01:00
parent 199f162fdf
commit 9a7fadb231
2 changed files with 4 additions and 3 deletions

View File

@@ -16,8 +16,6 @@ $hash = $_REQUEST['hash'];
if(!isExistingHash($hash)) if(!isExistingHash($hash))
{ {
//check storage controllers
exit(json_encode(array('status'=>'err','reason'=>'File not found'))); exit(json_encode(array('status'=>'err','reason'=>'File not found')));
} }
else else
@@ -31,10 +29,12 @@ else
function getInfoAboutHash($hash) function getInfoAboutHash($hash)
{ {
$file = ROOT.DS.'data'.DS.$hash.DS.$hash; $file = ROOT.DS.'data'.DS.$hash.DS.$hash;
if(!$file_exists($file))
return array('status'=>'err','reason'=>'File not found');
$size = filesize($file); $size = filesize($file);
$size_hr = renderSize($size); $size_hr = renderSize($size);
$content_type = exec("file -bi " . escapeshellarg($file)); $content_type = exec("file -bi " . escapeshellarg($file));
if($content_type && $content_type!=$type && strpos($content_type,'/')!==false && strpos($content_type,';')!==false) if($content_type && strpos($content_type,'/')!==false && strpos($content_type,';')!==false)
{ {
$type = $content_type; $type = $content_type;
$c = explode(';',$type); $c = explode(';',$type);

View File

@@ -195,6 +195,7 @@ function getNewHash($type,$length=10)
function isExistingHash($hash) function isExistingHash($hash)
{ {
if(!trim($hash)) return false;
return is_dir(ROOT.DS.'data'.DS.$hash); return is_dir(ROOT.DS.'data'.DS.$hash);
} }