From 7cf395a9bc6c7befa453a229f7edab0e08bd388a Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Fri, 1 Mar 2013 18:10:02 +0100 Subject: [PATCH] added the notion of site identifier "site.id" (typically this could be a UUID) --- draft/application/cms/src/cms_configuration.e | 9 +++++++++ draft/application/cms/src/cms_service.e | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/draft/application/cms/src/cms_configuration.e b/draft/application/cms/src/cms_configuration.e index fb38305c..2f7f8f53 100644 --- a/draft/application/cms/src/cms_configuration.e +++ b/draft/application/cms/src/cms_configuration.e @@ -107,6 +107,15 @@ feature -- Access end end + site_id: READABLE_STRING_8 + do + if attached options.item ("site.id") as s then + Result := s + else + Result := "_EWF_CMS_NO_ID_" + end + end + site_name (dft: like site_name): READABLE_STRING_8 do if attached options.item ("site.name") as s then diff --git a/draft/application/cms/src/cms_service.e b/draft/application/cms/src/cms_service.e index 531e36b8..5178eaa6 100644 --- a/draft/application/cms/src/cms_service.e +++ b/draft/application/cms/src/cms_service.e @@ -29,6 +29,7 @@ feature {NONE} -- Initialization configuration := cfg base_url := a_setup.base_url + site_id := cfg.site_id site_url := cfg.site_url ("") site_name := cfg.site_name ("EWF::CMS") site_email := cfg.site_email ("webmaster") @@ -234,6 +235,8 @@ feature -- Hook: block feature -- Router + site_id: READABLE_STRING_8 + site_name: READABLE_STRING_32 site_email: READABLE_STRING_8 @@ -350,7 +353,7 @@ feature -- Storage session_controller (req: WSF_REQUEST): CMS_SESSION_CONTROLER -- New session controller for request `req' do - create Result.make (req, session_manager) + create Result.make (req, session_manager, site_id) end session_manager: WSF_SESSION_MANAGER