aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2014-10-14 00:08:55 +0200
committerKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2014-10-14 00:15:41 +0200
commitbc2ad74813b2993e1d7c076181b904b3a5c4be5f (patch)
treed1aa656dc61af31394683fb697b77feaba50b378 /mod
parent1eefed0333cedaf262f0dc42c7f9d4d855dfc154 (diff)
downloadvolse-hubzilla-bc2ad74813b2993e1d7c076181b904b3a5c4be5f.tar.gz
volse-hubzilla-bc2ad74813b2993e1d7c076181b904b3a5c4be5f.tar.bz2
volse-hubzilla-bc2ad74813b2993e1d7c076181b904b3a5c4be5f.zip
When you delete something in /cloud stay in the right folder.
When you deleted a file in /cloud you was always jumped back to /cloud/[channel], now you will stay in the parent folder. Some more doxygen documentation. Removed duplicate data from logging output and reduced logging in RedDAV in general.
Diffstat (limited to 'mod')
-rw-r--r--mod/filestorage.php47
1 files changed, 27 insertions, 20 deletions
diff --git a/mod/filestorage.php b/mod/filestorage.php
index 383af84fc..e27087a92 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -1,18 +1,26 @@
<?php
+/**
+ * @file mod/filestorage.php
+ *
+ */
require_once('include/attach.php');
+/**
+ *
+ * @param object &$a
+ */
function filestorage_post(&$a) {
- $channel_id = ((x($_POST,'uid')) ? intval($_POST['uid']) : 0);
+ $channel_id = ((x($_POST, 'uid')) ? intval($_POST['uid']) : 0);
if((! $channel_id) || (! local_user()) || ($channel_id != local_user())) {
notice( t('Permission denied.') . EOL);
return;
}
- $recurse = ((x($_POST,'recurse')) ? intval($_POST['recurse']) : 0);
- $resource = ((x($_POST,'filehash')) ? notags($_POST['filehash']) : '');
+ $recurse = ((x($_POST, 'recurse')) ? intval($_POST['recurse']) : 0);
+ $resource = ((x($_POST, 'filehash')) ? notags($_POST['filehash']) : '');
if(! $resource) {
notice(t('Item not found.') . EOL);
@@ -24,11 +32,11 @@ function filestorage_post(&$a) {
$str_group_deny = perms2str($_REQUEST['group_deny']);
$str_contact_deny = perms2str($_REQUEST['contact_deny']);
- attach_change_permissions($channel_id,$resource,$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny,$recurse = false);
+ 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) ;
+ $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource);
goaway($cloudPath);
}
@@ -53,15 +61,15 @@ function filestorage_content(&$a) {
$observer = $a->get_observer();
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
- $perms = get_all_perms($owner,$ob_hash);
+ $perms = get_all_perms($owner, $ob_hash);
if(! $perms['view_storage']) {
notice( t('Permission denied.') . EOL);
return;
}
- // Since we have ACL'd files in the wild, but don't have ACL here yet, we
- // need to return for anyone other than the owner, despite the perms check for now.
+ // Since we have ACL'd files in the wild, but don't have ACL here yet, we
+ // need to return for anyone other than the owner, despite the perms check for now.
$is_owner = (((local_user()) && ($owner == local_user())) ? true : false);
if(! $is_owner) {
@@ -69,7 +77,6 @@ function filestorage_content(&$a) {
return;
}
-
if(argc() > 3 && argv(3) === 'delete') {
if(! $perms['write_storage']) {
notice( t('Permission denied.') . EOL);
@@ -77,7 +84,7 @@ function filestorage_content(&$a) {
}
$file = intval(argv(2));
- $r = q("select hash from attach where id = %d and uid = %d limit 1",
+ $r = q("SELECT hash FROM attach WHERE id = %d AND uid = %d LIMIT 1",
dbesc($file),
intval($owner)
);
@@ -86,11 +93,15 @@ function filestorage_content(&$a) {
goaway(z_root() . '/cloud/' . $which);
}
- attach_delete($owner,$r[0]['hash']);
-
- goaway(z_root() . '/cloud/' . $which);
- }
+ $f = $r[0];
+ $channel = $a->get_channel();
+
+ $parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']);
+ attach_delete($owner, $f['hash']);
+
+ goaway($parentpath);
+ }
if(argc() > 3 && argv(3) === 'edit') {
require_once('include/acl_selectors.php');
@@ -106,18 +117,16 @@ function filestorage_content(&$a) {
);
$f = $r[0];
-
$channel = $a->get_channel();
$cloudpath = get_cloudpath($f) . (($f['flags'] & ATTACH_FLAG_DIR) ? '?f=&davguest=1' : '');
$parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']);
- $aclselect_e = populate_acl($f,false);
+ $aclselect_e = populate_acl($f, false);
$is_a_dir = (($f['flags'] & ATTACH_FLAG_DIR) ? true : false);
$lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock');
-
$o = replace_macros(get_markup_template('attach_edit.tpl'), array(
'$header' => t('Edit file permissions'),
'$file' => $f,
@@ -135,12 +144,10 @@ function filestorage_content(&$a) {
'$cpdesc' => t('Copy/paste this code to attach file to a post'),
'$cpldesc' => t('Copy/paste this URL to link file from a web page'),
'$submit' => t('Submit')
-
));
return $o;
- }
+ }
goaway(z_root() . '/cloud/' . $which);
-
}