mirror of https://github.com/MISP/MISP
Merge branch 'develop' of github.com:MISP/MISP into develop
commit
6862f1a9d8
2
PyMISP
2
PyMISP
|
@ -1 +1 @@
|
||||||
Subproject commit 94a65c578a641751d9941a58d44b91b0cb7f554f
|
Subproject commit c5646d7463932f5c58b9569a7d771cdb8b2c048a
|
|
@ -13,7 +13,7 @@
|
||||||
$password = false;
|
$password = false;
|
||||||
} else {
|
} else {
|
||||||
$userType = Configure::read('Plugin.CustomAuth_name') ? Configure::read('Plugin.CustomAuth_name') : 'External authentication';
|
$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(
|
echo sprintf(
|
||||||
'<div class="clear"></div><div %s>%s</div>',
|
'<div class="clear"></div><div %s>%s</div>',
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
$password = false;
|
$password = false;
|
||||||
} else {
|
} else {
|
||||||
$userType = Configure::read('Plugin.CustomAuth_name') ? Configure::read('Plugin.CustomAuth_name') : 'External authentication';
|
$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(
|
echo sprintf(
|
||||||
'<div class="clear"></div><div %s>%s</div>',
|
'<div class="clear"></div><div %s>%s</div>',
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit a6d51a91b9cc45ac3062492b5e602f68392d63d6
|
Subproject commit 9515ae332e45d9ac306eaaaa802b605c1090cf5c
|
Loading…
Reference in New Issue