From 52749af2239979010e4bfad304a6cb1a2b1cf4a0 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Thu, 14 Jan 2021 18:23:11 +0100 Subject: [PATCH] Captcha : instructions are now italic --- captcha/captcha.sh | 3 --- captcha/experimental.sh | 14 +++++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/captcha/captcha.sh b/captcha/captcha.sh index f2af170..5a89c33 100755 --- a/captcha/captcha.sh +++ b/captcha/captcha.sh @@ -113,9 +113,6 @@ RAND_INDEX=$(($R % ${#TRANSFORMATIONS[@]})) INSTRUCTIONS=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 1) INSTRUCTIONS2=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 3) TEXT=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 2) -echo " $INSTRUCTIONS" -echo "$TEXT" -echo "$INSTRUCTIONS2" convert -size 300x70 xc:none -pointsize 20 \ \( -clone 0 -fill black \ diff --git a/captcha/experimental.sh b/captcha/experimental.sh index 2e644b8..8289f61 100755 --- a/captcha/experimental.sh +++ b/captcha/experimental.sh @@ -113,9 +113,6 @@ RAND_INDEX=$(($R % ${#TRANSFORMATIONS[@]})) INSTRUCTIONS=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 1) INSTRUCTIONS2=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 3) TEXT=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 2) -echo " $INSTRUCTIONS" -echo "$TEXT" -echo "$INSTRUCTIONS2" convert -size 300x70 xc:none -pointsize 20 \ \( -clone 0 -fill black \ @@ -127,3 +124,14 @@ convert -size 300x70 xc:none -pointsize 20 \ -wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \ -roll -$ROLL_X+0 \) \ -flatten -crop 300x70 +repage -quality 500 -depth 11 png:"/var/lib/ejabberd/chapril_captchas/EXPERIMENTAL_$(date "+%Y-%m-%d-%H%M%S")_${INPUT}.png" + +convert -size 300x70 xc:none -pointsize 20 \ + \( -clone 0 -fill black \ + -stroke black -strokewidth 1 \ + -annotate "${RAND_ANGLE}x25+0+0" "\n $INSTRUCTIONS" \ + -annotate "${RAND_ANGLE}x0+0+20" "\n $TEXT" \ + -annotate "${RAND_ANGLE}x25+0+40" "\n $INSTRUCTIONS2" \ + -roll +$ROLL_X+0 \ + -wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \ + -roll -$ROLL_X+0 \) \ + -flatten -crop 300x60 +repage -quality 500 -depth 11 png:-