Made it also compilable with compiler < 7.2

This commit is contained in:
Jocelyn Fiat
2013-02-28 14:13:04 +01:00
parent db4f665de1
commit ff9be2cf8e
6 changed files with 16 additions and 20 deletions

View File

@@ -1,7 +1,5 @@
OpenID consumer
Requirement: EiffelStudio 7.2
http://en.wikipedia.org/wiki/Openid
Anyone wanting to contribute is welcome

View File

@@ -37,7 +37,7 @@ feature {NONE} -- Initialization
do
if attached {WGI_NINO_CONNECTOR} conn as nino then
create e
if attached e.item ("COMSPEC") as l_comspec then
if attached e.get ("COMSPEC") as l_comspec then
e.launch (l_comspec + " /C start " + "http://localhost:" + nino.port.out + "/")
else
e.launch ("http://localhost:" + nino.port.out + "/")

View File

@@ -11,7 +11,7 @@
</option>
<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf"/>
<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL-safe.ecf" readonly="false"/>
<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri-safe.ecf" readonly="false"/>
<library name="uri" location="../../../../../contrib/ise_library/text/uri/uri-safe.ecf" readonly="false"/>
<library name="xml_parser" location="$ISE_LIBRARY\library\text\parser\xml\parser\xml_parser-safe.ecf"/>
<library name="xml_tree" location="$ISE_LIBRARY\library\text\parser\xml\tree\xml_tree-safe.ecf" readonly="false"/>
<library name="http_client" location="..\..\..\..\..\library\network\http_client\http_client-safe.ecf"/>

View File

@@ -11,7 +11,7 @@
</option>
<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL.ecf" readonly="false"/>
<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf" readonly="false"/>
<library name="uri" location="../../../../../contrib/ise_library/text/uri/uri.ecf" readonly="false"/>
<library name="xml_parser" location="$ISE_LIBRARY\library\text\parser\xml\parser\xml_parser.ecf"/>
<library name="xml_tree" location="$ISE_LIBRARY\library\text\parser\xml\tree\xml_tree.ecf" readonly="false"/>
<library name="http_client" location="..\..\..\..\..\library\network\http_client\http_client.ecf"/>

View File

@@ -137,7 +137,7 @@ feature {OPENID_CONSUMER_VALIDATION} -- Implementation
sess: HTTP_CLIENT_SESSION
ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT
xrds_location: detachable READABLE_STRING_8
xml: XML_STANDARD_PARSER
xml: XML_LITE_PARSER
tree: XML_CALLBACKS_DOCUMENT
xelt: detachable XML_ELEMENT
s: READABLE_STRING_32
@@ -315,8 +315,8 @@ feature {NONE} -- Implementation
add_ax_parameters_to (a_uri: URI)
local
lst: ARRAYED_LIST [READABLE_STRING_8]
l_aliases: STRING_TABLE [READABLE_STRING_8]
l_counts: STRING_TABLE [INTEGER]
l_aliases: HASH_TABLE [READABLE_STRING_8, STRING_8]
l_counts: HASH_TABLE [INTEGER, STRING_8]
l_alias: READABLE_STRING_8
s: STRING
do
@@ -440,7 +440,7 @@ feature {NONE} -- Implementation
end
end
ax_to_sreg_map: STRING_TABLE [READABLE_STRING_8]
ax_to_sreg_map: HASH_TABLE [READABLE_STRING_8, STRING_8]
once
create Result.make (7)
Result.compare_objects

View File

@@ -30,7 +30,7 @@ feature -- Access
identity: detachable READABLE_STRING_8
attributes: STRING_TABLE [READABLE_STRING_32]
attributes: HASH_TABLE [READABLE_STRING_32, STRING_8]
feature -- Basic operation
@@ -38,7 +38,7 @@ feature -- Basic operation
-- Is openid identifier validated?
local
l_claimed_id: detachable READABLE_STRING_8
tb: STRING_TABLE [detachable READABLE_STRING_32]
tb: HASH_TABLE [detachable READABLE_STRING_32, STRING_8]
ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT
ret: URI
sess: HTTP_CLIENT_SESSION
@@ -120,9 +120,6 @@ feature -- Basic operation
end
get_attributes (lst: like values)
local
s: READABLE_STRING_32
sreg_keys: ARRAYED_LIST [READABLE_STRING_32]
do
attributes.wipe_out
@@ -162,7 +159,8 @@ feature -- Basic operation
s: READABLE_STRING_32
ax_keys: ARRAYED_LIST [READABLE_STRING_32]
l_alias: detachable READABLE_STRING_8
k_value, k_type, k_count, k: STRING
k_value, k_type, k_count: READABLE_STRING_8
k: STRING_8
i: INTEGER
do
if lst /= Void and then attached item_by_name ("openid.signed", lst) as l_signed then
@@ -172,13 +170,13 @@ feature -- Basic operation
loop
i := i + 1
s := c.item
if s.starts_with ("ns.") then
if attached item_by_name ("openid." + s, lst) as v then
if s.same_string ("ns.ax") and v.same_string ("http://openid.net/srv/ax/1.0") then
if s.starts_with ({STRING_32} "ns.") then
if attached item_by_name ({STRING_32} "openid." + s, lst) as v then
if s.same_string ({STRING_32} "ns.ax") and v.same_string ({STRING_32} "http://openid.net/srv/ax/1.0") then
l_alias := "ax."
else
if v.same_string ("http://openid.net/srv/ax/1.0") then
l_alias := s.substring (("ns.").count + 1, s.count) + "."
l_alias := s.substring (("ns.").count + 1, s.count).to_string_8 + "."
end
end
end
@@ -238,7 +236,7 @@ feature -- Basic operation
end
end
item_by_name (a_name: READABLE_STRING_32; lst: like values): detachable READABLE_STRING_32
item_by_name (a_name: READABLE_STRING_GENERAL; lst: like values): detachable READABLE_STRING_32
local
l_found: BOOLEAN
do