diff --git a/G1BILLETS.sh b/G1BILLETS.sh index 24cd96d..9b44775 100755 --- a/G1BILLETS.sh +++ b/G1BILLETS.sh @@ -43,4 +43,10 @@ montage /tmp/g1billet/${UNIQID}/*.jpg -tile 2x3 -geometry 964x459 /tmp/g1billet/ # NB!! if "not autorized" then edit /etc/ImageMagick-6/policy.xml and comment # +# CLEANING TEMP FILES +# rm -Rf /tmp/g1billet/${UNIQID} + +# ALLOWS ANY USER TO DELETE +chmod 777 /tmp/g1billet/${UNIQID}.pdf + exit diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh index 665a32b..c8d2d59 100755 --- a/MAKE_G1BILLET.sh +++ b/MAKE_G1BILLET.sh @@ -39,33 +39,33 @@ composite -compose Over -gravity NorthEast -geometry +50+25 "/tmp/g1billet/${UNI # Change June logo color case "$MONTANT" in 1) - convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill grey -opaque '#e5912b' "/tmp/g1.png" + convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill grey -opaque '#e5912b' "/tmp/g1billet/g1.png" ;; 2) - convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill green -opaque '#e5912b' "/tmp/g1.png" + convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill green -opaque '#e5912b' "/tmp/g1billet/g1.png" ;; 5) - convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill orange -opaque '#e5912b' "/tmp/g1.png" + convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill orange -opaque '#e5912b' "/tmp/g1billet/g1.png" ;; 10) - convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill blue -opaque '#e5912b' "/tmp/g1.png" + convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill blue -opaque '#e5912b' "/tmp/g1billet/g1.png" ;; 20) - convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill purple -opaque '#e5912b' "/tmp/g1.png" + convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill purple -opaque '#e5912b' "/tmp/g1billet/g1.png" ;; 50) - convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill red -opaque '#e5912b' "/tmp/g1.png" + convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill red -opaque '#e5912b' "/tmp/g1billet/g1.png" ;; 100) - convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill black -opaque '#e5912b' "/tmp/g1.png" + convert "${MY_PATH}/images/g1.png" -fuzz 20% -fill black -opaque '#e5912b' "/tmp/g1billet/g1.png" ;; *) - cp "${MY_PATH}/images/g1.png" "/tmp/g1.png" + cp "${MY_PATH}/images/g1.png" "/tmp/g1billet/g1.png" ;; esac # Add June LOGO to Billet -composite -compose Over -gravity SouthEast -geometry +20+20 -dissolve 90% "/tmp/g1.png" "/tmp/${BILLETNAME}.jpg" "/tmp/${BILLETNAME}.jpg" +composite -compose Over -gravity SouthEast -geometry +20+20 -dissolve 90% "/tmp/g1billet/g1.png" "/tmp/${BILLETNAME}.jpg" "/tmp/${BILLETNAME}.jpg" convert -font 'Liberation-Sans' \ -pointsize 120 -fill black -draw 'text 250,250 "'"$MONTANT DU"'"' \ diff --git a/README.md b/README.md index 996ab34..1f1b797 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,8 @@ cd G1BILLET Ajoutez les dépendances nécessaire ``` -sudo apt install imagemagick qrencode ttf-mscorefonts-installer -pip3 install duniterpy +sudo apt install python3 python3-pip imagemagick qrencode ttf-mscorefonts-installer +sudo pip3 install duniterpy ``` NB: Si une erreur du type "not autorized" apparait, vous devez autoriser la création de pdf en editant /etc/ImageMagick-6/policy.xml pour commenter la ligne: diff --git a/index.php b/index.php index 55ca196..0518a91 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,6 @@ $mytime = new Datetime("now"); $timestamp = $mytime->format('U'); // CREATE 6 G1BILLETS in /tmp/g1billet/$timestamp -echo dirname(__FILE__)."/G1BILLETS.sh"; $page = shell_exec(dirname(__FILE__)."/G1BILLETS.sh '".$_REQUEST['montant']."' '".$timestamp."' 2>&1 >> /tmp/g1billet.log"); $attachment_location = "/tmp/g1billet/".$timestamp.".pdf"; @@ -19,5 +18,8 @@ if (file_exists($attachment_location)) { } else { die("Error: File not found."); } + +shell_exec(rm -f "/tmp/g1billet/".$timestamp.".pdf"); + ?>