fixes #4026

diff --git a/core/js/share.js b/core/js/share.js
index e59669cbc2b81344f5ab30d3edf753337fee3487..b4b5159b0b510a9f38d617cc4ae5d65c2b4bc965 100644 (file)
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -592,8 +592,7 @@ $(document).ready(function() {
                }
 
                // Update the share information
-               OC.Share.share(itemType, itemSource,    OC.Share.SHARE_TYPE_LINK, '', permissions, function(data) {
-                       return;
+               OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, function(data) {
                });
        });
 
@@ -609,13 +608,26 @@ $(document).ready(function() {
        });
 
        $(document).on('focusout keyup', '#dropdown #linkPassText', function(event) {
-               if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
-                       var itemType = $('#dropdown').data('item-type');
-                       var itemSource = $('#dropdown').data('item-source');
-                       OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), OC.PERMISSION_READ, function() {
-                               console.log("password set to: '" + $('#linkPassText').val() +"' by event: " + event.type);
-                               $('#linkPassText').val('');
-                               $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+               var linkPassText = $('#linkPassText');
+               if ( linkPassText.val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
+
+                       var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
+                       var dropDown = $('#dropdown');
+                       var itemType = dropDown.data('item-type');
+                       var itemSource = dropDown.data('item-source');
+                       var permissions = 0;
+
+                       // Calculate permissions
+                       if (allowPublicUpload) {
+                               permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
+                       } else {
+                               permissions = OC.PERMISSION_READ;
+                       }
+
+                       OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, function() {
+                               console.log("password set to: '" + linkPassText.val() +"' by event: " + event.type);
+                               linkPassText.val('');
+                               linkPassText.attr('placeholder', t('core', 'Password protected'));
                        });
                }
        });

diff --git a/lib/public/share.php b/lib/public/share.php
index 596a729a47d06a3c02357c99584235014ae38c33..b349dd48776b6fe885e30d119837e13c7c9f739c 100644 (file)
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -454,6 +454,9 @@ class Share {
                                        $forcePortable = (CRYPT_BLOWFISH != 1);
                                        $hasher = new \PasswordHash(8, $forcePortable);
                                        $shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
+                               } else {
+                                       // reuse the already set password
+                                       $shareWith = $checkExists['share_with'];
                                }
 
                                // Generate token