MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:MISP/MISP into develop

pull/8063/merge
Sami Mokaddem 2022-03-17 14:25:51 +01:00
parent 2d14113de9 61d4d36705
commit 6862f1a9d8
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit 94a65c578a641751d9941a58d44b91b0cb7f554f
Subproject commit c5646d7463932f5c58b9569a7d771cdb8b2c048a

2
app/View/Users/admin_add.ctp
View File

@ -13,7 +13,7 @@
$password = false;
} else {
$userType = Configure::read('Plugin.CustomAuth_name') ? Configure::read('Plugin.CustomAuth_name') : 'External authentication';
echo $this->Form->input('external_auth_required', array('type' => 'checkbox', 'label' => $userType . ' user'));
echo $this->Form->input('external_auth_required', array('type' => 'checkbox', 'label' => h($userType) . ' user'));
}
echo sprintf(
'<div class="clear"></div><div %s>%s</div>',

2
app/View/Users/admin_edit.ctp
View File

@ -16,7 +16,7 @@
$password = false;
} else {
$userType = Configure::read('Plugin.CustomAuth_name') ? Configure::read('Plugin.CustomAuth_name') : 'External authentication';
echo $this->Form->input('external_auth_required', array('type' => 'checkbox', 'label' => $userType . ' user'));
echo $this->Form->input('external_auth_required', array('type' => 'checkbox', 'label' => h($userType) . ' user'));
}
echo sprintf(
'<div class="clear"></div><div %s>%s</div>',

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit a6d51a91b9cc45ac3062492b5e602f68392d63d6
Subproject commit 9515ae332e45d9ac306eaaaa802b605c1090cf5c