harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small change to allow a person with sufficient privileges the ability to import a file into their cloud storage from elsewhere in the server filesystem - without nuking it in the process.

Browse Source
This commit is contained in:
redmatrix 2015-10-12 18:55:02 -07:00
parent 42db2bc93d
commit 6a7079a594
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/attach.php
View File

@ -447,11 +447,17 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
// revise or update must provide $arr['hash'] of the thing to revise/update // revise or update must provide $arr['hash'] of the thing to revise/update
// By default remove $src when finished
$remove_when processed = true;
if($options === 'import') { if($options === 'import') {
$src = $arr['src']; $src = $arr['src'];
$filename = $arr['filename']; $filename = $arr['filename'];
$filesize = @filesize($src); $filesize = @filesize($src);
$hash = $arr['resource_id']; $hash = $arr['resource_id'];
if($arr['preserve_original'])
$remove_when_processed = false;
} }
elseif($options !== 'update') { elseif($options !== 'update') {
$f = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''); $f = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => '');
@ -630,7 +636,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
if(($maxfilesize) && ($filesize > $maxfilesize)) { if(($maxfilesize) && ($filesize > $maxfilesize)) {
$ret['message'] = sprintf( t('File exceeds size limit of %d'), $maxfilesize); $ret['message'] = sprintf( t('File exceeds size limit of %d'), $maxfilesize);
@unlink($src); if($remove_when_processed)
@unlink($src);
call_hooks('photo_upload_end',$ret); call_hooks('photo_upload_end',$ret);
return $ret; return $ret;
} }
@ -643,7 +650,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
); );
if(($r) && (($r[0]['total'] + $filesize) > ($limit - $existing_size))) { if(($r) && (($r[0]['total'] + $filesize) > ($limit - $existing_size))) {
$ret['message'] = upgrade_message(true) . sprintf(t("You have reached your limit of %1$.0f Mbytes attachment storage."), $limit / 1024000); $ret['message'] = upgrade_message(true) . sprintf(t("You have reached your limit of %1$.0f Mbytes attachment storage."), $limit / 1024000);
@unlink($src); if($remove_when_processed)
@unlink($src);
call_hooks('photo_upload_end',$ret); call_hooks('photo_upload_end',$ret);
return $ret; return $ret;
} }
@ -786,7 +795,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
} }
} }
if($options !== 'update') if(($options !== 'update') && ($remove_when_processed))
@unlink($src); @unlink($src);
if(! $r) { if(! $r) {