Use leading exclamation mark for group messaging (not group redirecting).

1 files changed, 7 insertions, 7 deletions

diff --git a/localkannel-dispatch b/localkannel-dispatch
index dc003d8..93736b9 100755
--- a/localkannel-dispatch
+++ b/localkannel-dispatch
@@ -190,24 +190,24 @@ case "$app" in
 esac
 #fi
 
-if [ -n "$GROUP_OK" ]; then
+# FIXME: some safety net against abuse
+#if [ -n "$GROUP_OK" ]; then
 case "$app" in
   !*)
 	group="$(echo "$app" | perl -pe 's/^!//;')"
 	members=$(cd "$vardir/user" && grep -lF "$group" */group | perl -pe "s,/group$,,") || members=
-	[ -n "$members" ] || exit1 "Message redirected for none: no members resolved in group \"$group\"!"
+	[ -n "$members" ] || exit1 "Message not sent: no members found in group \"$group\"!"
 	for member in $members; do
 		phone=$(head -n 1 "$vardir/user/$member/phone") || nophone="${nophone+$nophone }$member"
-		[ -z "$phone" ] || $sbindir/localmarkdown2sms "$phone" "$@"
+		[ -z "$phone" ] || $sbindir/localsendsms "$phone" "$*"
 	done
-	[ -n "$members" ] || exit1 "Message redirected for none: no members resolved in group \"$group\"!"
 	membercount=$(echo "$members" | wc --word)
 	[ -z "$nophone" ] || nophonecount=$(echo "$nophone" | wc --word)
-	[ -z "$nophone" ] || exit1 "Message redirected for $membercount members of group \"$group\", but failed for $nophonecount of them (could not resolve phone number)!"
-	exit0 "Message redirected for $membercount members of group \"$group\"."
+	[ -z "$nophone" ] || exit1 "Message sent to $membercount members of group \"$group\", but failed for $nophonecount of them (could not resolve phone number)!"
+	exit0 "Message sent to all $membercount members of group \"$group\"."
 	;;
 esac
-fi
+#fi
 
 case "$app" in
   /*)