Support “-f” if PhpEmailTransport is used

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 30907a18a7c6494f4af58d87000f4e005bf5118f..787078d03d31c2ec1cda7d3644c3735e23aa8f1e 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -820,6 +820,7 @@ debug:!mail_use_f_param,!mail_smtp_host,!mail_smtp_port,!mail_smtp_user,!mail_sm
                        <option name="mail_use_f_param">
                                <categoryname>general.mail.send</categoryname>
                                <optiontype>boolean</optiontype>
+                               <defaultvalue>1</defaultvalue>
                        </option>
                        <!-- /general.mail.send -->
                        

diff --git a/wcfsetup/install/files/lib/system/email/transport/PhpEmailTransport.class.php b/wcfsetup/install/files/lib/system/email/transport/PhpEmailTransport.class.php
index 6e538283deee9218f0507c84776f2fdacf97777a..6b032b282c1eeade4dab8dd838d13a93d8e4f88f 100644 (file)
--- a/wcfsetup/install/files/lib/system/email/transport/PhpEmailTransport.class.php
+++ b/wcfsetup/install/files/lib/system/email/transport/PhpEmailTransport.class.php
@@ -39,7 +39,6 @@ class PhpEmailTransport implements EmailTransport {
                        return implode(': ', $item);
                }, $headers));
                
-               // TODO: -f flag
-               mail($envelopeTo->getAddress(), $email->getSubject(), StringUtil::unifyNewlines($email->getBodyString()), $headers);
+               mail($envelopeTo->getAddress(), $email->getSubject(), StringUtil::unifyNewlines($email->getBodyString()), $headers, '-f'.$email->getSender()->getAddress());
        }
 }

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 12ba5abf46de024dc937b867c70ac5408ab87ee0..01debcf5cb3b25d5f1d1bcbd415740b95210d2c7 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -789,7 +789,7 @@
                <item name="wcf.acp.option.mail_smtp_port"><![CDATA[SMTP-Port]]></item>
                <item name="wcf.acp.option.mail_smtp_user"><![CDATA[SMTP-Benutzer]]></item>
                <item name="wcf.acp.option.mail_use_f_param"><![CDATA[„-f“ Parameter verwenden]]></item>
-               <item name="wcf.acp.option.mail_use_f_param.description"><![CDATA[Manche Server benötigen den „-f“ Parameter beim Versenden von E-Mails. Falls Sie Probleme mit dem Versand von E-Mails haben, aktivieren Sie diese Einstellung.]]></item>
+               <item name="wcf.acp.option.mail_use_f_param.description"><![CDATA[Der „-f“-Parameter sorgt bei der PHP-Versandmethode dafür, dass der korrekte Absender gesetzt wird. Diese Einstellung wird möglicherweise nicht von jedem Server unterstützt. Probieren Sie in diesem Falle die Option zu deaktivieren.]]></item>
                <item name="wcf.acp.option.meta_description"><![CDATA[Meta Description]]></item>
                <item name="wcf.acp.option.meta_keywords"><![CDATA[Meta Keywords]]></item>
                <item name="wcf.acp.option.module_master_password"><![CDATA[Hauptkennwort aktivieren]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 7512e9f7824864015a78805da107502314d9b278..60ee124791a70531ce744ada075c6766fb2f2d76 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -788,7 +788,7 @@ Examples for medium ID detection:
                <item name="wcf.acp.option.mail_smtp_port"><![CDATA[SMTP Port]]></item>
                <item name="wcf.acp.option.mail_smtp_user"><![CDATA[SMTP Username]]></item>
                <item name="wcf.acp.option.mail_use_f_param"><![CDATA[Use “-f” parameter]]></item>
-               <item name="wcf.acp.option.mail_use_f_param.description"><![CDATA[Some servers require the “-f” parameter to send emails. Enable this option if you have any trouble sending emails.]]></item>
+               <item name="wcf.acp.option.mail_use_f_param.description"><![CDATA[The “-f” parameter sets the proper sender of the email if the PHP send method is used. This parameter may not be supported by every server. Try disabling it, if you have trouble sending emails.]]></item>
                <item name="wcf.acp.option.meta_description"><![CDATA[Meta Description]]></item>
                <item name="wcf.acp.option.meta_keywords"><![CDATA[Meta Keywords]]></item>
                <item name="wcf.acp.option.module_master_password"><![CDATA[Enable master password]]></item>