Merge pull request #1608 from owncloud/fix-shared-links

Fix shared links

12 files changed, 91 insertions, 303 deletions

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 7e4f677ce9d..2731d5a92f7 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -40,7 +40,7 @@ class Hooks {
 	

 		// Manually initialise Filesystem{} singleton with correct 

 		// fake root path, in order to avoid fatal webdav errors

-		\OC\Files\Filesystem::init( $params['uid'] . '/' . 'files' . '/' );

+		\OC\Files\Filesystem::init( $params['uid'], $params['uid'] . '/' . 'files' . '/' );

 	

 		$view = new \OC_FilesystemView( '/' );

 

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 492014344f7..13f42b130df 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -34,9 +34,8 @@ body {
 	background:#eee;
 	border-bottom:1px solid #f8f8f8;
 	min-height:30em;
-	padding-top:2em;
 	text-align:center;
-	margin:50px auto;
+	margin:45px auto;
 }
 
 #noPreview {
@@ -60,6 +59,7 @@ p.info a {
 #imgframe {
 	height:75%;
 	padding-bottom:2em;
+	padding-top:2em;
 	width:80%;
 	margin:0 auto;
 }
@@ -67,4 +67,8 @@ p.info a {
 #imgframe img {
 	max-height:100%;
 	max-width:100%;
-}
\ No newline at end of file
+}
+
+thead{
+	background-color: white;
+}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index ea28ca69b93..65812b7e2fd 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -390,7 +390,7 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	public static function setup($options) {
-		if (\OCP\Share::getItemsSharedWith('file')) {
+		if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] || \OCP\Share::getItemsSharedWith('file')) {
 			$user_dir = $options['user_dir'];
 			\OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/');
 		}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index a3e0ec192af..38d598f7780 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -1,67 +1,18 @@
 <?php
+$RUNTIME_NOSETUPFS = true;
 // Load other apps for file previews
 OC_App::loadApps();
 
