changes to the email sending

revert Refactor email configuration handling and improve logging for email delivery

Web/app.py

@@ -48,7 +48,7 @@ import Web.modules.log.audit_log as al
 import push_notifications as pn
 import Web.modules.inventarsystem.pdf_export as pdf_export 
 import Web.modules.inventarsystem.excel_export as excel_export
-from Web.modules.emailservice.email import send, send_pdf
+from Web.modules.emailservice.email import send
 import datetime
 from apscheduler.schedulers.background import BackgroundScheduler
 from bson.objectid import ObjectId, InvalidId
@@ -5543,7 +5543,7 @@ def student_card_single_barcode_download(card_id):
             if not cfg.MODULES.is_enabled('mail'):
                 flash('Das E-Mail-Add-on ist deaktiviert. Der Ausweis kann weiterhin als PDF heruntergeladen werden.', 'warning')
                 return redirect(url_for('student_cards_admin'))
-            sent = send_pdf(
+            sent = send(
                 recipient_email,
                 f'Bibliotheksausweis {card["AusweisId"]}',
                 f'Anbei erhalten Sie den Bibliotheksausweis für {card.get("SchülerName", "")} als PDF.',
@@ -9153,7 +9153,7 @@ def admin_audit_export_pdf_official():
                 flash('Das E-Mail-Add-on ist deaktiviert. Der Auditbericht kann weiterhin als PDF heruntergeladen werden.', 'warning')
                 return redirect(url_for('admin_audit_dashboard'))
             filename = f'audit-official-report-{datetime.datetime.now(ZoneInfo("Europe/Berlin")).strftime("%Y%m%d-%H%M%S")}.pdf'
-            sent = send_pdf(
+            sent = send(
                 recipient_email,
                 'Amtlicher Auditbericht',
                 'Anbei erhalten Sie den aktuellen amtlichen Auditbericht des Inventarsystems als PDF.',
@@ -9549,7 +9549,7 @@ def admin_create_invoice(borrow_id):
             if not cfg.MODULES.is_enabled('mail'):
                 flash('Das E-Mail-Add-on ist deaktiviert. Die PDF-Rechnung kann weiterhin heruntergeladen werden.', 'warning')
                 return redirect(url_for('admin_borrowings'))
-            sent = send_pdf(
+            sent = send(
                 recipient_email,
                 f'Rechnung {invoice_number} - {item_name}',
                 f'Anbei erhalten Sie die Rechnung {invoice_number} zum Element {item_name}.',
@@ -13755,4 +13755,16 @@ def upload_csv_batch():
         "images_processed": processed_count,
         "images_deduplicated": dedup_count,
         "images_failed": error_count
-    }), 200
+    }), 200
+
+@app.route('/test_email')
+def test_email():
+    
+    #Test endpoint to send a sample email. 
+    #This is for development purposes only.
+    
+    try:
+        send(to_email="maximiliangruendinger@gmail.com", subject="Test Email from Inventarsystem", body="This is a test email sent from the Inventarsystem application.")
+        return "Test email sent successfully."
+    except Exception as e:
+        return f"Failed to send test email: {str(e)}", 500

Web/modules/emailservice/email.py

@@ -3,95 +3,114 @@ from email.mime.text import MIMEText
 from email.mime.application import MIMEApplication
 import smtplib
 import time
-
+import os
 import Web.modules.database.settings as cfg
 
 
 def _build_smtp_client():
     smtp = smtplib.SMTP(
-        cfg.EMAIL_SMTP_HOST,
-        cfg.EMAIL_SMTP_PORT,
-        timeout=cfg.EMAIL_TIMEOUT_SECONDS,
+        "mail.invario-software.de",
+        587,
+        timeout=10,
     )
     smtp.ehlo()
-    if cfg.EMAIL_USE_TLS:
+    if True:
         smtp.starttls()
         smtp.ehlo()
-    if cfg.EMAIL_USERNAME:
-        smtp.login(cfg.EMAIL_USERNAME, cfg.EMAIL_PASSWORD or "")
+    smtp.login("no-reply@invario-software.de", "eSpage,65,{")
     return smtp
 
 
+
 def _normalize_recipients(email: list | str) -> list[str]:
     if isinstance(email, str):
         email = email.replace(';', ',').split(',')
     return [str(recipient).strip() for recipient in (email or []) if str(recipient).strip()]
 
 
-def _send_message(email: list | str, subject: str, note: str, sender: str, attachment=None) -> bool:
-    """Send a plain/HTML message, optionally with one PDF attachment."""
-    if not cfg.MODULES.is_enabled("mail"):
-        print("Debug: Module not enabled")
-        return False
+def send(
+    email: list | str, 
+    subject: str, 
+    text_body: str, 
+    html_body: str = None, 
+    attachments: list = None
+) -> bool:
+    """Sends the email with Plain Text, HTML, and optional File Attachments support."""
+    
+    if isinstance(email, str):
+        email = [email]
 
-    recipients = _normalize_recipients(email)
-    if not recipients:
-        return False
+    if attachments is None:
+        attachments = []
 
-    body_message = note
+    TEXT_SIGNATURE = (
+        "\n\n--\n"
+        "Mit freundlichen Grüßen\n"
+        "Ihr Invario Team\n\n"
+        "Invario UG\n"
+        "Am Sportplatz 10\n"
+        "83052 Bruckmühl"
+    )
 
-    HTML_SIGNATURE = f"""
-    <table cellpadding="0" cellspacing="0" border="0" style="font-family: Arial, Helvetica, sans-serif; font-size: 13px; color: #333333; line-height: 1.5;">
+    HTML_SIGNATURE = """
+    <br><br>
+    <table cellpadding="0" cellspacing="0" border="0" style="font-family: Arial, Helvetica, sans-serif; font-size: 13px; color: #555555; line-height: 1.5; border-top: 1px solid #eaebed; padding-top: 15px; width: 100%;">
         <tr>
             <td>
-                <p style="margin:0 0 12px 0;">Mit freundlichen Grüßen</p>
-                <p style="margin:0;"><strong style="font-size:16px;">Automatisierter Email Verteiler für die Schule: {cfg.get_school_info().get("name")}</strong><br></p><br>
-                <p style="margin:12px 0 0 0;"><strong>Invario UG</strong><br>Am Sportplatz 10<br>83052 Bruckmühl</p>
+                <p style="margin:0 0 5px 0;">Mit freundlichen Grüßen,</p>
+                <p style="margin:0;"><strong style="font-size:15px; color: #333333;">Ihr Invario Team</strong></p><br>
+                <p style="margin:0 0 0 0; font-size: 12px; color: #888888;">
+                    <strong>Invario UG</strong><br>
+                    Am Sportplatz 10<br>
+                    83052 Bruckmühl
+                </p>
             </td>
         </tr>
     </table>
     """
 
-    text_content = f"{body_message}\n\nMit freundlichen Grüßen\n{sender}\n"
-
-    html_content = f"""
-    <html>
-      <body>
-        <p>{body_message}</p>
-        <br>
-        {HTML_SIGNATURE}
-      </body>
-    </html>
-    """
+    text_content = f"{text_body}{TEXT_SIGNATURE}"
+    
+    if html_body:
+        html_content = f"<html><body style='background-color: #f9f9f9; padding: 20px;'><div style='background-color: #ffffff; padding: 30px; border-radius: 8px; max-width: 600px; margin: 0 auto; box-shadow: 0px 2px 5px rgba(0,0,0,0.05);'>{html_body}{HTML_SIGNATURE}</div></body></html>"
+    else:
+        # Fallback if only text is provided
+        html_safe_text = text_body.replace('\n', '<br>')
+        html_content = f"<html><body><p style='font-family: Arial, sans-serif; color: #333333;'>{html_safe_text}</p>{HTML_SIGNATURE}</body></html>"
 
     mails_per_second = 10
     interval = 1.0 / mails_per_second
-
     smtp = None
+
     try:
         smtp = _build_smtp_client()
 
-        for i, recipient in enumerate(recipients):
+        for i, recipient in enumerate(email):
             start_time = time.time()
 
-            msg = MIMEMultipart("mixed" if attachment else "alternative")
-            msg["Subject"] = str(subject)
-            from_address = cfg.EMAIL_FROM_ADDRESS or cfg.EMAIL_USERNAME or "no-reply@invario-software.de"
-            msg["From"] = f"{sender} <{from_address}>"
+            # Root message structure for email with attachments
+            msg = MIMEMultipart("mixed")
+            msg["Subject"] = subject
+            msg["From"] = "Invario Team <no-reply@invario-software.de>"
             msg["To"] = str(recipient)
 
-            body = MIMEMultipart("alternative") if attachment else msg
-            body.attach(MIMEText(text_content, "plain"))
-            body.attach(MIMEText(html_content, "html"))
-            if attachment:
-                msg.attach(body)
-                attachment_payload, filename = attachment
-                pdf_part = MIMEApplication(attachment_payload, _subtype="pdf")
-                pdf_part.add_header("Content-Disposition", "attachment", filename=filename)
-                msg.attach(pdf_part)
+            # Sub-container for Plain Text and HTML bodies
+            msg_body = MIMEMultipart("alternative")
+            msg_body.attach(MIMEText(text_content, "plain"))
+            msg_body.attach(MIMEText(html_content, "html"))
+            msg.attach(msg_body)
+
+            # Attach files if provided
+            for file_path in attachments:
+                if file_path and os.path.isfile(file_path):
+                    filename = os.path.basename(file_path)
+                    with open(file_path, "rb") as file:
+                        part = MIMEApplication(file.read(), Name=filename)
+                    part['Content-Disposition'] = f'attachment; filename="{filename}"'
+                    msg.attach(part)
 
             smtp.sendmail(
-                from_addr=from_address,
+                from_addr="no-reply@invario-software.de",
                 to_addrs=[recipient],
                 msg=msg.as_string()
             )
@@ -99,7 +118,7 @@ def _send_message(email: list | str, subject: str, note: str, sender: str, attac
             elapsed_time = time.time() - start_time
             sleep_time = interval - elapsed_time
 
-            if sleep_time > 0 and i < len(recipients) - 1:
+            if sleep_time > 0 and i < len(email) - 1:
                 time.sleep(sleep_time)
 
         return True
@@ -111,14 +130,4 @@ def _send_message(email: list | str, subject: str, note: str, sender: str, attac
             try:
                 smtp.quit()
             except Exception:
-                pass
-
-
-def send(email: list | str, subject: str, note: str, sender: str) -> bool:
-    """Send an HTML/plain email without an attachment."""
-    return _send_message(email, subject, note, sender)
-
-
-def send_pdf(email: list | str, subject: str, note: str, sender: str, pdf_bytes: bytes, filename: str) -> bool:
-    """Send an email with a PDF attachment."""
-    return _send_message(email, subject, note, sender, attachment=(pdf_bytes, filename))
+                pass

Web/templates/base.html

@@ -1346,11 +1346,13 @@
                         </li>
                         {% endif %}
                         {% if 'username' in session %}
+                        <!--
                         {% if current_permissions.pages.get('tutorial_page', False) %}
                         <li class="nav-item">
                             <a class="nav-link quick-link-pill {% if current_path == url_for('tutorial_page') %}nav-active{% endif %}" href="{{ url_for('tutorial_page') }}" data-tutorial-tip="Nutzen Sie das Tutorial, um die Bibliotheksfunktionen kennenzulernen.">Tutorial</a>
                         </li>
                         {% endif %}
+                        -->
                         {% endif %}
                         {% if 'username' in session and current_permissions.actions.get('can_insert', False) and current_permissions.pages.get('library_admin', False) %}
                         <li class="nav-item">
@@ -1630,6 +1632,8 @@
         </div>
     </div>
 
+<!--
+
     <div id="onboarding-overlay" role="dialog" aria-modal="true" aria-label="Tutorial Vorschlag">
         <div id="onboarding-modal">
             <h3>Wollen Sie eine Vorstellung des Produkts?</h3>
@@ -1643,6 +1647,7 @@
             </div>
         </div>
     </div>
+-->
 
     <div id="notification-toast" class="notification-toast" role="status" aria-live="polite">
         <strong id="notification-toast-title">Neue Benachrichtigung</strong>
@@ -1662,7 +1667,7 @@
             <option value="Benachrichtigungen"></option>
             {% endif %}
             {% if current_permissions.pages.get('tutorial_page', False) %}
-            <option value="Tutorial"></option>
+            <!--<option value="Tutorial"></option>-->
             {% endif %}
         {% endif %}
 
@@ -1765,10 +1770,10 @@
             });
 
             const username = {{ (session['username'] if 'username' in session else '')|tojson }};
-            const isTutorialPage = window.location.pathname === {{ url_for('tutorial_page')|tojson }};
+            //const isTutorialPage = window.location.pathname === {{ url_for('tutorial_page')|tojson }};
             const isLoginPage = window.location.pathname === {{ url_for('login')|tojson }};
             const notificationsPagePath = {{ url_for('notifications_view')|tojson }};
-            const onboardingKey = username ? ('inventarsystem_tutorial_prompt_v1_' + username) : null;
+            //const onboardingKey = username ? ('inventarsystem_tutorial_prompt_v1_' + username) : null;
             const onboardingOverlay = document.getElementById('onboarding-overlay');
             const notificationButtons = Array.from(document.querySelectorAll('[data-notification-button="true"]'));
             const notificationToast = document.getElementById('notification-toast');
@@ -1789,9 +1794,9 @@
                     {% if current_permissions.pages.get('notifications_view', False) %}
                     { label: 'Benachrichtigungen', keywords: ['benachrichtigungen', 'nachrichten', 'notifications'], url: {{ url_for('notifications_view')|tojson }} },
                     {% endif %}
-                    {% if current_permissions.pages.get('tutorial_page', False) %}
-                    { label: 'Tutorial', keywords: ['tutorial', 'hilfe', 'anleitung'], url: {{ url_for('tutorial_page')|tojson }} },
-                    {% endif %}
+                    //{% if current_permissions.pages.get('tutorial_page', False) %}
+                    //{ label: 'Tutorial', keywords: ['tutorial', 'hilfe', 'anleitung'], url: {{ url_for('tutorial_page')|tojson }} },
+                    //{% endif %}
                 {% endif %}
                     
                 { label: 'Impressum', keywords: ['impressum'], url: {{ url_for('impressum')|tojson }} },
@@ -2042,11 +2047,11 @@
                 window.setInterval(pollNotificationStatus, 30000);
             }
 
-            function showOnboarding(){
-                if (onboardingOverlay) {
-                    onboardingOverlay.style.display = 'flex';
-                }
-            }
+            //function showOnboarding(){
+            //    if (onboardingOverlay) {
+            //        onboardingOverlay.style.display = 'flex';
+            //    }
+            //}
 
             function hideOnboarding(){
                 if (onboardingOverlay) {
@@ -2054,19 +2059,19 @@
                 }
             }
 
-            if (onboardingKey && !isTutorialPage && !isLoginPage) {
-                const decision = localStorage.getItem(onboardingKey);
-                if (!decision || decision === 'later') {
-                    showOnboarding();
-                }
-            }
+            //if (onboardingKey && !isTutorialPage && !isLoginPage) {
+            //    const decision = localStorage.getItem(onboardingKey);
+            //    if (!decision || decision === 'later') {
+            //        showOnboarding();
+            //    }
+            //}
 
-            document.getElementById('onboarding-start')?.addEventListener('click', function(){
-                if (onboardingKey) {
-                    localStorage.setItem(onboardingKey, 'started');
-                }
-                window.location.href = {{ url_for('tutorial_page')|tojson }};
-            });
+            //document.getElementById('onboarding-start')?.addEventListener('click', function(){
+            //    if (onboardingKey) {
+            //        localStorage.setItem(onboardingKey, 'started');
+            //    }
+            //    window.location.href = {{ url_for('tutorial_page')|tojson }};
+            //});
 
             document.getElementById('onboarding-later')?.addEventListener('click', function(){
                 if (onboardingKey) {
@@ -2399,21 +2404,21 @@
     <script>
         (function () {
             const username = {{ (session['username'] if 'username' in session else '')|tojson }};
-            const tooltipModeKey = username ? ('inventarsystem_tutorial_tooltips_enabled_' + username) : 'inventarsystem_tutorial_tooltips_enabled';
+            //const tooltipModeKey = username ? ('inventarsystem_tutorial_tooltips_enabled_' + username) : 'inventarsystem_tutorial_tooltips_enabled';
             const enabled = localStorage.getItem(tooltipModeKey) === '1';
 
-            function applyTooltipMode(active) {
-                document.body.classList.toggle('tutorial-tooltips-active', active);
-                let indicator = document.getElementById('tutorialTooltipIndicator');
-                if (!indicator) {
-                    indicator = document.createElement('div');
-                    indicator.id = 'tutorialTooltipIndicator';
-                    indicator.className = 'tutorial-tooltip-indicator';
-                    indicator.textContent = 'Tutorial-Modus aktiv: Tooltips sind eingeschaltet';
-                    document.body.appendChild(indicator);
-                }
-                indicator.style.display = active ? 'inline-flex' : 'none';
-            }
+            //function applyTooltipMode(active) {
+            //    document.body.classList.toggle('tutorial-tooltips-active', active);
+            //    let indicator = document.getElementById('tutorialTooltipIndicator');
+            //    if (!indicator) {
+            //        indicator = document.createElement('div');
+            //        indicator.id = 'tutorialTooltipIndicator';
+            //        indicator.className = 'tutorial-tooltip-indicator';
+            //        indicator.textContent = 'Tutorial-Modus aktiv: Tooltips sind eingeschaltet';
+            //        document.body.appendChild(indicator);
+            //    }
+            //    indicator.style.display = active ? 'inline-flex' : 'none';
+            //}
 
             applyTooltipMode(enabled);
         })();

Web/templates/main_admin.html

@@ -5396,7 +5396,11 @@ document.addEventListener('DOMContentLoaded', ()=>{
     max-width: 880px;
     margin: 4vh auto;
     padding: 0;
-    overflow: hidden;
+    max-height: 92vh;
+    overflow-x: hidden;
+    overflow-y: auto;
+    overscroll-behavior: contain;
+    -webkit-overflow-scrolling: touch;
     border: 1px solid #d8e1eb;
     border-radius: 16px;
     background: var(--ui-surface);
@@ -5645,6 +5649,8 @@ document.addEventListener('DOMContentLoaded', ()=>{
     #item-modal .modal-content {
         width: calc(100vw - 18px);
         margin: 9px auto;
+        max-height: calc(100dvh - 18px);
+        overflow-y: auto;
         border-radius: 13px;
     }