Fix bad merge

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -1470,53 +1470,6 @@ sub attributes {
             default       => 'http://auth.example.com/resetpwd',
             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
         certificateResetByMailCeaAttribute => {

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm

@@ -75,7 +75,7 @@ sub tree {
                                         'portalDisplayResetPassword',
                                         'passwordResetAllowedRetries',
                                         'portalDisplayRegister',
-                                        'portalDisplayCertificateResetByMail',  
+                                        'portalDisplayCertificateResetByMail',
                                     ]
                                 },
                                 {
@@ -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',
-                            help  => 'resetcertificate.html',
+                            form  => 'simpleInputContainer',
                             nodes => [ {
                                     title => 'certificateMailContent',
                                     form  => 'simpleInputContainer',
@@ -1213,8 +1185,7 @@ sub tree {
         {
             title => 'oidcServiceMetaData',
             help  => 'openidconnectservice.html#service_configuration',
-            nodes => [
-                {
+            nodes => [ {
                     title => 'oidcServiceMetaDataEndPoints',
                     form  => 'simpleInputContainer',
                     nodes => [

lemonldap-ng-manager/site/htdocs/static/languages/ar.json

@@ -142,7 +142,7 @@
 "casStorageOptions":" خيارات وحدة جلسات كاس",
 "categoryName":"اسم الفئة",
 "cda":"نطاقات متعددة",
-"certifcateMailContent":"Certificate mail content",
+"certificateMailContent":"Certificate mail content",
 "certificateResetByMailManagement":"Certificate reset management",
 "certificateResetByMailURL":"Reset page URL",
 "certificateResetByMailCeaAttribute":"Certificate attibute name",
@@ -234,7 +234,6 @@
 "dbiAuthPassword":"كلمة المرور",
 "dbiAuthPasswordCol":"اسم حقل كلمة المرور",
 "dbiAuthPasswordHash":"هاش المخطط",
-"dbiAuthPasswordHash":"Hash scheme",
 "dbiDynamicHash":"dynamic hashing",
 "dbiDynamicHashEnabled":"dynamic hash activation",
 "dbiDynamicHashValidSchemes":"Supported non-salted schemes",