From 4701a81b55feb64d08b1d2d046bb66ddba1882ad Mon Sep 17 00:00:00 2001 From: Hugo Gonzalez Labrador Date: Tue, 18 Aug 2015 11:42:22 +0200 Subject: [PATCH 1/3] Changed maximun upload values from 513M to 4G --- .htaccess | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.htaccess b/.htaccess index ba31b6ec3781..878313964bc1 100644 --- a/.htaccess +++ b/.htaccess @@ -8,9 +8,9 @@ RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION -php_value upload_max_filesize 513M -php_value post_max_size 513M -php_value memory_limit 512M +php_value upload_max_filesize 4G +php_value post_max_size 4G +php_value memory_limit 4G php_value mbstring.func_overload 0 php_value always_populate_raw_post_data -1 From 68e5d2fb3018687884f098f99f07e4988a5b261f Mon Sep 17 00:00:00 2001 From: Hugo Gonzalez Labrador Date: Thu, 27 Aug 2015 15:55:23 +0200 Subject: [PATCH 2/3] Propagate X permission to top level directory and limit share with users to just folders in depth 1. --- core/js/share.js | 4 ++-- lib/private/share/share.php | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index f71091cd7f29..38f9237a1a9e 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -386,7 +386,7 @@ OC.Share={ return true; } }); - if(itemType === 'folder' ){ + if(itemType === 'folder' && actualPath === '/'){ html += ''; html += ''; html += ''; @@ -465,7 +465,7 @@ OC.Share={ } }); } - if(itemType === 'folder') { + if(itemType === 'folder' && actualPath === '/') { $('#shareWith').autocomplete({minLength: 2, delay: 750, source: function(search, response) { var $loading = $('#dropdown .shareWithLoading'); $loading.removeClass('hidden'); diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 6d7a8a5a2e19..21d3d528c842 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -2229,6 +2229,8 @@ private static function insertShare(array $shareData) } else { $result = $mailNotification->sendLinkEosEGroup($shareData["shareWith"]."@cern.ch", $filedata["name"],$filedata["eospath"],$shareData["shareWith"]); } + // HUGO-TODO Add +x permissions to parent folders of a share + //EosUtil::propagatePermissionXToParents($filedata, $to); } From 2f272e75872034158e8aaea59e9102263b55bb89 Mon Sep 17 00:00:00 2001 From: Hugo Gonzalez Labrador Date: Mon, 31 Aug 2015 10:21:21 +0200 Subject: [PATCH 3/3] Propagate X bit --- lib/private/share/share.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 21d3d528c842..bad83ad52962 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -2230,7 +2230,7 @@ private static function insertShare(array $shareData) $result = $mailNotification->sendLinkEosEGroup($shareData["shareWith"]."@cern.ch", $filedata["name"],$filedata["eospath"],$shareData["shareWith"]); } // HUGO-TODO Add +x permissions to parent folders of a share - //EosUtil::propagatePermissionXToParents($filedata, $to); + EosUtil::propagatePermissionXToParents($filedata, $to); }