chalec/xmpp
chalec
/
xmpp
7
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases Wiki Activity

Captcha : changed size to make text to fit inside

This commit is contained in:
Adrien Bourmault 2021-01-14 18:55:18 +01:00 committed by root
parent 6c7683e66b
commit 481704d43a
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
captcha/captcha.sh
View File

@ -112,24 +112,24 @@ INSTRUCTIONS=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 1)
INSTRUCTIONS2=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 3) INSTRUCTIONS2=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 3)
TEXT=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 2) TEXT=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 2)
convert -size 300x60 xc:none -pointsize 20 \ convert -size 300x70 xc:none -pointsize 20 \
\( -clone 0 -fill black \ \( -clone 0 -fill black \
-stroke black -strokewidth 1 \ -stroke black -strokewidth 1 \
-font Helvetica-Narrow -weight Thin -annotate "0x0+0+0" "\n $INSTRUCTIONS" \ -font Helvetica-Narrow -annotate "0x0+0+0" "\n $INSTRUCTIONS" \
-font Helvetica-Bold -weight Light -annotate "0x0+0+18" "\n $TEXT" \ -font Helvetica-Bold -annotate "0x0+0+20" "\n $TEXT" \
-font Helvetica-Narrow -weight Thin -annotate "0x0+0+35" "\n $INSTRUCTIONS2" \ -font Helvetica-Narrow -annotate "0x0+0+40" "\n $INSTRUCTIONS2" \
-roll +$ROLL_X+0 \ -roll +$ROLL_X+0 \
-wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \ -wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \
-roll -$ROLL_X+0 \) \ -roll -$ROLL_X+0 \) \
-flatten -crop 300x60 +repage -quality 500 -depth 11 png:"/var/lib/ejabberd/chapril_captchas/$(date "+%Y-%m-%d-%H%M%S")_${INPUT}.png" -flatten -crop 300x70 +repage -quality 500 -depth 11 png:"/var/lib/ejabberd/chapril_captchas/$(date "+%Y-%m-%d-%H%M%S")_${INPUT}.png"
convert -size 300x60 xc:none -pointsize 20 \ convert -size 300x70 xc:none -pointsize 20 \
\( -clone 0 -fill black \ \( -clone 0 -fill black \
-stroke black -strokewidth 1 \ -stroke black -strokewidth 1 \
-font Helvetica-Narrow -weight Thin -annotate "0x0+0+0" "\n $INSTRUCTIONS" \ -font Helvetica-Narrow -annotate "0x0+0+0" "\n $INSTRUCTIONS" \
-font Helvetica-Bold -annotate "0x0+0+18" "\n $TEXT" \ -font Helvetica-Bold -annotate "0x0+0+20" "\n $TEXT" \
-font Helvetica-Narrow -weight Thin -annotate "0x0+0+36" "\n $INSTRUCTIONS2" \ -font Helvetica-Narrow -annotate "0x0+0+40" "\n $INSTRUCTIONS2" \
-roll +$ROLL_X+0 \ -roll +$ROLL_X+0 \
-wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \ -wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \
-roll -$ROLL_X+0 \) \ -roll -$ROLL_X+0 \) \
-flatten -crop 300x60 +repage -quality 500 -depth 11 png:- -flatten -crop 300x70 +repage -quality 500 -depth 11 png:-

16
captcha/experimental.sh
View File

@ -112,24 +112,24 @@ INSTRUCTIONS=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 1)
INSTRUCTIONS2=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 3) INSTRUCTIONS2=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 3)
TEXT=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 2) TEXT=$(echo "$(${TRANSFORMATIONS[$RAND_INDEX]})" | cut -d "|" -f 2)
convert -size 300x60 xc:none -pointsize 20 \ convert -size 300x70 xc:none -pointsize 20 \
\( -clone 0 -fill black \ \( -clone 0 -fill black \
-stroke black -strokewidth 1 \ -stroke black -strokewidth 1 \
-font Helvetica-Narrow -annotate "0x0+0+0" "\n $INSTRUCTIONS" \ -font Helvetica-Narrow -annotate "0x0+0+0" "\n $INSTRUCTIONS" \
-font Helvetica-Bold -annotate "0x0+0+18" "\n $TEXT" \ -font Helvetica-Bold -annotate "0x0+0+20" "\n $TEXT" \
-font Helvetica-Narrow -annotate "0x0+0+35" "\n $INSTRUCTIONS2" \ -font Helvetica-Narrow -annotate "0x0+0+40" "\n $INSTRUCTIONS2" \
-roll +$ROLL_X+0 \ -roll +$ROLL_X+0 \
-wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \ -wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \
-roll -$ROLL_X+0 \) \ -roll -$ROLL_X+0 \) \
-flatten -crop 300x60 +repage -quality 500 -depth 11 png:"/var/lib/ejabberd/chapril_captchas/EXPERIMENTAL_$(date "+%Y-%m-%d-%H%M%S")_${INPUT}.png" -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 300x60 xc:none -pointsize 20 \ convert -size 300x70 xc:none -pointsize 20 \
\( -clone 0 -fill black \ \( -clone 0 -fill black \
-stroke black -strokewidth 1 \ -stroke black -strokewidth 1 \
-font Helvetica-Narrow -annotate "0x0+0+0" "\n $INSTRUCTIONS" \ -font Helvetica-Narrow -annotate "0x0+0+0" "\n $INSTRUCTIONS" \
-font Helvetica-Bold -annotate "0x0+0+18" "\n $TEXT" \ -font Helvetica-Bold -annotate "0x0+0+20" "\n $TEXT" \
-font Helvetica-Narrow -annotate "0x0+0+36" "\n $INSTRUCTIONS2" \ -font Helvetica-Narrow -annotate "0x0+0+40" "\n $INSTRUCTIONS2" \
-roll +$ROLL_X+0 \ -roll +$ROLL_X+0 \
-wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \ -wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \
-roll -$ROLL_X+0 \) \ -roll -$ROLL_X+0 \) \
-flatten -crop 300x60 +repage -quality 500 -depth 11 png:- -flatten -crop 300x70 +repage -quality 500 -depth 11 png:-