From a6403905ef51194c09b5c63983ea9be9455dfc96 Mon Sep 17 00:00:00 2001
From: Klaus Weidenbach <Klaus.Weidenbach@gmx.net>
Date: Tue, 24 Jun 2014 21:05:00 +0200
Subject: Set backlink to the parent folder, not cloud's root.

If you edit a file and click on the backlink you always returned to
the root folder of your cloud. This patch sets the correct parent
folder as backlink.
Bit messy, but looks like it works.
---
 mod/filestorage.php      | 2 ++
 view/tpl/attach_edit.tpl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mod/filestorage.php b/mod/filestorage.php
index 6a7eac706..383af84fc 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -110,6 +110,7 @@ function filestorage_content(&$a) {
 		$channel = $a->get_channel();
 
 		$cloudpath = get_cloudpath($f) . (($f['flags'] & ATTACH_FLAG_DIR) ? '?f=&davguest=1' : '');
+		$parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']);
 
 		$aclselect_e = populate_acl($f,false);
 		$is_a_dir = (($f['flags'] & ATTACH_FLAG_DIR) ? true : false);
@@ -121,6 +122,7 @@ function filestorage_content(&$a) {
 			'$header' => t('Edit file permissions'),
 			'$file' => $f,
 			'$cloudpath' => z_root() . '/' . $cloudpath,
+			'$parentpath' => $parentpath,
 			'$uid' => $channel['channel_id'],
 			'$channelnick' => $channel['channel_address'],
 			'$permissions' => t('Permissions'),
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 0d3d2c571..e91b4c0c6 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -1,4 +1,4 @@
-<div id="attach-edit-backlink">< <a href="cloud/{{$channelnick}}">{{$backlink}}</a></div>
+<div id="attach-edit-backlink">< <a href="{{$parentpath}}">{{$backlink}}</a></div>
 
 <h1>{{$header}}</h1>
 
-- 
cgit v1.2.3