浏览代码

Changes to target and from email addresses.

Alan Lam 8 年之前
父节点
当前提交
fc830b6afe
共有 4 个文件被更改,包括 8 次插入 和 5 次删除
  1. 3 0
      config.template.php
  2. 1 1
      controllers/contact.php
  3. 1 1
      engine/test.php
  4. 3 3
      engine/user.php

+ 3 - 0
config.template.php

@@ -24,6 +24,9 @@ define("SMTP_AUTHENTICATION_TYPE", "tls");
 
 define("EMAIL_FROM", "noreply@check-policy.co.uk");
 define("EMAIL_FROM_NAME", "Check Policy");
+define("EMAIL_DOMAIN", "check-policy.co.uk");
+define("EMAIL_NO_REPLY", "noreply@" . EMAIL_DOMAIN);
+define("EMAIL_CONTACT", "contact@" . EMAIL_DOMAIN);
 
 define("GOOGLE_RECAPTCHA_SITE_KEY", "");
 define("GOOGLE_RECAPTCHA_SECRET", "");

+ 1 - 1
controllers/contact.php

@@ -34,7 +34,7 @@ if($submit) {
 			"message" => htmlspecialchars($message),
 		]);
 
-		$mail->setFrom(EMAIL_FROM, EMAIL_FROM_NAME);
+		$mail->setFrom(EMAIL_CONTACT, EMAIL_FROM_NAME);
 		$mail->addAddress("admin@" . DOMAIN);
 		$mail->addReplyTo($email);
 

+ 1 - 1
engine/test.php

@@ -68,7 +68,7 @@ class Test extends Model {
 			"admin-phone" => Core::$user->phone
 		]);
 
-		$mail->setFrom(EMAIL_FROM, EMAIL_FROM_NAME);
+		$mail->setFrom(EMAIL_CONTACT, EMAIL_FROM_NAME);
 		$mail->addAddress($tester->email, $tester->getDisplayName());
 
 		$mail->setSubject("You have been allocated a test");

+ 3 - 3
engine/user.php

@@ -66,7 +66,7 @@ class User extends Model {
 			"link" => PROTOCOL . "://" . DOMAIN . "/verify-email/" . $this->verify_token
 		]);
 
-		$mail->setFrom(EMAIL_FROM, EMAIL_FROM_NAME);
+		$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
 		$mail->addAddress($this->email, $this->getDisplayName());
 
 		$mail->setSubject("Verify your email address");
@@ -86,7 +86,7 @@ class User extends Model {
 			"link" => PROTOCOL . "://" . DOMAIN . "/account/submit-id"
 		]);
 
-		$mail->setFrom(EMAIL_FROM, EMAIL_FROM_NAME);
+		$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
 		$mail->addAddress($this->email, $this->getDisplayName());
 
 		$mail->setSubject("Welcome to Check Policy");
@@ -110,7 +110,7 @@ class User extends Model {
 			"link" => PROTOCOL . "://" . DOMAIN . "/reset-password/" . $this->reset_token
 		]);
 
-		$mail->setFrom(EMAIL_FROM, EMAIL_FROM_NAME);
+		$mail->setFrom(EMAIL_NO_REPLY, EMAIL_FROM_NAME);
 		$mail->addAddress($this->email, $this->getDisplayName());
 
 		$mail->setSubject("Password reset instructions");