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

add function attach_syspaths to calculate the contents of os_path and display_path; add this to the rename function. We will also need it to populate existing file/photo structures as an upgrade task.

Browse Source
This commit is contained in:
zotlabs 2017-03-19 21:39:28 -07:00
parent a12a614e7e
commit 78aeb50ce5
1 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/attach.php
View File

@ -2212,10 +2212,23 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) {
intval($r[0]['id']) intval($r[0]['id'])
); );
$x = attach_syspaths($channel_id,$resource_id);
$t1 = q("update attach set os_path = '%s', display_path = '%s' where id = %d",
dbesc($x['os_path']),
dbesc($x['path']),
intval($r[0]['id'])
);
if($r[0]['is_photo']) { if($r[0]['is_photo']) {
$t = q("update photo set album = '%s', filename = '%s' where resource_id = '%s' and uid = %d", $t = q("update photo set album = '%s', filename = '%s', os_path = '%s', display_path = '%s'
where resource_id = '%s' and uid = %d",
dbesc($newdirname), dbesc($newdirname),
dbesc($filename), dbesc($filename),
dbesc($x['os_path']),
dbesc($x['path']),
dbesc($resource_id), dbesc($resource_id),
intval($channel_id) intval($channel_id)
); );
@ -2248,7 +2261,7 @@ function attach_folder_select_list($channel_id) {
} }
} }
} }
logger('results: ' . print_r($out,true));
return $out; return $out;
} }
@ -2280,3 +2293,30 @@ function attach_folder_rpaths($all_folders,$that_folder) {
return (($error) ? false : [ $current_hash , $path ]); return (($error) ? false : [ $current_hash , $path ]);
} }
function attach_syspaths($channel_id,$attach_hash) {
$os_path = '';
$path = '';
do {
$r = q("select folder, filename, hash from attach where hash = '%s' and uid = %d",
dbesc($attach_hash),
intval($channel_id)
);
if(! $r)
break;
$os_path = $r[0]['hash'] . (($os_path) ? '/' . $os_path : '');
$path = $r[0]['filename'] . (($path) ? '/' . $path : '');
$attach_hash = $r[0]['folder'];
}
while($attach_hash);
return [ 'os_path' => $os_path, 'path' => $path ];
}