diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-03 09:44:53 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-03 09:44:53 +0200 |
| commit | cd526139fb0440938971261c0502006e9d212fbf (patch) | |
| tree | 9cc3e0ed340283fe168bb904c911248a2f7fd661 /Zotlabs/Storage | |
| parent | d83f12e883e79b7268677f8981579102c48ca00b (diff) | |
| parent | 459ec78a5e3cb09ee908fd7810bbb0b80b2e4713 (diff) | |
| download | volse-hubzilla-cd526139fb0440938971261c0502006e9d212fbf.tar.gz volse-hubzilla-cd526139fb0440938971261c0502006e9d212fbf.tar.bz2 volse-hubzilla-cd526139fb0440938971261c0502006e9d212fbf.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Storage')
| -rw-r--r-- | Zotlabs/Storage/Browser.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Storage/File.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 508c39d22..f4f906ad1 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -241,7 +241,7 @@ class Browser extends DAV\Browser\Plugin { // put the array for this file together $ft['attachId'] = $this->findAttachIdByHash($attachHash); - $ft['fileStorageUrl'] = substr($fullPath, 0, strpos($fullPath, "cloud/")) . "filestorage/" . $this->auth->getCurrentUser(); + $ft['fileStorageUrl'] = substr($fullPath, 0, strpos($fullPath, "cloud/")) . "filestorage/" . $this->auth->owner_nick; $ft['icon'] = $icon; $ft['photo_icon'] = $photo_icon; $ft['attachIcon'] = (($size) ? $attachIcon : ''); @@ -276,6 +276,8 @@ class Browser extends DAV\Browser\Plugin { '$create' => t('Create'), '$upload' => t('Add Files'), '$is_owner' => $is_owner, + '$is_admin' => is_site_admin(), + '$admin_delete' => t('Admin Delete'), '$parentpath' => $parentpath, '$cpath' => bin2hex(\App::$query_string), '$tiles' => intval($_SESSION['cloud_tiles']), diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php index 53d5d3476..4610aceb7 100644 --- a/Zotlabs/Storage/File.php +++ b/Zotlabs/Storage/File.php @@ -49,7 +49,7 @@ class File extends DAV\Node implements DAV\IFile { $this->data = $data; $this->auth = $auth; - logger(print_r($this->data, true), LOGGER_DATA); + // logger(print_r($this->data, true), LOGGER_DATA); } /** |