Changeset 751fac6b567d675afee10e627efb5cf786ce5c83 for http/smanage.cc

Timestamp:

08/24/10 21:31:46 (21 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

7eb42bed950e3f81ef9f0d39432e07c55f12cc22

Parents:

ec0da3f87768820f9ca9e8065c7998e9d825bd4c

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/24/10 21:31:46)

Message:

[http::request] Cleanup

Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani@…>

Files:

• http/smanage.cc (modified) (7 diffs)

http/smanage.cc

@@ -51 +51 @@
                 void reload_action(boost::shared_ptr<request>,
                                    tlate::data_model::ptr,
-                                   std::multimap<std::string,std::string> &fb,
                                    std::string error_message = "");
 
                 void post_action(boost::shared_ptr<request> req,
-                                 tlate::data_model::ptr,
-                                 std::multimap<std::string,std::string> &fb);
+                                 tlate::data_model::ptr);
         };
 
         void smanage::reload_action(boost::shared_ptr<request> req,
                                     tlate::data_model::ptr am,
-                                    std::multimap<std::string,std::string> &fb,
                                     std::string error_message)
         {
-                typedef std::multimap<std::string,std::string>::const_iterator 
-                        cit_type;
-                std::pair<cit_type, cit_type> its;
-
                 if (!error_message.empty())
                         am->insert("error", html::quote(error_message, false));
-                am->insert("diname", lookup(fb, "diname"));
-                am->insert("diaddr", lookup(fb, "diaddr"));
-                std::string deaddr = lookup(fb, "deaddr");
+                am->insert("diname", req->get_form_field("diname"));
+                am->insert("diaddr", req->get_form_field("diaddr"));
+                std::string deaddr = req->get_form_field("deaddr");
                 am->insert("deaddr", deaddr);
                 db::user::ptr u = req->get_session()->get_user();
@@ -81 +74 @@
                         am->insert("verify");
 
-                if (fb.find("allow_clear") != fb.end())
-                        am->insert("allow_clear", lookup(fb, "allow_clear"));
+                if (req->has_form_field("allow_clear"))
+                        am->insert("allow_clear",
+                                   req->get_form_field("allow_clear"));
         }
 
         void smanage::post_action(boost::shared_ptr<request> req,
-                                  tlate::data_model::ptr am,
-                                  std::multimap<std::string,std::string> &fb)
+                                  tlate::data_model::ptr am)
         {
                 std::string (*const pd)(std::string) = uri::percent_decode;
@@ -93 +86 @@
                 boost::shared_ptr<db::user> u = req->get_session()->get_user();
 
-                u->set_display_name(pd(lookup(fb, "diname")));
-                u->set_display_email(pd(lookup(fb, "diaddr")));
-                if (u->set_delivery_email(pd(lookup(fb, "deaddr")))) {
+                u->set_display_name(pd(req->get_form_field("diname")));
+                u->set_display_email(pd(req->get_form_field("diaddr")));
+                if (u->set_delivery_email(pd(req->get_form_field("deaddr")))) {
                         u->send_delivery_email_cookie
                                 (cb, req->get_peer().to_string());
                 }
                 u->set_allow_cleartext_password
-                        (fb.find("allow_clear") != fb.end());
-                reload_action(req, am, fb, "Saved.");
+                        (req->has_form_field("allow_clear"));
+                reload_action(req, am, "Saved.");
         }
 
@@ -121 +114 @@
                 }
 
-                std::multimap<std::string,std::string> fb = 
-                        req->get_form_data();
-                std::map<std::string,std::string>::const_iterator fbit_ch;
-                std::map<std::string,std::string>::const_iterator fbit_ve;
-
-                fbit_ch = fb.find("change_button");
-                fbit_ve = fb.find("verify_button");
-                if (fbit_ch != fb.end()) 
+                if (req->has_form_field("change_button"))
                 {
                         if (req->get_method() == "POST")
-                                post_action(req, am, fb);
+                                post_action(req, am);
                         else
-                                reload_action(req, am, fb);
+                                reload_action(req, am);
                         
                 }
-                else if (fbit_ve != fb.end())
+                else if (req->has_form_field("verify_button"))
                 {
                         boost::shared_ptr<db::user> u =
@@ -144 +130 @@
                                 u->send_delivery_email_cookie
                                         (cb, req->get_peer().to_string());
-                                reload_action(req, am, fb,
+                                reload_action(req, am,
                                               "Verification email has been "
                                               "sent to " +
@@ -150 +136 @@
                         }
                         else
-                                reload_action(req, am, fb);
+                                reload_action(req, am);
                 }
                 else
@@ -166 +152 @@
                         if (u->allow_cleartext_password())
                                 am->insert("allow_clear",
-                                           lookup(fb, "allow_clear"));
+                                           req->get_form_field("allow_clear"));
                 }