From 5e57e571b37ecd49732eb6036dd6b237e999d1bc Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Sat, 24 Aug 2024 19:35:33 +0300 Subject: [PATCH] Fix the default notification email is set as non-replyable --- backup-config/config.info | 2 +- backup-config/config.info.ar | 2 +- backup-config/config.info.ca | 2 +- backup-config/config.info.cs | 2 +- backup-config/config.info.de | 2 +- backup-config/config.info.es | 2 +- backup-config/config.info.fr | 2 +- backup-config/config.info.hu | 2 +- backup-config/config.info.it | 2 +- backup-config/config.info.ja | 2 +- backup-config/config.info.ko | 2 +- backup-config/config.info.ms | 2 +- backup-config/config.info.nl | 2 +- backup-config/config.info.no | 2 +- backup-config/config.info.pl | 2 +- backup-config/config.info.ru | 2 +- backup-config/config.info.sk | 2 +- backup-config/config.info.tr | 2 +- cluster-shutdown/check.pl | 2 +- itsecur-firewall/config.info | 2 +- itsecur-firewall/config.info.de | 2 +- itsecur-firewall/itsecur-lib.pl | 2 +- itsecur-firewall/welf.cgi | 2 +- mailboxes/config.info | 2 +- mailboxes/config.info.ca | 2 +- mailboxes/config.info.cs | 2 +- mailboxes/config.info.de | 2 +- mailboxes/config.info.el | 2 +- mailboxes/config.info.fr | 2 +- mailboxes/config.info.it | 2 +- mailboxes/config.info.ja | 2 +- mailboxes/config.info.ko | 2 +- mailboxes/config.info.nl | 2 +- mailboxes/config.info.no | 2 +- mailboxes/mailboxes-lib.pl | 2 +- quota/list_groups.cgi | 2 +- quota/list_users.cgi | 2 +- webmin/edit_sendmail.cgi | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/backup-config/config.info b/backup-config/config.info index 139f180c2..a73b8a192 100644 --- a/backup-config/config.info +++ b/backup-config/config.info @@ -1,3 +1,3 @@ date_subs=Do strftime substitution of backup destinations?,1,1-Yes,0-No webmin_subs=Do Webmin variable substitution on backup destinations?,1,1-Yes,0-No -from_addr=From: address for email messages,3,webmin@hostname +from_addr=From: address for email messages,3,webmin-noreply@hostname diff --git a/backup-config/config.info.ar b/backup-config/config.info.ar index 1e75d4a36..68af4f561 100644 --- a/backup-config/config.info.ar +++ b/backup-config/config.info.ar @@ -1,3 +1,3 @@ date_subs=هل استبدال strftime على وجهات النسخ الاحتياطية؟,1,1-نعم,0-لا webmin_subs=هل استبدال متغير Webmin على وجهات النسخ الاحتياطي؟,1,1-نعم,0-لا -from_addr=من: عنوان رسائل البريد الإلكتروني,3,webmin@hostname +from_addr=من: عنوان رسائل البريد الإلكتروني,3,webmin-noreply@hostname diff --git a/backup-config/config.info.ca b/backup-config/config.info.ca index 710eccfb4..465132b24 100644 --- a/backup-config/config.info.ca +++ b/backup-config/config.info.ca @@ -1,3 +1,3 @@ date_subs=Fes la substitució strftime de les destinacions de còpia,1,1-Sí,0-No webmin_subs=Fes la substitució de les variables Webmin a les destinacions de còpia,1,1-Sí,0-No -from_addr=Adreça From: dels missatges de correu,3,webmin@hostname +from_addr=Adreça From: dels missatges de correu,3,webmin-noreply@hostname diff --git a/backup-config/config.info.cs b/backup-config/config.info.cs index ed2ff6e1d..eeb294815 100644 --- a/backup-config/config.info.cs +++ b/backup-config/config.info.cs @@ -1,2 +1,2 @@ date_subs=Provést strftime náhradu v cíli záloh?,1,1-Ano,0-Ne -from_addr=Adresa Od: pro e-mailové zprávy,3,webmin@hostname +from_addr=Adresa Od: pro e-mailové zprávy,3,webmin-noreply@hostname diff --git a/backup-config/config.info.de b/backup-config/config.info.de index 16bf54f04..eeb22404f 100644 --- a/backup-config/config.info.de +++ b/backup-config/config.info.de @@ -1,3 +1,3 @@ date_subs=strftime der Backupziele?,1,1-Ja,0-Nein webmin_subs=Webmin Variablensubstitution auf Backupziele?,1,1-Ja,0-Nein -from_addr=Absender-E-Mail-Adresse für E-Mails,3,webmin@hostname +from_addr=Absender-E-Mail-Adresse für E-Mails,3,webmin-noreply@hostname diff --git a/backup-config/config.info.es b/backup-config/config.info.es index 2a28a1eda..38e396948 100644 --- a/backup-config/config.info.es +++ b/backup-config/config.info.es @@ -1,2 +1,2 @@ date_subs=¿Realizar sustitución strftime en los destinos de copia de seguridad?,1,1-Sí,0-No -from_addr=De: dirección para los mensajes de correo,3,webmin@hostname +from_addr=De: dirección para los mensajes de correo,3,webmin-noreply@hostname diff --git a/backup-config/config.info.fr b/backup-config/config.info.fr index 33bf76b7e..c1863fb2d 100644 --- a/backup-config/config.info.fr +++ b/backup-config/config.info.fr @@ -1,2 +1,2 @@ date_subs=Effectuer une substitution strftime des destinations des sauvegardes?,1,1-Oui,0-Non -from_addr=Champ From: des messages électroniques,3,webmin@nom_hote +from_addr=Champ From: des messages électroniques,3,webmin-noreply@nom_hote diff --git a/backup-config/config.info.hu b/backup-config/config.info.hu index b688900c2..e920ecf93 100644 --- a/backup-config/config.info.hu +++ b/backup-config/config.info.hu @@ -1,2 +1,2 @@ date_subs=Csináljak strftime cserét a másolat célkönyvtárában?,1,1-Igen,0-Nem -from_addr=Indító: az email üzenetek indító címe,3,webmin@hostname +from_addr=Indító: az email üzenetek indító címe,3,webmin-noreply@hostname diff --git a/backup-config/config.info.it b/backup-config/config.info.it index 98849b473..cfc60b7f8 100644 --- a/backup-config/config.info.it +++ b/backup-config/config.info.it @@ -1,2 +1,2 @@ date_subs=Effettuare le sostituzioni nei nomi dei file di destinazione dei backup utilizzando strftime?,1,1-Si,0-No -from_addr=Indirizzo del mittente per i messaggi email,3,webmin@hostname +from_addr=Indirizzo del mittente per i messaggi email,3,webmin-noreply@hostname diff --git a/backup-config/config.info.ja b/backup-config/config.info.ja index b61575182..bdc489464 100644 --- a/backup-config/config.info.ja +++ b/backup-config/config.info.ja @@ -1,2 +1,2 @@ date_subs=バックアップ先にstrftime置換を行いますか?,1,1-はい,0-いいえ -from_addr=電子メールメッセージの From: アドレス,3,webmin@hostname +from_addr=電子メールメッセージの From: アドレス,3,webmin-noreply@hostname diff --git a/backup-config/config.info.ko b/backup-config/config.info.ko index 2511685f2..5d99a5593 100644 --- a/backup-config/config.info.ko +++ b/backup-config/config.info.ko @@ -1,2 +1,2 @@ date_subs=백업 결과물의 strftime 을 변경 하겠습니까?,1,1-예,0-아니오 -from_addr=메일 메세지를 위한 From: 주소,3,webmin@hostname +from_addr=메일 메세지를 위한 From: 주소,3,webmin-noreply@hostname diff --git a/backup-config/config.info.ms b/backup-config/config.info.ms index faa88992c..d60e29f03 100644 --- a/backup-config/config.info.ms +++ b/backup-config/config.info.ms @@ -1,3 +1,3 @@ date_subs=Guna penggantian strftime pada destinasi backup?,1,1-Ya,0-Tidak webmin_subs=Guna penggantian pembolehubah Webmin pada destinasi backup?,1,1-Ya,0-Tidak -from_addr=From: alamat untuk mesej emel,3,webmin@hostname +from_addr=From: alamat untuk mesej emel,3,webmin-noreply@hostname diff --git a/backup-config/config.info.nl b/backup-config/config.info.nl index 8331aad8c..02578e832 100644 --- a/backup-config/config.info.nl +++ b/backup-config/config.info.nl @@ -1,3 +1,3 @@ date_subs=Doe strftime toevoegingen van de backup bestemming?,1,1-Ja,0-Nee webmin_subs=Webmin variabele vervanging uitvoeren op backup bestemmingen?,1,1-Ja,0-Nee -from_addr=Van: adres voor email berichten,3,webmin@hostname +from_addr=Van: adres voor email berichten,3,webmin-noreply@hostname diff --git a/backup-config/config.info.no b/backup-config/config.info.no index 106d81e94..37ba1c33d 100644 --- a/backup-config/config.info.no +++ b/backup-config/config.info.no @@ -1,3 +1,3 @@ date_subs=Utfør strftime erstatning på målfiler for sikkerhetskopi?,1,1-Ja,0-Nei webmin_subs=Utfør Webmin variabel-erstatning på sikkerhetskopi-destinasjoner,1,1-Ja,0-Nei -from_addr=Fra: adresse for e-post meldinger,3,webmin@vertsnavn +from_addr=Fra: adresse for e-post meldinger,3,webmin-noreply@vertsnavn diff --git a/backup-config/config.info.pl b/backup-config/config.info.pl index d1ef8e260..4ceaa6e98 100644 --- a/backup-config/config.info.pl +++ b/backup-config/config.info.pl @@ -1,3 +1,3 @@ date_subs=Wykonać zastępowanie strftime miejsc docelowych kopii zapasowej?,1,1-Tak,0-Nie webmin_subs=Uczynić zmienną Webmina jako miejsce docelowe kopii zapasowych?,1,1-Tak,0-Nie -from_addr=Od: adres dla wiadomości email,3,webmin@hostname +from_addr=Od: adres dla wiadomości email,3,webmin-noreply@hostname diff --git a/backup-config/config.info.ru b/backup-config/config.info.ru index 78279c8b1..c24a297db 100644 --- a/backup-config/config.info.ru +++ b/backup-config/config.info.ru @@ -1,2 +1,2 @@ date_subs=Использовать подстановку strftime при указании расположения резервной копии?,1,1-Да,0-Нет -from_addr=Адрес указываемый в поле "От:" отправляемых писем,3,webmin@hostname +from_addr=Адрес указываемый в поле "От:" отправляемых писем,3,webmin-noreply@hostname diff --git a/backup-config/config.info.sk b/backup-config/config.info.sk index d2797d340..827a8f53a 100644 --- a/backup-config/config.info.sk +++ b/backup-config/config.info.sk @@ -1,2 +1,2 @@ date_subs=Robiť strftime náhradu cieľa zálohovania?,1,1-Áno,0-Nie -from_addr=Od: adresa e-mailových správ,3,webmin@hostname +from_addr=Od: adresa e-mailových správ,3,webmin-noreply@hostname diff --git a/backup-config/config.info.tr b/backup-config/config.info.tr index 66f53a1ea..a509d20fc 100644 --- a/backup-config/config.info.tr +++ b/backup-config/config.info.tr @@ -1,2 +1,2 @@ date_subs=Yedekleme yerleri için strftime gösterimi kullanılsın mı?,1,1-Evet,0-Hayır -from_addr=E-posta mesajları için Gönderici: adresi,3,webmin@makineadı +from_addr=E-posta mesajları için Gönderici: adresi,3,webmin-noreply@makineadı diff --git a/cluster-shutdown/check.pl b/cluster-shutdown/check.pl index 941d284e6..70d9c8a6b 100755 --- a/cluster-shutdown/check.pl +++ b/cluster-shutdown/check.pl @@ -15,7 +15,7 @@ foreach $s (@servers) { if (!$up{$s} && $oldstatus{$s->{'id'}}) { # Just went down .. send email local $mail = - { 'headers' => [ [ 'From', 'webmin@'.&get_system_hostname() ], + { 'headers' => [ [ 'From', 'webmin-noreply@'.&get_system_hostname() ], [ 'To', $config{'email'} ], [ 'Subject', "System $s->{'host'} is down" ], ], diff --git a/itsecur-firewall/config.info b/itsecur-firewall/config.info index bf3aac6b9..a2def1b46 100644 --- a/itsecur-firewall/config.info +++ b/itsecur-firewall/config.info @@ -7,7 +7,7 @@ show_desc=Show rule descriptions?,1,1-Yes,0-No perpage=Logs to show per page,0,5 refresh=Seconds between log view refreshes,3,Never all_files=Include rotated versions of log file,1,1-Yes,0-No -from=From: address for emails,3,Automatic (webmin@hostname) +from=From: address for emails,3,Automatic (webmin-noreply@hostname) open_log=Open logs in new window?,1,1-Yes,0-No line2=System configuration,11 type=Firewall type,1,iptables-IPtables,ipf-IPF diff --git a/itsecur-firewall/config.info.de b/itsecur-firewall/config.info.de index 4c59640a5..b449a57cf 100644 --- a/itsecur-firewall/config.info.de +++ b/itsecur-firewall/config.info.de @@ -7,7 +7,7 @@ show_desc=Zeige Regel Beschreibungen,1,1-Ja,0-Nein perpage=Anzahl Logs pro Seite,0,5 refresh=Sekunden zwischen Aktualisierung der Log-Ansicht,3,Niemals all_files=Rotierende Versionen von Log-Datei,1,1-Ja,0-Nein -from=Von: Adresse für E-Mails,3,Automatisch (webmin@hostname) +from=Von: Adresse für E-Mails,3,Automatisch (webmin-noreply@hostname) open_log=Öffnet Logs im neuen Fenster?,1,1-Ja,0-Nein line2=Systemkonfiguration,11 type=Firewalltyp,1,iptables-IPtables,ipf-IPF diff --git a/itsecur-firewall/itsecur-lib.pl b/itsecur-firewall/itsecur-lib.pl index 8f5bded5b..622aadb13 100644 --- a/itsecur-firewall/itsecur-lib.pl +++ b/itsecur-firewall/itsecur-lib.pl @@ -974,7 +974,7 @@ elsif ($mode == 3) { $host = &get_system_hostname(); $body = "The backup of the firewall configuration on $host is attached to this email.\n"; local $mail = { 'headers' => - [ [ 'From', $config{'from'} || "webmin\@$host" ], + [ [ 'From', $config{'from'} || "webmin-noreply\@$host" ], [ 'To', $dest[0] ], [ 'Subject', "Firewall backup" ] ], 'attach' => diff --git a/itsecur-firewall/welf.cgi b/itsecur-firewall/welf.cgi index e39455f75..c2b924d93 100755 --- a/itsecur-firewall/welf.cgi +++ b/itsecur-firewall/welf.cgi @@ -103,7 +103,7 @@ elsif ($mode == 3) { $host = &get_system_hostname(); $body = "Firewall logs in WELF format from $host are attached to this email.\n"; local $mail = { 'headers' => - [ [ 'From', $config{'from'} || "webmin\@$host" ], + [ [ 'From', $config{'from'} || "webmin-noreply\@$host" ], [ 'To', $dest[0] ], [ 'Subject', "Firewall logs" ] ], 'attach' => diff --git a/mailboxes/config.info b/mailboxes/config.info index faa92bec4..ccc4af40a 100644 --- a/mailboxes/config.info +++ b/mailboxes/config.info @@ -50,7 +50,7 @@ spam_report=Report spam using,1,sa_learn-sa-learn --spam,spamassass line3.5=From address options,11 from_addr=From: address to use when sending email manually,3,From mailbox username -webmin_from=From: address to use when Webmin sends email,3,Default (webmin@yourhost) +webmin_from=From: address to use when Webmin sends email,3,Default (webmin-noreply@yourhost) from_virtualmin=Get From: address from Virtualmin?,1,1-Yes,0-No from_dom=Domain to use in From: address,3,System hostname no_orig_ip=Include browser IP in X-Originating-IP header?,1,0-Yes,1-No diff --git a/mailboxes/config.info.ca b/mailboxes/config.info.ca index 27bd7a8da..9f86f3288 100644 --- a/mailboxes/config.info.ca +++ b/mailboxes/config.info.ca @@ -44,7 +44,7 @@ spam_del=Suprimeix el spam en fer l'informe,1,1-Sí,0-No spam_report=Informa del spam utilitzant,1,sa_learn-sa-learn --spam,spamassassin-spamassasin -r,-Decideix-ho automàticament line3.5=Opcions de les adreces From:,11 from_addr=Adreça From: a utilitzar quan s'envia correu manualment,3,Del nom d'usuari de la bústia -webmin_from=Adreça From: a utilitzar quan el Webmin envia correu,3,per defecte (webmin@elteuhost) +webmin_from=Adreça From: a utilitzar quan el Webmin envia correu,3,per defecte (webmin-noreply@elteuhost) from_virtualmin=Obtingues l'adreça From: de Virtualmin,1,1-Sí,0-No from_dom=Domini a utilitzar a les adreces From:,3,Nom de host del sistema no_orig_ip=Inclou la IP del navegador a la capçalera X-Originating-IP,1,0-Sí,1-No diff --git a/mailboxes/config.info.cs b/mailboxes/config.info.cs index 9921db458..7291b13b0 100644 --- a/mailboxes/config.info.cs +++ b/mailboxes/config.info.cs @@ -39,7 +39,7 @@ spam_del=Smazat spam při oznámení?,1,1-Ano,0-Ne spam_report=Oznámit spam použitím,1,sa_learn-sa-learn --spam,spamassassin-spamassasin -r,-Rozhodnout automaticky line3.5=Volby pro Od: adresu,11 from_addr=Od: adresa užívaná pro ruční odeslání zprávy,3,Jméno uživatele poštovní schránky -webmin_from=Použitá Od: adresa v momentě, kdy odesílá mail Webmin,3,Výchozí (webmin@vášhost) +webmin_from=Použitá Od: adresa v momentě, kdy odesílá mail Webmin,3,Výchozí (webmin-noreply@vášhost) from_virtualmin=Získat Od: adresu z Virtualminu?,1,1-Ano,0-Ne from_dom=Doména užívaná v Od: adrese,3,Hostname systému line1=Systémová konfigurace,11 diff --git a/mailboxes/config.info.de b/mailboxes/config.info.de index 7b4544ea2..8a464cf30 100644 --- a/mailboxes/config.info.de +++ b/mailboxes/config.info.de @@ -44,7 +44,7 @@ spam_del=Lösche Spam nach dem Report?,1,1-Ja,0-Nein spam_report=Spam-Report-Methode,1,sa_learn-sa-learn --spam,spamassassin-spamassassin -r,-Entscheide Automatisch line3.5=Absenderadress-Optionen,11 from_addr=From:-E-Mail-Adresse, die für das Versenden manuell verschickter E-Mails benutzt werden soll,3,Aus dem E-Mailbox-Benutzernamen generieren -webmin_from=Wenn Webmin E-Mails versendet benutze diese "From"-E-Mail-Adresse,3,Standard (webmin@yourhost) +webmin_from=Wenn Webmin E-Mails versendet benutze diese "From"-E-Mail-Adresse,3,Standard (webmin-noreply@yourhost) from_virtualmin=Absenderadresse aus Virtualmin beziehen?,1,1-Ja,0-Nein from_dom=Domaine, die für die From:-E-Mail-Adresse genutzt werden soll,3,System-Hostname no_orig_ip=Fügen Browser IP in X-Originating-IP-Header ein?,1,0-Ja,1-Nein diff --git a/mailboxes/config.info.el b/mailboxes/config.info.el index e760a5454..c8ce1c138 100644 --- a/mailboxes/config.info.el +++ b/mailboxes/config.info.el @@ -38,7 +38,7 @@ spam_del=Διαγραφή spam κατά την σημείωση;,1,1-Ναι,0-Ό spam_report=Σημείωση ως spam με χρήση,1,sa_learn-sa-learn --spam,spamassassin-spamassasin -r,-Να αποφασίζεται αυτόματα line3.5=Επιλογές διεύθυνσης Από,11 from_addr=Διεύθυνση Από: που θα χρησιμοποιείται όταν αποστέλλεται email χειρωκίνητα,3,Από το όνομα χρήστη γραμματοθυρίδας -webmin_from=Διεύθυνση Από: που θα χρησιμοποιείται όταν αποστέλλεται email από το Webmin,3,Προκαθορισμένη (webmin@yourhost) +webmin_from=Διεύθυνση Από: που θα χρησιμοποιείται όταν αποστέλλεται email από το Webmin,3,Προκαθορισμένη (webmin-noreply@yourhost) from_virtualmin=Λήψη διέυθυνσης Από: από το Virtualmin?,1,1-Ναι,0-Όχι from_dom=Domain που θα χρησιμοποιείται στην διεύθυνση Από:,3,hostname συστήματος line1=Ρύθμιση συστήματος,11 diff --git a/mailboxes/config.info.fr b/mailboxes/config.info.fr index 8bad3d08a..093309e90 100644 --- a/mailboxes/config.info.fr +++ b/mailboxes/config.info.fr @@ -48,7 +48,7 @@ spam_report=Signaler le spam en utilisant,1,sa_learn-sa-learn --spam,spamass line3.5=À partir des options d'adresse,11 from_addr=De: adresse à utiliser lors de l'envoi manuel d'un e-mail,3,À partir du nom d'utilisateur de la boîte aux lettres -webmin_from=De: adresse à utiliser lorsque Webmin envoie un e-mail,3,Défaut (webmin@yourhost) +webmin_from=De: adresse à utiliser lorsque Webmin envoie un e-mail,3,Défaut (webmin-noreply@yourhost) from_virtualmin=Obtenir de: adresse de Virtualmin?,1,1-Oui,0-Non from_dom=Domaine à utiliser dans De: adresse,3,Nom d'hôte du système no_orig_ip=Inclure l'adresse IP du navigateur dans l'en-tête X-Originating-IP?,1,0-Oui,1-Non diff --git a/mailboxes/config.info.it b/mailboxes/config.info.it index cef1031fd..722ec6b4e 100644 --- a/mailboxes/config.info.it +++ b/mailboxes/config.info.it @@ -43,7 +43,7 @@ spam_del=Cancellare lo spam dopo la segnalazione?,1,1-Si,0-No spam_report=Segnala lo spam usando,1,sa_learn-sa-learn --spam,spamassassin-spamassasin -r,-Decidi automaticamente line3.5=Opzioni per l'indirizzo del mittente,11 from_addr=Indirizzo del mittente da utilizzare in caso di invio manuale di un messaggio,3,Usa quello della casella utente -webmin_from=Indirizzo da utilizzare quando Webmin invia dei messaggi di posta,3,Predefinito (webmin@tuonomehost) +webmin_from=Indirizzo da utilizzare quando Webmin invia dei messaggi di posta,3,Predefinito (webmin-noreply@tuonomehost) from_virtualmin=Utilizzare come indirizzo del mittente quello di Virtualmin?,1,1-Si,0-No from_dom=Dominio da utilizzare nell'indirizzo del mittente,3,Nome host del sistema no_orig_ip=Includere l' indirizzo IP nell' intestazione X-Originating?,1,0-Si,1-No diff --git a/mailboxes/config.info.ja b/mailboxes/config.info.ja index 2396c8c81..8f8d83a22 100644 --- a/mailboxes/config.info.ja +++ b/mailboxes/config.info.ja @@ -39,7 +39,7 @@ spam_del=Spam報告をしたら削除しますか?,1,1-はい,0-いいえ spam_report=Spam報告に以下を使う,1,sa_learn-sa-learn --spam,spamassassin-spamassasin -r,-自動的に決定 line3.5=From アドレス設定,11 from_addr=手動でメールを送信する際に使うFrom:アドレス,3,メールボックスのユーザ名から -webmin_from=Webminがメールを送信する際に使うFrom:アドレス,3,デフォルト (webmin@yourhost) +webmin_from=Webminがメールを送信する際に使うFrom:アドレス,3,デフォルト (webmin-noreply@yourhost) from_virtualmin=VirtualminからFrom:アドレスを使いますか?,1,1-はい,0-いいえ from_dom=From: アドレスに使うドメイン,3,システムのホスト名 line1=システム設定,11 diff --git a/mailboxes/config.info.ko b/mailboxes/config.info.ko index bf2ea4657..8c9e73ac3 100644 --- a/mailboxes/config.info.ko +++ b/mailboxes/config.info.ko @@ -39,7 +39,7 @@ spam_del=보고시에 스팸을 삭제하겠습니까?,1,1-예,0-아니오 spam_report=스팸 보고,1,sa_learn-sa-learn --spam,spamassassin-spamassasin -r,-자동으로 결정 line3.5=From 주소 옵션,11 from_addr=수동으로 메일을 전송할 때 사용할 From: 주소,3,mailbox 유저 이름 -webmin_from=Webmin 이 메일일 발송할 때 사용할 From: 주소,3,기본 (webmin@yourhost) +webmin_from=Webmin 이 메일일 발송할 때 사용할 From: 주소,3,기본 (webmin-noreply@yourhost) from_virtualmin=Virtualmin 에서 From: 주소를 가져오겠습니까?,1,1-예,0-아니오 from_dom=From: 주소에 사용할 도메인,3,시스템 호스트이름 line1=시스템 설정,11 diff --git a/mailboxes/config.info.nl b/mailboxes/config.info.nl index fa32db570..73ea42d7b 100644 --- a/mailboxes/config.info.nl +++ b/mailboxes/config.info.nl @@ -44,7 +44,7 @@ spam_del=Verwijder spam na rapportage?,1,1-Ja,0-Nee spam_report=Rapporteer spam met gebruik van,1,sa_learn-sa-learn --spam,spamassassin-spamassasin -r,-Beslis automatisch line3.5=Van adres opties,11 from_addr=Van: adres die word gebruikt indien email handmatig word verzonden,3,Van mailbox gebruikersnaam -webmin_from=Van: adres om te gebruiken wanneer Webmin email verstuurt,3,Standaard (webmin@jouwhost) +webmin_from=Van: adres om te gebruiken wanneer Webmin email verstuurt,3,Standaard (webmin-noreply@jouwhost) from_virtualmin=Adres verkrijgen van Virtualmin?,1,1-Ja,0-Nee from_dom=Domein om te gebruiken van: adres,3,Systeem hostnaam no_orig_ip=Browser IP toevoegen in X-Originating-IP koptekst?,1,0-Ja,1-Nee diff --git a/mailboxes/config.info.no b/mailboxes/config.info.no index 3fb5be97f..32184cf6a 100644 --- a/mailboxes/config.info.no +++ b/mailboxes/config.info.no @@ -44,7 +44,7 @@ spam_del=Slett søppelpost ved rapportering?,1,1-Ja,0-Nei spam_report=Rapporter søppelpost vha.,1,sa_learn-sa-learn --spam,spamassassin-spamassasin -r,-Bestem automatisk line3.5=Fra adresse innstillinger,11 from_addr=Fra: adresse som brukes ved manuell sending av e-post,3,Fra postboksens brukernavn -webmin_from=Fra : adresse å bruke når Webmin sender e-post,3,Standard (webmin@dinvert) +webmin_from=Fra : adresse å bruke når Webmin sender e-post,3,Standard (webmin-noreply@dinvert) from_virtualmin=Hent Fra: adresse fra Virtualmin?,1,1-Ja,0-Nei from_dom=Domene som skal brukes i Fra: adresse,3,Systemets vertsnavn no_orig_ip=Ta med nettlesers IP i X-Originatin-IP header?,1,0-Ja,1-Nei diff --git a/mailboxes/mailboxes-lib.pl b/mailboxes/mailboxes-lib.pl index 00f560ec4..ef8331df4 100755 --- a/mailboxes/mailboxes-lib.pl +++ b/mailboxes/mailboxes-lib.pl @@ -605,7 +605,7 @@ if ($config{'webmin_from'} =~ /\@/) { return $config{'webmin_from'}; } elsif (!$config{'webmin_from'}) { - return "webmin\@$host"; + return "webmin-noreply\@$host"; } else { return "$config{'webmin_from'}\@$host"; diff --git a/quota/list_groups.cgi b/quota/list_groups.cgi index f979f5c81..bd51b8d3c 100755 --- a/quota/list_groups.cgi +++ b/quota/list_groups.cgi @@ -293,7 +293,7 @@ if ($access{'email'} && &foreign_check("cron") && print &ui_table_row($text{'lusers_from'}, &ui_textbox("from", $config{"gemail_from_$f"} || - 'webmin@'.&get_system_hostname(), 30)); + 'webmin-noreply@'.&get_system_hostname(), 30)); print &ui_table_row($text{'lusers_cc'}, &ui_opt_textbox("cc", $config{"gemail_cc_$f"}, 30, diff --git a/quota/list_users.cgi b/quota/list_users.cgi index 67397e44a..c859313ff 100755 --- a/quota/list_users.cgi +++ b/quota/list_users.cgi @@ -293,7 +293,7 @@ if ($access{'email'} && &foreign_check("cron") && print &ui_table_row($text{'lusers_from'}, &ui_textbox("from", $config{"email_from_$f"} || - 'webmin@'.&get_system_hostname(), 30)); + 'webmin-noreply@'.&get_system_hostname(), 30)); print &ui_table_row($text{'lusers_cc'}, &ui_opt_textbox("cc", $config{"email_cc_$f"}, 30, diff --git a/webmin/edit_sendmail.cgi b/webmin/edit_sendmail.cgi index 845368985..16ecc840a 100755 --- a/webmin/edit_sendmail.cgi +++ b/webmin/edit_sendmail.cgi @@ -61,7 +61,7 @@ print &ui_table_row($text{'sendmail_auth'}, # From address $from = $mconfig{'webmin_from'}; -$fromdef = "webmin\@".&mailboxes::get_from_domain(); +$fromdef = "webmin-noreply\@".&mailboxes::get_from_domain(); print &ui_table_row($text{'sendmail_from'}, &ui_opt_textbox("from", $from, 40, &text('sendmail_fromdef', $fromdef)."
",