Merge branch 'v2.0'

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm

@@ -30,8 +30,6 @@ sub defaultValues {
         'certificateResetByMailCeaAttribute' => 'description',
         'certificateResetByMailCertificateAttribute' =>
           'userCertificate;binary',
-        'certificateResetByMailReplyTo' => 'noreply@example.com',
-        'certificateResetByMailSender'  => 'noreply@example.com',
         'certificateResetByMailURL' =>
           'http://auth.example.com/certificateReset',
         'certificateResetByMailValidityDelay' => 0,

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

@@ -773,14 +773,6 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
             'default' => 'userCertificate;binary',
             'type'    => 'text'
         },
-        'certificateResetByMailReplyTo' => {
-            'default' => 'noreply@example.com',
-            'type'    => 'text'
-        },
-        'certificateResetByMailSender' => {
-            'default' => 'noreply@example.com',
-            'type'    => 'text'
-        },
         'certificateResetByMailStep1Body' => {
             'type' => 'longtext'
         },

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

@@ -1480,39 +1480,27 @@ sub attributes {
             type    => 'text',
             default => 'userCertificate;binary',
         },
+        certificateResetByMailStep1Subject => {
+            type          => 'text',
+            documentation => 'Mail subject for certificate reset email',
+        },
         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 => {
+        certificateResetByMailStep2Body => {
-            type          => 'text',
+            type          => 'longtext',
-            documentation => 'Mail subject for certificate reset email',
+            documentation => 'Custom confirm Certificate reset mail body',
         },
-
         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

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

@@ -676,8 +676,6 @@ sub tree {
                                     title => 'certificateMailContent',
                                     form  => 'simpleInputContainer',
                                     nodes => [
-                                        'certificateResetByMailSender',
-                                        'certificateResetByMailReplyTo',
                                         'certificateResetByMailStep1Subject',
                                         'certificateResetByMailStep1Body',
                                         'certificateResetByMailStep2Subject',

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

@@ -143,14 +143,12 @@
 "categoryName":"اسم الفئة",
 "cda":"نطاقات متعددة",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certificate reset management",
+"certificateResetByMailManagement":"Certificate management",
 "certificateResetByMailURL":"Reset page URL",
 "certificateResetByMailCeaAttribute":"Certificate attibute name",
 "certificateResetByMailCertificateAttribute":"Certificate attribute name",
-"certificateResetByMailSender":"Mail sender",
+"certificateResetByMailStep1Subject":"Reset mail subject",
-"certificateResetByMailReplyTo":"Reply address",
+"certificateResetByMailStep1Body":"Reset mail content",
-"certificateResetByMailStep1Subject":"Certificate reset mail subject",
-"certificateResetByMailStep1Body":"Certificate reset mail content",
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
@@ -459,7 +457,7 @@
 "mailCharset":"charset",
 "mailConfirmBody":"تأكيد محتوى البريد",
 "mailConfirmSubject":"تأكيد عنوان بريد",
-"mailContent":"Password reset mail content",
+"mailContent":"Password mail content",
 "mailFrom":"مرسل البريد",
 "mailHeaders":"هيدر البريد",
 "mailLDAPFilter":"فلتر البريد",

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

@@ -143,14 +143,12 @@
 "categoryName":"Category name",
 "cda":"Mehrere Domains",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certificate reset management",
+"certificateResetByMailManagement":"Certificate management",
 "certificateResetByMailURL":"Reset page URL",
 "certificateResetByMailCeaAttribute":"Certificate CEA attibute",
 "certificateResetByMailCertificateAttribute":"Certificate attribute name",
-"certificateResetByMailSender":"Mail sender",
+"certificateResetByMailStep1Subject":"Reset mail subject",
-"certificateResetByMailReplyTo":"Reply address",
+"certificateResetByMailStep1Body":"Reset mail content",
-"certificateResetByMailStep1Subject":"Certificate reset mail subject",
-"certificateResetByMailStep1Body":"Certificate reset mail content",
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
@@ -459,7 +457,7 @@
 "mailCharset":"Charset",
 "mailConfirmBody":"Confirmation mail content",
 "mailConfirmSubject":"Confirmation mail subject",
-"mailContent":"Password reset mail content",
+"mailContent":"Password mail content",
 "mailFrom":"Mail sender",
 "mailHeaders":"Mail headers",
 "mailLDAPFilter":"Mail filter",

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

@@ -143,14 +143,12 @@
 "categoryName":"Category name",
 "cda":"Multiple domains",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certificate reset management",
+"certificateResetByMailManagement":"Certificate management",
 "certificateResetByMailURL":"Reset page URL",
 "certificateResetByMailCeaAttribute":"Certificate CEA attibute",
 "certificateResetByMailCertificateAttribute":"Certificate attribute name",
-"certificateResetByMailSender":"Mail sender",
+"certificateResetByMailStep1Subject":"Reset mail subject",
-"certificateResetByMailReplyTo":"Reply address",
+"certificateResetByMailStep1Body":"Reset mail content",
-"certificateResetByMailStep1Subject":"Certificate reset mail subject",
-"certificateResetByMailStep1Body":"Certificate reset mail content",
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
@@ -459,7 +457,7 @@
 "mailCharset":"Charset",
 "mailConfirmBody":"Confirmation mail content",
 "mailConfirmSubject":"Confirmation mail subject",
-"mailContent":"Password reset mail content",
+"mailContent":"Password mail content",
 "mailFrom":"Mail sender",
 "mailHeaders":"Mail headers",
 "mailLDAPFilter":"Mail filter",

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

@@ -143,14 +143,12 @@
 "categoryName":"Nom de la catégorie",
 "cda":"Domaines multiples",
 "certificateMailContent":"Contenu du mail du certificat",
-"certificateResetByMailManagement":"Gestion de la réinitialisation des certificats",
+"certificateResetByMailManagement":"Gestion 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",
+"certificateResetByMailStep1Subject":"Sujet du mail de réinitialisation",
-"certificateResetByMailReplyTo":"Adresse pour la réponse",
+"certificateResetByMailStep1Body":"Contenu du mail de réinitialisation",
-"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",
@@ -459,7 +457,7 @@
 "mailCharset":"Charset",
 "mailConfirmBody":"Contenu du message de confirmation",
 "mailConfirmSubject":"Sujet du message de confirmation",
-"mailContent":"Contenu du mail de réinitialisation",
+"mailContent":"Contenu du mail de mot de passe",
 "mailFrom":"Expéditeur du message",
 "mailHeaders":"En-têtes du mail",
 "mailLDAPFilter":"Filtre mail",

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

@@ -143,14 +143,12 @@
 "categoryName":"Nome della categoria",
 "cda":"Domini multipli",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certificate reset management",
+"certificateResetByMailManagement":"Certificate management",
 "certificateResetByMailURL":"Reset page URL",
 "certificateResetByMailCeaAttribute":"Certificat CEA attribut",
 "certificateResetByMailCertificateAttribute":"Certificate attribute name",
-"certificateResetByMailSender":"Mail sender",
+"certificateResetByMailStep1Subject":"Reset mail subject",
-"certificateResetByMailReplyTo":"Reply address",
+"certificateResetByMailStep1Body":"Reset mail content",
-"certificateResetByMailStep1Subject":"Certificate reset mail subject",
-"certificateResetByMailStep1Body":"Certificate reset mail content",
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",

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

@@ -143,14 +143,12 @@
 "categoryName":"Kategori ismi",
 "cda":"Çoklu alan adları",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certificate reset management",
+"certificateResetByMailManagement":"Certificate management",
 "certificateResetByMailURL":"Reset page URL",
 "certificateResetByMailCeaAttribute":"Certificate CEA attibute",
 "certificateResetByMailCertificateAttribute":"Certificate attribute name",
-"certificateResetByMailSender":"Mail sender",
+"certificateResetByMailStep1Subject":"Reset mail subject",
-"certificateResetByMailReplyTo":"Reply address",
+"certificateResetByMailStep1Body":"Reset mail content",
-"certificateResetByMailStep1Subject":"Certificate reset mail subject",
-"certificateResetByMailStep1Body":"Certificate reset mail content",
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",

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

@@ -143,14 +143,12 @@
 "categoryName":"Tên thể loại",
 "cda":"Nhiều tên miền",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certificate reset management",
+"certificateResetByMailManagement":"Certificate management",
 "certificateResetByMailURL":"Reset page URL",
 "certificateResetByMailCeaAttribute":"Certificate CEA attibute",
 "certificateResetByMailCertificateAttribute":"Certificate attribute name",
-"certificateResetByMailSender":"Mail sender",
+"certificateResetByMailStep1Subject":"Reset mail subject",
-"certificateResetByMailReplyTo":"Reply address",
+"certificateResetByMailStep1Body":"Reset mail content",
-"certificateResetByMailStep1Subject":"Certificate reset mail subject",
-"certificateResetByMailStep1Body":"Certificate reset mail content",
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
@@ -459,7 +457,7 @@
 "mailCharset":"Charset",
 "mailConfirmBody":"Xác nhận nội dung thư",
 "mailConfirmSubject":"Xác nhận chủ đề thư",
-"mailContent":"Password reset mail content",
+"mailContent":"Password mail content",
 "mailFrom":"Người gửi thư",
 "mailHeaders":"Tiêu đề thư",
 "mailLDAPFilter":"Bộ lọc thư",

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

@@ -143,14 +143,12 @@
 "categoryName":"分类名称",
 "cda":"Multiple domains",
 "certificateMailContent":"Certificate mail content",
-"certificateResetByMailManagement":"Certificate reset management",
+"certificateResetByMailManagement":"Certificate management",
 "certificateResetByMailURL":"Reset page URL",
 "certificateResetByMailCeaAttribute":"Certificate CEA attibute",
 "certificateResetByMailCertificateAttribute":"Certificate attribute name",
-"certificateResetByMailSender":"Mail sender",
+"certificateResetByMailStep1Subject":"Reset mail subject",
-"certificateResetByMailReplyTo":"Reply address",
+"certificateResetByMailStep1Body":"Reset mail content",
-"certificateResetByMailStep1Subject":"Certificate reset mail subject",
-"certificateResetByMailStep1Body":"Certificate reset mail content",
 "certificateResetByMailStep2Subject":"Confirmation mail subject",
 "certificateResetByMailStep2Body":"Confirmation mail content",
 "certificateResetByMailValidityDelay":"Minimum duration before expiration",
@@ -459,7 +457,7 @@
 "mailCharset":"Charset",
 "mailConfirmBody":"Confirmation mail content",
 "mailConfirmSubject":"Confirmation mail subject",
-"mailContent":"Password reset mail content",
+"mailContent":"Password mail content",
 "mailFrom":"邮件发送者",
 "mailHeaders":"邮件头",
 "mailLDAPFilter":"邮件过滤器",

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

@@ -391,7 +391,7 @@ sub _certificateReset {
 
         # Send mail
         unless (
-            $self->sendmail(
+            $self->send_mail(
                 $req->data->{mailAddress}, $subject, $body, $html
             )
           )
@@ -568,7 +568,7 @@ sub modifyCertificate {
 
     # Send mail
     return PE_MAILERROR
-      unless $self->sendmail( $req->data->{mailAddress}, $subject, $body,
+      unless $self->send_mail( $req->data->{mailAddress}, $subject, $body,
         $html );
 
     return PE_MAILOK;
@@ -711,25 +711,11 @@ sub getCertificateSession {
     return "";
 }
 
-# Use Certificate Update parameter to send mail
-sub sendmail {
-
-    my ( $self, $mail, $subject, $body, $html ) = @_;
-
-    $self->{mailFrom}    = $self->conf->{certificateResetByMailSender};
-    $self->{mailReplyTo} = $self->conf->{certificateResetByMailReplyTo};
-
-    return $self->send_mail( $mail, $subject, $body, $html );
-}
-
 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 $dtNotAfter = $f->parse_datetime($notAfter);
     $self->userLogger->debug("Not After Date: $dtNotAfter");
 
@@ -753,7 +739,6 @@ sub checkCertificateValidity {
 }
 
 sub certificateHash {
-
     my ( $self, $file ) = @_;
     my $cert;