Merge branch 'cernbox-develop-8.0.2-integration' into cernbox-prod-8.0.2

cernbox · Aug 31, 2015 · 1866ddc · 1866ddc
2 parents 2c3c60a + 2f272e7
commit 1866ddc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.htaccess b/.htaccess
@@ -8,9 +8,9 @@ RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
 </IfModule>
 </IfModule>
 <IfModule mod_php5.c>
-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
 <IfModule mod_env.c>

diff --git 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 += '<label for="shareWith" class="hidden-visually">'+t('core', 'Share')+'</label>';
 			html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with user or group …')+'" />';
 			html += '<span class="shareWithLoading icon-loading-small hidden"></span>';
@@ -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
@@ -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);
 
                 }