From 65d66d12724720b8fb94cec6eff56f131162c22e Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 26 Sep 2010 22:54:15 +0200 Subject: Use leading exclamation mark for group messaging (not group redirecting). --- localkannel-dispatch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'localkannel-dispatch') 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 /*) -- cgit v1.2.3