From 795c68fe2a593b0b2b82a524c70a7ec14d73a14a Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 3 Jun 2010 13:44:43 +0200 Subject: Add support for dlr_url in localmarkdown2sms. --- localmarkdown2sms | 2 ++ 1 file changed, 2 insertions(+) (limited to 'localmarkdown2sms') diff --git a/localmarkdown2sms b/localmarkdown2sms index 2f91108..feb7a53 100755 --- a/localmarkdown2sms +++ b/localmarkdown2sms @@ -47,6 +47,7 @@ my $sms_msgtag = $ENV{SMS_MSGTAG} || "text"; my $sms_cp = $ENV{SMS_CP} || "utf8"; my $sms_concat = $ENV{SMS_CONCAT}; my $sms_dlr_mask = $ENV{SMS_DLR_MASK}; +my $sms_dlr_url = $ENV{SMS_DLR_URL}; my $path = $ENV{mdpath}; my (%file, %delay, %reply); @@ -206,6 +207,7 @@ sub sendmsg { $url .= '&smsc=' . uri_escape($sms_smsc) if ($sms_smsc); $url .= '&concat=' . uri_escape($sms_concat) if ($sms_concat); $url .= '&dlr-mask=' . uri_escape($sms_dlr_mask) if ($sms_dlr_mask); + $url .= '&dlr-url=' . uri_escape($sms_dlr_url) if ($sms_dlr_url); $url .= '&' . $sms_msgtag . '=' . uri_escape(transliterate($sms_cp, $msg)); DEBUG "Sending request: $url"; my $response = $ua->request(HTTP::Request->new('GET', $url)); -- cgit v1.2.3 From 6080ca49fa91a316f71247575a59cf7e0df0dd2f Mon Sep 17 00:00:00 2001 From: Jonas Date: Sat, 5 Jun 2010 18:38:44 +0200 Subject: Add support for validity in localmarkdown2sms, localsendsms and localkannel-dispatch. --- localkannel-dispatch | 3 ++- localmarkdown2sms | 2 ++ localsendsms | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'localmarkdown2sms') diff --git a/localkannel-dispatch b/localkannel-dispatch index e1685d8..bf635a8 100755 --- a/localkannel-dispatch +++ b/localkannel-dispatch @@ -100,7 +100,8 @@ case "$provider" in SMS_SMSC="X" 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" - export SMS_SMSC SMS_DLR_MASK SMS_DLR_URL + SMS_VALIDITY="1" + export SMS_SMSC SMS_DLR_MASK SMS_DLR_URL SMS_VALIDITY ;; *) exit1 "unknown provider \"$provider\"!" diff --git a/localmarkdown2sms b/localmarkdown2sms index feb7a53..47a06f3 100755 --- a/localmarkdown2sms +++ b/localmarkdown2sms @@ -48,6 +48,7 @@ my $sms_cp = $ENV{SMS_CP} || "utf8"; my $sms_concat = $ENV{SMS_CONCAT}; my $sms_dlr_mask = $ENV{SMS_DLR_MASK}; my $sms_dlr_url = $ENV{SMS_DLR_URL}; +my $sms_validity = $ENV{SMS_VALIDITY}; my $path = $ENV{mdpath}; my (%file, %delay, %reply); @@ -208,6 +209,7 @@ sub sendmsg { $url .= '&concat=' . uri_escape($sms_concat) if ($sms_concat); $url .= '&dlr-mask=' . uri_escape($sms_dlr_mask) if ($sms_dlr_mask); $url .= '&dlr-url=' . uri_escape($sms_dlr_url) if ($sms_dlr_url); + $url .= '&validity=' . uri_escape($sms_validity) if ($sms_validity); $url .= '&' . $sms_msgtag . '=' . uri_escape(transliterate($sms_cp, $msg)); DEBUG "Sending request: $url"; my $response = $ua->request(HTTP::Request->new('GET', $url)); diff --git a/localsendsms b/localsendsms index ec1468a..6449e3c 100755 --- a/localsendsms +++ b/localsendsms @@ -27,6 +27,7 @@ my $sms_cp = $ENV{SMS_CP} || "utf8"; my $sms_concat = $ENV{SMS_CONCAT}; my $sms_dlr_mask = $ENV{SMS_DLR_MASK}; my $sms_dlr_url = $ENV{SMS_DLR_URL}; +my $sms_validity = $ENV{SMS_VALIDITY}; # decode data if passed from kannel if ($urldecode) { @@ -77,6 +78,7 @@ sub sendmsg { $url .= '&concat=' . uri_escape($sms_concat) if ($sms_concat); $url .= '&dlr-mask=' . uri_escape($sms_dlr_mask) if ($sms_dlr_mask); $url .= '&dlr-url=' . uri_escape($sms_dlr_url) if ($sms_dlr_url); + $url .= '&validity=' . uri_escape($sms_validity) if ($sms_validity); $url .= '&' . $sms_msgtag . '=' . uri_escape(transliterate($sms_cp, $msg)); DEBUG "Sending request: $url"; my $response = $ua->request(HTTP::Request->new('GET', $url)); -- cgit v1.2.3 From 2915e2a7d90483216a7caf32a715a2ffe0200c1e Mon Sep 17 00:00:00 2001 From: root Date: Sun, 6 Jun 2010 04:36:27 +0200 Subject: Respect stripprefix in localmarkdown2sms localsendsms . --- localmarkdown2sms | 4 +++- localsendsms | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'localmarkdown2sms') diff --git a/localmarkdown2sms b/localmarkdown2sms index 47a06f3..1767788 100755 --- a/localmarkdown2sms +++ b/localmarkdown2sms @@ -49,6 +49,7 @@ my $sms_concat = $ENV{SMS_CONCAT}; my $sms_dlr_mask = $ENV{SMS_DLR_MASK}; my $sms_dlr_url = $ENV{SMS_DLR_URL}; my $sms_validity = $ENV{SMS_VALIDITY}; +my $stripprefix = $ENV{stripprefix}; my $path = $ENV{mdpath}; my (%file, %delay, %reply); @@ -62,7 +63,8 @@ my ($key) = lc (shift @ARGV); # strip international prefix # (prefix is optional some places and illegal at other places - forgot where) -$phone =~ s/\+/ /g; +$phone =~ s/^\+//g if ($stripprefix); +$sms_phone =~ s/^\+//g if ($stripprefix); # strip non-word chars from keyword (and use only first chunk of word chars) $key =~ s/.*?(\w+).*?/$1/; diff --git a/localsendsms b/localsendsms index 6449e3c..ff82ffd 100755 --- a/localsendsms +++ b/localsendsms @@ -28,6 +28,7 @@ my $sms_concat = $ENV{SMS_CONCAT}; my $sms_dlr_mask = $ENV{SMS_DLR_MASK}; my $sms_dlr_url = $ENV{SMS_DLR_URL}; my $sms_validity = $ENV{SMS_VALIDITY}; +my $stripprefix = $ENV{stripprefix}; # decode data if passed from kannel if ($urldecode) { @@ -37,7 +38,8 @@ my ($phone) = shift @ARGV; # strip international prefix # (prefix is optional some places and illegal at other places - forgot where) -#$phone =~ s/\+/ /g; +$phone =~ s/^\+//g if ($stripprefix); +$sms_phone =~ s/^\+//g if ($stripprefix); if ($debug) { Log::Log4perl->easy_init($DEBUG); -- cgit v1.2.3 From f8322721903e0c049ddd4ee681eb8b9691f56b46 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 10 Jun 2010 00:28:03 +0200 Subject: Support req_feat and binfo in localmarkdown2sms and localsendsms . --- localmarkdown2sms | 4 ++++ localsendsms | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'localmarkdown2sms') diff --git a/localmarkdown2sms b/localmarkdown2sms index 1767788..d30ed19 100755 --- a/localmarkdown2sms +++ b/localmarkdown2sms @@ -49,6 +49,8 @@ my $sms_concat = $ENV{SMS_CONCAT}; my $sms_dlr_mask = $ENV{SMS_DLR_MASK}; my $sms_dlr_url = $ENV{SMS_DLR_URL}; my $sms_validity = $ENV{SMS_VALIDITY}; +my $sms_req_feat = $ENV{SMS_REQ_FEAT}; +my $sms_binfo = $ENV{SMS_BINFO}; my $stripprefix = $ENV{stripprefix}; my $path = $ENV{mdpath}; @@ -212,6 +214,8 @@ sub sendmsg { $url .= '&dlr-mask=' . uri_escape($sms_dlr_mask) if ($sms_dlr_mask); $url .= '&dlr-url=' . uri_escape($sms_dlr_url) if ($sms_dlr_url); $url .= '&validity=' . uri_escape($sms_validity) if ($sms_validity); + $url .= '&req_feat=' . uri_escape($sms_req_feat) if ($sms_req_feat); + $url .= '&binfo=' . uri_escape($sms_binfo) if ($sms_binfo); $url .= '&' . $sms_msgtag . '=' . uri_escape(transliterate($sms_cp, $msg)); DEBUG "Sending request: $url"; my $response = $ua->request(HTTP::Request->new('GET', $url)); diff --git a/localsendsms b/localsendsms index ff82ffd..0bd22c2 100755 --- a/localsendsms +++ b/localsendsms @@ -28,6 +28,8 @@ my $sms_concat = $ENV{SMS_CONCAT}; my $sms_dlr_mask = $ENV{SMS_DLR_MASK}; my $sms_dlr_url = $ENV{SMS_DLR_URL}; my $sms_validity = $ENV{SMS_VALIDITY}; +my $sms_req_feat = $ENV{SMS_REQ_FEAT}; +my $sms_binfo = $ENV{SMS_BINFO}; my $stripprefix = $ENV{stripprefix}; # decode data if passed from kannel @@ -81,6 +83,8 @@ sub sendmsg { $url .= '&dlr-mask=' . uri_escape($sms_dlr_mask) if ($sms_dlr_mask); $url .= '&dlr-url=' . uri_escape($sms_dlr_url) if ($sms_dlr_url); $url .= '&validity=' . uri_escape($sms_validity) if ($sms_validity); + $url .= '&req_feat=' . uri_escape($sms_req_feat) if ($sms_req_feat); + $url .= '&binfo=' . uri_escape($sms_binfo) if ($sms_binfo); $url .= '&' . $sms_msgtag . '=' . uri_escape(transliterate($sms_cp, $msg)); DEBUG "Sending request: $url"; my $response = $ua->request(HTTP::Request->new('GET', $url)); -- cgit v1.2.3