summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlocalkannel-dispatch3
-rwxr-xr-xlocalshowkannelsms2
2 files changed, 3 insertions, 2 deletions
diff --git a/localkannel-dispatch b/localkannel-dispatch
index 8edde5b..f1fcf5f 100755
--- a/localkannel-dispatch
+++ b/localkannel-dispatch
@@ -101,7 +101,8 @@ case "$provider" in
SMS_DLR_MASK="7"
SMS_DLR_URL="http://helloearth.jones.dk/test.cgi?type=dlr&msgid=XXX&smsid=%I&from=%p&to=%P&time=%t&unixtime=%T&dlr=%d&dlrmsg=%A"
SMS_VALIDITY="1"
- export SMS_SMSC SMS_DLR_MASK SMS_DLR_URL SMS_VALIDITY
+ stripprefix="1"
+ export SMS_SMSC SMS_DLR_MASK SMS_DLR_URL SMS_VALIDITY stripprefix
;;
routo)
SMS_SMSC="Y"
diff --git a/localshowkannelsms b/localshowkannelsms
index 437b72b..46c04bd 100755
--- a/localshowkannelsms
+++ b/localshowkannelsms
@@ -17,6 +17,6 @@ lslogfiles() {
}
#lslogfiles | xargs zcat -f | perl -ne '/^(\S+ +\S+) .*Starting to service <(.*)> from <.*> to <\+4530959593>$/ and print "$1 $2\n"; /^\S+ (\S+) .*sendsms sender:<\S+:\+4530959593> .*msg:<(.*?)>?$/ and print " $1 $2\n"; /^(...................)(?<!\d\d\d\d\-\d\d\-\d\d \d\d:\d\d:\d\d)(.*?)>?$/ and print " $1$2\n"'
-lslogfiles | xargs zcat -f | perl -ne '/^(\S+ +\S+) .*Starting to service <(.*)> from <.*> to <\+4530640636>$/ and print "$1 $2\n"; /^\S+ (\S+) .*sendsms sender:<\S+:\+4530959593> .*msg:<(.*?)>?$/ and print " $1 $2\n"; /^(...................)(?<!\d\d\d\d\-\d\d\-\d\d \d\d:\d\d:\d\d)(.*?)>?$/ and print " $1$2\n"'
+lslogfiles | xargs zcat -f | perl -ne '/^(\S+ +\S+) .*Starting to service <(.*)> from <.*> to / and print "$1 $2\n"; /^\S+ (\S+) .*sendsms sender:<\S+:.*msg:<(.*?)>?$/ and print " $1 $2\n"; /^(...................)(?<!\d\d\d\d\-\d\d\-\d\d \d\d:\d\d:\d\d)(.*?)>?$/ and print " $1$2\n"'
exit 0