From fe0951b5a7bf4481c4be479b5a469398714f38f1 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 10 Jul 2010 15:20:51 +0200 Subject: Implement callback support, and set callback=3 for clickatell. --- localkannel-dispatch | 3 ++- localmarkdown2sms | 2 ++ localsendsms | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/localkannel-dispatch b/localkannel-dispatch index e104054..3a9be68 100755 --- a/localkannel-dispatch +++ b/localkannel-dispatch @@ -115,12 +115,13 @@ case "$provider" in SMS_CP="iso8859-1" SMS_USERTAG="user" SMS_API="3231280" + SMS_CALLBACK="3" SMS_CONCAT="3" SMS_ESCALATE="1" SMS_VALIDITY="1" SMS_REQ_FEAT="24611" # 1+2+32+8192+16384 = text+8bit+numeric_src+dlr+concat stripprefix="1" - export SMS_URL SMS_USER SMS_PW SMS_CP SMS_USERTAG SMS_API SMS_CONCAT SMS_ESCALATE SMS_VALIDITY SMS_REQ_FEAT stripprefix + export SMS_URL SMS_USER SMS_PW SMS_CP SMS_USERTAG SMS_API SMS_CALLBACK SMS_CONCAT SMS_ESCALATE SMS_VALIDITY SMS_REQ_FEAT stripprefix ;; # supports DLR # Kannel clickatell profile supports concatenation but not req_feat diff --git a/localmarkdown2sms b/localmarkdown2sms index 1bcb181..c18dd01 100755 --- a/localmarkdown2sms +++ b/localmarkdown2sms @@ -42,6 +42,7 @@ my $sms_usertag = $ENV{SMS_USERTAG} || "username"; my $sms_user = $ENV{SMS_USER} || "tester"; my $sms_pw = $ENV{SMS_PW} || "foobar"; my $sms_api = $ENV{SMS_API}; +my $sms_callback = $ENV{SMS_CALLBACK}; my $sms_phone = $ENV{SMS_PHONE}; my $sms_errfrom = $ENV{SMS_ERRFROM} || $sms_phone; my $sms_errto1 = $ENV{SMS_ERRTO1}; @@ -222,6 +223,7 @@ sub sendmsg { . '&password=' . uri_escape($sms_pw) . '&to=' . uri_escape($to); $url .= '&api_id=' . uri_escape($sms_api) if ($sms_api); + $url .= '&callback=' . uri_escape($sms_callback) if ($sms_callback); $url .= '&from=' . uri_escape($from) if ($from); $url .= '&smsc=' . uri_escape($sms_smsc) if ($sms_smsc); $url .= '&concatenation=true' if ($sms_concatenation); diff --git a/localsendsms b/localsendsms index ad4b749..6b69e93 100755 --- a/localsendsms +++ b/localsendsms @@ -20,6 +20,7 @@ my $sms_usertag = $ENV{SMS_USERTAG} || "username"; my $sms_user = $ENV{SMS_USER} || "tester"; my $sms_pw = $ENV{SMS_PW} || "foobar"; my $sms_api = $ENV{SMS_API}; +my $sms_callback = $ENV{SMS_CALLBACK}; my $sms_phone = $ENV{SMS_PHONE}; my $sms_smsc = $ENV{SMS_SMSC}; my $sms_msgtag = $ENV{SMS_MSGTAG} || "text"; @@ -79,6 +80,7 @@ sub sendmsg { . '&password=' . uri_escape($sms_pw) . '&to=' . uri_escape($to); $url .= '&api_id=' . uri_escape($sms_api) if ($sms_api); + $url .= '&callback=' . uri_escape($sms_callback) if ($sms_callback); $url .= '&from=' . uri_escape($from) if ($from); $url .= '&smsc=' . uri_escape($sms_smsc) if ($sms_smsc); $url .= '&concatenation=true' if ($sms_concatenation); -- cgit v1.2.3