diff options
| -rw-r--r-- | include/attach.php | 16 | ||||
| -rw-r--r-- | mod/filestorage.php | 1 |
2 files changed, 11 insertions, 6 deletions
diff --git a/include/attach.php b/include/attach.php index bf58566fe..f5eaaa448 100644 --- a/include/attach.php +++ b/include/attach.php @@ -834,20 +834,26 @@ function get_cloudpath($arr) { return $path; } +/** + * @brief Returns path to parent folder in cloud/. + * + * @param $arr + * @return string with the folder path + */ function get_parent_cloudpath($channel_id, $channel_name, $attachHash) { //Build directory tree and redirect $parentHash = $attachHash; do { - $parentHash = findFolderHashByAttachHash($channel_id, $parentHash); + $parentHash = find_folder_hash_by_attach_hash($channel_id, $parentHash); if ($parentHash) { - $parentName = findFilenameByHash($channel_id, $parentHash); + $parentName = find_filename_by_hash($channel_id, $parentHash); $parentFullPath = $parentName."/".$parentFullPath; } } while ($parentHash); $parentFullPath = z_root() . "/cloud/" . $channel_name . "/" . $parentFullPath; - goaway($parentFullPath); + return $parentFullPath; } -function findFolderHashByAttachHash($channel_id, $attachHash) { +function find_folder_hash_by_attach_hash($channel_id, $attachHash) { $r = q("select * from attach where uid = %d and hash = '%s' limit 1", intval($channel_id), dbesc($attachHash) ); @@ -859,7 +865,7 @@ function findFolderHashByAttachHash($channel_id, $attachHash) { } return $hash; } -function findFilenameByHash($channel_id, $attachHash) { +function find_filename_by_hash($channel_id, $attachHash) { $r = q("select * from attach where uid = %d and hash = '%s' limit 1", intval($channel_id), dbesc($attachHash) ); diff --git a/mod/filestorage.php b/mod/filestorage.php index 7db5a0961..6a7eac706 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -29,7 +29,6 @@ function filestorage_post(&$a) { //Build directory tree and redirect $channel = $a->get_channel(); $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource) ; - echo $cloudPath;die; goaway($cloudPath); } |