Typo & FR translation & Container type (#1605)

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

@@ -1458,14 +1458,15 @@ sub attributes {
             default       => 'http://auth.example.com/resetpwd',
             documentation => 'URL of password reset page',
         },
-                   # Certificate reset by mail
+
+        # Certificate reset by mail
         certificateResetByMailCeaAttribute => {
-            type          => 'text',
-            default       => 'description'
+            type    => 'text',
+            default => 'description'
         },
         certificateResetByMailCertificateAttribute => {
-            type          => 'text',
-            default       => 'userCertificate;binary',
+            type    => 'text',
+            default => 'userCertificate;binary',
         },
         certificateResetByMailStep1Body => {
             type          => 'longtext',
@@ -1501,8 +1502,8 @@ sub attributes {
             documentation => 'URL of certificate reset page',
         },
         certificateResetByMailValidityDelay => {
-            type          => 'int',
-            default       => 0
+            type    => 'int',
+            default => 0
         },
 
         # Registration

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

@@ -570,8 +570,7 @@ sub tree {
                 {
                     title => 'reloadParams',
                     help  => 'configlocation.html#configuration_reload',
-                    nodes =>
-                      [ 'reloadUrls', 'reloadTimeout', 'compactConf' ]
+                    nodes => [ 'reloadUrls', 'reloadTimeout', 'compactConf' ]
                 },
                 {
                     title => 'plugins',
@@ -657,34 +656,34 @@ sub tree {
                                     ]
                                 }
                             ]
-                         },
-                          {
+                        },
+                        {
                             title => 'certificateResetByMailManagement',
-                             form  => 'simpleInputContainer',
-                             nodes => [ {
-                                     title => 'certificateMailContent',
-                                     form  => 'simpleInputContainer',
-                                     nodes => [ 
-                                         'certificateResetByMailSender',
-                                         'certificateResetByMailReplyTo',
-                                         'certificateResetByMailStep1Subject',
-                                         'certificateResetByMailStep1Body',
-                                         'certificateResetByMailStep2Subject',
-                                         'certificateResetByMailStep2Body'
-                                      ]
-                                  },
-  
-                                  {
-                                      title => 'mailOther',
-                                      form  => 'simpleInputContainer',
-                                      nodes => [
-                                          'certificateResetByMailURL',
-                                          'certificateResetByMailCeaAttribute',
-                                          'certificateResetByMailCertificateAttribute',
-                                          'certificateResetByMailValidityDelay'
+                            help  => 'resetcertificate.html',
+                            nodes => [ {
+                                    title => 'certificateMailContent',
+                                    form  => 'simpleInputContainer',
+                                    nodes => [
+                                        'certificateResetByMailSender',
+                                        'certificateResetByMailReplyTo',
+                                        'certificateResetByMailStep1Subject',
+                                        'certificateResetByMailStep1Body',
+                                        'certificateResetByMailStep2Subject',
+                                        'certificateResetByMailStep2Body'
                                     ]
-                                 } 
-                             ]
+                                },
+
+                                {
+                                    title => 'mailOther',
+                                    form  => 'simpleInputContainer',
+                                    nodes => [
+                                        'certificateResetByMailURL',
+                                        'certificateResetByMailCeaAttribute',
+'certificateResetByMailCertificateAttribute',
+                                        'certificateResetByMailValidityDelay'
+                                    ]
+                                }
+                            ]
                         },
                         {
                             title => 'register',
@@ -1057,7 +1056,8 @@ sub tree {
                     help  => 'samlservice.html#organization',
                     form  => 'simpleInputContainer',
                     nodes => [
-                        'samlOrganizationDisplayName', 'samlOrganizationName',
+                        'samlOrganizationDisplayName',
+                        'samlOrganizationName',
                         'samlOrganizationURL'
                     ]
                 },
@@ -1217,8 +1217,8 @@ sub tree {
                     title => "oidcServiceMetaDataSessions",
                     nodes => [ 'oidcStorage', 'oidcStorageOptions', ],
                 },
-		'oidcServiceDynamicRegistrationExportedVars',
-		'oidcServiceDynamicRegistrationExtraClaims',
+                'oidcServiceDynamicRegistrationExportedVars',
+                'oidcServiceDynamicRegistrationExtraClaims',
             ]
         },
         'oidcOPMetaDataNodes',

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

@@ -143,10 +143,10 @@
 "categoryName":"اسم الفئة",
 "cda":"نطاقات متعددة",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certifcate reset management",
+"certificateResetByMailManagement":"Certificate reset management",
 "certificateResetByMailURL":"Reset page URL",
-"certificateResetByMailCeaAttribute":"Certificate attibute name",
-"certificateResetByMailCertificateAttribute":"certificate attribute name",
+"certificateResetByMailCeaAttribute":"Certificate CEA attibute",
+"certificateResetByMailCertificateAttribute":"Certificate attribute name",
 "certificateResetByMailSender":"Mail sender",
 "certificateResetByMailReplyTo":"Reply address",
 "certificateResetByMailStep1Subject":"Certificate reset mail subject",
@@ -154,7 +154,7 @@
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
-"portalDisplayCertificateResetByMail":"Reset your Certificate",
+"portalDisplayCertificateResetByMail":"Reset your certificate",
 "contentSecurityPolicy":"السياسة الأمنية للمحتوى",
 "contextSwitching":"Switch context another user",
 "contextSwitchingHiddenAttributes":"Hidden attributes",

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

@@ -143,10 +143,10 @@
 "categoryName":"Category name",
 "cda":"Mehrere Domains",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certifcate reset management",
+"certificateResetByMailManagement":"Certificate reset management",
 "certificateResetByMailURL":"Reset page URL",
-"certificateResetByMailCeaAttribute":"Certificate attibute name",
-"certificateResetByMailCertificateAttribute":"certificate attribute name",
+"certificateResetByMailCeaAttribute":"Certificate CEA attibute",
+"certificateResetByMailCertificateAttribute":"Certificate attribute name",
 "certificateResetByMailSender":"Mail sender",
 "certificateResetByMailReplyTo":"Reply address",
 "certificateResetByMailStep1Subject":"Certificate reset mail subject",
@@ -154,7 +154,7 @@
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
-"portalDisplayCertificateResetByMail":"Reset your Certificate",
+"portalDisplayCertificateResetByMail":"Reset your certificate",
 "contentSecurityPolicy":"Content security policy",
 "contextSwitching":"Switch context another user",
 "contextSwitchingHiddenAttributes":"Hidden attributes",

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

@@ -143,10 +143,10 @@
 "categoryName":"Category name",
 "cda":"Multiple domains",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certifcate reset management",
+"certificateResetByMailManagement":"Certificate reset management",
 "certificateResetByMailURL":"Reset page URL",
-"certificateResetByMailCeaAttribute":"Certificate attibute name",
-"certificateResetByMailCertificateAttribute":"certificate attribute name",
+"certificateResetByMailCeaAttribute":"Certificate CEA attibute",
+"certificateResetByMailCertificateAttribute":"Certificate attribute name",
 "certificateResetByMailSender":"Mail sender",
 "certificateResetByMailReplyTo":"Reply address",
 "certificateResetByMailStep1Subject":"Certificate reset mail subject",
@@ -154,7 +154,7 @@
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
-"portalDisplayCertificateResetByMail":"Reset your Certificate",
+"portalDisplayCertificateResetByMail":"Reset your certificate",
 "contentSecurityPolicy":"Content security policy",
 "contextSwitching":"Switch context another user",
 "contextSwitchingHiddenAttributes":"Hidden attributes",

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

@@ -142,19 +142,19 @@
 "casStorageOptions":"Options du module des sessions CAS",
 "categoryName":"Nom de la catégorie",
 "cda":"Domaines multiples",
-"certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certifcate reset management",
-"certificateResetByMailURL":"Reset page URL",
-"certificateResetByMailCeaAttribute":"Certificate attibute name",
-"certificateResetByMailCertificateAttribute":"certificate attribute name",
-"certificateResetByMailSender":"Mail sender",
-"certificateResetByMailReplyTo":"Reply address",
-"certificateResetByMailStep1Subject":"Certificate reset mail subject",
-"certificateResetByMailStep1Body":"Certificate reset mail content",
-"certificateResetByMailStep2Subject":"Confirmation mail subject",
-"certificateResetByMailStep2Body":"Confirmation mail content",
-"certificateResetByMailValidityDelay":"Minimum duration before expiration",
-"portalDisplayCertificateResetByMail":"Reset your Certificate",
+"certificateMailContent":"Contenu du mail du certificat",
+"certificateResetByMailManagement":"Gestion de la réinitialisation des certificats",
+"certificateResetByMailURL":"URL de la page de réinitialisation",
+"certificateResetByMailCeaAttribute":"Attribut CEA du certificat",
+"certificateResetByMailCertificateAttribute":"Nom de l'attribut du certificat",
+"certificateResetByMailSender":"Expéditeur",
+"certificateResetByMailReplyTo":"Adresse pour la réponse",
+"certificateResetByMailStep1Subject":"Sujet du mail",
+"certificateResetByMailStep1Body":"Contenu du mail",
+"certificateResetByMailStep2Subject":"Sujet du mail de confirmation",
+"certificateResetByMailStep2Body":"Contenu du mail de confirmation",
+"certificateResetByMailValidityDelay":"Durée minimun avant expiration",
+"portalDisplayCertificateResetByMail":"Réinitialiser votre certificat",
 "contentSecurityPolicy":"Politique de sécurité de contenu",
 "contextSwitching":"Endossement d'identité",
 "contextSwitchingHiddenAttributes":"Attributs masqués",

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

@@ -143,10 +143,10 @@
 "categoryName":"Nome della categoria",
 "cda":"Domini multipli",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certifcate reset management",
+"certificateResetByMailManagement":"Certificate reset management",
 "certificateResetByMailURL":"Reset page URL",
-"certificateResetByMailCeaAttribute":"Certificate attibute name",
-"certificateResetByMailCertificateAttribute":"certificate attribute name",
+"certificateResetByMailCeaAttribute":"Certificat CEA attribut",
+"certificateResetByMailCertificateAttribute":"Certificate attribute name",
 "certificateResetByMailSender":"Mail sender",
 "certificateResetByMailReplyTo":"Reply address",
 "certificateResetByMailStep1Subject":"Certificate reset mail subject",
@@ -154,7 +154,7 @@
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
-"portalDisplayCertificateResetByMail":"Reset your Certificate",
+"portalDisplayCertificateResetByMail":"Reset your crtificate",
 "contentSecurityPolicy":"Politica di protezione dei contenuti",
 "contextSwitching":"Switch context another user",
 "contextSwitchingHiddenAttributes":"Attributi nascosti",

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

@@ -143,10 +143,10 @@
 "categoryName":"Kategori ismi",
 "cda":"Çoklu alan adları",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certifcate reset management",
+"certificateResetByMailManagement":"Certificate reset management",
 "certificateResetByMailURL":"Reset page URL",
-"certificateResetByMailCeaAttribute":"Certificate attibute name",
-"certificateResetByMailCertificateAttribute":"certificate attribute name",
+"certificateResetByMailCeaAttribute":"Certificate CEA attibute",
+"certificateResetByMailCertificateAttribute":"Certificate attribute name",
 "certificateResetByMailSender":"Mail sender",
 "certificateResetByMailReplyTo":"Reply address",
 "certificateResetByMailStep1Subject":"Certificate reset mail subject",
@@ -154,7 +154,7 @@
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
-"portalDisplayCertificateResetByMail":"Reset your Certificate",
+"portalDisplayCertificateResetByMail":"Reset your certificate",
 "contentSecurityPolicy":"İçerik güvenlik ilkesi",
 "contextSwitching":"İçeriği başka bir kullanıcıyla değiştir",
 "contextSwitchingHiddenAttributes":"Gizli nitelikler",

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

@@ -143,10 +143,10 @@
 "categoryName":"Tên thể loại",
 "cda":"Nhiều tên miền",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certifcate reset management",
+"certificateResetByMailManagement":"Certificate reset management",
 "certificateResetByMailURL":"Reset page URL",
-"certificateResetByMailCeaAttribute":"Certificate attibute name",
-"certificateResetByMailCertificateAttribute":"certificate attribute name",
+"certificateResetByMailCeaAttribute":"Certificate CEA attibute",
+"certificateResetByMailCertificateAttribute":"Certificate attribute name",
 "certificateResetByMailSender":"Mail sender",
 "certificateResetByMailReplyTo":"Reply address",
 "certificateResetByMailStep1Subject":"Certificate reset mail subject",
@@ -154,7 +154,7 @@
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
-"portalDisplayCertificateResetByMail":"Reset your Certificate",
+"portalDisplayCertificateResetByMail":"Reset your certificate",
 "contentSecurityPolicy":"Chính sách bảo mật nội dung",
 "contextSwitching":"Switch context another user",
 "contextSwitchingHiddenAttributes":"Hidden attributes",

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

@@ -143,10 +143,10 @@
 "categoryName":"分类名称",
 "cda":"Multiple domains",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certifcate reset management",
+"certificateResetByMailManagement":"Certificate reset management",
 "certificateResetByMailURL":"Reset page URL",
-"certificateResetByMailCeaAttribute":"Certificate attibute name",
-"certificateResetByMailCertificateAttribute":"certificate attribute name",
+"certificateResetByMailCeaAttribute":"Certificate CEA attibute",
+"certificateResetByMailCertificateAttribute":"Certificate attribute name",
 "certificateResetByMailSender":"Mail sender",
 "certificateResetByMailReplyTo":"Reply address",
 "certificateResetByMailStep1Subject":"Certificate reset mail subject",
@@ -154,7 +154,7 @@
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
-"portalDisplayCertificateResetByMail":"Reset your Certificate",
+"portalDisplayCertificateResetByMail":"Reset your certificate",
 "contentSecurityPolicy":"Content security policy",
 "contextSwitching":"Switch context another user",
 "contextSwitchingHiddenAttributes":"Hidden attributes",

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/CertificateResetByMail/LDAP.pm

@@ -11,7 +11,7 @@ use Lemonldap::NG::Portal::Main::Constants qw(
 
 extends 'Lemonldap::NG::Portal::Lib::LDAP';
 
-our $VERSION = '2.1.0';
+our $VERSION = '2.0.7';
 
 # RUNNING METHODS
 

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CertificateResetByMail.pm

@@ -10,6 +10,7 @@ use MIME::Base64;
 use POSIX qw(strftime);
 use Lemonldap::NG::Common::FormEncode;
 use Lemonldap::NG::Portal::Main::Constants qw(
+  PE_OK
   PE_BADCREDENTIALS
   PE_BADMAILTOKEN
   PE_CAPTCHAEMPTY
@@ -23,10 +24,6 @@ use Lemonldap::NG::Portal::Main::Constants qw(
   PE_MAILOK
   PE_MALFORMEDUSER
   PE_NOTOKEN
-  PE_OK
-  PE_PASSWORDFIRSTACCESS
-  PE_PASSWORDFORMEMPTY
-  PE_PASSWORD_OK
   PE_TOKENEXPIRED
   PE_USERNOTFOUND
   PE_RESETCERTIFICATE_INVALID
@@ -34,10 +31,13 @@ use Lemonldap::NG::Portal::Main::Constants qw(
   PE_RESETCERTIFICATE_FIRSTACCESS
 );
 
-our $VERSION = '2.1.0';
+our $VERSION = '2.0.7';
 
-extends 'Lemonldap::NG::Portal::Main::Plugin',
-  'Lemonldap::NG::Portal::Lib::SMTP', 'Lemonldap::NG::Portal::Lib::_tokenRule';
+extends qw(
+  Lemonldap::NG::Portal::Main::Plugin
+  Lemonldap::NG::Portal::Lib::SMTP
+  Lemonldap::NG::Portal::Lib::_tokenRule
+);
 
 # PROPERTIES
 
@@ -107,6 +107,7 @@ sub init {
             '::CertificateResetByMail::' . $self->conf->{registerDB}
         )
     ) or return 0;
+
     return 1;
 }
 
@@ -536,7 +537,6 @@ sub modifyCertificate {
     $self->{user} = undef;
 
     # Mail token can be used only one time, delete the session if all is ok
-    #
     return $result unless ( $result == PE_OK );
 
     # Send mail to notify the certificate reset sucessfully
@@ -690,13 +690,12 @@ sub display {
     return 'certificateReset', \%tplPrm;
 }
 
-#tring getCertifResetSession (string mail)
+#string getCertifResetSession (string mail)
 # Check if a certificate reset session exists
 # @param mail the value of the mail key in session
 # @return the first session id found or nothing if no session
 sub getCertificateSession {
     my ( $self, $user ) = @_;
-
     my $moduleOptions = $self->conf->{globalStorageOptions} || {};
     $moduleOptions->{backend} = $self->conf->{globalStorage};
     my $module = "Lemonldap::NG::Common::Apache::Session";
@@ -721,7 +720,6 @@ sub getCertificateSession {
 # Use Certificate Update parameter to send mail
 
 sub sendmail {
-
     my ( $self, $mail, $subject, $body, $html ) = @_;
 
     $self->{mailFrom}    = $self->conf->{certificateResetByMailSender};
@@ -731,13 +729,10 @@ sub sendmail {
 }
 
 sub checkCertificateValidity {
-
     my ( $self, $notAfter, $delay ) = @_;
     my $dtNow;    # now in format DateTime
     my $days;     # difference between NotAfter and now
-
-    my $f = DateTime::Format::RFC3339->new();
-
+    my $f          = DateTime::Format::RFC3339->new();
     my $dtNotAfter = $f->parse_datetime($notAfter);
     $self->userLogger->debug("Not After Date: $dtNotAfter");
 
@@ -761,7 +756,6 @@ sub checkCertificateValidity {
 }
 
 sub certificateHash {
-
     my ( $self, $file ) = @_;
     my $cert;