NB-Public
/
user_saml
mirror of https://github.com/netzbegruenung/user_saml.git
14
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 86684d6c54.

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>
This commit is contained in:
Sascha Markert 2022-05-11 15:47:21 +02:00 committed by Arthur Schiwon
parent 8fdb09403f
commit 96b197206e
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Settings/Admin.php
View File

@ -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')
];
}

4
templates/admin.php
View File

@ -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; ?>