-// Compatibility with shared-by-link items from ownCloud 4.0
-// requires old Sharing table !
-// support will be removed in OC 5.0,a
-if (isset($_GET['token'])) {
-	unset($_GET['file']);
-	$qry = \OC_DB::prepare('SELECT `source` FROM `*PREFIX*sharing` WHERE `target` = ?', 1);
-	$filepath = $qry->execute(array($_GET['token']))->fetchOne();
-	if (isset($filepath)) {
-		$rootView = new \OC\Files\View('');
-		$info = $rootView->getFileInfo($filepath, '');
-		if (strtolower($info['mimetype']) == 'httpd/unix-directory') {
-			$_GET['dir'] = $filepath;
-		} else {
-			$_GET['file'] = $filepath;
-		}
-		\OCP\Util::writeLog('files_sharing', 'You have files that are shared by link originating from ownCloud 4.0.'
-				.' Redistribute the new links, because backwards compatibility will be removed in ownCloud 5.',
-				\OCP\Util::WARN);
-	}
-}
-
-function getID($path) {
-	// use the share table from the db to find the item source if the file was reshared because shared files
-	//are not stored in the file cache.
-	if (substr(\OC\Files\Filesystem::getMountPoint($path), -7, 6) == "Shared") {
-		$path_parts = explode('/', $path, 5);
-		$user = $path_parts[1];
-		$intPath = '/'.$path_parts[4];
-		$query = \OC_DB::prepare('SELECT `item_source`'
-								.' FROM `*PREFIX*share`'
-								.' WHERE `uid_owner` = ?'
-								.' AND `file_target` = ? ');
-		$result = $query->execute(array($user, $intPath));
-		$row = $result->fetchRow();
-		$fileSource = $row['item_source'];
+function fileCmp($a, $b) {
+	if ($a['type'] == 'dir' and $b['type'] != 'dir') {
+		return -1;
+	} elseif ($a['type'] != 'dir' and $b['type'] == 'dir') {
+		return 1;
 	} else {
-		$rootView = new \OC\Files\View('');
-		$meta = $rootView->getFileInfo($path);
-		$fileSource = $meta['fileid'];
+		return strnatcasecmp($a['name'], $b['name']);
 	}
-
-	return $fileSource;
-}
-
-// Enf of backward compatibility
-
-/**
- * lookup file path and owner by fetching it from the fscache
- * needed because OC_FileCache::getPath($id, $user) already requires the user
- * @param int $id
- * @return array
- */
-function getPathAndUser($id) {
-	$query = \OC_DB::prepare('SELECT `user`, `path` FROM `*PREFIX*fscache` WHERE `id` = ?');
-	$result = $query->execute(array($id));
-	$row = $result->fetchRow();
-	return $row;
 }
 
-
 if (isset($_GET['t'])) {
 	$token = $_GET['t'];
 	$linkItem = OCP\Share::getShareByToken($token);
@@ -70,61 +21,30 @@ if (isset($_GET['t'])) {
 		$type = $linkItem['item_type'];
 		$fileSource = $linkItem['file_source'];
 		$shareOwner = $linkItem['uid_owner'];
-
-		if (OCP\User::userExists($shareOwner) && $fileSource != -1 ) {
-
-			$pathAndUser = getPathAndUser($linkItem['file_source']);
-			$fileOwner = $pathAndUser['user'];
-
-			//if this is a reshare check the file owner also exists
-			if ($shareOwner != $fileOwner && ! OCP\User::userExists($fileOwner)) {
-					OCP\Util::writeLog('share', 'original file owner '.$fileOwner
-											   .' does not exist for share '.$linkItem['id'], \OCP\Util::ERROR);
-					header('HTTP/1.0 404 Not Found');
-					$tmpl = new OCP\Template('', '404', 'guest');
-					$tmpl->printPage();
-					exit();
-			}
-
-			//mount filesystem of file owner
-			OC_Util::setupFS($fileOwner);
-		}
-	}
-} else {
-	if (isset($_GET['file']) || isset($_GET['dir'])) {
-		OCP\Util::writeLog('share', 'Missing token, trying fallback file/dir links', \OCP\Util::DEBUG);
-		if (isset($_GET['dir'])) {
-			$type = 'folder';
-			$path = $_GET['dir'];
-			if (strlen($path) > 1 and substr($path, -1, 1) === '/') {
-				$path = substr($path, 0, -1);
+		$fileOwner = null;
+		$path = null;
+		if (isset($linkItem['parent'])) {
+			$parent = $linkItem['parent'];
+			while (isset($parent)) {
+				$query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+				$item = $query->execute(array($parent))->fetchRow();
+				if (isset($item['parent'])) {
+					$parent = $item['parent'];
+				} else {
+					$fileOwner = $item['uid_owner'];
+					break;
+				}
 			}
-			$baseDir = $path;
-			$dir = $baseDir;
 		} else {
-			$type = 'file';
-			$path = $_GET['file'];
-			if (strlen($path) > 1 and substr($path, -1, 1) === '/') {
-				$path = substr($path, 0, -1);
-			}
+			$fileOwner = $shareOwner;
 		}
-		$shareOwner = substr($path, 1, strpos($path, '/', 1) - 1);
-
-		if (OCP\User::userExists($shareOwner)) {
-			OC_Util::setupFS($shareOwner);
-			$fileSource = getId($path);
-			if ($fileSource != -1) {
-				$linkItem = OCP\Share::getItemSharedWithByLink($type, $fileSource, $shareOwner);
-				$pathAndUser['path'] = $path;
-				$path_parts = explode('/', $path, 5);
-				$pathAndUser['user'] = $path_parts[1];
-				$fileOwner = $path_parts[1];
-			}
+		if (isset($fileOwner)) {
+			OC_Util::setupFS($fileOwner);
+			$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
 		}
 	}
-}
-
-if ($linkItem) {
+} 
+if (isset($path)) {
 	if (!isset($linkItem['item_type'])) {
 		OCP\Util::writeLog('share', 'No item type set for share id: ' . $linkItem['id'], \OCP\Util::ERROR);
 		header('HTTP/1.0 404 Not Found');
@@ -181,36 +101,23 @@ if ($linkItem) {
 			}
 		}
 	}
-	$basePath = substr($pathAndUser['path'], strlen('/' . $fileOwner . '/files'));
-	$path = $basePath;
-	if (isset($_GET['path'])) {
-		$path .= $_GET['path'];
-	}
-	if (!$path || !\OC\Files\Filesystem::isValidPath($path) || !\OC\Files\Filesystem::file_exists($path)) {
-		OCP\Util::writeLog('share', 'Invalid path ' . $path . ' for share id ' . $linkItem['id'], \OCP\Util::ERROR);
-		header('HTTP/1.0 404 Not Found');
-		$tmpl = new OCP\Template('', '404', 'guest');
-		$tmpl->printPage();
-		exit();
+	$basePath = $path;
+	if (isset($_GET['path']) && \OC\Files\Filesystem::isReadable($basePath . $_GET['path'])) {
+		$getPath = \OC\Files\Filesystem::normalizePath($_GET['path']);
+		$path .= $getPath;
+	} else {
+		$getPath = '';
 	}
 	$dir = dirname($path);
 	$file = basename($path);
 	// Download the file
 	if (isset($_GET['download'])) {
-		if (isset($_GET['path']) && $_GET['path'] !== '') {
-			if (isset($_GET['files'])) { // download selected files
-				OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-			} else {
-				if (isset($_GET['path']) && $_GET['path'] != '') { // download a file from a shared directory
-					OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-				} else { // download the whole shared directory
-					OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-				}
-			}
-		} else { // download a single shared file
+		if (isset($_GET['files'])) { // download selected files
+			OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+		} else {
 			OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
 		}
-
+		exit();
 	} else {
 		OCP\Util::addStyle('files_sharing', 'public');
 		OCP\Util::addScript('files_sharing', 'public');
@@ -218,209 +125,86 @@ if ($linkItem) {
 		$tmpl = new OCP\Template('files_sharing', 'public', 'base');
 		$tmpl->assign('uidOwner', $shareOwner);
 		$tmpl->assign('displayName', \OCP\User::getDisplayName($shareOwner));
-		$tmpl->assign('dir', $dir);
 		$tmpl->assign('filename', $file);
 		$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
-		if (isset($_GET['path'])) {
-			$getPath = $_GET['path'];
-		} else {
-			$getPath = '';
-		}
-		//
+		$tmpl->assign('fileTarget', basename($linkItem['file_target']));
 		$urlLinkIdentifiers= (isset($token)?'&t='.$token:'')
 							.(isset($_GET['dir'])?'&dir='.$_GET['dir']:'')
 							.(isset($_GET['file'])?'&file='.$_GET['file']:'');
 		// Show file list
 		if (\OC\Files\Filesystem::is_dir($path)) {
+			$tmpl->assign('dir', $getPath);
+
 			OCP\Util::addStyle('files', 'files');
 			OCP\Util::addScript('files', 'files');
 			OCP\Util::addScript('files', 'filelist');
 			OCP\Util::addscript('files', 'keyboardshortcuts');
 			$files = array();
 			$rootLength = strlen($basePath) + 1;
-			foreach (OC_Files::getDirectoryContent($path) as $i) {
+			foreach (\OC\Files\Filesystem::getDirectoryContent($path) as $i) {
 				$i['date'] = OCP\Util::formatDate($i['mtime']);
 				if ($i['type'] == 'file') {
 					$fileinfo = pathinfo($i['name']);
 					$i['basename'] = $fileinfo['filename'];
-					$i['extension'] = isset($fileinfo['extension']) ? ('.' . $fileinfo['extension']) : '';
-				}
-				$i['directory'] = '/' . substr($i['directory'], $rootLength);
-				if ($i['directory'] == '/') {
-					$i['directory'] = '';
+					if (!empty($fileinfo['extension'])) {
+						$i['extension'] = '.' . $fileinfo['extension'];
+					} else {
+						$i['extension'] = '';
+					}
 				}
+				$i['directory'] = $getPath;
 				$i['permissions'] = OCP\PERMISSION_READ;
 				$files[] = $i;
 			}
+			usort($files, "fileCmp");
+
 			// Make breadcrumb
 			$breadcrumb = array();
 			$pathtohere = '';
-
-			//add base breadcrumb
-			$breadcrumb[] = array('dir' => '/', 'name' => basename($basePath));
-
-			//add subdir breadcrumbs
-			foreach (explode('/', urldecode($getPath)) as $i) {
+			foreach (explode('/', $getPath) as $i) {
 				if ($i != '') {
 					$pathtohere .= '/' . $i;
 					$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
-					$path = $linkItem['path'];
-					if (isset($_GET['path'])) {
-						$path .= $_GET['path'];
-						$dir .= $_GET['path'];
-						if (!\OC\Files\Filesystem::file_exists($path)) {
-							header('HTTP/1.0 404 Not Found');
-							$tmpl = new OCP\Template('', '404', 'guest');
-							$tmpl->printPage();
-							exit();
-						}
-					}
-
-					$list = new OCP\Template('files', 'part.list', '');
-					$list->assign('files', $files, false);
-					$list->assign('publicListView', true);
-					$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false);
-					$list->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=', false);
-					$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
-					$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
-					$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false);
-					$folder = new OCP\Template('files', 'index', '');
-					$folder->assign('fileList', $list->fetchPage(), false);
-					$folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
-					$folder->assign('isCreatable', false);
-					$folder->assign('permissions', 0);
-					$folder->assign('files', $files);
-					$folder->assign('uploadMaxFilesize', 0);
-					$folder->assign('uploadMaxHumanFilesize', 0);
-					$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
-					$tmpl->assign('folder', $folder->fetchPage(), false);
-					$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
-					$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
-				} else {
-					// Show file preview if viewer is available
-					if ($type == 'file') {
-						$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download');
-					} else {
-						OCP\Util::addStyle('files_sharing', 'public');
-						OCP\Util::addScript('files_sharing', 'public');
-						OCP\Util::addScript('files', 'fileactions');
-						$tmpl = new OCP\Template('files_sharing', 'public', 'base');
-						$tmpl->assign('owner', $uidOwner);
-						// Show file list
-						if (\OC\Files\Filesystem::is_dir($path)) {
-							OCP\Util::addStyle('files', 'files');
-							OCP\Util::addScript('files', 'files');
-							OCP\Util::addScript('files', 'filelist');
-							$files = array();
-							$rootLength = strlen($baseDir) + 1;
-							foreach (OC_Files::getDirectoryContent($path) as $i) {
-								$i['date'] = OCP\Util::formatDate($i['mtime']);
-								if ($i['type'] == 'file') {
-									$fileinfo = pathinfo($i['name']);
-									$i['basename'] = $fileinfo['filename'];
-									$i['extension'] = isset($fileinfo['extension']) ? ('.' . $fileinfo['extension']) : '';
-								}
-								$i['directory'] = '/' . substr('/' . $uidOwner . '/files' . $i['directory'], $rootLength);
-								if ($i['directory'] == '/') {
-									$i['directory'] = '';
-								}
-								$i['permissions'] = OCP\PERMISSION_READ;
-								$files[] = $i;
-							}
-							// Make breadcrumb
-							$breadcrumb = array();
-							$pathtohere = '';
-							$count = 1;
-							foreach (explode('/', $dir) as $i) {
-								if ($i != '') {
-									if ($i != $baseDir) {
-										$pathtohere .= '/' . $i;
-									}
-									if (strlen($pathtohere) < strlen($_GET['dir'])) {
-										continue;
-									}
-									$breadcrumb[] = array('dir' => str_replace($_GET['dir'], "", $pathtohere, $count), 'name' => $i);
-								}
-							}
-							$list = new OCP\Template('files', 'part.list', '');
-							$list->assign('files', $files, false);
-							$list->assign('publicListView', true);
-							$list->assign('baseURL', OCP\Util::linkToPublic('files') . '&dir=' . urlencode($_GET['dir']) . '&path=', false);
-							$list->assign('downloadURL', OCP\Util::linkToPublic('files') . '&download&dir=' . urlencode($_GET['dir']) . '&path=', false);
-							$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
-							$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
-							$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . '&dir=' . urlencode($_GET['dir']) . '&path=', false);
-							$folder = new OCP\Template('files', 'index', '');
-							$folder->assign('fileList', $list->fetchPage(), false);
-							$folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
-							$folder->assign('dir', basename($dir));
-							$folder->assign('isCreatable', false);
-							$folder->assign('permissions', 0);
-							$folder->assign('files', $files);
-							$folder->assign('uploadMaxFilesize', 0);
-							$folder->assign('uploadMaxHumanFilesize', 0);
-							$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
-							$tmpl->assign('folder', $folder->fetchPage(), false);
-							$tmpl->assign('uidOwner', $uidOwner);
-							$tmpl->assign('dir', basename($dir));
-							$tmpl->assign('filename', basename($path));
-							$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
-							$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
-							if (isset($_GET['path'])) {
-								$getPath = $_GET['path'];
-							} else {
-								$getPath = '';
-							}
-							$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . '&download&dir=' . urlencode($_GET['dir']) . '&path=' . urlencode($getPath), false);
-						} else {
-							// Show file preview if viewer is available
-							$tmpl->assign('uidOwner', $uidOwner);
-							$tmpl->assign('dir', dirname($path));
-							$tmpl->assign('filename', basename($path));
-							$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
-							if ($type == 'file') {
-								$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . '&file=' . urlencode($_GET['file']) . '&download', false);
-							} else {
-								if (isset($_GET['path'])) {
-									$getPath = $_GET['path'];
-								} else {
-									$getPath = '';
-								}
-								$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . '&download&dir=' . urlencode($_GET['dir']) . '&path=' . urlencode($getPath), false);
-							}
-						}
-						$tmpl->printPage();
-					}
 				}
-				$tmpl->printPage();
 			}
-
 			$list = new OCP\Template('files', 'part.list', '');
 			$list->assign('files', $files, false);
 			$list->assign('disableSharing', true);
-			$list->assign('baseURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&path=', false);
-			$list->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download&path=', false);
-			$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' );
+			$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false);
+			$list->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=', false);
+			$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
 			$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
-			$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&path=', false);
+			$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false);
 			$folder = new OCP\Template('files', 'index', '');
 			$folder->assign('fileList', $list->fetchPage(), false);
 			$folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
-			$folder->assign('dir', basename($dir));
+			$folder->assign('dir', $getPath);
 			$folder->assign('isCreatable', false);
 			$folder->assign('permissions', 0);
 			$folder->assign('files', $files);
 			$folder->assign('uploadMaxFilesize', 0);
 			$folder->assign('uploadMaxHumanFilesize', 0);
 			$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+			$folder->assign('usedSpacePercent', 0);
 			$tmpl->assign('folder', $folder->fetchPage(), false);
 			$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
-			$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files')
-										.$urlLinkIdentifiers.'&download&path='.urlencode($getPath));
+			$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
 		} else {
-			OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
+			$tmpl->assign('dir', $dir);
+
+			// Show file preview if viewer is available
+			if ($type == 'file') {
+				$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download');
+			} else {
+				$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files')
+										.$urlLinkIdentifiers.'&download&path='.urlencode($getPath));
+			}
 		}
+		$tmpl->printPage();
 	}
