Commit 1c44733b authored by Christophe Maudoux's avatar Christophe Maudoux 🐛

Fix bad merge

parent 0b8f84ae
...@@ -1470,53 +1470,6 @@ sub attributes { ...@@ -1470,53 +1470,6 @@ sub attributes {
default => 'http://auth.example.com/resetpwd', default => 'http://auth.example.com/resetpwd',
documentation => 'URL of password reset page', documentation => 'URL of password reset page',
}, },
# Certificate reset by mail
certificateResetByMailCeaAttribute => {
type => 'text',
default => 'description'
},
certificateResetByMailCertificateAttribute => {
type => 'text',
default => 'userCertificate;binary',
},
certificateResetByMailStep1Body => {
type => 'longtext',
documentation => 'Custom Certificate reset mail body',
},
certificateResetByMailStep2Body => {
type => 'longtext',
documentation => 'Custom confirm Certificate reset mail body',
},
certificateResetByMailStep2Subject => {
type => 'text',
documentation => 'Mail subject for reset confirmation',
},
certificateResetByMailStep1Subject => {
type => 'text',
documentation => 'Mail subject for certificate reset email',
},
certificateResetByMailURL => {
type => 'url',
default => 'http://auth.example.com/certificateReset',
documentation => 'URL of certificate reset page',
},
certificateResetByMailSender => {
type => 'text',
default => 'noreply@example.com',
documentation => 'URL of certificate reset page',
},
certificateResetByMailReplyTo => {
type => 'text',
default => 'noreply@example.com',
documentation => 'URL of certificate reset page',
},
certificateResetByMailValidityDelay => {
type => 'int',
default => 0
},
# Certificate reset by mail # Certificate reset by mail
certificateResetByMailCeaAttribute => { certificateResetByMailCeaAttribute => {
......
...@@ -75,7 +75,7 @@ sub tree { ...@@ -75,7 +75,7 @@ sub tree {
'portalDisplayResetPassword', 'portalDisplayResetPassword',
'passwordResetAllowedRetries', 'passwordResetAllowedRetries',
'portalDisplayRegister', 'portalDisplayRegister',
'portalDisplayCertificateResetByMail', 'portalDisplayCertificateResetByMail',
] ]
}, },
{ {
...@@ -668,38 +668,10 @@ sub tree { ...@@ -668,38 +668,10 @@ sub tree {
] ]
} }
] ]
},
{
title => 'certificateResetByMailManagement',
form => 'simpleInputContainer',
nodes => [ {
title => 'certifcateMailContent',
form => 'simpleInputContainer',
nodes => [
'certificateResetByMailSender',
'certificateResetByMailReplyTo',
'certificateResetByMailStep1Subject',
'certificateResetByMailStep1Body',
'certificateResetByMailStep2Subject',
'certificateResetByMailStep2Body'
]
},
{
title => 'mailOther',
form => 'simpleInputContainer',
nodes => [
'certificateResetByMailURL',
'certificateResetByMailCeaAttribute',
'certificateResetByMailCertificateAttribute',
'certificateResetByMailValidityDelay'
]
}
]
}, },
{ {
title => 'certificateResetByMailManagement', title => 'certificateResetByMailManagement',
help => 'resetcertificate.html', form => 'simpleInputContainer',
nodes => [ { nodes => [ {
title => 'certificateMailContent', title => 'certificateMailContent',
form => 'simpleInputContainer', form => 'simpleInputContainer',
...@@ -1213,8 +1185,7 @@ sub tree { ...@@ -1213,8 +1185,7 @@ sub tree {
{ {
title => 'oidcServiceMetaData', title => 'oidcServiceMetaData',
help => 'openidconnectservice.html#service_configuration', help => 'openidconnectservice.html#service_configuration',
nodes => [ nodes => [ {
{
title => 'oidcServiceMetaDataEndPoints', title => 'oidcServiceMetaDataEndPoints',
form => 'simpleInputContainer', form => 'simpleInputContainer',
nodes => [ nodes => [
......
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
"casStorageOptions":" خيارات وحدة جلسات كاس", "casStorageOptions":" خيارات وحدة جلسات كاس",
"categoryName":"اسم الفئة", "categoryName":"اسم الفئة",
"cda":"نطاقات متعددة", "cda":"نطاقات متعددة",
"certifcateMailContent":"Certificate mail content", "certificateMailContent":"Certificate mail content",
"certificateResetByMailManagement":"Certificate reset management", "certificateResetByMailManagement":"Certificate reset management",
"certificateResetByMailURL":"Reset page URL", "certificateResetByMailURL":"Reset page URL",
"certificateResetByMailCeaAttribute":"Certificate attibute name", "certificateResetByMailCeaAttribute":"Certificate attibute name",
...@@ -234,7 +234,6 @@ ...@@ -234,7 +234,6 @@
"dbiAuthPassword":"كلمة المرور", "dbiAuthPassword":"كلمة المرور",
"dbiAuthPasswordCol":"اسم حقل كلمة المرور", "dbiAuthPasswordCol":"اسم حقل كلمة المرور",
"dbiAuthPasswordHash":"هاش المخطط", "dbiAuthPasswordHash":"هاش المخطط",
"dbiAuthPasswordHash":"Hash scheme",
"dbiDynamicHash":"dynamic hashing", "dbiDynamicHash":"dynamic hashing",
"dbiDynamicHashEnabled":"dynamic hash activation", "dbiDynamicHashEnabled":"dynamic hash activation",
"dbiDynamicHashValidSchemes":"Supported non-salted schemes", "dbiDynamicHashValidSchemes":"Supported non-salted schemes",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment