external-repos/pictshare
1
0
Fork 0
mirror of https://github.com/HaschekSolutions/pictshare.git synced 2025-11-11 18:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

added delete codes and fixed various bugs related to custom hashes

Browse Source
This commit is contained in:
Chris
2018-12-25 11:34:43 +01:00
parent bf13df48aa
commit b66a1f2a55
7 changed files with 106 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
content-controllers/image/image.controller.php
View File

@@ -28,8 +28,6 @@ class ImageController implements ContentController
$res = imagecreatefromjpeg($tmpfile);
imagejpeg($res, $tmpfile, (defined('JPEG_COMPRESSION')?JPEG_COMPRESSION:90));
$ext = 'jpg';
$newsha1 = sha1_file($tmpfile);
break;
default:
@@ -42,26 +40,13 @@ class ImageController implements ContentController
}
else
{
$hash.='.'.$ext;
if(!endswith($hash,'.'.$ext))
$hash.='.'.$ext;
if(isExistingHash($hash))
return array('status'=>'err','reason'=>'Custom hash already exists');
return array('status'=>'err','hash'=>$hash,'reason'=>'Custom hash already exists');
}
if($newsha1)
addSha1($hash,$newsha1);
mkdir(ROOT.DS.'data'.DS.$hash);
$file = ROOT.DS.'data'.DS.$hash.DS.$hash;
copy($tmpfile, $file);
unlink($tmpfile);
if(defined('LOG_UPLOADER') && LOG_UPLOADER)
{
$fh = fopen(ROOT.DS.'data'.DS.'uploads.txt', 'a');
fwrite($fh, time().';'.$url.';'.$hash.';'.getUserIP()."\n");
fclose($fh);
}
storeFile($tmpfile,$hash,true);
return array('status'=>'ok','hash'=>$hash,'url'=>URL.$hash);
}

15
content-controllers/text/text.controller.php
View File

@@ -43,21 +43,10 @@ class TextController implements ContentController
if(!endswith($hash,'.txt'))
$hash.='.txt';
if(isExistingHash($hash))
return array('status'=>'err','reason'=>'Custom hash already exists');
return array('status'=>'err','hash'=>$hash,'reason'=>'Custom hash already exists');
}
mkdir(ROOT.DS.'data'.DS.$hash);
$file = ROOT.DS.'data'.DS.$hash.DS.$hash;
copy($tmpfile, $file);
unlink($tmpfile);
if(defined('LOG_UPLOADER') && LOG_UPLOADER)
{
$fh = fopen(ROOT.DS.'data'.DS.'uploads.txt', 'a');
fwrite($fh, time().';'.$url.';'.$hash.';'.getUserIP()."\n");
fclose($fh);
}
storeFile($tmpfile,$hash,true);
return array('status'=>'ok','hash'=>$hash,'url'=>URL.$hash);
}

15
content-controllers/video/video.controller.php
View File

@@ -69,24 +69,13 @@ class VideoController implements ContentController
{
$hash.='.mp4';
if(isExistingHash($hash))
return array('status'=>'err','reason'=>'Custom hash already exists');
return array('status'=>'err','hash'=>$hash,'reason'=>'Custom hash already exists');
}
mkdir(ROOT.DS.'data'.DS.$hash);
$file = ROOT.DS.'data'.DS.$hash.DS.$hash;
copy($tmpfile, $file);
unlink($tmpfile);
storeFile($tmpfile,$hash,true);
if(!$this->rightEncodedMP4($file))
system("nohup php ".ROOT.DS.'tools'.DS.'re-encode_mp4.php force '.$hash." > /dev/null 2> /dev/null &");
if(defined('LOG_UPLOADER') && LOG_UPLOADER)
{
$fh = fopen(ROOT.DS.'data'.DS.'uploads.txt', 'a');
fwrite($fh, time().';'.$url.';'.$hash.';'.getUserIP()."\n");
fclose($fh);
}
return array('status'=>'ok','hash'=>$hash,'url'=>URL.$hash);
}