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