free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

List or subject

This commit is contained in:
Bob Mottram 2016-02-11 09:22:03 +00:00
parent 238a7fbc92
commit b8a155caca
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/freedombone-controlpanel
View File

@ -687,23 +687,26 @@ function add_to_mailing_list {
return return
fi fi
if [ ${#LIST_SUBJECT} -lt 2 ]; then if [ ${#LIST_SUBJECT} -lt 2 ]; then
dialog --title $"Add mailing list" \
--msgbox $"No mailing list subject was given" 6 40
return
fi
if [ ${#LIST_EMAIL} -lt 2 ]; then if [ ${#LIST_EMAIL} -lt 2 ]; then
dialog --title $"Add mailing list" \ dialog --title $"Add mailing list" \
--msgbox $"No mailing list email address was given" 6 40 --msgbox $"No mailing list subject or address was given" 6 40
return return
fi fi
fi
if [ ${#LIST_SUBJECT} -gt 1 ]; then
${PROJECT_NAME}-addlist -u $SELECTED_USERNAME -l "$LIST_NAME" \
-s "$LIST_SUBJECT"
else
if [[ "$LIST_EMAIL" != *"@"* || "$LIST_EMAIL" != *"."* ]]; then if [[ "$LIST_EMAIL" != *"@"* || "$LIST_EMAIL" != *"."* ]]; then
dialog --title $"Add mailing list" \ dialog --title $"Add mailing list" \
--msgbox $"Unrecognised email address" 6 40 --msgbox $"Unrecognised email address" 6 40
return return
else
${PROJECT_NAME}-addlist -u $SELECTED_USERNAME -l "$LIST_NAME" \
-e "$LIST_EMAIL"
fi
fi fi
${PROJECT_NAME}-addlist -u $SELECTED_USERNAME -l "$LIST_NAME" \
-s "$LIST_SUBJECT" -e "$LIST_EMAIL"
dialog --title $"Add mailing list" \ dialog --title $"Add mailing list" \
--msgbox $"$LIST_NAME list was added" 6 40 --msgbox $"$LIST_NAME list was added" 6 40
} }