diff --git a/classes/Modules/SystemMailer/SystemMailer.php b/classes/Modules/SystemMailer/SystemMailer.php index d981c8e3..566c835d 100644 --- a/classes/Modules/SystemMailer/SystemMailer.php +++ b/classes/Modules/SystemMailer/SystemMailer.php @@ -139,6 +139,7 @@ final class SystemMailer && $account->getSmtpAuthType() !== EmailBackupAccount::AUTH_GMAIL ) ) { + $mailerror_text = 'Authtype error.'; return false; } diff --git a/www/lib/class.erpapi.php b/www/lib/class.erpapi.php index 07cc8e00..ac3ff03e 100644 --- a/www/lib/class.erpapi.php +++ b/www/lib/class.erpapi.php @@ -29734,7 +29734,7 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert, function GetSelectEmailMitName($selected="") { - $own = $this->app->User->GetEmail(); + /* $own = $this->app->User->GetEmail(); $name = $this->app->User->GetName(); $selected = str_replace(' <',' <',$selected); @@ -29769,9 +29769,14 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert, } $email_addr = $this->app->DB->SelectArr("SELECT if(smtp_frommail!='',smtp_frommail,email) as email,smtp_fromname FROM emailbackup WHERE (smtp_frommail!='' OR email!='') AND (adresse<=0 OR adresse='".$this->app->User->GetAdresse()."') AND geloescht!=1 ORDER BY email"); +*/ +// Force only existing emailbackup accounts + + $email_addr = $this->app->DB->SelectArr("SELECT email, angezeigtername FROM emailbackup WHERE email != '' AND (adresse<=0 OR adresse='".$this->app->User->GetAdresse()."') AND geloescht!=1 ORDER BY email"); + foreach($email_addr AS $mail) { - if($mail['smtp_fromname']!="") $emails[] = $mail['smtp_fromname']." <".$mail['email'].">"; + if($mail['angezeigtername']!="") $emails[] = $mail['angezeigtername']." <".$mail['email'].">"; else $emails[] = $firmenname." <".$mail['email'].">"; } @@ -29789,6 +29794,7 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert, function GetSelectEmail($selected="") { +/* $own = $this->app->User->GetEmail(); $email_addr= $this->Firmendaten("email"); @@ -29804,16 +29810,28 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert, $emails[] = $email_addr; $email_addr = $this->app->DB->SelectArr("SELECT if(smtp_frommail!='',smtp_frommail,email) as email FROM emailbackup WHERE (smtp_frommail!='' OR email!='') AND (adresse<=0 OR adresse='".$this->app->User->GetAdresse()."') AND geloescht!=1 ORDER BY email"); - foreach($email_addr AS $mail) +*/ +// Force only existing emailbackup accounts + + $email_addr = $this->app->DB->SelectArr("SELECT email FROM emailbackup WHERE email != '' AND (adresse<=0 OR adresse='".$this->app->User->GetAdresse()."') AND geloescht!=1 ORDER BY email"); + + foreach($email_addr AS $mail) { $emails[] = $mail['email']; + } $emails = array_keys(array_flip($emails)); for($i=0;$i<(!empty($emails)?count($emails):0);$i++) { - if($emails[$i]==$selected) $mark="selected"; else $mark=""; + if($emails[$i]==$selected) { + $mark="selected"; + } + else { + $mark=""; + } $tpl .=""; } + return $tpl; } diff --git a/www/pages/content/firmendaten.tpl b/www/pages/content/firmendaten.tpl index eedeefe5..5c49e1a8 100644 --- a/www/pages/content/firmendaten.tpl +++ b/www/pages/content/firmendaten.tpl @@ -99,13 +99,6 @@ document.forms[0].elements['footer[3][4]'].value = ""; document.forms[0].elements['footer[3][5]'].value = ""; - - document.forms[0].benutzername.value = "musterman"; - document.forms[0].passwort.value = "passwort"; - document.forms[0].host.value = "smtp.server.de"; - document.forms[0].port.value = "25"; - document.forms[0].ssl.checked = true; - document.forms[0].email.value = "info@server.de"; document.forms[0].absendername.value = "Meine Firma"; document.forms[0].signatur.value = "--\n" @@ -663,19 +656,11 @@
-
- {|Versand Einstellungen|} +
+ Standard Einstellung E-Mail (bei Versand von E-Mails) - - - - - - - - - +
Benutzername (E-Mail): 
Passwort: 
Postausgangsserver: 
Port: 
Verschlüsselung:
Testmail Empfänger: 
Testmail:  Bitte erst speichern und dann senden!
PHP mail() verwenden (nur in Ausnahme!):
Keine SMTP Authentifizierung:
Testmail: Bitte erst speichern und dann senden!
@@ -690,7 +675,9 @@
Standard Einstellung E-Mail (bei Versand von E-Mails) - + diff --git a/www/pages/firmendaten.php b/www/pages/firmendaten.php index 5123158e..3217ea40 100644 --- a/www/pages/firmendaten.php +++ b/www/pages/firmendaten.php @@ -1711,19 +1711,11 @@ class Firmendaten { $this->app->Tpl->Set('HINTERGRUNDBRIEFPAPIER2TEXT', "PDF herunterladen"); } - //Versand E-Mail - $this->app->Tpl->Set('BENUTZERNAME' , $data[0]['benutzername']); - $this->app->Tpl->Set('PASSWORT' , $data[0]['passwort']); - $this->app->Tpl->Set('HOST' , $data[0]['host']); - $this->app->Tpl->Set('PORT' , $data[0]['port']); - if($data[0]['mailssl']=="2") - $this->app->Tpl->Set('SSL' , "selected"); - else if($data[0]['mailssl']=="1") - $this->app->Tpl->Set('TLS' , "selected"); - // Signatur $this->app->Tpl->Set('SIGNATUR' , base64_decode($data[0]['signatur'])); - $this->app->Tpl->Set('EMAIL' , $data[0]['email']); + + $this->app->Tpl->Set('EMAIL', $this->app->erp->GetSelectEmail($data[0]['email'])); + $this->app->Tpl->Set('ABSENDERNAME' , $data[0]['absendername']); $this->app->Tpl->Set('BCC1' , $data[0]['bcc1']); $this->app->Tpl->Set('BCC2' , $data[0]['bcc2']);
E-Mailadresse:
E-Mailadresse:
Name des Absenders:
Standardsignatur:
Standard Grußformel: Variable Absendername {MITARBEITER}