Changeset f2c6ab73bbeb02eb513a3952a380305eeeae60ff

Timestamp:

01/27/11 21:22:20 (16 months ago)

Author:

ajk <ajk@…>

Children:

aab07470af6dc81c6a52e8b8446582745216df17

Parents:

cbc895b6da7a6196ef0422747bd7dec2a40551d5

git-committer:

ajk <ajk@…> (01/27/11 21:22:20)

Message:

#82: Integrate sub/unsub messages and email confirmation messages

Signed-off-by: ajk <ajk@…>

Files:

• db/group.cc (modified) (4 diffs)
• db/group.hh (modified) (2 diffs)
• db/role.hh (modified) (1 diff)
• db/user.cc (modified) (4 diffs)
• db/user.hh (modified) (2 diffs)
• http/confirm.cc (modified) (2 diffs)
• http/sub.cc (modified) (2 diffs)
• tlate/user_value.cc (modified) (3 diffs)

db/group.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -167 +167 @@
                 mam->insert("group",
                             new tlate::group_value(shared_from_this(), u));
-                if (u->is_delivery_email_verified())
-                        mam->insert("verified");
 
                 boost::shared_ptr<tlate::tlate> tl = tlate::tlate::parse(tln);
@@ -181 +179 @@
 
         void group::add_subscriber(boost::shared_ptr<user> u,
-                                   server::conn_cb cb)
+                                   server::conn_cb cb,
+                                   boost::asio::ip::address peer)
         {
                 BOOST_ASSERT(u);
                 ensure_subscriber_role();
                 u->add_role(subscriber_role);
-                send_submail(u, "sub.msg", cb);
+                if (!u->is_delivery_email_verified())
+                        u->send_delivery_email_cookie
+                                (cb, peer.to_string());
+                else
+                        send_submail(u, "sub.msg", cb);
         }
         void group::delete_subscriber(boost::shared_ptr<user> u,
@@ -193 +196 @@
                 ensure_subscriber_role();
                 u->delete_role(subscriber_role);
-                send_submail(u, "unsub.msg", cb);
+                if (u->is_delivery_email_verified())
+                        send_submail(u, "unsub.msg", cb);
         }
         bool group::is_subscriber(boost::shared_ptr<const user> u)

db/group.hh

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -99 +99 @@
 
                 void add_subscriber(boost::shared_ptr<user> u,
-                                    server::conn_cb cb);
+                                    server::conn_cb cb,
+                                   boost::asio::ip::address peer);
                 void delete_subscriber(boost::shared_ptr<user> u,
                                        server::conn_cb cb);

db/role.hh

@@ -83 +83 @@
                 }
 
+                bool is_subscriber_role() const
+                        { return is_subscriber_role(name); }
+
+                std::string whose_subscriber_role() const {
+                        return name.substr(subscriber_prefix.length());
+                }
+
                 static bool is_subscriber_role(std::string str) {
                         return  str.substr(0, subscriber_prefix.length())

db/user.cc

@@ -27 +27 @@
 #include "../tlate/data_model.hh"
 #include "../tlate/tlate.hh"
+#include "../tlate/user_value.hh"
 #include "../uri.hh"
 
@@ -152 +153 @@
                 mam->insert("to",
                             ::msg::make_phrase(ton) + " <" + to + ">");
-                mam->insert("userid", userid);
+                mam->insert("user", new tlate::user_value(shared_from_this()));
                 mam->insert("link", link.str());
                 mam->insert("request_ip", request_ip);
@@ -166 +167 @@
                 cb.smtpc().send_mail(recv, mos.str());
         }
-        bool user::verify_delivery_email(std::string cookie)
+        bool user::verify_delivery_email(std::string cookie, server::conn_cb cb)
         {
                 if (delivery_email_verified) return true;
@@ -178 +179 @@
                 dbase->add_record(os.str());
                 BOOST_ASSERT(delivery_email_verified);
+
+                tlate::data_model::ptr mam(new tlate::data_model);
+
+                std::string ton = display_name;
+                std::string to = delivery_email;
+                std::string from = 
+                        config["alue-name"].as<std::string>() +
+                        " <" +
+                        config["operator-email"].as<std::string>() +
+                        ">";
+                mam->insert("from", from);
+                mam->insert("to",
+                            ::msg::make_phrase(ton) + " <" + to + ">");
+                mam->insert("user", new tlate::user_value(shared_from_this()));
+
+                boost::shared_ptr<tlate::tlate> tl =
+                        tlate::tlate::parse("confirmed.msg");
+                std::ostringstream mos;
+                mos << tl->eval(mam);
+                        
+                std::list<std::string> recv;
+                recv.push_back(to);
+                                
+                cb.smtpc().send_mail(recv, mos.str());
+
                 return true;
         }

db/user.hh

@@ -84 +84 @@
                 void send_delivery_email_cookie(server::conn_cb cb,
                                                 std::string request_ip);
-                bool verify_delivery_email(std::string cookie);
+                bool verify_delivery_email(std::string cookie,
+                                           server::conn_cb cb);
 
                 bool allow_cleartext_password() const {
@@ -122 +123 @@
                         return err;
                 }
+
+                boost::shared_ptr<db> get_db() const { return dbase; };
         };
 }

http/confirm.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -77 +77 @@
                 {
                         boost::shared_ptr<resource> er;
-                        if (u->verify_delivery_email(tokstr))
+                        if (u->verify_delivery_email(tokstr, cb))
                                 er.reset(new redir_resource(cb,
                                                             "/confirmed.html",

http/sub.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -98 +98 @@
                 if (sub)
                 {
-                        gr->add_subscriber(u, cb);
-                        if (!u->is_delivery_email_verified())
-                                u->send_delivery_email_cookie
-                                        (cb, req->get_peer().to_string());
+                        gr->add_subscriber(u, cb, req->get_peer());
                 }
                 else

tlate/user_value.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2011 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -21 +21 @@
 #include "user_value.hh"
 
+#include "../db/db.hh"
+#include "../db/group.hh"
+#include "../db/role.hh"
 #include "../db/user.hh"
 #include "../html/util.hh"
+#include "../tlate/group_value.hh"
+#include "../tlate/list_value.hh"
 
 namespace tlate
@@ -40 +45 @@
                 else if (var == "chpasswd")
                         rv.reset(new string_value("/passwd/"));
+                else if (var == "subs")
+                {
+                        const std::set<db::role::ptr> &roles = u->get_roles();
+                        list_value::ptr sublist;
+                        for (std::set<db::role::ptr>::const_iterator it 
+                                     = roles.begin();
+                             it != roles.end(); it++)
+                        {
+                                if (!sublist) sublist.reset(new list_value);
+                                db::role::ptr r = *it;
+                                if (!r->is_subscriber_role()) continue;
+                                db::group::ptr gr;
+                                try
+                                {
+                                        gr = u->get_db()->lookup_group
+                                                (r->whose_subscriber_role());
+                                }
+                                catch (db::no_such_group)
+                                {
+                                        continue;
+                                }
+                                group_value::ptr gv(new group_value(gr, u));
+                                                                
+                                sublist->push_back(gv);
+                        }
+                        rv = sublist;
+                }
+                
                 return rv;
         }