q/thirdculture-werc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make bridge app more correct: only activated when GET-ing pages which can have comments and don't get confused by other apps POSTs. Simplify code along the way.

Browse source
This commit is contained in:
Uriel 2009-02-26 11:42:20 +01:00
parent b9d64d6bd2
commit b00107e3b8
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
apps/bridge/app.rc
View file

@ -11,23 +11,27 @@ fn conf_enable_comments {
} }
fn bridge_init { fn bridge_init {
if(~ $#enable_comments 1) { if(~ $#enable_comments 1 && ! ~ `{ls $local_path.$comment_file_types >[2]/dev/null|wc -l} 0) {
comments_dir=$sitedir$req_path'_werc/comments' comments_dir=$sitedir$req_path'_werc/comments'
if(test -d $comments_dir) if(~ $REQUEST_METHOD GET && test -d $comments_dir)
ll_add handlers_body_foot template apps/bridge/comments_list.tpl ll_add handlers_body_foot template apps/bridge/comments_list.tpl
if({ check_user $groups_allowed_comments || {~ $#logged_user 0 && ! ~ $#allow_new_user_comments 0} } && ! ~ `{ls $local_path.$comment_file_types >[2]/dev/null|wc -l} 0) { if(check_user $groups_allowed_comments || {~ $#logged_user 0 && ! ~ $#allow_new_user_comments 0}) {
ll_add handlers_body_foot template apps/bridge/foot.tpl
if(~ $REQUEST_METHOD POST && mk_new_comment $comments_dir) if(~ $#post_arg_bridge_post 1) {
post_redirect $base_url^$post_arg_document_uri ll_add handlers_body_foot template apps/bridge/foot.tpl
if not
saved_comment_text=$post_arg_comment_text if(mk_new_comment $comments_dir)
post_redirect $base_url^$req_path
if not
saved_comment_text=$post_arg_comment_text
}
if not if(~ $REQUEST_METHOD GET)
ll_add handlers_body_foot template apps/bridge/foot.tpl
} }
if not if not if(~ $REQUEST_METHOD GET)
ll_add handlers_body_foot echo '<hr /><p>To post a comment you need to <a href="/_users/login">login</a> first.' ll_add handlers_body_foot echo '<hr /><p>To post a comment you need to <a href="/_users/login">login</a> first.'
} }
} }

4
apps/bridge/foot.tpl
View file

@ -1,12 +1,10 @@
<hr /> <hr />
% notices_handler % notices_handler
% # XXX should post to bridge_post or similar
<form action="" method="post"> <form action="" method="post">
<textarea name="comment_text" id="comment_text" cols="80" rows="16">%($"saved_comment_text%)</textarea> <textarea name="comment_text" id="comment_text" cols="80" rows="16">%($"saved_comment_text%)</textarea>
<br /> <br />
<input type="hidden" name="document_uri" value="%($req_path%)" /> <input type="submit" name="bridge_post" value="Post a comment" />
<input type="submit" name="post_comment" value="Post a comment" />
% if(~ $#logged_user 0 && ! ~ $#allow_new_user_comments 0) { % if(~ $#logged_user 0 && ! ~ $#allow_new_user_comments 0) {
<label>New user name: <label>New user name: