add emailfrom

atowerlight · Jun 30, 2018 · a6adfe2 · a6adfe2
1 parent 882a7b1
commit a6adfe2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/addons/languages/Chinese/definitions.SMTP.php b/addons/languages/Chinese/definitions.SMTP.php
@@ -2,6 +2,7 @@
 $definitions["Server"] = "服务器";
 $definitions["Port"] = "端口";
 $definitions["Authentication"] = "验证";
+$definitions["From"] = "发信人";
 $definitions["Normal"] = "正常";
 $definitions["TLS"] = "TLS";
 $definitions["SSL"] = "SSL";
diff --git a/addons/plugins/SMTP/plugin.php b/addons/plugins/SMTP/plugin.php
@@ -27,6 +27,7 @@ function handler_sendEmailBefore($mail, &$to, &$subject, &$body)
 		$mail->Port       = C("plugin.SMTP.port");
 		$mail->Username   = C("plugin.SMTP.username");
 		$mail->Password   = C("plugin.SMTP.password");
+		$mail->From       = C("esoTalk.emailFrom");
 	}
 
 	/**
@@ -46,6 +47,7 @@ public function settings($sender)
 		$form->setValue("password", C("plugin.SMTP.password"));
 		$form->setValue("port", C("plugin.SMTP.port"));
 		$form->setValue("auth", C("plugin.SMTP.auth"));
+		$form->setValue("from", C("esoTalk.emailFrom"));
 
 		// If the form was submitted...
 		if ($form->validPostBack("smtpSave")) {
@@ -57,6 +59,7 @@ public function settings($sender)
 			$config["plugin.SMTP.password"] = $form->getValue("password");
 			$config["plugin.SMTP.port"] = $form->getValue("port");
 			$config["plugin.SMTP.auth"] = $form->getValue("auth");
+			$config["esoTalk.emailFrom"] = $form->getValue("from");
 
 			if (!$form->errorCount()) {
 

diff --git a/addons/plugins/SMTP/views/settings.php b/addons/plugins/SMTP/views/settings.php
@@ -39,6 +39,11 @@
 <?php echo $form->input("port", "text"); ?>
 </li>
 
+<li>
+<label><?php echo T("From"); ?></label>
+<?php echo $form->input("from", "text"); ?>
+</li>
+
 <li>
 <label><?php echo T("Authentication"); ?></label>
 <div class='checkboxGroup'>