Made it compilable with 7.1
This commit is contained in:
@@ -79,9 +79,9 @@ feature -- Access
|
|||||||
Result.add_value (t.item, t.item.name)
|
Result.add_value (t.item, t.item.name)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
p := k.index_of ('[', 1)
|
p := k.index_of_code (91, 1) -- 91 '['
|
||||||
if p > 0 then
|
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 then
|
||||||
if q = p + 1 then
|
if q = p + 1 then
|
||||||
-- []
|
-- []
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ feature -- Hooks
|
|||||||
create fh.make_with_text ("openid-identity", l_openid_identity.to_string_32)
|
create fh.make_with_text ("openid-identity", l_openid_identity.to_string_32)
|
||||||
a_execution.remove_session_item ("openid.identity")
|
a_execution.remove_session_item ("openid.identity")
|
||||||
a_form.extend (fh)
|
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 {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
|
if attached a_form.fields_by_name ("username") as f_lst then
|
||||||
across
|
across
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ feature -- Persistence
|
|||||||
if not f.exists or else f.is_writable then
|
if not f.exists or else f.is_writable then
|
||||||
f.create_read_write
|
f.create_read_write
|
||||||
a_session.data.set_expiration (a_session.expiration)
|
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
|
f.close
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -106,11 +106,6 @@ feature -- Persistence
|
|||||||
|
|
||||||
feature {NONE} -- Implementation
|
feature {NONE} -- Implementation
|
||||||
|
|
||||||
storage: SED_STORABLE_FACILITIES
|
|
||||||
once
|
|
||||||
create Result
|
|
||||||
end
|
|
||||||
|
|
||||||
data_from_file (f: FILE): detachable like session_data
|
data_from_file (f: FILE): detachable like session_data
|
||||||
require
|
require
|
||||||
f.is_open_read and f.is_readable
|
f.is_open_read and f.is_readable
|
||||||
@@ -119,7 +114,7 @@ feature {NONE} -- Implementation
|
|||||||
do
|
do
|
||||||
if
|
if
|
||||||
not rescued and then
|
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
|
then
|
||||||
Result := d
|
Result := d
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -429,9 +429,9 @@ feature -- Access: global variables
|
|||||||
Result := item (a_name)
|
Result := item (a_name)
|
||||||
end
|
end
|
||||||
if Result = Void then
|
if Result = Void then
|
||||||
p := a_name.index_of ('[', 1)
|
p := a_name.index_of_code (91, 1) -- 91 '['
|
||||||
if p > 0 then
|
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
|
if q > p then
|
||||||
n := a_name.substring (1, p - 1)
|
n := a_name.substring (1, p - 1)
|
||||||
k := a_name.substring (p + 1, q - 1)
|
k := a_name.substring (p + 1, q - 1)
|
||||||
|
|||||||
Reference in New Issue
Block a user