reinstated prefix handling in query building

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 11 insertions, 9 deletions

diff --git a/lib/openid_message.cc b/lib/openid_message.cc
index 75e59b3..4b9179b 100644
--- a/lib/openid_message.cc
+++ b/lib/openid_message.cc
@@ -62,49 +62,51 @@ namespace opkele {
         return i->substr(3);
     }
 
     struct __om_query_builder : public unary_function<const string&,void> {
         public:
             const basic_openid_message& om;
             bool first;
             string& rv;
+            const char *pfx;
 
-            __om_query_builder(string& r,const basic_openid_message& m)
-                : om(m), first(true), rv(r) {
+            __om_query_builder(const char *p,string& r,const basic_openid_message& m)
+                : om(m), first(true), rv(r), pfx(p) {
                     for_each(om.fields_begin(),om.fields_end(),*this);
                 }
-            __om_query_builder(string& r,const basic_openid_message& m,const string& u)
-                : om(m), first(true), rv(r) {
+            __om_query_builder(const char *p,string& r,const basic_openid_message& m,const string& u)
+                : om(m), first(true), rv(r), pfx(p) {
                     rv = u;
                     if(rv.find('?')==string::npos)
                         rv += '?';
                     else
                         first = false;
                     for_each(om.fields_begin(),om.fields_end(),*this);
                 }
 
             result_type operator()(argument_type f) {
                 if(first)
                     first = false;
                 else
                     rv += '&';
-                rv += "openid."; rv+= f;
+                if(pfx) rv += pfx;
+                rv+= f;
                 rv += '=';
                 rv += util::url_encode(om.get_field(f));
             }
     };
 
-    string basic_openid_message::append_query(const string& url) const {
+    string basic_openid_message::append_query(const string& url,const char *pfx) const {
         string rv;
-        return __om_query_builder(rv,*this,url).rv;
+        return __om_query_builder(pfx,rv,*this,url).rv;
     }
-    string basic_openid_message::query_string() const {
+    string basic_openid_message::query_string(const char *pfx) const {
         string rv;
-        return __om_query_builder(rv,*this).rv;
+        return __om_query_builder(pfx,rv,*this).rv;
     }
 
     void basic_openid_message::reset_fields() {
         throw not_implemented(OPKELE_CP_ "reset_fields() not implemented");
     }
     void basic_openid_message::set_field(const string&,const string&) {
         throw not_implemented(OPKELE_CP_ "set_field() not implemented");
     }