Merge more from 'stable'.

apps/bridge/app.rc

@@ -5,6 +5,9 @@ fn conf_enable_comments {
         allow_new_user_comments=yes
         shift
     }
+    if not if(~ $1 -a) {
+        bridge_anon_comments=yes 
+    }
     enable_comments=yes
     groups_allowed_comments=$*
     conf_enable_app bridge
@@ -67,6 +70,12 @@ fn mk_new_comment {
             if not
                 _status=$status
         }
+        if not if(! ~ $#bridge_anon_comments 0) {
+            if(~ $"post_arg_ima_robot 'not')
+                u='Glenda' # Anonymous
+            if not
+                _status='You are a robot!'
+        }
         if not
             _status='You need to log in to comment.'
     }

apps/bridge/foot.tpl

@@ -6,7 +6,8 @@
     <br>
     <input type="submit" name="bridge_post" value="Post a comment">
 
-% if(~ $#logged_user 0 && ! ~ $#allow_new_user_comments 0) {
+% if(~ $#logged_user 0) {
+%   if(~ $#allow_new_user_comments 1) {
     <label>New user name:
         <input type="text" name="comment_user" value="%($"post_arg_comment_user%)">
     </label>
@@ -21,5 +22,14 @@
     <div style="font-size: 70%">
     Enter your desired user name/password and after your comment has been reviewed by an admin it will be posted and your account will be enabled. If you are already registered please <a href="/_users/login" rel="nofollow">login</a> before posting.
     </div>
+%   }
+%   if not if(~ $#bridge_anon_comments 1) {
+    <label>Are you a robot? 
+        <select>
+        <option value="yes">Yes</option>
+        <option value="no">No</option>
+        </select>
+    </label>
+%   }
 % }
 </form>

sites/tst.cat-v.org/apps/bridge/a/_werc/config

@@ -0,0 +1 @@
+conf_enable_comments -a