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

preparations for dynamic data directories

Browse Source
This commit is contained in:
Chris
2023-11-02 23:20:05 +01:00
parent 3fe84a63a4
commit 2388f68d5d
17 changed files with 93 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/base64.php
View File

@@ -21,7 +21,7 @@ loadAllContentControllers();
executeUploadPermission();
// check write permissions first
if(!isFolderWritable(ROOT.DS.'data'))
if(!isFolderWritable(getDataDir()))
exit(json_encode(array('status'=>'err','reason'=>'Data directory not writable')));
else if(!isFolderWritable(ROOT.DS.'tmp'))
exit(json_encode(array('status'=>'err','reason'=>'Temp directory not writable')));
@@ -45,8 +45,8 @@ if($_REQUEST['base64'])
//check for duplicates
$sha1 = sha1_file($tmpfile);
$ehash = sha1Exists($sha1);
if($ehash && file_exists(ROOT.DS.'data'.DS.$ehash.DS.$ehash))
exit(json_encode(array('status'=>'ok','hash'=>$ehash,'filetype'=>$type,'url'=>URL.$ehash)));
if($ehash && file_exists(getDataDir().DS.$ehash.DS.$ehash))
exit(json_encode(array('status'=>'ok','hash'=>$ehash,'filetype'=>$type,'url'=>getURL().$ehash)));
@@ -80,7 +80,7 @@ if($_REQUEST['base64'])
if(getDeleteCodeOfHash($answer['hash']))
{
$answer['delete_code'] = getDeleteCodeOfHash($answer['hash']);
$answer['delete_url'] = URL.'delete_'.getDeleteCodeOfHash($answer['hash']).'/'.$answer['hash'];
$answer['delete_url'] = getURL().'delete_'.getDeleteCodeOfHash($answer['hash']).'/'.$answer['hash'];
}
storageControllerUpload($answer['hash']);

10
api/geturl.php
View File

@@ -21,7 +21,7 @@ loadAllContentControllers();
executeUploadPermission();
// check write permissions first
if(!isFolderWritable(ROOT.DS.'data'))
if(!isFolderWritable(getDataDir()))
exit(json_encode(array('status'=>'err','reason'=>'Data directory not writable')));
else if(!isFolderWritable(ROOT.DS.'tmp'))
exit(json_encode(array('status'=>'err','reason'=>'Temp directory not writable')));
@@ -57,8 +57,8 @@ $type = getTypeOfFile($tmpfile);
//check for duplicates
$sha1 = sha1_file($tmpfile);
$ehash = sha1Exists($sha1);
if($ehash && file_exists(ROOT.DS.'data'.DS.$ehash.DS.$ehash))
exit(json_encode(array('status'=>'ok','hash'=>$ehash,'filetype'=>$type,'url'=>URL.$ehash)));
if($ehash && file_exists(getDataDir().DS.$ehash.DS.$ehash))
exit(json_encode(array('status'=>'ok','hash'=>$ehash,'filetype'=>$type,'url'=>getURL().$ehash)));
//cross check filetype for controllers
//
@@ -90,7 +90,7 @@ if($answer['hash'] && $answer['status']=='ok')
if(getDeleteCodeOfHash($answer['hash']))
{
$answer['delete_code'] = getDeleteCodeOfHash($answer['hash']);
$answer['delete_url'] = URL.'delete_'.getDeleteCodeOfHash($answer['hash']).'/'.$answer['hash'];
$answer['delete_url'] = getURL().'delete_'.getDeleteCodeOfHash($answer['hash']).'/'.$answer['hash'];
}
@@ -105,7 +105,7 @@ if($answer['hash'] && $answer['status']=='ok')
if(getDeleteCodeOfHash($answer['hash']))
{
$answer['delete_code'] = getDeleteCodeOfHash($answer['hash']);
$answer['delete_url'] = URL.'delete_'.getDeleteCodeOfHash($answer['hash']).'/'.$answer['hash'];
$answer['delete_url'] = getURL().'delete_'.getDeleteCodeOfHash($answer['hash']).'/'.$answer['hash'];
}
storageControllerUpload($answer['hash']);

2
api/info.php
View File

@@ -36,7 +36,7 @@ else
function getInfoAboutHash($hash)
{
$file = ROOT.DS.'data'.DS.$hash.DS.$hash;
$file = getDataDir().DS.$hash.DS.$hash;
if(!file_exists($file))
return array('status'=>'err','reason'=>'File not found');
$size = filesize($file);

6
api/pastebin.php
View File

@@ -21,7 +21,7 @@ if(!in_array('TextController',$controllers))
executeUploadPermission();
// check write permissions first
if(!isFolderWritable(ROOT.DS.'data'))
if(!isFolderWritable(getDataDir()))
exit(json_encode(array('status'=>'err','reason'=>'Data directory not writable')));
else if(!isFolderWritable(ROOT.DS.'tmp'))
exit(json_encode(array('status'=>'err','reason'=>'Temp directory not writable')));
@@ -37,11 +37,11 @@ if($_REQUEST['api_paste_code'])
$sha1 = sha1_file($tmpfile);
$sha_hash = sha1Exists($sha1);
if($sha_hash)
exit(URL.$sha_hash);
exit(getURL().$sha_hash);
$answer = (new TextController())->handleUpload($tmpfile,$hash);
if($answer['hash'] && $answer['status']=='ok')
addSha1($answer['hash'],$sha1);
echo URL.$hash;
echo getURL().$hash;
}

8
api/upload.php
View File

@@ -18,7 +18,7 @@ if(file_exists(ROOT.'/lib/vendor/autoload.php'))
$allowedcontentcontrollers = loadAllContentControllers();
// check write permissions first
if(!isFolderWritable(ROOT.DS.'data'))
if(!isFolderWritable(getDataDir()))
exit(json_encode(array('status'=>'err','reason'=>'Data directory not writable')));
else if(!isFolderWritable(ROOT.DS.'tmp'))
exit(json_encode(array('status'=>'err','reason'=>'Temp directory not writable')));
@@ -40,8 +40,8 @@ if ($_FILES['file']["error"] == UPLOAD_ERR_OK)
//check for duplicates
$sha1 = sha1_file($_FILES['file']["tmp_name"]);
$ehash = sha1Exists($sha1);
if($ehash && file_exists(ROOT.DS.'data'.DS.$ehash.DS.$ehash))
exit(json_encode(array('status'=>'ok','hash'=>$ehash,'filetype'=>$type,'url'=>URL.$ehash)));
if($ehash && file_exists(getDataDir().DS.$ehash.DS.$ehash))
exit(json_encode(array('status'=>'ok','hash'=>$ehash,'filetype'=>$type,'url'=>getURL().$ehash)));
//cross check filetype for controllers
//
@@ -85,7 +85,7 @@ if ($_FILES['file']["error"] == UPLOAD_ERR_OK)
if(getDeleteCodeOfHash($answer['hash']))
{
$answer['delete_code'] = getDeleteCodeOfHash($answer['hash']);
$answer['delete_url'] = URL.'delete_'.getDeleteCodeOfHash($answer['hash']).'/'.$answer['hash'];
$answer['delete_url'] = getURL().'delete_'.getDeleteCodeOfHash($answer['hash']).'/'.$answer['hash'];
}