diff --git a/core/js/share.js b/core/js/share.js index 778a9f8e2015638c141f2d469dce7057b3e174b8..ced1e0aa8ca9251feb869c7ee37f1bdb4a465433 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -163,10 +163,10 @@ OC.Share={ var allowPublicUploadStatus = false; $.each(data.shares, function(key, value) { - if (allowPublicUploadStatus) { - return true; - } - allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false; + if (allowPublicUploadStatus) { + return true; + } + allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false; }); html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />'; @@ -181,7 +181,7 @@ OC.Share={ html += '<div id="linkPass">'; html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />'; html += '</div>'; - if (itemType == 'folder') { + if (itemType == 'folder' && (possiblePermissions & OC.PERMISSION_CREATE)) { html += '<div id="allowPublicUploadWrapper" style="display:none;">'; html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />'; html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>'; diff --git a/core/templates/altmail.php b/core/templates/altmail.php index 37dc8eee94266bd99c178161484b7056a9c525d8..a7df29a2446d244cc27371d81d0cfdd649424b46 100644 --- a/core/templates/altmail.php +++ b/core/templates/altmail.php @@ -1,9 +1,9 @@ <?php +$defaults = new OC_Defaults(); + print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link']))); ?> -- -ownCloud - <?php -print_unescaped($l->t("web services under your control")); -?> -http://ownCloud.org +<?php p($defaults->getName() . ' - ' . $defaults->getSlogan()); ?> +<?php print_unescaped("\n".$defaults->getBaseUrl()); diff --git a/core/templates/mail.php b/core/templates/mail.php index ebeefd5c7e82d4538cb6cc05c8f826e056157a94..562ad82e953ad7ce38ea4aa476fbeefa085fc721 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -1,3 +1,4 @@ +<?php $defaults = new OC_Defaults() // initialize themable default strings and urls ?> <table cellspacing="0" cellpadding="0" border="0" width="100%"> <tr><td> <table cellspacing="0" cellpadding="0" border="0" width="600px"> @@ -20,10 +21,9 @@ print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared ยป <tr> <td bgcolor="#f8f8f8" width="20px"> </td> <td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br> -ownCloud - <?php -print_unescaped($l->t('web services under your control')); -?> -<br><a href="http://owncloud.org">http://ownCloud.org</a></td> +<?php p($defaults->getName()); ?> - +<?php p($defaults->getSlogan()); ?> +<br><a href="<?php print_unescaped($defaults->getBaseUrl()); ?>"><?php print_unescaped($defaults->getBaseUrl());?></a></td> </tr> <tr> <td bgcolor="#f8f8f8" colspan="2"> </td>