dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update captcha parameters in Manager (#703)

Browse Source
This commit is contained in:
Clément Oudot 2014-06-11 10:46:43 +00:00
parent 1b6655a431
commit 525d43ade8
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Serializer.pm
View File

@ -104,6 +104,7 @@ sub unserialize {
$k =~ /^(?x: $k =~ /^(?x:
applicationList applicationList
|authChoiceModules |authChoiceModules
|captchaStorageOptions
|CAS_proxiedServices |CAS_proxiedServices
|casStorageOptions |casStorageOptions
|dbiExportedVars |dbiExportedVars
@ -113,7 +114,7 @@ sub unserialize {
|facebookExportedVars |facebookExportedVars
|globalStorageOptions |globalStorageOptions
|googleExportedVars |googleExportedVars
|grantSessionRules |grantSessionRules
|groups |groups
|ldapExportedVars |ldapExportedVars
|localSessionStorageOptions |localSessionStorageOptions
@ -125,7 +126,7 @@ sub unserialize {
|persistentStorageOptions |persistentStorageOptions
|portalSkinRules |portalSkinRules
|post |post
|reloadUrls |reloadUrls
|remoteGlobalStorageOptions |remoteGlobalStorageOptions
|samlIDPMetaDataExportedAttributes |samlIDPMetaDataExportedAttributes
|samlIDPMetaDataOptions |samlIDPMetaDataOptions
@ -134,7 +135,7 @@ sub unserialize {
|samlSPMetaDataOptions |samlSPMetaDataOptions
|samlSPMetaDataXML |samlSPMetaDataXML
|samlStorageOptions |samlStorageOptions
|sessionDataToRemember |sessionDataToRemember
|slaveExportedVars |slaveExportedVars
|vhostOptions |vhostOptions
|webIDExportedVars |webIDExportedVars

1
lemonldap-ng-manager/example/skins/default/js/manager.js
View File

@ -33,6 +33,7 @@ var helpCh = {
'authTwitter': '/pages/documentation/current/authtwitter.html', 'authTwitter': '/pages/documentation/current/authtwitter.html',
'authWebID': '/pages/documentation/current/authwebid.html', 'authWebID': '/pages/documentation/current/authwebid.html',
'authYubikey': '/pages/documentation/current/authyubikey.html', 'authYubikey': '/pages/documentation/current/authyubikey.html',
'captcha': '/pages/documentation/current/captcha.html',
'cookies': '/pages/documentation/current/ssocookie.html', 'cookies': '/pages/documentation/current/ssocookie.html',
'customfunctions': '/pages/documentation/current/customfunctions.html', 'customfunctions': '/pages/documentation/current/customfunctions.html',
'default': '/pages/documentation/current/start.html#configuration', 'default': '/pages/documentation/current/start.html#configuration',

15
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
View File

@ -349,15 +349,22 @@ sub struct {
portalCaptcha => { portalCaptcha => {
_nodes => [ _nodes => [
qw(captcha_login_enabled captcha_mail_enabled captcha_register_enabled captcha_size captcha_data captcha_output) qw(captcha_login_enabled captcha_mail_enabled captcha_register_enabled captcha_size captchaStorage captchaStorageOptions)
], ],
_help => 'captcha',
captcha_login_enabled => 'bool:/captcha_login_enabled', captcha_login_enabled => 'bool:/captcha_login_enabled',
captcha_mail_enabled => 'bool:/captcha_mail_enabled', captcha_mail_enabled => 'bool:/captcha_mail_enabled',
captcha_register_enabled => captcha_register_enabled =>
'bool:/captcha_register_enabled', 'bool:/captcha_register_enabled',
captcha_size => 'int:/captcha_size', captcha_size => 'int:/captcha_size',
captcha_data => 'text:/captcha_data', captchaStorage => 'text:/captchaStorage',
captcha_output => 'text:/captcha_output', captchaStorageOptions => {
_nodes => ['hash:/captchaStorageOptions:captcha:btext'],
_js => 'hashRoot',
_help => 'captcha',
},
}, },
}, },

8
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
View File

@ -109,12 +109,12 @@ sub en {
demoExportedVars => 'Exported variables', demoExportedVars => 'Exported variables',
demoParams => 'Demonstration parameters', demoParams => 'Demonstration parameters',
done => 'done', done => 'done',
captcha_data => 'Directory for data',
captcha_login_enabled => 'Activation in login form', captcha_login_enabled => 'Activation in login form',
captcha_mail_enabled => 'Activation in password reset by mail form', captcha_mail_enabled => 'Activation in password reset by mail form',
captcha_register_enabled => 'Activation in register form', captcha_register_enabled => 'Activation in register form',
captcha_output => 'Directory for images',
captcha_size => 'Size', captcha_size => 'Size',
captchaStorage => 'Captcha module name',
captchaStorageOptions => 'Captcha module options',
CAS_authnLevel => 'Authentication level', CAS_authnLevel => 'Authentication level',
CAS_CAFile => 'CA file', CAS_CAFile => 'CA file',
CAS_gateway => 'Gateway authentication', CAS_gateway => 'Gateway authentication',
@ -609,15 +609,15 @@ sub fr {
demoExportedVars => 'Variables exportées', demoExportedVars => 'Variables exportées',
demoParams => 'Paramètres démonstration', demoParams => 'Paramètres démonstration',
done => 'validée', done => 'validée',
captcha_data => 'Répertoire des données',
captcha_login_enabled => captcha_login_enabled =>
"Activation dans le formulaire d'authentification", "Activation dans le formulaire d'authentification",
captcha_mail_enabled => captcha_mail_enabled =>
'Activation dans le formulaire de réinitialisation par mail', 'Activation dans le formulaire de réinitialisation par mail',
captcha_register_enabled => captcha_register_enabled =>
'Activation dans le formulaire de création de compte', 'Activation dans le formulaire de création de compte',
captcha_output => 'Répertoire des images',
captcha_size => 'Taille', captcha_size => 'Taille',
captchaStorage => 'Nom du module de stockage',
captchaStorageOptions => 'Options du module de stockage',
CAS_authnLevel => 'Niveau d\'authentification', CAS_authnLevel => 'Niveau d\'authentification',
CAS_CAFile => 'Fichier d\'AC', CAS_CAFile => 'Fichier d\'AC',
CAS_gateway => 'Authentification transparente', CAS_gateway => 'Authentification transparente',