controle_adhesion/mail_bienvenue_header.txt

@@ -2,4 +2,5 @@ From: =?UTF-8?Q?Secr=c3=a9taire_de_Libre_en_Communs?= <secretaire@a-lec.org>
 To: <COURRIEL_INSCRIPTION>
 Bcc: <secretaire@a-lec.org>, <tresorier@a-lec.org>
 Subject: =?UTF-8?Q?=5bSecr=c3=a9tariat=5d_Confirmation de votre adh=c3=a9sion?=
+Content-Type: text/plain; charset="UTF-8"
 Content-Transfer-Encoding: quoted-printable

controle_cotisation/mail_instructions_headers.txt

@@ -3,4 +3,5 @@ From: =?UTF-8?Q?Tr=c3=a9sorier_de_Libre_en_Communs?= <tresorier@a-lec.org>
 To: <COURRIEL-COTISANT>
 Bcc: <tresorier@a-lec.org>
 Subject: =?UTF-8?Q?Modalit=c3=a9s_de_r=c3=a8glement_de_votre_cotisation_ANNEE_CIVILE?=
+Content-Type: text/plain; charset="UTF-8"
 Content-Transfer-Encoding: quoted-printable

controle_cotisation/mail_recap_header.txt

@@ -2,4 +2,5 @@ From: tresorier@a-lec.org
 To: tresorier@a-lec.org
 Subject: Suivi automatique des cotisations
 MIME-Version: 1.0
+Content-Type: text/plain; charset="UTF-8"
 Content-Transfer-Encoding: quoted-printable

controle_cotisation/mail_recu_headers.txt

@@ -8,4 +8,5 @@ Content-Type: multipart/mixed; boundary="------------3yxkFgv0AINs5nd0i6BJrWaV"
 
 This is a multi-part message in MIME format.
 --------------3yxkFgv0AINs5nd0i6BJrWaV
+Content-Type: text/plain; charset="UTF-8"
 Content-Transfer-Encoding: quoted-printable

controle_cotisation/main.py

@@ -115,10 +115,8 @@ def setup_workdir():
 
 
 def sendmail_with_attachment(headers, data, attachment_path=None, filename=None):
-    # Create a multipart message
+    # Parse headers
     msg = MIMEMultipart()
-
-    # Add the headers without manually setting Content-Type or MIME-Version
     for header in headers.split("\n"):
         if ": " in header:
             key, value = header.split(": ", 1)
@@ -130,8 +128,8 @@ def sendmail_with_attachment(headers, data, attachment_path=None, filename=None)
 
     # Add the attachment only if attachment_path is provided
     if attachment_path and filename:
-        with open(attachment_path, "rb") as attach_file:
         attachment = MIMEBase('application', 'octet-stream')
+        with open(attachment_path, "rb") as attach_file:
             attachment.set_payload(attach_file.read())
         encoders.encode_base64(attachment)
         attachment.add_header('Content-Disposition', f'attachment; filename={filename}')

controle_don/mail_instructions_headers.txt

@@ -3,4 +3,5 @@ From: =?UTF-8?Q?Tr=c3=a9sorier_de_Libre_en_Communs?= <tresorier@a-lec.org>
 To: <COURRIEL_DONNEUR>
 Bcc: <tresorier@a-lec.org>
 Subject: =?UTF-8?Q?Libre_en_Communs_:_modalit=c3=a9s_de_r=c3=a8glement_de_votre_don?=
+Content-Type: text/plain; charset="UTF-8"
 Content-Transfer-Encoding: quoted-printable

controle_don/mail_recap_header.txt

@@ -2,4 +2,5 @@ From: tresorier@a-lec.org
 To: tresorier@a-lec.org
 Subject: Suivi automatique des dons
 MIME-Version: 1.0
+Content-Type: text/plain; charset="UTF-8"
 Content-Transfer-Encoding: quoted-printable

controle_don/mail_recu_headers.txt

@@ -8,4 +8,5 @@ Content-Type: multipart/mixed; boundary="------------3yxkFgv0AINs5nd0i6BJrWaV"
 
 This is a multi-part message in MIME format.
 --------------3yxkFgv0AINs5nd0i6BJrWaV
+Content-Type: text/plain; charset="UTF-8"
 Content-Transfer-Encoding: quoted-printable

controle_don/main.py

@@ -78,38 +78,36 @@ def setup_workdir():
             os.makedirs(path)
 
 # Send email with attachment via SMTP, password fetched from file
-def sendmail_with_attachment(headers, data, attachment_path=None, filename=None):
-    # Create a multipart message
+def sendmail_with_attachment(headers, body, attachment_path, attachment_filename):
     msg = MIMEMultipart()
 
-    # Add the headers without manually setting Content-Type or MIME-Version
+    # Add headers
     for header in headers.split("\n"):
-        if ": " in header and "Content-Type" not in header and "Mime-Version" not in header:
+        if ": " in header:
             key, value = header.split(": ", 1)
             msg[key] = value.strip()
 
-    # Add the email body
-    body = MIMEText(data, 'plain', 'utf-8')
-    msg.attach(body)
+    # Email body
+    msg.attach(MIMEText(body, 'plain', 'utf-8'))
 
-    # Add the attachment only if attachment_path is provided
-    if attachment_path and filename:
-        with open(attachment_path, "rb") as attach_file:
-            attachment = MIMEBase('application', 'octet-stream')
-            attachment.set_payload(attach_file.read())
-        encoders.encode_base64(attachment)
-        attachment.add_header('Content-Disposition', f'attachment; filename={filename}')
-        msg.attach(attachment)
+    # Attach PDF file
+    if attachment_path:
+        with open(attachment_path, "rb") as attachment:
+            part = MIMEBase('application', 'octet-stream')
+            part.set_payload(attachment.read())
+            encoders.encode_base64(part)
+            part.add_header('Content-Disposition', f'attachment; filename={attachment_filename}')
+            msg.attach(part)
 
-    # Send the email
+    # Send email
     try:
         with smtplib.SMTP(SMTP_SERVER, SMTP_PORT) as server:
-            server.starttls()  # Start TLS encryption
-            server.login(SMTP_USER, smtp_get_secret())
+            server.starttls()  # Secure the connection
+            server.login(SMTP_USER, smtp_get_secret())  # Fetch SMTP password from file
             server.sendmail(SMTP_USER, msg['To'], msg.as_string())
-            print("Email sent successfully")
+            print(f"Email sent to {msg['To']}")
     except Exception as e:
-        print(f"Failed to send email: {e}")
+        print(f"Error sending email: {e}")
 
 # Notify unpaid donors
 def notify_unpaid(record):