fix bug in accounts, added better From: to mail handler

merge-requests/2/head
Dominika Liberda 2020-10-29 19:20:11 +01:00 committed by Dominika Liberda
parent 9b8033854b
commit 1d3e54e085
2 changed files with 9 additions and 3 deletions

View File

@ -71,6 +71,8 @@ function session_verify() {
# session_get_username(session)
function session_get_username() {
[[ "$1" == "" ]] && return
IFS=':'
local data=($(grep ":$1" secret/users.dat))
unset IFS

View File

@ -3,8 +3,12 @@
# mailgen(from, to, subject, msg)
function mailgen() {
echo "From: $1
To: $2
if [[ "$sender_name" != "" ]]; then
echo "From: $sender_name <$1>"
else
echo "From: $1"
fi
echo "To: $2
Subject: $3
$4"
@ -13,7 +17,7 @@ $4"
# mailsend(to, subject, msg)
function mailsend() {
tmp="$(mktemp)"
mailgen "${cfg[mail]}" "$1" "$2" "$3" > "$tmp"
sender_name="$sender_name" mailgen "${cfg[mail]}" "$1" "$2" "$3" > "$tmp"
curl \
$([[ ${cfg[mail_ignore_bad_cert]} == true ]] && printf -- "-k") \