From f6482fb9003e4953f838ba4ef2c110190355622f Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sun, 02 Mar 2008 20:57:57 +0000
Subject: reinstated prefix handling in query building

Signed-off-by: Michael Krelin <hacker@klever.net>
---
diff --git a/include/opkele/types.h b/include/opkele/types.h
index 1fab869..af7fb1a 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -139,8 +139,8 @@ namespace opkele {
 	    virtual fields_iterator fields_begin() const = 0;
 	    virtual fields_iterator fields_end() const = 0;
 
-	    virtual string append_query(const string& url) const;
-	    virtual string query_string() const;
+	    virtual string append_query(const string& url,const char *pfx="openid.") const;
+	    virtual string query_string(const char *pfx="openid.") const;
 
 
 	    virtual void reset_fields();
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
@@ -67,13 +67,14 @@ namespace opkele {
 	    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 += '?';
@@ -87,19 +88,20 @@ namespace opkele {
 		    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() {
--
cgit v0.9.0.2