fix missing parameters in sharing settings page

diff --git a/lib/private/Settings/Admin/Sharing.php b/lib/private/Settings/Admin/Sharing.php
index e110a3d81b7bb783c3d3b4a6f4b7cfba464ee506..8d3ddc9b3b55a5ad1a0da21966f9cc84aba23097 100644 (file)
--- a/lib/private/Settings/Admin/Sharing.php
+++ b/lib/private/Settings/Admin/Sharing.php
@@ -23,9 +23,11 @@
 
 namespace OC\Settings\Admin;
 
+use OC\Share\Share;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use OCP\Settings\ISettings;
+use OCP\Util;
 
 class Sharing implements ISettings {
        /** @var IConfig */
@@ -48,12 +50,21 @@ class Sharing implements ISettings {
 
                $parameters = [
                        // Built-In Sharing
-                       'shareAPIEnabled'           => $this->config->getAppValue('core', 'shareapi_enabled', 'yes'),
-                       'shareDefaultExpireDateSet' => $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no'),
-                       'shareExpireAfterNDays'     => $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7'),
-                       'shareEnforceExpireDate'    => $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no'),
-                       'shareExcludeGroups'        => $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes' ? true : false,
-                       'shareExcludedGroupsList'   => $excludeGroupsList,
+                       'allowGroupSharing'               => $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes'),
+                       'allowLinks'                      => $this->config->getAppValue('core', 'shareapi_allow_links', 'yes'),
+                       'allowMailNotification'           => $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'no'),
+                       'allowPublicMailNotification'     => $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no'),
+                       'allowPublicUpload'               => $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes'),
+                       'allowResharing'                  => $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes'),
+                       'allowShareDialogUserEnumeration' => $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes'),
+                       'enforceLinkPassword'             => Util::isPublicLinkPasswordRequired(),
+                       'onlyShareWithGroupMembers'       => Share::shareWithGroupMembersOnly(),
+                       'shareAPIEnabled'                 => $this->config->getAppValue('core', 'shareapi_enabled', 'yes'),
+                       'shareDefaultExpireDateSet'       => $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no'),
+                       'shareExpireAfterNDays'           => $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7'),
+                       'shareEnforceExpireDate'          => $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no'),
+                       'shareExcludeGroups'              => $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes' ? true : false,
+                       'shareExcludedGroupsList'         => $excludeGroupsList,
                ];
 
                return new TemplateResponse('settings', 'admin/sharing', $parameters, '');

diff --git a/settings/templates/admin/sharing.php b/settings/templates/admin/sharing.php
index c81f7e2ae1c6bccbf3feb14d9d25bfa187638250..b8f8e920246276a46d0cab71deb8a23078ea311b 100644 (file)
--- a/settings/templates/admin/sharing.php
+++ b/settings/templates/admin/sharing.php
@@ -104,6 +104,4 @@
                        <?php if ($_['allowShareDialogUserEnumeration'] === 'yes') print_unescaped('checked="checked"'); ?> />
                <label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered.'));?></label><br />
        </p>
-
-       <?php print_unescaped($_['fileSharingSettings']); ?>
 </div>