Changeset f2c6ab73bbeb02eb513a3952a380305eeeae60ff for http

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@…>

Location:

http

Files:

• confirm.cc (modified) (2 diffs)
• sub.cc (modified) (2 diffs)

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