X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=processor%2Fdefault.html.do;h=196713c1172d6b090cc9d8d74168036f9f1cdb7d;hb=7fced3bc8411add4f4d3c6b70ab4a6f01e30277a;hp=c744889405bbe8e4f8b9070b18cd02828d994882;hpb=c841d869ec1eaa8107bece1385038339aa6cfd3e;p=redo-blog diff --git a/processor/default.html.do b/processor/default.html.do index c744889..196713c 100644 --- a/processor/default.html.do +++ b/processor/default.html.do @@ -10,6 +10,7 @@ prep_url() { # Pull in global dependencies. . ./helpers.sh metadata_dir=metadata +captchas_dir=captchas meta_file="${metadata_dir}/${1%.html}.automatic_metadata" redo-ifchange "$meta_file" intermediate_file="${metadata_dir}/${1%.html}.intermediate" @@ -22,6 +23,8 @@ linkback_tmpl_file="${metadata_dir}"/linkback.tmpl redo-ifchange "$linkback_tmpl_file" replies_file="${1%.html}.links" redo-ifchange "$replies_file" +captcha_file="$captchas_dir/${1%.html}" +redo-ifchange "$captcha_file" # Build entry data. blog_title=$(read_and_escape_file "$title_file" | head -1 | prep_sed) @@ -35,6 +38,7 @@ date_created=$(date -u "+%Y-%m-%d" -d "@${datetime_created_unix}") datetime_lastmod_unix=$(get_lastmod_date_from_meta_file "$meta_file") date_updated=$(date -u "+%Y-%m-%d" -d "@${datetime_lastmod_unix}") replies=$(while read line; do prep_url "$line"; done < "$replies_file") +captcha=$(escape_html "$(cat "$captcha_file" | sed -n 2p)" | prep_sed) # Put data into template. template=$(cat "$article_tmpl_file") @@ -46,4 +50,5 @@ sed 's/%DATE_CREATED%/'"$date_created"'/g' | \ sed 's/%DATE_UPDATED%/'"$date_updated"'/g' | \ sed 's/%BODY%/'"$body"'/g' | \ sed 's/%LINKBACKS%/'"$replies"'/g' | \ +sed 's/%CAPTCHA%/'"$captcha"'/g' | \ tr '\a' '%'