From 99bbbdca42faaea487c9e5d044c5be8a6e0c8ed1 Mon Sep 17 00:00:00 2001
From: Xenomporio <>
Date: Sun, 17 Jul 2022 20:28:51 +0200
Subject: [PATCH] Bugfix in IMAP put mail into sentfolder

---
 www/lib/class.erpapi.php  | 7 ++++---
 www/pages/emailbackup.php | 2 +-
 www/pages/firmendaten.php | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/www/lib/class.erpapi.php b/www/lib/class.erpapi.php
index c5d014c9..6b2d17f4 100644
--- a/www/lib/class.erpapi.php
+++ b/www/lib/class.erpapi.php
@@ -32659,7 +32659,6 @@ function MailSendFinal($from,$from_name,$to,$to_name,$betreff,$text,$files="",$p
           $sendmail_error
       );
     }
-
     if($sysMailerSent === false) {
       $this->app->erp->LogFile("Mailer Error: " . $sendmail_error);
       $this->MailLogFile($from,$from_name,$to,$to_name,$betreff,$text,$files,$projekt,$signature,$cc,$bcc,$system);
@@ -32673,7 +32672,7 @@ function MailSendFinal($from,$from_name,$to,$to_name,$betreff,$text,$files="",$p
     }
     // schreiben in post ausgang
     $this->MailLogFile($from,$from_name,$to,$to_name,$betreff,$text,$files,$projekt,$signature,$cc,$bcc,$system);
-    $imap_aktiv = $this->app->DB->Select("SELECT imap_sentfolder_aktiv FROM emailbackup WHERE email='".$fromm."' AND imap_sentfolder!='' AND geloescht!=1 LIMIT 1");
+    $imap_aktiv = $this->app->DB->Select("SELECT imap_sentfolder_aktiv FROM emailbackup WHERE email='".$from."' AND imap_sentfolder!='' AND geloescht!=1 LIMIT 1");
     if($imap_aktiv=="1" && !preg_match("/Xentral Kopie/",$to_name) && !preg_match("/WaWision Kopie/",$to_name))
     {
       $imap_data = $this->app->DB->SelectRow("SELECT * FROM emailbackup WHERE email='".$from."' AND geloescht!=1 LIMIT 1");
@@ -32693,7 +32692,9 @@ function MailSendFinal($from,$from_name,$to,$to_name,$betreff,$text,$files="",$p
         $client = $clientProvider->createMailClientFromAccount($account);
         $client->connect();
         $client->appendMessage($imapCopyMessage, $account->getImapOutgoingFolder());
-      } catch (Exception $e) {}
+      } catch (Exception $e) {
+        $this->app->erp->LogFile("Mailer Error: " . (string)$e);
+      }
 
       $this->app->erp->LogFile("IMAP Ausgang FROM ".$from." S $server P $port T $type SP $server_path B ".$imap_data['benutzername']." SF ".$imap_data['imap_sentfolder']);
     }
diff --git a/www/pages/emailbackup.php b/www/pages/emailbackup.php
index 1d904b7f..fc4d1aa6 100644
--- a/www/pages/emailbackup.php
+++ b/www/pages/emailbackup.php
@@ -294,7 +294,7 @@ $width = array('10%'); // Fill out manually later
     }
     else {
       $msg = $this->app->erp->base64_url_encode(
-        '<div class="error">Die Testmail wurde nicht versendet: '.$this->app->erp->mail_error.'</div>'
+        '<div class="error">Fehler beim Versende der Testmail: '.$this->app->erp->mail_error.'</div>'
       );
     }
     $this->app->Location->execute("index.php?module=emailbackup&id=$id&action=edit&msg=$msg");
diff --git a/www/pages/firmendaten.php b/www/pages/firmendaten.php
index 42e0c28c..715007d0 100644
--- a/www/pages/firmendaten.php
+++ b/www/pages/firmendaten.php
@@ -480,7 +480,7 @@ class Firmendaten  {
     }
     else {
       $msg = $this->app->erp->base64_url_encode(
-        '<div class="error">Die Testmail wurde nicht versendet: '.$this->app->erp->mail_error.'</div>'
+        '<div class="error">Fehler beim Versenden der Testmail: '.$this->app->erp->mail_error.'</div>'
       );
     }
     $this->app->Location->execute("index.php?module=firmendaten&action=edit&msg=$msg#tabs-4");