+	exit();
+} else {
+	OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
 }
 header('HTTP/1.0 404 Not Found');
 $tmpl = new OCP\Template('', '404', 'guest');
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index 9695caebf18..6bce6857ac8 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -1,8 +1,8 @@
 <form action="<?php echo $_['URL']; ?>" method="post">
 	<fieldset>
-		<p>
+		<p class="infield">
 			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
-			<input type="password" name="password" id="password" value="" />
+			<input type="password" name="password" id="password" value="" autofocus />
 			<input type="submit" value="<?php echo $l->t('Submit'); ?>" />
 		</p>
 	</fieldset>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 71fca09ed6d..7776fd63b3c 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -6,9 +6,9 @@
 	<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
 	<div class="header-right">
 	<?php if (isset($_['folder'])): ?>
-		<span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['displayName'], $_['filename'])) ?></span>
+		<span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['displayName'], $_['fileTarget'])) ?></span>
 	<?php else: ?>
-		<span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['displayName'], $_['filename'])) ?></span>
+		<span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['displayName'], $_['fileTarget'])) ?></span>
 	<?php endif; ?>
 		<?php if (!isset($_['folder']) || $_['allowZipDownload']): ?>
 			<a href="<?php echo $_['downloadURL']; ?>" class="button" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
@@ -26,7 +26,7 @@
 		<?php endif; ?>
 		<ul id="noPreview">
 			<li class="error">
