swerc

commit 4115ed4d9673e8312f7e675c0660f80a9c6f380f
parent bba572152506db29e4654901a63e30ed2ea0baff
Author: uriel@engel.se.cat-v.org <unknown>
Date:   Wed, 22 Oct 2008 09:17:08 +0200

Update comments code to use new comment dir format and the new user auth system
Diffstat:
M
bin/controller.rc
 | 
28
++++++++++++++++++++--------

1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/bin/controller.rc b/bin/controller.rc
@@ -140,16 +140,28 @@ fn select_handler {
             set_handler blog_post_handler $body.md
         if not
             set_handler md_handler $body.md
-
         if (! ~ $#allowComments 0 && ~ $REQUEST_METHOD POST) {
-            get_post_args comment_user_name comment_text
-            ddir = $body.md_werc/comments/
+            get_post_args comment_text
+            d = `{date -n} # FIXME Obvious race
+            d = $body.md_werc/comments/$d/
+
+            u = $logged_user
+            if (~ $#logged_user 0) {
+                get_post_args comment_user_name comment_user_password
+                # TODO Should take this path too if the user can login but doesn't
+                # belong to required group
+                if (! login_user $comment_user_name $comment_user_password) {
+                    u = $comment_user_name ':' $comment_user_password
+                    d = $d^'_pending'
+                }
+                if not
+                    u = $logged_user
+            }
+
             umask 002
-            mkdir -m 775 -p $ddir
-            d = `{date -n} # Obvious race
-            { echo '% user_name='^$comment_user_name'
- 
-'^$comment_text } > $ddir/$d.rec
+            mkdir -m 775 -p $d
+            echo $u > $d/user
+            echo $comment_text > $d/body
         }
     }
     if not if (test -f $body.tpl)