diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-11 22:54:39 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-11 22:54:39 +0200 |
| commit | fb2d2bc2011c371ff1e4334f84494f15a84a07a2 (patch) | |
| tree | b5c20c842441ce4288038909daa5a158c8e74e80 /apps/files_sharing | |
| parent | 5c6e9518edde10e0c23d0d734d2cc6d161fc15c0 (diff) | |
| parent | ee28e35ba93032a3d43601c030d3d44df9b092f0 (diff) | |
| download | nextcloud-server-fb2d2bc2011c371ff1e4334f84494f15a84a07a2.tar.gz nextcloud-server-fb2d2bc2011c371ff1e4334f84494f15a84a07a2.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/js/share.js | 2 | ||||
| -rw-r--r-- | apps/files_sharing/public.php | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index bc94d78fb76..72663c068c9 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -1,6 +1,6 @@ $(document).ready(function() { - if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined') { + if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !publicListView) { OC.Share.loadIcons('file'); FileActions.register('all', 'Share', OC.PERMISSION_READ, function(filename) { // Return the correct sharing icon diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index c5f4b39d704..96d0f0de05c 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -45,6 +45,11 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { } if (isset($linkItem['share_with'])) { // Check password + if (isset($_GET['file'])) {
+ $url = OCP\Util::linkToPublic('files').'&file='.$_GET['file'];
+ } else {
+ $url = OCP\Util::linkToPublic('files').'&dir='.$_GET['dir'];
+ } if (isset($_POST['password'])) { $password = $_POST['password']; $storedHash = $linkItem['share_with']; @@ -52,7 +57,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { $hasher = new PasswordHash(8, $forcePortable); if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash))) { $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest'); - $tmpl->assign('URL', OCP\Util::linkToPublic('files').'&file='.$_GET['file']); + $tmpl->assign('URL', $url); $tmpl->assign('error', true); $tmpl->printPage(); exit(); @@ -64,7 +69,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { } else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) { // Prompt for password $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest'); - $tmpl->assign('URL', OCP\Util::linkToPublic('files').'&file='.$_GET['file']); + $tmpl->assign('URL', $url); $tmpl->printPage(); exit(); } @@ -138,6 +143,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { } $list = new OCP\Template('files', 'part.list', ''); $list->assign('files', $files, false); + $list->assign('publicListView', true); $list->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.$_GET['dir'].'&path=', false); $list->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.$_GET['dir'].'&path=', false); $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' ); |