Improved feed aggregation module.

  Added support to choose either atom or rss for the "/feed" format.
  Added support for feed format view to feed aggregation.
  Use proper content type for RSS and ATOM response.
  For feed aggregation  use `?view=feed` or `?view=feed.atom` or `?view=feed.rss`
  Improved sized feed view.
  Use site name for recent changes feed title.
  Better name for node feeds (include the site name).
  Use current date when a feed aggregation is converted to a new feed, to set the last build date.
  Fixed category filter per feed location for the feed aggregation module.
Fixed authentication module, where a potential case (but not probable) had no response content.
Cosmetic and minor changes on messaging module.

Author: jocelyn

modules/auth/cms_authentication_module.e

@@ -362,79 +362,78 @@ feature -- Handler
 			l_captcha_passed: BOOLEAN
 			l_email: READABLE_STRING_8
 		do
-			create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
-			if r.has_permission ("account register") then
-				if req.is_post_request_method then
-					if
-						attached {WSF_STRING} req.form_parameter ("name") as l_name and then
-						attached {WSF_STRING} req.form_parameter ("password") as l_password and then
-						attached {WSF_STRING} req.form_parameter ("email") as p_email and then
-						attached {WSF_STRING} req.form_parameter ("personal_information") as l_personal_information
-					then
-						if p_email.value.is_valid_as_string_8 then
-							l_email := p_email.value.to_string_8
-							l_user_api := api.user_api
-							if attached l_user_api.user_by_name (l_name.value) or else attached l_user_api.temp_user_by_name (l_name.value) then
-									-- Username already exist.
-								r.set_value ("User name already exists!", "error_name")
-								l_exist := True
-							end
-							if attached l_user_api.user_by_email (l_email) or else attached l_user_api.temp_user_by_email (l_email) then
-									-- Email already exists.
-								r.set_value ("An account is already associated with that email address!", "error_email")
-								l_exist := True
-							end
-							if attached recaptcha_secret_key (api) as l_recaptcha_key then
-								if attached {WSF_STRING} req.form_parameter ("g-recaptcha-response") as l_recaptcha_response and then is_captcha_verified (l_recaptcha_key, l_recaptcha_response.url_encoded_value) then
-									l_captcha_passed := True
-								else
-										--| Bad or missing captcha
-									l_captcha_passed := False
-								end
-							else
-									--| reCaptcha is not setup, so no verification
+			if
+				api.has_permission ("account register") and then
+				req.is_post_request_method
+			then
+				create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+				if
+					attached {WSF_STRING} req.form_parameter ("name") as l_name and then
+					attached {WSF_STRING} req.form_parameter ("password") as l_password and then
+					attached {WSF_STRING} req.form_parameter ("email") as p_email and then
+					attached {WSF_STRING} req.form_parameter ("personal_information") as l_personal_information
+				then
+					if p_email.value.is_valid_as_string_8 then
+						l_email := p_email.value.to_string_8
+						l_user_api := api.user_api
+						if attached l_user_api.user_by_name (l_name.value) or else attached l_user_api.temp_user_by_name (l_name.value) then
+								-- Username already exist.
+							r.set_value ("User name already exists!", "error_name")
+							l_exist := True
+						end
+						if attached l_user_api.user_by_email (l_email) or else attached l_user_api.temp_user_by_email (l_email) then
+								-- Email already exists.
+							r.set_value ("An account is already associated with that email address!", "error_email")
+							l_exist := True
+						end
+						if attached recaptcha_secret_key (api) as l_recaptcha_key then
+							if attached {WSF_STRING} req.form_parameter ("g-recaptcha-response") as l_recaptcha_response and then is_captcha_verified (l_recaptcha_key, l_recaptcha_response.url_encoded_value) then
 								l_captcha_passed := True
