Changeset d3efc818ad12f25b70157a80a98888a3fbaac544

Timestamp:

08/23/10 22:36:53 (18 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

ec0da3f87768820f9ca9e8065c7998e9d825bd4c

Parents:

22d9643ba8d951cde698749cf25dbe905e197a4f

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/23/10 22:36:53)

Message:

[http::markread,article] Prevent marking read after explicit unmarking

Fixes #70.

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

Location:

http

Files:

• article.cc (modified) (1 diff)
• markread.cc (modified) (2 diffs)

http/article.cc

@@ -95 +95 @@
                 boost::shared_ptr<db::user> u = req->get_user();
 
-                if (is_single && u) u->mark_read(art->msgid());
+                if (is_single && u && req->get_query_param("markread") != "no")
+                        u->mark_read(art->msgid());
                 
                 db::thread_node::ptr tn = 

http/markread.cc

@@ -41 +41 @@
         (boost::shared_ptr<request> req, response::factory)
         {
-                if (req->get_method() != "POST")
-                {
-                        boost::shared_ptr<error_resource> er
-                                (new error_resource
-                                 (cb, "405 Method not allowed"));
-                        er->add_header("Allow", "POST");
-                        throw resource_exception(er);
-                }
-
                 db::user::ptr u = req->get_user();
 
@@ -62 +53 @@
                 bool value = lookup(fd, "undo") != "yes";
                 std::string msgid = lookup(fd, "msgid");
-                std::string redir = lookup(fd, "redir");
+                ::uri redir = lookup(fd, "redir");
+                redir.replace_query_param("markread","no");
 
-                if (value)
-                        u->mark_read(msgid);
-                else
-                        u->unmark_read(msgid);
-
+                if (req->get_method() == "POST")
+                {
+                        if (value)
+                                u->mark_read(msgid);
+                        else
+                                u->unmark_read(msgid);
+                }
                 boost::shared_ptr<redir_resource> r
-                        (new redir_resource(cb, redir, "303 See other"));
+                        (new redir_resource(cb, redir.to_string(),
+                                            "303 See other"));
                 throw resource_exception(r);
         }