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

Move comments display to a template. Show a link to login page when required for posting comments.

Browse source
This commit is contained in:
Uriel 2009-02-16 03:46:21 +00:00
parent 47955dd43a
commit 77f2dcce59
2 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
apps/bridge/app.rc
View file

@ -13,18 +13,21 @@ fn conf_enable_comments {
fn bridge_init {
if(~ $#enable_comments 1) {
cdir=$sitedir$req_path'_werc/comments'
if(test -d $cdir)
ll_add handlers_body_foot display_comments $cdir
comments_dir=$sitedir$req_path'_werc/comments'
if(test -d $comments_dir)
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) {
ll_add handlers_body_foot template apps/bridge/foot.tpl
if(~ $REQUEST_METHOD POST && mk_new_comment $cdir)
if(~ $REQUEST_METHOD POST && mk_new_comment $comments_dir)
post_redirect $base_url^$post_arg_document_uri
if not
saved_comment_text=$post_arg_comment_text
}
if not
ll_add handlers_body_foot echo '<p>To post a comment you need to <a href="/_users/login">login</a> first.'
}
}
@ -53,7 +56,7 @@ fn mk_new_comment {
if(! ~ $#allow_new_user_comments 0) {
if(validate_new_user $"post_arg_comment_user $post_arg_comment_passwd $post_arg_comment_passwd2) {
u=$post_arg_comment_user':'$post_arg_comment_passwd
dir=$cdir^'_pending'
dir=$comments_dir^'_pending'
# XXX: This doesn't work because we then do a redirect.
notify_notes='Saved comment and registration info, they will be enabled when approved by an admin.'
}
@ -85,15 +88,3 @@ fn mk_new_comment {
notify_errors=$_status
status=$_status
}
fn display_comments {
echo '<hr /><h2>Comments</h2>'
for(c in `{ls $*/}) {
if(test -s $c/body) {
ifs=() { echo '<div class="comment"><h5>By: <i>'`{cat $c/user}'</i></b> ('`{cat $c/posted}')</h5>'}
cat $c/body | escape_html | sed 's,$,<br />,'
echo '<hr /></div>'
}
}
}

13
apps/bridge/comments_list.tpl Normal file
View file

@ -0,0 +1,13 @@
<hr />
<h2>Comments</h2>
% for(c in `{ls $comments_dir/}) {
% if(test -s $c/body) {
<div class="comment">
<h5>By: <i>%(`{cat $c/user}%)</i></b> (%(`{cat $c/posted}%))
</h5>
% cat $c/body | escape_html | sed 's,$,<br />,'
<hr /></div>
% }
% }