author | Michael Krelin <hacker@klever.net> | 2008-04-06 09:31:10 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-04-06 09:31:10 (UTC) |
commit | 752e484cd2fc239bc582a88fe7d62a225880ee3b (patch) (side-by-side diff) | |
tree | ad53fd61add881c5262b9cbc66c5db41e179a993 /include/opkele/types.h | |
parent | c56867c814a70505e27501c8f02768a594d8e42d (diff) | |
parent | 1e3ed01c149aaeed5a64aacff218a5486128fc92 (diff) | |
download | libopkele-752e484cd2fc239bc582a88fe7d62a225880ee3b.zip libopkele-752e484cd2fc239bc582a88fe7d62a225880ee3b.tar.gz libopkele-752e484cd2fc239bc582a88fe7d62a225880ee3b.tar.bz2 |
Merge commit '1e3ed01c149aaeed5a64aacff218a5486128fc92' into devel/openid20
-rw-r--r-- | include/opkele/types.h | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/include/opkele/types.h b/include/opkele/types.h index ffb9afb..f63bf5d 100644 --- a/include/opkele/types.h +++ b/include/opkele/types.h @@ -115,42 +115,53 @@ namespace opkele { /** * the shared_ptr<> for association_t object type */ typedef tr1mem::shared_ptr<association_t> assoc_t; - class basic_openid_message { + class basic_fields { public: - typedef list<string> fields_t; typedef util::forward_iterator_proxy< string,const string&,const string* > fields_iterator; - basic_openid_message() { } - virtual ~basic_openid_message() { } - basic_openid_message(const basic_openid_message& x); - void copy_to(basic_openid_message& x) const; - void append_to(basic_openid_message& x) const; + basic_fields() { } + virtual ~basic_fields() { } + basic_fields(const basic_fields& x); + void copy_to(basic_fields& x) const; + void append_to(basic_fields& x) const; virtual bool has_field(const string& n) const = 0; virtual const string& get_field(const string& n) const = 0; - virtual bool has_ns(const string& uri) const; - virtual string get_ns(const string& uri) const; - virtual fields_iterator fields_begin() const = 0; virtual fields_iterator fields_end() const = 0; - virtual string append_query(const string& url,const char *pfx="openid.") const; - virtual string query_string(const char *pfx="openid.") const; - + virtual string append_query(const string& url,const char *pfx=0) const; + virtual string query_string(const char *pfx=0) const; virtual void reset_fields(); virtual void set_field(const string& n,const string& v); virtual void reset_field(const string& n); + }; + + class basic_openid_message : public basic_fields { + public: + + basic_openid_message() { } + basic_openid_message(const basic_openid_message& x); + + virtual bool has_ns(const string& uri) const; + virtual string get_ns(const string& uri) const; + + virtual string append_query(const string& url,const char *pfx="openid.") const { + return basic_fields::append_query(url,pfx); } + virtual string query_string(const char *pfx="openid.") const { + return basic_fields::query_string(pfx); } + virtual void from_keyvalues(const string& kv); virtual void to_keyvalues(ostream& o) const; virtual void to_htmlhiddens(ostream& o,const char* pfx=0) const; void add_to_signed(const string& fields); @@ -161,14 +172,12 @@ namespace opkele { class openid_message_t : public basic_openid_message, public map<string,string> { public: openid_message_t() { } openid_message_t(const basic_openid_message& x) : basic_openid_message(x) { } - void copy_to(basic_openid_message& x) const; - bool has_field(const string& n) const; const string& get_field(const string& n) const; virtual fields_iterator fields_begin() const; virtual fields_iterator fields_end() const; void reset_fields(); |