From d20c37758072c3ea95275458e45533b77ef482a4 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Fri, 8 Jan 2016 21:46:01 +0100
Subject: [PATCH] Fixed Reply-To: implementation in notification mailer. Added
 helper routines to query additional header, and reset Cc:, and Bcc: values.

---
 .../notification_email/notification_email.e   | 44 +++++++++++++++++--
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/library/runtime/process/notification_email/notification_email.e b/library/runtime/process/notification_email/notification_email.e
index 5f835b82..cfe8beb3 100644
--- a/library/runtime/process/notification_email/notification_email.e
+++ b/library/runtime/process/notification_email/notification_email.e
@@ -18,7 +18,7 @@ feature {NONE} -- Initialization
 			-- Initialize `Current'.
 		require
 			well_formed_from_address: is_valid_address (a_from)
-			well_formed_to_address: a_to_address.has ('@')
+			well_formed_to_address: is_valid_address (a_to_address)
 		do
 			initialize
 			from_address := a_from
@@ -91,14 +91,21 @@ feature -- Change
 
 	set_from_address (add: READABLE_STRING_8)
 		require
-			well_formed_address: add.has ('@')
+			well_formed_address: is_valid_address (add)
 		do
 			from_address := add
 		end
 
+	set_reply_to_address (add: like reply_to_address)
+		require
+			well_formed_address: add = Void or else is_valid_address (add)
+		do
+			reply_to_address := add
+		end
+
 	add_cc_address (add: READABLE_STRING_8)
 		require
-			well_formed_address: add.has ('@')
+			well_formed_address: is_valid_address (add)
 		local
 			lst: like cc_addresses
 		do
@@ -112,7 +119,7 @@ feature -- Change
 
 	add_bcc_address (add: READABLE_STRING_8)
 		require
-			well_formed_address: add.has ('@')
+			well_formed_address: is_valid_address (add)
 		local
 			lst: like bcc_addresses
 		do
@@ -124,6 +131,20 @@ feature -- Change
 			lst.force (add)
 		end
 
+	reset_cc_addresses
+			-- Clear Cc: addresses.
+		do
+			cc_addresses := Void
+		end
+
+	reset_bcc_addresses
+			-- Clear Bcc: addresses.
+		do
+			bcc_addresses := Void
+		end
+
+feature -- Header manipulation		
+
 	add_header_line (a_line: READABLE_STRING_8)
 		require
 			well_formed_header_line: a_line.has (':')
@@ -138,6 +159,21 @@ feature -- Change
 			lst.force (a_line)
 		end
 
+feature -- Status report
+
+	has_header (a_header_name: READABLE_STRING_8): BOOLEAN
+			-- Has additional header `a_header_name'?
+			-- Warning: it checks only `additional_header_lines'!
+		local
+			h_colon: STRING
+		do
+			if attached additional_header_lines as lst then
+				create h_colon.make_from_string (a_header_name)
+				h_colon.append_character (':')
+				Result := across lst as ic some ic.item.starts_with (h_colon) end
+			end
+		end
+
 feature -- Reset
 
 	reset