diff options
| author | Sascha Markert <markert@b1-systems.de> | 2022-05-11 16:47:21 +0300 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2022-05-24 13:28:25 +0300 |
| commit | 96b197206e925ab8962365305b165525d38029f4 (patch) | |
| tree | ffb0e1153c19c2c5e2633dcfb1b49a428b89d3a2 | |
| parent | 8fdb09403fcbf35ac1b1141ac1ef16237cd1373c (diff) | |
Fix displaying of global checkboxes in user_saml settings
Signed-off-by: Sascha Markert <markert@b1-systems.de>
Signed-off-by: Sascha Markert <kaio@kaio.ws>
Update lib/Settings/Admin.php
space to tabs
Co-authored-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: Sascha Markert <kaio@kaio.ws>
Signed-off-by: Sascha Markert <markert@b1-systems.de>
merge latest commits (#1)
* Stricter check for direct=1 login
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* Revert "Handle mobile login flow with direct=1"
This reverts commit 86684d6c5473765b9fc3c7f3146f214cbce0dfd4.
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* [tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Co-authored-by: Carl Schwan <carl@carlschwan.eu>
Co-authored-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Sascha Markert <kaio@kaio.ws>
Signed-off-by: Sascha Markert <markert@b1-systems.de>
Revert "merge latest commits (#1)"
This reverts commit 626686f7afa8b373251e966ad28865483d6b56b1.
Signed-off-by: Sascha Markert <markert@b1-systems.de>
| -rw-r--r-- | lib/Settings/Admin.php | 8 | ||||
| -rw-r--r-- | templates/admin.php | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index 47937c90..65022073 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -186,10 +186,17 @@ class Admin implements ISettings { $type = $this->config->getAppValue('user_saml', 'type'); if ($type === 'saml') { + $generalSettings['require_provisioned_account'] = [ + 'text' => $this->l10n->t('Only allow authentication if an account exists on some other backend (e.g. LDAP).', [$this->defaults->getName()]), + 'type' => 'checkbox', + 'global' => true, + 'value' => $this->config->getAppValue('user_saml', 'general-require_provisioned_account', 0) + ]; $generalSettings['use_saml_auth_for_desktop'] = [ 'text' => $this->l10n->t('Use SAML auth for the %s desktop clients (requires user re-authentication)', [$this->defaults->getName()]), 'type' => 'checkbox', 'global' => true, + 'value' => $this->config->getAppValue('user_saml', 'general-use_saml_auth_for_desktop', 0) ]; $generalSettings['idp0_display_name'] = [ 'text' => $this->l10n->t('Optional display name of the identity provider (default: "SSO & SAML log in")'), @@ -201,6 +208,7 @@ class Admin implements ISettings { 'type' => 'checkbox', 'hideForEnv' => true, 'global' => true, + 'value' => $this->config->getAppValue('user_saml', 'general-allow_multiple_user_back_ends') ]; } diff --git a/templates/admin.php b/templates/admin.php index 73a9ef57..9fcae32e 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -55,12 +55,12 @@ style('user_saml', 'admin'); <?php foreach ($_['general'] as $key => $attribute): ?> <?php if ($attribute['type'] === 'checkbox' && $attribute['global']): ?> <p> - <input type="checkbox" data-key="<?php p($key)?>" id="user-saml-general-<?php p($key)?>" name="<?php p($key)?>" value="<?php p($_['config']['general-'.$key] ?? '0') ?>"> + <input type="checkbox" data-key="<?php p($key)?>" id="user-saml-general-<?php p($key)?>" name="<?php p($key)?>" value="<?php p($attribute['value'] ?? '0') ?>"> <label for="user-saml-general-<?php p($key)?>"><?php p($attribute['text']) ?></label><br/> </p> <?php elseif ($attribute['type'] === 'line' && isset($attribute['global'])): ?> <p> - <input data-key="<?php p($key)?>" name="<?php p($key) ?>" value="<?php p($_['config']['general-'.$key] ?? '') ?>" type="text" <?php if (isset($attribute['required']) && $attribute['required'] === true): ?>class="required"<?php endif;?> placeholder="<?php p($attribute['text']) ?>"/> + <input data-key="<?php p($key)?>" name="<?php p($key) ?>" value="<?php p($attribute['value'] ?? '') ?>" type="text" <?php if (isset($attribute['required']) && $attribute['required'] === true): ?>class="required"<?php endif;?> placeholder="<?php p($attribute['text']) ?>"/> </p> <?php endif; ?> <?php endforeach; ?> |