diff options
| author | Mario <mario@mariovavti.com> | 2022-10-12 19:36:24 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-10-12 19:36:24 +0000 |
| commit | 71efb0565803018cb1ba362706c763714c596cf7 (patch) | |
| tree | 508827af55db42365892e6064f0e009e5068567e /Zotlabs/Storage | |
| parent | a9a36894cb2637b546ed566ee06f20511cce031f (diff) | |
| download | volse-hubzilla-71efb0565803018cb1ba362706c763714c596cf7.tar.gz volse-hubzilla-71efb0565803018cb1ba362706c763714c596cf7.tar.bz2 volse-hubzilla-71efb0565803018cb1ba362706c763714c596cf7.zip | |
fix php warnings
Diffstat (limited to 'Zotlabs/Storage')
| -rw-r--r-- | Zotlabs/Storage/Browser.php | 7 | ||||
| -rw-r--r-- | Zotlabs/Storage/Directory.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Storage/File.php | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index fdef35210..923906371 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -262,7 +262,7 @@ class Browser extends DAV\Browser\Plugin { // put the array for this file together $ft['attach_id'] = $id; - $ft['icon'] = $icon; + // $ft['icon'] = $icon; $ft['photo_icon'] = $photo_icon; $ft['is_creator'] = $is_creator; $ft['rel_path'] = (($data) ? '/cloud/' . $nick .'/' . $data['display_path'] : $href); @@ -454,6 +454,9 @@ class Browser extends DAV\Browser\Plugin { $lockstate = ''; $limit = 0; + $cat = $_REQUEST['cat'] ?? ''; + $cloud_tiles = $_SESSION['cloud_tiles'] ?? 0; + if($this->auth->owner_id) { $channel = channelx_by_n($this->auth->owner_id); if($channel) { @@ -507,7 +510,7 @@ class Browser extends DAV\Browser\Plugin { $breadcrumbs_html = ''; - if($display_path && ! $_REQUEST['cat'] && ! $_SESSION['cloud_tiles']){ + if ($display_path && !$cat && !$cloud_tiles) { $breadcrumbs = []; $folders = explode('/', $display_path); $folder_hashes = explode('/', $node->os_path); diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index c56ffcbbb..87ca220d6 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -617,7 +617,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo $file = trim($file, '/'); $path_arr = explode('/', $file); - $cat = $_REQUEST['cat']; + $cat = $_REQUEST['cat'] ?? ''; if (! $path_arr) diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php index 76295d922..dc60a72ae 100644 --- a/Zotlabs/Storage/File.php +++ b/Zotlabs/Storage/File.php @@ -38,6 +38,7 @@ class File extends DAV\Node implements DAV\IFile { */ private $name; + /** * Sets up the node, expects a full path name. * @@ -49,7 +50,8 @@ class File extends DAV\Node implements DAV\IFile { $this->name = $name; $this->data = $data; $this->auth = $auth; - + $this->os_path = null; + $this->folder_hash = null; // logger(print_r($this->data, true), LOGGER_DATA); } |