From b694faf3bfa8a7be7eafcc21568728785ec24c4e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Fri, 19 Jun 2015 18:54:41 +0200
Subject: [PATCH] Remove obsolete options

---
 com.woltlab.wcf/option.xml                       | 16 +++++-----------
 .../acp/templates/sendMailUserBulkProcessing.tpl |  1 +
 .../install/files/acp/templates/userMail.tpl     |  1 +
 .../files/lib/acp/form/UserMailForm.class.php    |  7 +------
 .../email/transport/SmtpEmailTransport.class.php |  1 +
 .../lib/system/mail/DebugMailSender.class.php    |  9 +--------
 .../install/files/lib/system/mail/Mail.class.php |  5 -----
 wcfsetup/install/lang/de.xml                     |  6 +-----
 wcfsetup/install/lang/en.xml                     |  6 +-----
 9 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 918188fea6..30907a18a7 100644
--- 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 960422c985..6d04f9486a 100644
--- 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 6059176633..b570349333 100644
--- 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 1cf87cf820..b659c2a831 100755
--- 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 d47da402a1..9668b86525 100644
--- 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 6cfaa6df5f..a74703110b 100644
--- 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 d695a1c6f7..8a795d0c09 100644
--- 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 efe52883ef..12ba5abf46 100644
--- 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 5044b0bd43..7512e9f782 100644
--- 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>
-- 
2.20.1