-							end
-							if not l_exist then
-									-- New temp user
-								create u.make (l_name.value)
-								u.set_email (l_email)
-								u.set_password (l_password.value)
-								u.set_personal_information (l_personal_information.value)
-								l_user_api.new_temp_user (u)
-
-									-- Create activation token
-								l_token := new_token
-								l_user_api.new_activation (l_token, u.id)
-								l_url_activate := req.absolute_script_url ("/account/activate/" + l_token)
-								l_url_reject := req.absolute_script_url ("/account/reject/" + l_token)
-
-									-- Send Email to webmaster
-								create es.make (create {CMS_AUTHENTICATION_EMAIL_SERVICE_PARAMETERS}.make (api))
-								write_debug_log (generator + ".handle register: send_register_email")
-								es.send_account_evaluation (u, l_personal_information.value, l_url_activate, l_url_reject, req.absolute_script_url (""))
-
-									-- Send Email to user
-								create es.make (create {CMS_AUTHENTICATION_EMAIL_SERVICE_PARAMETERS}.make (api))
-								write_debug_log (generator + ".handle register: send_contact_email")
-								es.send_contact_email (l_email, u, req.absolute_script_url (""))
 							else
-								r.set_value (l_name.value, "name")
-								r.set_value (l_email, "email")
-								r.set_value (l_personal_information.value, "personal_information")
-								r.set_status_code ({HTTP_CONSTANTS}.bad_request)
+									--| Bad or missing captcha
+								l_captcha_passed := False
 							end
+						else
+								--| reCaptcha is not setup, so no verification
+							l_captcha_passed := True
+						end
+						if not l_exist then
+								-- New temp user
+							create u.make (l_name.value)
+							u.set_email (l_email)
+							u.set_password (l_password.value)
+							u.set_personal_information (l_personal_information.value)
+							l_user_api.new_temp_user (u)
+								-- Create activation token
+							l_token := new_token
+							l_user_api.new_activation (l_token, u.id)
+							l_url_activate := req.absolute_script_url ("/account/activate/" + l_token)
+							l_url_reject := req.absolute_script_url ("/account/reject/" + l_token)
+								-- Send Email to webmaster
+							create es.make (create {CMS_AUTHENTICATION_EMAIL_SERVICE_PARAMETERS}.make (api))
+							write_debug_log (generator + ".handle register: send_register_email")
+							es.send_account_evaluation (u, l_personal_information.value, l_url_activate, l_url_reject, req.absolute_script_url (""))
+
+								-- Send Email to user
+							create es.make (create {CMS_AUTHENTICATION_EMAIL_SERVICE_PARAMETERS}.make (api))
+							write_debug_log (generator + ".handle register: send_contact_email")
+							es.send_contact_email (l_email, u, req.absolute_script_url (""))
 						else
 							r.set_value (l_name.value, "name")
-							r.set_value (p_email.value, "email")
+							r.set_value (l_email, "email")
 							r.set_value (l_personal_information.value, "personal_information")
 							r.set_status_code ({HTTP_CONSTANTS}.bad_request)
 						end
 					else
-						api.response_api.send_bad_request ("There were issue with your application, invalid or missing values.", req, res)
+						r.set_value (l_name.value, "name")
+						r.set_value (p_email.value, "email")
+						r.set_value (l_personal_information.value, "personal_information")
+						r.set_status_code ({HTTP_CONSTANTS}.bad_request)
 					end
+					r.execute
+				else
+					api.response_api.send_bad_request ("There were issue with your application, invalid or missing values.", req, res)
 				end
-				r.execute
 			else
 				api.response_api.send_permissions_access_denied ("You can also contact the webmaster to ask for an account.", Void, req, res)
 			end

modules/feed_aggregator/feed_aggregation.e

@@ -52,14 +52,14 @@ feature -- Access
 feature -- Status report
 
 	has_category_filter: BOOLEAN
