Commit 993f3d46 authored by Mario's avatar Mario
Browse files

fix issue with path outside of the channel directory and fix css issue

parent 66ade6a9
Pipeline #369604 passed with stage
in 4 minutes and 15 seconds
......@@ -115,6 +115,8 @@ class Browser extends DAV\Browser\Plugin {
$f = [];
foreach ($files as $file) {
$ft = [];
$type = null;
......@@ -251,8 +253,8 @@ class Browser extends DAV\Browser\Plugin {
$ft['photo_icon'] = $photo_icon;
$ft['is_owner'] = $is_owner;
$ft['is_creator'] = $is_creator;
$ft['rel_path'] = '/cloud/' . $nick .'/' . $data['display_path'];
$ft['full_path'] = z_root() . '/cloud/' . $nick .'/' . $data['display_path'];
$ft['rel_path'] = (($data) ? '/cloud/' . $nick .'/' . $data['display_path'] : $href);
$ft['full_path'] = z_root() . (($data) ? '/cloud/' . $nick .'/' . $data['display_path'] : $href);
$ft['name'] = $name;
$ft['type'] = $type;
$ft['size'] = $size;
......
......@@ -767,7 +767,6 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
$r = q("SELECT channel_id, channel_address, profile.publish FROM channel left join profile on profile.uid = channel.channel_id WHERE channel_removed = 0 AND channel_system = 0 AND (channel_pageflags & %d) = 0",
intval(PAGE_HIDDEN)
);
if ($r) {
foreach ($r as $rr) {
if (perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage') && $rr['publish']) {
......
......@@ -37,10 +37,6 @@
word-break: break-all;
}
#cloud-index td:nth-child(3) {
white-space: nowrap;
}
#cloud-index th:nth-child(6),
#cloud-index td:nth-child(6) {
padding: 7px 3px;
......
......@@ -1818,4 +1818,9 @@ span.default-highlight {
.bootstrap-tagsinput {
width: 100%;
height: unset;
}
.bootstrap-tagsinput input {
height: unset;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment