|
@@ -687,23 +687,26 @@ function add_to_mailing_list {
|
687
|
687
|
return
|
688
|
688
|
fi
|
689
|
689
|
if [ ${#LIST_SUBJECT} -lt 2 ]; then
|
690
|
|
- dialog --title $"Add mailing list" \
|
691
|
|
- --msgbox $"No mailing list subject was given" 6 40
|
692
|
|
- return
|
693
|
|
- fi
|
694
|
|
- if [ ${#LIST_EMAIL} -lt 2 ]; then
|
695
|
|
- dialog --title $"Add mailing list" \
|
696
|
|
- --msgbox $"No mailing list email address was given" 6 40
|
697
|
|
- return
|
|
690
|
+ if [ ${#LIST_EMAIL} -lt 2 ]; then
|
|
691
|
+ dialog --title $"Add mailing list" \
|
|
692
|
+ --msgbox $"No mailing list subject or address was given" 6 40
|
|
693
|
+ return
|
|
694
|
+ fi
|
698
|
695
|
fi
|
699
|
|
- if [[ "$LIST_EMAIL" != *"@"* || "$LIST_EMAIL" != *"."* ]]; then
|
700
|
|
- dialog --title $"Add mailing list" \
|
701
|
|
- --msgbox $"Unrecognised email address" 6 40
|
702
|
|
- return
|
|
696
|
+ if [ ${#LIST_SUBJECT} -gt 1 ]; then
|
|
697
|
+ ${PROJECT_NAME}-addlist -u $SELECTED_USERNAME -l "$LIST_NAME" \
|
|
698
|
+ -s "$LIST_SUBJECT"
|
|
699
|
+ else
|
|
700
|
+ if [[ "$LIST_EMAIL" != *"@"* || "$LIST_EMAIL" != *"."* ]]; then
|
|
701
|
+ dialog --title $"Add mailing list" \
|
|
702
|
+ --msgbox $"Unrecognised email address" 6 40
|
|
703
|
+ return
|
|
704
|
+ else
|
|
705
|
+ ${PROJECT_NAME}-addlist -u $SELECTED_USERNAME -l "$LIST_NAME" \
|
|
706
|
+ -e "$LIST_EMAIL"
|
|
707
|
+ fi
|
703
|
708
|
fi
|
704
|
709
|
|
705
|
|
- ${PROJECT_NAME}-addlist -u $SELECTED_USERNAME -l "$LIST_NAME" \
|
706
|
|
- -s "$LIST_SUBJECT" -e "$LIST_EMAIL"
|
707
|
710
|
dialog --title $"Add mailing list" \
|
708
|
711
|
--msgbox $"$LIST_NAME list was added" 6 40
|
709
|
712
|
}
|