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

Oops I left some debug stuff around

Browse Source
This commit is contained in:
tuscanhobbit 2014-06-24 12:13:54 +02:00
parent cc4001fce7
commit 4c78c3bdee
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/attach.php
View File

@ -834,20 +834,26 @@ function get_cloudpath($arr) {
return $path; 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) { function get_parent_cloudpath($channel_id, $channel_name, $attachHash) {
//Build directory tree and redirect //Build directory tree and redirect
$parentHash = $attachHash; $parentHash = $attachHash;
do { do {
$parentHash = findFolderHashByAttachHash($channel_id, $parentHash); $parentHash = find_folder_hash_by_attach_hash($channel_id, $parentHash);
if ($parentHash) { if ($parentHash) {
$parentName = findFilenameByHash($channel_id, $parentHash); $parentName = find_filename_by_hash($channel_id, $parentHash);
$parentFullPath = $parentName."/".$parentFullPath; $parentFullPath = $parentName."/".$parentFullPath;
} }
} while ($parentHash); } while ($parentHash);
$parentFullPath = z_root() . "/cloud/" . $channel_name . "/" . $parentFullPath; $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", $r = q("select * from attach where uid = %d and hash = '%s' limit 1",
intval($channel_id), dbesc($attachHash) intval($channel_id), dbesc($attachHash)
); );
@ -859,7 +865,7 @@ function findFolderHashByAttachHash($channel_id, $attachHash) {
} }
return $hash; 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", $r = q("select * from attach where uid = %d and hash = '%s' limit 1",
intval($channel_id), dbesc($attachHash) intval($channel_id), dbesc($attachHash)
); );

1
mod/filestorage.php
View File

@ -29,7 +29,6 @@ function filestorage_post(&$a) {
//Build directory tree and redirect //Build directory tree and redirect
$channel = $a->get_channel(); $channel = $a->get_channel();
$cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource) ; $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource) ;
echo $cloudPath;die;
goaway($cloudPath); goaway($cloudPath);
} }