aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-02-20 23:03:48 -0800
committerzotlabs <mike@macgirvin.com>2017-02-20 23:03:48 -0800
commite54ba7ecbc7391069b38d9f911bf77623d0ee582 (patch)
tree025a92390bc8ed78452a44e421c52c2fc2e68ea1 /Zotlabs
parent1c1d1f11851722db3c8c7e6bb1d814b42399f67e (diff)
downloadvolse-hubzilla-e54ba7ecbc7391069b38d9f911bf77623d0ee582.tar.gz
volse-hubzilla-e54ba7ecbc7391069b38d9f911bf77623d0ee582.tar.bz2
volse-hubzilla-e54ba7ecbc7391069b38d9f911bf77623d0ee582.zip
fix find_folder_hash_by_path() which was not safe against multiple attach structures with the same filename but in different directories
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Storage/Browser.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index a30eedba5..f527a6a44 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -314,7 +314,13 @@ class Browser extends DAV\Browser\Plugin {
$quota['desc'] = $quotaDesc;
$quota['warning'] = ((($limit) && ((round($used / $limit, 1) * 100) >= 90)) ? t('WARNING:') : ''); // 10485760 bytes = 100MB
- $path = trim(str_replace('cloud/' . $this->auth->owner_nick, '', $path), '/');
+ // strip 'cloud/nickname', but only at the beginning of the path
+
+ $special = 'cloud/' . $this->auth->owner_nick;
+ $count = strlen($special);
+
+ if(strpos($path,$special) === 0)
+ $path = trim(substr($path,$count),'/');
$output .= replace_macros(get_markup_template('cloud_actionspanel.tpl'), array(
'$folder_header' => t('Create new folder'),