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

attach_mkdirp - implement force option to return success if dir exists

Browse Source
This commit is contained in:
redmatrix 2015-06-17 01:18:55 -07:00
parent 4ecee713d5
commit c6c17182e5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/attach.php
View File

@ -685,13 +685,19 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
// Check for duplicate name. // Check for duplicate name.
// Check both the filename and the hash as we will be making use of both. // Check both the filename and the hash as we will be making use of both.
$r = q("select hash from attach where ( filename = '%s' or hash = '%s' ) and folder = '%s' and uid = %d limit 1", $r = q("select hash, is_dir, flags from attach where ( filename = '%s' or hash = '%s' ) and folder = '%s' and uid = %d limit 1",
dbesc($arr['filename']), dbesc($arr['filename']),
dbesc($arr['hash']), dbesc($arr['hash']),
dbesc($arr['folder']), dbesc($arr['folder']),
intval($channel['channel_id']) intval($channel['channel_id'])
); );
if($r) { if($r) {
if(array_key_exists('force',$arr) && intval($arr['force'])
&& ( intval($r[0]['is_dir']) || $r[0]['flags'] & ATTACH_FLAG_DIR)) {
$ret['success'] = true;
$ret['data'] = $r[0];
return $ret;
}
$ret['message'] = t('duplicate filename or path'); $ret['message'] = t('duplicate filename or path');
return $ret; return $ret;
} }
@ -831,7 +837,8 @@ function attach_mkdirp($channel, $observer_hash, $arr = null) {
continue; continue;
$arx = array( $arx = array(
'filename' => $p, 'filename' => $p,
'folder' => $current_parent 'folder' => $current_parent,
'force' => 1
); );
if(array_key_exists('allow_cid',$arr)) if(array_key_exists('allow_cid',$arr))
$arx['allow_cid'] = $arr['allow_cid']; $arx['allow_cid'] = $arr['allow_cid'];