Remove obsolete options

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 918188fea693ead7a6b3511891dd8de66c5a23f7..30907a18a7c6494f4af58d87000f4e005bf5118f 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -794,13 +794,9 @@ physical:wcf.acp.option.google_maps_type.physical]]></selectoptions>
                                <selectoptions><![CDATA[php:wcf.acp.option.mail_send_method.php
 smtp:wcf.acp.option.mail_send_method.smtp
 debug:wcf.acp.option.mail_send_method.debug]]></selectoptions>
-                               <enableoptions><![CDATA[php:mail_use_f_param,!mail_debug_logfile_path,!mail_smtp_host,!mail_smtp_port,!mail_smtp_user,!mail_smtp_password
-smtp:!mail_debug_logfile_path,!mail_use_f_param,mail_smtp_host,mail_smtp_port,mail_smtp_user,mail_smtp_password
-debug:mail_debug_logfile_path,!mail_use_f_param,!mail_smtp_host,!mail_smtp_port,!mail_smtp_user,!mail_smtp_password]]></enableoptions>
-                       </option>
-                       <option name="mail_debug_logfile_path">
-                               <categoryname>general.mail.send</categoryname>
-                               <optiontype>text</optiontype>
+                               <enableoptions><![CDATA[php:mail_use_f_param,!mail_smtp_host,!mail_smtp_port,!mail_smtp_user,!mail_smtp_password
+smtp:!mail_use_f_param,mail_smtp_host,mail_smtp_port,mail_smtp_user,mail_smtp_password
+debug:!mail_use_f_param,!mail_smtp_host,!mail_smtp_port,!mail_smtp_user,!mail_smtp_password]]></enableoptions>
                        </option>
                        <option name="mail_smtp_host">
                                <categoryname>general.mail.send</categoryname>
@@ -825,10 +821,6 @@ debug:mail_debug_logfile_path,!mail_use_f_param,!mail_smtp_host,!mail_smtp_port,
                                <categoryname>general.mail.send</categoryname>
                                <optiontype>boolean</optiontype>
                        </option>
-                       <option name="mail_use_formatted_address">
-                               <categoryname>general.mail.send</categoryname>
-                               <optiontype>boolean</optiontype>
-                       </option>
                        <!-- /general.mail.send -->
                        
                        <!-- general.cache -->
@@ -1435,5 +1427,7 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
                <option name="cache_source_memcached_use_pconnect" />
                <option name="http_gzip_level" />
                <option name="enable_pluginstore_widget" />
+               <option name="mail_use_formatted_address" />
+               <option name="mail_debug_logfile_path" />
        </delete>
 </data>

