From f6e15b6ce1898a9deba7510bfff39c2705c07909 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Fri, 8 Mar 2013 22:13:27 +0100 Subject: [PATCH] Made it compilable with 7.1 --- draft/application/cms/src/kernel/form/cms_form_data.e | 4 ++-- draft/application/cms/src/modules/openid/openid_module.e | 2 +- library/server/wsf/session/wsf_fs_session_manager.e | 9 ++------- library/server/wsf/src/wsf_request.e | 4 ++-- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/draft/application/cms/src/kernel/form/cms_form_data.e b/draft/application/cms/src/kernel/form/cms_form_data.e index 8c20fb70..e02a368a 100644 --- a/draft/application/cms/src/kernel/form/cms_form_data.e +++ b/draft/application/cms/src/kernel/form/cms_form_data.e @@ -79,9 +79,9 @@ feature -- Access Result.add_value (t.item, t.item.name) end else - p := k.index_of ('[', 1) + p := k.index_of_code (91, 1) -- 91 '[' if p > 0 then - q := k.index_of (']', p + 1) + q := k.index_of_code (93, p + 1) -- 93 ']' if q > p then if q = p + 1 then -- [] diff --git a/draft/application/cms/src/modules/openid/openid_module.e b/draft/application/cms/src/modules/openid/openid_module.e index b403b638..302b1b78 100644 --- a/draft/application/cms/src/modules/openid/openid_module.e +++ b/draft/application/cms/src/modules/openid/openid_module.e @@ -92,7 +92,7 @@ feature -- Hooks create fh.make_with_text ("openid-identity", l_openid_identity.to_string_32) a_execution.remove_session_item ("openid.identity") a_form.extend (fh) - a_form.extend_text ("The new account will be associated with OpenID %""+ l_openid_identity +"%"") + a_form.extend_text ("The new account will be associated with OpenID %""+ a_execution.html_encoded (l_openid_identity) +"%"") if attached {READABLE_STRING_GENERAL} a_execution.session_item ("openid.nickname") as l_openid_nickname then if attached a_form.fields_by_name ("username") as f_lst then across diff --git a/library/server/wsf/session/wsf_fs_session_manager.e b/library/server/wsf/session/wsf_fs_session_manager.e index 0cb6f82b..260607a1 100644 --- a/library/server/wsf/session/wsf_fs_session_manager.e +++ b/library/server/wsf/session/wsf_fs_session_manager.e @@ -72,7 +72,7 @@ feature -- Persistence if not f.exists or else f.is_writable then f.create_read_write a_session.data.set_expiration (a_session.expiration) - storage.store (a_session.data, create {SED_MEDIUM_READER_WRITER}.make_for_writing (f)) + f.general_store (a_session.data) f.close end end @@ -106,11 +106,6 @@ feature -- Persistence feature {NONE} -- Implementation - storage: SED_STORABLE_FACILITIES - once - create Result - end - data_from_file (f: FILE): detachable like session_data require f.is_open_read and f.is_readable @@ -119,7 +114,7 @@ feature {NONE} -- Implementation do if not rescued and then - attached {like session_data} storage.retrieved (create {SED_MEDIUM_READER_WRITER}.make_for_reading (f), True) as d + attached {like session_data} f.retrieved as d then Result := d end diff --git a/library/server/wsf/src/wsf_request.e b/library/server/wsf/src/wsf_request.e index cd048c5f..129c9937 100644 --- a/library/server/wsf/src/wsf_request.e +++ b/library/server/wsf/src/wsf_request.e @@ -429,9 +429,9 @@ feature -- Access: global variables Result := item (a_name) end if Result = Void then - p := a_name.index_of ('[', 1) + p := a_name.index_of_code (91, 1) -- 91 '[' if p > 0 then - q := a_name.index_of (']', p + 1) + q := a_name.index_of_code (93, p + 1) -- 93 ']' if q > p then n := a_name.substring (1, p - 1) k := a_name.substring (p + 1, q - 1)