diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-06-04 11:07:31 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-06-05 15:49:34 +0200 |
| commit | 6578f00b4bcfbd5bc44bc12e341506f922498d7b (patch) | |
| tree | 6ef948934965edb35a6852ca75144848844b7722 /settings | |
| parent | cf9099c7885453bcf15e40cbed722f432dffa1fb (diff) | |
| download | nextcloud-server-6578f00b4bcfbd5bc44bc12e341506f922498d7b.tar.gz nextcloud-server-6578f00b4bcfbd5bc44bc12e341506f922498d7b.zip | |
unify share settings
Diffstat (limited to 'settings')
| -rwxr-xr-x | settings/admin.php | 2 | ||||
| -rw-r--r-- | settings/templates/admin.php | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/settings/admin.php b/settings/admin.php index d2be04fcd1d..dd1c604edb1 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -83,7 +83,7 @@ $tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired()); $tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes')); $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes')); $tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'no')); -$tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global')); +$tmpl->assign('onlyShareWithGroupMembers', \OC\Share\Share::shareWithGroupMembersOnly()); $tmpl->assign('forms', array()); foreach($forms as $form) { $tmpl->append('forms', $form); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index f0b72d0956e..ce33a804f54 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -278,12 +278,9 @@ if (!$_['internetconnectionworking']) { </tr> <tr> <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>> - <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" - value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> /> - <label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/> - <input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly" - value="groups_only" <?php if ($_['sharePolicy'] === 'groups_only') print_unescaped('checked="checked"'); ?> /> - <label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/> + <input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers" + value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> /> + <label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/> </td> </tr> <tr> |