diff --git a/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
index 960422c985ca8a2e83bd7f311aa1c16972043cab..6d04f9486abbe0025c326224248b287b754b2361 100644 (file)
--- a/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
@@ -19,6 +19,7 @@
                                {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
                        </small>
                {/if}
+               {* TODO: Add field for Human readable name for new mail system *}
                <small>{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
        </dd>
 </dl>

diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 60591766339558543406ffa4b9d37aa208735166..b570349333ed18759c851e967e3b11ce603ea364 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -108,6 +108,7 @@
                                                        {/if}
                                                </small>
                                        {/if}
+                                       {* TODO: Add field for Human readable name for new mail system *}
                                        <small>{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
                                </dd>
                        </dl>

diff --git a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
index 1cf87cf82023ba52d462e476c8063961c4a3610f..b659c2a831bdebf97c57837a08f814cff6c03592 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
@@ -174,12 +174,7 @@ class UserMailForm extends AbstractForm {
                                $this->userIDs = array_keys($users);
                        }
                        
-                       if (MAIL_USE_FORMATTED_ADDRESS) {
-                               $this->from = MAIL_FROM_NAME.' <'.MAIL_FROM_ADDRESS.'>';
-                       }
-                       else {
-                               $this->from = MAIL_FROM_ADDRESS;
-                       }
+                       $this->from = MAIL_FROM_ADDRESS;
                }
                
                if (!empty($this->userIDs)) {

diff --git a/wcfsetup/install/files/lib/system/email/transport/SmtpEmailTransport.class.php b/wcfsetup/install/files/lib/system/email/transport/SmtpEmailTransport.class.php
index d47da402a150f3d03b7015fababf086af62d33ea..9668b86525da9a6dc90ad9249907d097322d128f 100644 (file)
--- a/wcfsetup/install/files/lib/system/email/transport/SmtpEmailTransport.class.php
+++ b/wcfsetup/install/files/lib/system/email/transport/SmtpEmailTransport.class.php
@@ -82,6 +82,7 @@ class SmtpEmailTransport implements EmailTransport {
                $this->username = $username;
                $this->password = $password;
                
+               // TODO: Add option in ACP for STARTTLS
                switch ($starttls) {
                        case 'none':
                        case 'may':

diff --git a/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php b/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php
index 6cfaa6df5fb917ee1479e2262134be0ef18f4976..a74703110b7d761f3bec274036394de5c90042ab 100644 (file)
--- a/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php
+++ b/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php
@@ -28,14 +28,7 @@ class DebugMailSender extends MailSender {
         */
        public function sendMail(Mail $mail) {
                if ($this->log === null) {
-                       $logFilePath = '';
-                       if (MAIL_DEBUG_LOGFILE_PATH) {
-                               $logFilePath = FileUtil::addTrailingSlash(MAIL_DEBUG_LOGFILE_PATH);
-                       }
-                       else {
-                               $logFilePath = WCF_DIR . 'log/';
-                       }
-                       
+                       $logFilePath = WCF_DIR . 'log/';
                        $this->log = new File($logFilePath . 'mail.log', 'ab');
                }
                

diff --git a/wcfsetup/install/files/lib/system/mail/Mail.class.php b/wcfsetup/install/files/lib/system/mail/Mail.class.php
index d695a1c6f741e4ffe9459cd88df9c739a252143f..8a795d0c0914657b7b9bd3343ff11fe70abe197a 100644 (file)
--- a/wcfsetup/install/files/lib/system/mail/Mail.class.php
+++ b/wcfsetup/install/files/lib/system/mail/Mail.class.php
@@ -241,11 +241,6 @@ class Mail {
         * @return      string
         */
        public static function buildAddress($name, $email, $encodeName = true) {
-               if (!empty($name) && MAIL_USE_FORMATTED_ADDRESS) {
-                       if ($encodeName) $name = self::encodeMIMEHeader($name);
-                       if (!preg_match('/^[a-z0-9 ]*$/i', $name)) return '"'.str_replace('"', '\"', $name).'" <'.$email.'>';
-                       else return $name . ' <'.$email.'>';
-               }
                return $email;
        }
        

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index efe52883efda710816b9adb4c8f8cb231ec8ed5c..12ba5abf46de024dc937b867c70ac5408ab87ee0 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -774,7 +774,6 @@
                <item name="wcf.acp.option.log_ip_address.description"><![CDATA[Aktiviert die Speicherung von IP-Adressen der Benutzer in z.B. Sitzungen, Benutzerprofilen, Forenbeiträgen.]]></item>
                <item name="wcf.acp.option.mail_admin_address"><![CDATA[Administrator-Adresse]]></item>
                <item name="wcf.acp.option.mail_admin_address.description"><![CDATA[E-Mail-Adresse des Administrators]]></item>
-               <item name="wcf.acp.option.mail_debug_logfile_path"><![CDATA[Debug Logfile-Pfad]]></item>
                <item name="wcf.acp.option.mail_from_address"><![CDATA[Absender-Adresse]]></item>
                <item name="wcf.acp.option.mail_from_address.description"><![CDATA[Absender-Adresse für automatisch generierte E-Mails]]></item>
                <item name="wcf.acp.option.mail_from_name"><![CDATA[Absender-Name]]></item>
@@ -791,8 +790,6 @@
                <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_formatted_address"><![CDATA[Formatierte E-Mail-Adressen verwenden]]></item>
-               <item name="wcf.acp.option.mail_use_formatted_address.description"><![CDATA[Absender- und Empfänger-Adressen werden in folgendes Format gebracht: „Name &lt;email@example.com&gt;“. Diese Funktion wird nicht von allen Mailservern unterstützt und sollte daher bei Problemen abgeschaltet werden.]]></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>
@@ -1608,8 +1605,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.user.sendMail.all"><![CDATA[E-Mail an alle Benutzer senden]]></item>
                <item name="wcf.acp.user.sendMail.enableHTML"><![CDATA[E-Mail als HTML versenden]]></item>
                <item name="wcf.acp.user.sendMail.from"><![CDATA[Absender]]></item>
-               <item name="wcf.acp.user.sendMail.from.description"><![CDATA[Hier können Sie die E-Mail-Adresse des Absenders definieren.{if MAIL_USE_FORMATTED_ADDRESS} Es ist auch folgendes Format möglich:{/if}<br />
-{if MAIL_USE_FORMATTED_ADDRESS}<em>Absender Name &lt;email@example.com&gt;</em><br />{/if}
+               <item name="wcf.acp.user.sendMail.from.description"><![CDATA[Hier können Sie die E-Mail-Adresse des Absenders definieren.<br />
 Wenn Sie unter <em>System -&gt; Optionen -&gt; Allgemein -&gt; E-Mails</em> alles ausgefüllt haben, wird dieses Feld automatisch ausgefüllt. Sollten Sie E-Mails per SMTP senden, so achten Sie darauf, dass die E-Mail-Adresse des Absenders auch vom Server akzeptiert werden muss.]]></item>
                <item name="wcf.acp.user.sendMail.group"><![CDATA[E-Mail an Gruppenmitglieder senden]]></item>
                <item name="wcf.acp.user.sendMail.groups"><![CDATA[E-Mail an die Mitglieder folgender Benutzergruppen senden]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 5044b0bd43419448a5e0afb9b7d36f11a16abc92..7512e9f7824864015a78805da107502314d9b278 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -773,7 +773,6 @@ Examples for medium ID detection:
                <item name="wcf.acp.option.log_ip_address.description"><![CDATA[Stores IP addresses for user-generated content, e.g. sessions, profiles or forum posts.]]></item>
                <item name="wcf.acp.option.mail_admin_address"><![CDATA[Administrator]]></item>
                <item name="wcf.acp.option.mail_admin_address.description"><![CDATA[Administrator’s email address]]></item>
-               <item name="wcf.acp.option.mail_debug_logfile_path"><![CDATA[Debug Log Filename]]></item>
                <item name="wcf.acp.option.mail_from_address"><![CDATA[Sender Email]]></item>
                <item name="wcf.acp.option.mail_from_address.description"><![CDATA[Email used as a sender for all generated emails]]></item>
                <item name="wcf.acp.option.mail_from_name"><![CDATA[Sender Name]]></item>
@@ -790,8 +789,6 @@ Examples for medium ID detection:
                <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_formatted_address"><![CDATA[Use formatted email address]]></item>
-               <item name="wcf.acp.option.mail_use_formatted_address.description"><![CDATA[Sender and receiver addresses will be converted into “Name &lt;email@example.com&gt;”. This option is not supported by most mail-servers, try turning it off if you experience any issues.]]></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>
@@ -1607,8 +1604,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.user.sendMail.all"><![CDATA[Send email to all users]]></item>
                <item name="wcf.acp.user.sendMail.enableHTML"><![CDATA[Enable HTML for email]]></item>
                <item name="wcf.acp.user.sendMail.from"><![CDATA[Sender]]></item>
-               <item name="wcf.acp.user.sendMail.from.description"><![CDATA[Specify the sender’s email address.{if MAIL_USE_FORMATTED_ADDRESS} It is possible to use the following format:{/if}<br />
-{if MAIL_USE_FORMATTED_ADDRESS}<em>Sender Name &lt;email@example.com&gt;</em><br />{/if}
+               <item name="wcf.acp.user.sendMail.from.description"><![CDATA[Specify the sender’s email address.<br />
 You can define the default sender in <em>System -&gt; Options -&gt; General -&gt; Emails</em>. The sender’s email must be known to the server if using SMTP, otherwise it would be rejected.]]></item>
                <item name="wcf.acp.user.sendMail.group"><![CDATA[Email to user group]]></item>
                <item name="wcf.acp.user.sendMail.groups"><![CDATA[Send email to members of the following user groups]]></item>