aboutsummaryrefslogtreecommitdiffstats
path: root/mod/filestorage.php
diff options
context:
space:
mode:
authortuscanhobbit <tuscanhobbit@users.noreply.github.com>2014-06-24 12:05:11 +0200
committertuscanhobbit <tuscanhobbit@users.noreply.github.com>2014-06-24 12:05:11 +0200
commitcc4001fce7934b49e6e7888a602b9bb9c33cf37f (patch)
tree91f7e332149b40fd872ce66c742ca158190e80ba /mod/filestorage.php
parentb2b47dcd7ca823bacd5d223666c8603d099116ec (diff)
downloadvolse-hubzilla-cc4001fce7934b49e6e7888a602b9bb9c33cf37f.tar.gz
volse-hubzilla-cc4001fce7934b49e6e7888a602b9bb9c33cf37f.tar.bz2
volse-hubzilla-cc4001fce7934b49e6e7888a602b9bb9c33cf37f.zip
Fixes to links and forward URLs in filestorage
Diffstat (limited to 'mod/filestorage.php')
-rw-r--r--mod/filestorage.php54
1 files changed, 8 insertions, 46 deletions
diff --git a/mod/filestorage.php b/mod/filestorage.php
index bcf798e7b..7db5a0961 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -26,12 +26,13 @@ function filestorage_post(&$a) {
attach_change_permissions($channel_id,$resource,$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny,$recurse = false);
+ //Build directory tree and redirect
+ $channel = $a->get_channel();
+ $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource) ;
+ echo $cloudPath;die;
+ goaway($cloudPath);
}
-
-
-
-
function filestorage_content(&$a) {
if(argc() > 1)
@@ -83,12 +84,12 @@ function filestorage_content(&$a) {
);
if(! $r) {
notice( t('File not found.') . EOL);
- goaway(z_root() . '/filestorage/' . $which);
+ goaway(z_root() . '/cloud/' . $which);
}
attach_delete($owner,$r[0]['hash']);
- goaway(z_root() . '/filestorage/' . $which);
+ goaway(z_root() . '/cloud/' . $which);
}
@@ -139,45 +140,6 @@ function filestorage_content(&$a) {
return $o;
}
- $r = q("select * from attach where uid = %d order by edited desc",
- intval($owner)
- );
-
- $files = null;
-
- if($r) {
- $files = array();
- foreach($r as $rr) {
- $files[$rr['id']][] = array(
- 'id' => $rr['id'],
- 'download' => $rr['hash'],
- 'title' => $rr['filename'],
- 'size' => $rr['filesize'],
- 'rev' => $rr['revision'],
- 'dir' => (($rr['flags'] & ATTACH_FLAG_DIR) ? true : false)
- );
- }
- }
-
- $limit = service_class_fetch ($owner,'attach_upload_limit');
- $r = q("select sum(filesize) as total from attach where aid = %d ",
- intval($channel['channel_account_id'])
- );
- $used = $r[0]['total'];
-
- $url = z_root() . "/filestorage/" . $which;
- return $o . replace_macros(get_markup_template("filestorage.tpl"), array(
- '$baseurl' => $url,
- '$download' => t('Download'),
- '$files' => $files,
- '$channel' => $which,
- '$edit' => t('Edit'),
- '$delete' => t('Delete'),
- '$used' => $used,
- '$usedlabel' => t('Used: '),
- '$directory' => t('[directory]'),
- '$limit' => $limit,
- '$limitlabel' => t('Limit: '),
- ));
+ goaway(z_root() . '/cloud/' . $which);
}