CRICS/streamupload
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add BCC option

Browse Source
This commit is contained in:
pepa65 2022-09-18 10:03:03 +07:00
parent 461940d93a
commit a33f05f75a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_vars
View File

@ -20,3 +20,5 @@ smtp=''
port='' port=''
# Defaults to StartTLS when empty, otherwise SSL/TLS # Defaults to StartTLS when empty, otherwise SSL/TLS
ssltls='true' ssltls='true'
# When empty, no BCC gets sent
bcc=''

5
encode
View File

@ -20,7 +20,7 @@ Log(){ # 1:message 2:returncode(empty: no exit) I:file
} }
Mail(){ # 1:kind(0:done, 1:wrong type, 2:encoding error) 2:logline I:repopath,email,username,name,type,start,finish Mail(){ # 1:kind(0:done, 1:wrong type, 2:encoding error) 2:logline I:repopath,email,username,name,type,start,finish
source "$repopath/vars" # I:user,password,smtp,port,ssltls source "$repopath/vars" # I:user,password,smtp,port,ssltls.bcc
local sbj msg to from="Stream Upload server" local sbj msg to from="Stream Upload server"
mapfile -t <"$repopath/mailhash" mapfile -t <"$repopath/mailhash"
for line in "${MAPFILE[@]}" for line in "${MAPFILE[@]}"
@ -32,6 +32,7 @@ Mail(){ # 1:kind(0:done, 1:wrong type, 2:encoding error) 2:logline I:repopath,em
[[ $port ]] || port=587 [[ $port ]] || port=587
# If ssltls is not empty, switch to SSL/TLS # If ssltls is not empty, switch to SSL/TLS
[[ $ssltls ]] && $ssltls='-T' [[ $ssltls ]] && $ssltls='-T'
[[ $bcc ]] && $bcc='-b '.$bcc
sbj[0]="Stream Upload encoding done for ${name##*@}" sbj[0]="Stream Upload encoding done for ${name##*@}"
sbj[1]="Stream Upload file wrong type: $type" sbj[1]="Stream Upload file wrong type: $type"
sbj[2]="Stream Upload error encoding" sbj[2]="Stream Upload error encoding"
@ -40,7 +41,7 @@ Mail(){ # 1:kind(0:done, 1:wrong type, 2:encoding error) 2:logline I:repopath,em
msg[2]="Heya,\n\nThe file '$name' started encoding on $start but ran into an error on $finish.\n\nStream Upload server\n" msg[2]="Heya,\n\nThe file '$name' started encoding on $start but ran into an error on $finish.\n\nStream Upload server\n"
if [[ $to && $user && $password && $smtp && $port ]] if [[ $to && $user && $password && $smtp && $port ]]
then # All ingredients for a mail present then # All ingredients for a mail present
/usr/local/bin/mailer -m "$(echo -e "${msg[$1]}")" -t "$to" -s "${sbj[$1]}" -u "$user" -p "$password" -S "$smtp" -P "$port" $ssltls -f "$from" 2>"$repopath/mailer.log" && /usr/local/bin/mailer -m "$(echo -e "${msg[$1]}")" -t "$to" $bcc -s "${sbj[$1]}" -u "$user" -p "$password" -S "$smtp" -P "$port" $ssltls -f "$from" 2>"$repopath/mailer.log" &&
Log "== Mail with subject '${sbj[$1]}' sent to $to" || Log "== Mail with subject '${sbj[$1]}' sent to $to" ||
Log "== Mail with subject '${sbj[$1]}' failed to send to: $to" Log "== Mail with subject '${sbj[$1]}' failed to send to: $to"
Log "Start encoding on $start, finished on $finish" Log "Start encoding on $start, finished on $finish"