Add URI parts validiy and excalate, and fix strip leading sms_ from concat.

3 files changed, 8 insertions, 2 deletions

diff --git a/localkannel-dispatch b/localkannel-dispatch
index 56b2a9b..8e098cc 100755
--- a/localkannel-dispatch
+++ b/localkannel-dispatch
@@ -107,9 +107,11 @@ case "$provider" in
 	SMS_USERTAG="user"
 	SMS_API="3231280"
 	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_REQ_FEAT stripprefix
+	export SMS_URL SMS_USER SMS_PW SMS_CP SMS_USERTAG SMS_API SMS_CONCAT SMS_ESCALATE SMS_VALIDITY SMS_REQ_FEAT stripprefix
 	;;
   # supports DLR
   # Kannel clickatell profile supports concatenation but not req_feat
@@ -119,7 +121,7 @@ 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"
-	SMS_BINFO="req_feat=24611&sms_concat=3" # 1+2+32+8192+16384 = text+8bit+numeric_src+dlr+concat
+	SMS_BINFO="req_feat=24611&concat=3&escalate=1%validity=1" # 1+2+32+8192+16384 = text+8bit+numeric_src+dlr+concat
 	stripprefix="1"
 	export SMS_SMSC SMS_DLR_MASK SMS_DLR_URL SMS_VALIDITY SMS_BINFO stripprefix
 	;;
diff --git a/localmarkdown2sms b/localmarkdown2sms
index fc771f6..c73a53f 100755
--- a/localmarkdown2sms
+++ b/localmarkdown2sms
@@ -49,6 +49,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_escalate = $ENV{SMS_ESCALATE};
 my $sms_validity = $ENV{SMS_VALIDITY};
 my $sms_req_feat = $ENV{SMS_REQ_FEAT};
 my $sms_binfo = $ENV{SMS_BINFO};
@@ -217,6 +218,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 .= '&escalate=' . uri_escape($sms_escalate) if ($sms_escalate);
 		$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);
diff --git a/localsendsms b/localsendsms
index 0bd22c2..e1e7298 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_escalate = $ENV{SMS_ESCALATE};
 my $sms_validity = $ENV{SMS_VALIDITY};
 my $sms_req_feat = $ENV{SMS_REQ_FEAT};
 my $sms_binfo = $ENV{SMS_BINFO};
@@ -82,6 +83,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 .= '&escalate=' . uri_escape($sms_escalate) if ($sms_escalate);
 		$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);