mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload

This commit is contained in:
Bjoern Schiessle 2013-11-21 16:00:21 +01:00
parent 87f2696e6a d2e6f7d979
commit 6443e570c2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/files_encryption/lib/helper.php
View File

@ -225,7 +225,7 @@ class Helper {
* @return bool * @return bool
*/ */
public static function isPublicAccess() { public static function isPublicAccess() {
if (\OCP\USER::getUser() === false) { if (strpos($_SERVER['HTTP_REFERER'], 'public.php') !== false) {
return true; return true;
} else { } else {
return false; return false;
@ -252,16 +252,22 @@ class Helper {
return $relPath; return $relPath;
} }
/**
* @brief get user from the path, because we can't assume that \OCP\User::getUser()
* will always return the right result
* @param type $path
* @return boolean
*/
public static function getUser($path) { public static function getUser($path) {
$user = \OCP\User::getUser(); $user = \OCP\User::getUser();
// if we are logged in, than we return the userid // if we are logged in and if we don't come from a public URL, then we return the userid
if ($user) { if ($user && strpos($_SERVER['HTTP_REFERER'], 'public.php') === false) {
return $user; return $user;
} }
// if no user is logged in we try to access a publically shared files. // ...otherwise we try to access a publically shared files.
// In this case we need to try to get the user from the path // In this case we need to try to get the user from the path
$trimmed = ltrim($path, '/'); $trimmed = ltrim($path, '/');