diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-07 00:16:10 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-07 00:16:10 +0100 |
| commit | e8d08d4930fae31a665c679b5ac1a147859eb099 (patch) | |
| tree | 426671882f753d0fea8f80c786bdd6892d57cdb5 /apps/files_sharing | |
| parent | 1137723b2a46c37d61e7f501694c73562b21ef74 (diff) | |
| parent | 0b007235b99fa8d66cdb8ca917fe2f45dd8e4edc (diff) | |
| download | nextcloud-server-e8d08d4930fae31a665c679b5ac1a147859eb099.tar.gz nextcloud-server-e8d08d4930fae31a665c679b5ac1a147859eb099.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/public.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index eb4af58cdca..e8d18a213b1 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -175,7 +175,7 @@ if ($linkItem) { if (isset($_GET['path'])) { $path .= $_GET['path']; } - if (!$path || !\OC\Files\Filesystem::isValidPath($path) || !OC_Filesystem::file_exists($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'); @@ -208,7 +208,7 @@ if ($linkItem) { $tmpl->assign('uidOwner', $shareOwner); $tmpl->assign('dir', $dir); $tmpl->assign('filename', $file); - $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path)); + $tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path)); if (isset($_GET['path'])) { $getPath = $_GET['path']; } else { @@ -217,7 +217,7 @@ if ($linkItem) { // $urlLinkIdentifiers = (isset($token) ? '&t=' . $token : '') . (isset($_GET['dir']) ? '&dir=' . $_GET['dir'] : '') . (isset($_GET['file']) ? '&file=' . $_GET['file'] : ''); // Show file list - if (OC_Filesystem::is_dir($path)) { + if (\OC\Files\Filesystem::is_dir($path)) { OCP\Util::addStyle('files', 'files'); OCP\Util::addScript('files', 'files'); OCP\Util::addScript('files', 'filelist'); @@ -292,7 +292,7 @@ if ($linkItem) { $tmpl = new OCP\Template('files_sharing', 'public', 'base'); $tmpl->assign('owner', $uidOwner); // Show file list - if (OC_Filesystem::is_dir($path)) { + if (\OC\Files\Filesystem::is_dir($path)) { OCP\Util::addStyle('files', 'files'); OCP\Util::addScript('files', 'files'); OCP\Util::addScript('files', 'filelist'); @@ -349,7 +349,7 @@ if ($linkItem) { $tmpl->assign('uidOwner', $uidOwner); $tmpl->assign('dir', basename($dir)); $tmpl->assign('filename', basename($path)); - $tmpl->assign('mimetype', OC_Filesystem::getMimeType($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']; @@ -362,7 +362,7 @@ if ($linkItem) { $tmpl->assign('uidOwner', $uidOwner); $tmpl->assign('dir', dirname($path)); $tmpl->assign('filename', basename($path)); - $tmpl->assign('mimetype', OC_Filesystem::getMimeType($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 { |