-			-- Is there any category filtering?
+			-- Is there any global category filtering?
 			-- i.e via `included_categories'
 		do
 			Result := attached included_categories as cats and then not cats.is_empty
 		end
 
 	has_category_filter_for_location (a_location: READABLE_STRING_GENERAL): BOOLEAN
-			-- Is there any category filtering for `a_location'?
+			-- Is there any specific category filtering for `a_location'?
 		do
 			Result := attached included_categories_per_feed as cats_per_location and then
 					attached cats_per_location.item (a_location) as cats and then
@@ -118,7 +118,7 @@ feature -- Element change
 			end
 		end
 
-	include_category_per_feed (a_cat: READABLE_STRING_GENERAL; a_feed_location: READABLE_STRING_8)
+	include_category_per_feed (a_cat: READABLE_STRING_GENERAL; a_feed_location: READABLE_STRING_GENERAL)
 		local
 			tb: like included_categories_per_feed
 			lst: like included_categories
@@ -163,20 +163,22 @@ feature -- Status report
 
 	is_included_for_location (e: FEED_ITEM; a_location: READABLE_STRING_GENERAL): BOOLEAN
 			-- Is `e' included in feed related to `a_location'?
-			-- note that if `e' has no category, it is included by default,
-			-- even if `included_categories_per_feed' is defined for `a_location'.
+			-- notes:
+			--		- it also check for `included_categories' condition.
+			-- 		- if `e' has no category, it is included by default,
+			-- 			even if `included_categories_per_feed' is defined for `a_location'.
 		do
-			Result := True
-			if attached e.categories as e_cats then
+			Result := is_included (e)
+			if Result and attached e.categories as e_cats then
 				if
 					attached included_categories_per_feed as tb and then
 					attached tb.item (a_location) as lst
 				then
 					Result := across lst as ic some
-							across e_cats as e_ic some
-								e_ic.item.same_string (ic.item)
+								across e_cats as e_ic some
+									e_ic.item.same_string (ic.item)
+								end
 							end
-						end
 				end
 			end
 		end

modules/feed_aggregator/feed_aggregator_api.e

@@ -35,6 +35,8 @@ feature -- Access
 			l_feed_id: READABLE_STRING_32
 			l_title: detachable READABLE_STRING_GENERAL
 			l_locations: detachable STRING_TABLE [READABLE_STRING_8]
+			loc_name: READABLE_STRING_GENERAL
+			loc: READABLE_STRING_8
 			l_table: like internal_aggregations
 		do
 			l_table := internal_aggregations
@@ -102,6 +104,19 @@ feature -- Access
 										agg.include_category (cats_ic.item)
 									end
 								end
+								across
+									l_locations as locs_ic
+								loop
+									loc_name := locs_ic.key
+									loc := locs_ic.item
+									if attached cfg.text_list_item ({STRING_32} "feeds." + l_feed_id + {STRING_32} ".categories." + loc_name.as_string_32) as l_loc_cats then
+										across
+											l_loc_cats as cats_ic
+										loop
+											agg.include_category_per_feed (cats_ic.item, loc)
+										end
+									end
+								end
 							end
 						end
 					end
@@ -138,11 +153,42 @@ feature -- Operation
 
 	aggregation_feed (agg: FEED_AGGREGATION): detachable FEED
 			-- Feed from aggregation `agg'.
+		local
+			loc: READABLE_STRING_8
+			lst: LIST [FEED_ITEM]
 		do
 			across
 				agg.locations as ic
 			loop
-				if attached feed (ic.item) as f then
+				loc := ic.item
+				if attached feed (loc) as f then
+					lst := f.items
+					if agg.has_category_filter_for_location (loc) then
+							-- Note: it also check the global filter.
+						from
+							lst.start
+						until
+							lst.after
+						loop
+							if agg.is_included_for_location (lst.item, loc) then
+								lst.forth
+							else
+								lst.remove
+							end
+						end
+					elseif agg.has_category_filter then
+						from
+							lst.start
+						until
+							lst.after
+						loop
+							if agg.is_included (lst.item) then
+								lst.forth
+							else
+								lst.remove
+							end
+						end
+					end
 					if Result /= Void then
 						if f /= Void then
 							Result := Result + f
@@ -152,6 +198,9 @@ feature -- Operation
 					end
 				end
 			end
+			if Result /= Void then
+				Result.set_date (create {DATE_TIME}.make_now_utc)
+			end
 		end
 
 	new_http_client_session (a_url: READABLE_STRING_8): HTTP_CLIENT_SESSION