s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-15 04:27:14 +01:00
Code Issues Projects Releases Wiki Activity

Bugfix in IMAP put mail into sentfolder

Browse Source
This commit is contained in:
Xenomporio 2022-07-17 20:28:51 +02:00
parent 02bf9af08e
commit 99bbbdca42
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/lib/class.erpapi.php
View File

@ -32659,7 +32659,6 @@ function MailSendFinal($from,$from_name,$to,$to_name,$betreff,$text,$files="",$p
$sendmail_error $sendmail_error
); );
} }
if($sysMailerSent === false) { if($sysMailerSent === false) {
$this->app->erp->LogFile("Mailer Error: " . $sendmail_error); $this->app->erp->LogFile("Mailer Error: " . $sendmail_error);
$this->MailLogFile($from,$from_name,$to,$to_name,$betreff,$text,$files,$projekt,$signature,$cc,$bcc,$system); $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 // schreiben in post ausgang
$this->MailLogFile($from,$from_name,$to,$to_name,$betreff,$text,$files,$projekt,$signature,$cc,$bcc,$system); $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)) 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"); $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 = $clientProvider->createMailClientFromAccount($account);
$client->connect(); $client->connect();
$client->appendMessage($imapCopyMessage, $account->getImapOutgoingFolder()); $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']); $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']);
} }

2
www/pages/emailbackup.php
View File

@ -294,7 +294,7 @@ $width = array('10%'); // Fill out manually later
} }
else { else {
$msg = $this->app->erp->base64_url_encode( $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"); $this->app->Location->execute("index.php?module=emailbackup&id=$id&action=edit&msg=$msg");

2
www/pages/firmendaten.php
View File

@ -480,7 +480,7 @@ class Firmendaten {
} }
else { else {
$msg = $this->app->erp->base64_url_encode( $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"); $this->app->Location->execute("index.php?module=firmendaten&action=edit&msg=$msg#tabs-4");