diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-05 13:52:33 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-05 13:52:33 +0200 |
| commit | 59b700a5504549508ecde1f83469824840f55d90 (patch) | |
| tree | 90f867b7982d2b219713e6daf52576189a09fecb /core | |
| parent | 13991be5ce6e318670b84458c2cdaa6878ad63cc (diff) | |
| parent | 9c855f7b3d97b312095ba53a08fe45b71ca06c98 (diff) | |
| download | nextcloud-server-59b700a5504549508ecde1f83469824840f55d90.tar.gz nextcloud-server-59b700a5504549508ecde1f83469824840f55d90.zip | |
Merge branch 'master' into fixing-3934-master
Conflicts:
core/js/share.js
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/share.js | 10 | ||||
| -rw-r--r-- | core/templates/altmail.php | 8 | ||||
| -rw-r--r-- | core/templates/mail.php | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/core/js/share.js b/core/js/share.js index 778a9f8e201..ced1e0aa8ca 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 37dc8eee942..a7df29a2446 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 ebeefd5c7e8..562ad82e953 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> |