2 files changed, 10 insertions, 6 deletions

diff --git a/include/opkele/types.h b/include/opkele/types.h
index a3b657d..1f48362 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -145,17 +145,17 @@ namespace opkele {
 
             virtual void reset_fields();
             virtual void set_field(const string& n,const string& v);
             virtual void reset_field(const string& n);
 
             virtual void from_keyvalues(const string& kv);
             virtual void to_keyvalues(ostream& o) const;
 
-            virtual void to_htmlhiddens(ostream& o) const;
+            virtual void to_htmlhiddens(ostream& o,const char* pfx=0) const;
 
             void add_to_signed(const string& fields);
             string find_ns(const string& uri,const char *pfx) const;
             string allocate_ns(const string& uri,const char *pfx);
     };
 
     class openid_message_t : public basic_openid_message, public map<string,string> {
         public:
diff --git a/lib/openid_message.cc b/lib/openid_message.cc
index 521ea85..588bd62 100644
--- a/lib/openid_message.cc
+++ b/lib/openid_message.cc
@@ -158,30 +158,34 @@ namespace opkele {
     void basic_openid_message::to_keyvalues(ostream& o) const {
         for_each(fields_begin(),fields_end(),__om_kv_outputter(*this,o));
     }
 
     struct __om_html_outputter : public unary_function<const string&,void> {
         public:
             const basic_openid_message& om;
             ostream& os;
+            const char *pfx;
 
-            __om_html_outputter(const basic_openid_message& m,ostream& s)
-                : om(m), os(s) { }
+            __om_html_outputter(const basic_openid_message& m,ostream& s,const char *p=0)
+                : om(m), os(s), pfx(p) { }
 
             result_type operator()(argument_type f) {
                 os <<
                     "<input type=\"hidden\""
-                    " name=\"" << util::attr_escape(f) << "\""
+                    " name=\"";
+                if(pfx)
+                    os << util::attr_escape(pfx);
+                os << util::attr_escape(f) << "\""
                     " value=\"" << util::attr_escape(om.get_field(f)) << "\" />";
             }
     };
 
-    void basic_openid_message::to_htmlhiddens(ostream& o) const {
-        for_each(fields_begin(),fields_end(),__om_html_outputter(*this,o));
+    void basic_openid_message::to_htmlhiddens(ostream& o,const char* pfx) const {
+        for_each(fields_begin(),fields_end(),__om_html_outputter(*this,o,pfx));
     }
 
     void basic_openid_message::add_to_signed(const string& fields) {
         string::size_type fnc = fields.find_first_not_of(",");
         if(fnc==string::npos)
             throw bad_input(OPKELE_CP_ "Trying to add nothing in particular to the list of signed fields");
         string signeds;
         try {