-				<?php echo $l->t('No preview available for').' '.$_['filename']; ?><br />
+				<?php echo $l->t('No preview available for').' '.$_['fileTarget']; ?><br />
 				<a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
 			</li>
 		</ul>
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 71bf3d8708d..a0c3c4b9b75 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -190,14 +190,14 @@ class Filesystem {
 		}
 	}
 
-	static public function init($root) {
+	static public function init($user, $root) {
 		if (self::$defaultInstance) {
 			return false;
 		}
 		self::$defaultInstance = new View($root);
 
 		//load custom mount config
-		self::initMountPoints();
+		self::initMountPoints($user);
 
 		self::$loaded = true;
 
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 57cca902303..e86bea6bff9 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -58,8 +58,8 @@ class OC_Filesystem {
 	/**
 	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
 	 */
-	static public function init($root) {
-		return \OC\Files\Filesystem::init($root);
+	static public function init($user, $root) {
+		return \OC\Files\Filesystem::init($user, $root);
 	}
 
 	/**
diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php
index 179ed8f3107..820d24a8e0c 100644
--- a/lib/ocs/cloud.php
+++ b/lib/ocs/cloud.php
@@ -45,7 +45,7 @@ class OC_OCS_Cloud {
 			if(OC_User::userExists($parameters['user'])) {
 				// calculate the disc space
 				$userDir = '/'.$parameters['user'].'/files';
-				\OC\Files\Filesystem::init($useDir);
+				\OC\Files\Filesystem::init($parameters['user'], $userDir);
 				$rootInfo = \OC\Files\Filesystem::getFileInfo('');
 				$sharedInfo = \OC\Files\Filesystem::getFileInfo('/Shared');
 				$used = $rootInfo['size'] - $sharedInfo['size'];
diff --git a/lib/util.php b/lib/util.php
index 7950586b580..81ad2df3ac6 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -51,7 +51,7 @@ class OC_Util {
 				mkdir( $userdirectory, 0755, true );
 			}
 			//jail the user into his "home" directory
-			\OC\Files\Filesystem::init($user_dir);
+			\OC\Files\Filesystem::init($user, $user_dir);
 
 			$quotaProxy=new OC_FileProxy_Quota();
 			$fileOperationProxy = new OC_FileProxy_FileOperations();
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index b83dd0c26e5..7a79f45a203 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -45,7 +45,7 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		if (!self::$user) {
 			if (!\OC\Files\Filesystem::getView()) {
 				self::$user = uniqid();
-				\OC\Files\Filesystem::init('/' . self::$user . '/files');
+				\OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files');
 			} else {
 				self::$user = \OC_User::getUser();
 			}
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index fd116af2d2e..6ce45e6178a 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -82,7 +82,7 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
 			$user = \OC_User::getUser();
 		}else{
 			$user=uniqid();
-			\OC\Files\Filesystem::init('/'.$user.'/files');
+			\OC\Files\Filesystem::init($user, '/'.$user.'/files');
 		}
 		\OC_Hook::clear('OC_Filesystem');
 		\OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');