diff options
author | Max Kostikov <max@kostikov.co> | 2020-12-19 22:02:51 +0100 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2020-12-19 22:02:51 +0100 |
commit | 116fc4e00df8f0a232289bc3fce37f8fc16f1c9d (patch) | |
tree | 0d1cc173d40f620626dff401333d7756975e8fc2 /Zotlabs/Module/Filestorage.php | |
parent | 600dcdfc583ab671fc61ff957ad7fd1a3a0c547d (diff) | |
parent | 57f6f54f29623972abc980b5e87c7933e32d1d3a (diff) | |
download | volse-hubzilla-116fc4e00df8f0a232289bc3fce37f8fc16f1c9d.tar.gz volse-hubzilla-116fc4e00df8f0a232289bc3fce37f8fc16f1c9d.tar.bz2 volse-hubzilla-116fc4e00df8f0a232289bc3fce37f8fc16f1c9d.zip |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!4
Diffstat (limited to 'Zotlabs/Module/Filestorage.php')
-rw-r--r-- | Zotlabs/Module/Filestorage.php | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php index 0c6233493..0d132e998 100644 --- a/Zotlabs/Module/Filestorage.php +++ b/Zotlabs/Module/Filestorage.php @@ -11,6 +11,9 @@ class Filestorage extends \Zotlabs\Web\Controller { function post() { + notice( t('Deprecated!') . EOL); + return; + $channel_id = ((x($_POST, 'uid')) ? intval($_POST['uid']) : 0); if((! $channel_id) || (! local_channel()) || ($channel_id != local_channel())) { @@ -47,6 +50,9 @@ class Filestorage extends \Zotlabs\Web\Controller { function get() { + notice( t('Deprecated!') . EOL); + return; + if(argc() > 1) $which = argv(1); else { @@ -88,7 +94,7 @@ class Filestorage extends \Zotlabs\Web\Controller { } else { notice( t('Permission denied.') . EOL); - if($json_return) + if($json_return) json_return_and_die([ 'success' => false ]); return; } @@ -102,24 +108,23 @@ class Filestorage extends \Zotlabs\Web\Controller { if(! $r) { notice( t('File not found.') . EOL); - if($json_return) + if($json_return) json_return_and_die([ 'success' => false ]); goaway(z_root() . '/cloud/' . $which); } - if(local_channel() !== $owner) { + if((local_channel() !== $owner) && !$admin_delete) { if($r[0]['creator'] && $r[0]['creator'] !== $ob_hash) { notice( t('Permission denied.') . EOL); - if($json_return) + if($json_return) json_return_and_die([ 'success' => false ]); goaway(z_root() . '/cloud/' . $which); } } - $f = $r[0]; $channel = channelx_by_n($owner); @@ -138,7 +143,7 @@ class Filestorage extends \Zotlabs\Web\Controller { if($json_return) json_return_and_die([ 'success' => true ]); - goaway(dirname($url)); + //goaway(dirname($url)); } |