Support Kannel concatenation flag, and transliterate from iso8859-1 also for Kannel.

3 files changed, 7 insertions, 1 deletions

diff --git a/localkannel-dispatch b/localkannel-dispatch
index 2c768af..7b43ff4 100755
--- a/localkannel-dispatch
+++ b/localkannel-dispatch
@@ -118,12 +118,14 @@ case "$provider" in
   # Kannel generic profile supports req_feat but not concatenation
   clickatell_via_kannel)
 	SMS_SMSC="X"
+	SMS_CONCATENATION="1"
 	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_CP="iso8859-1"
 	SMS_VALIDITY="1"
 	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
+	export SMS_SMSC SMS_CONCATENATION SMS_DLR_MASK SMS_DLR_URL SMS_CP SMS_VALIDITY SMS_BINFO stripprefix
 	;;
   routo_via_kannel)
 	SMS_SMSC="Y"
diff --git a/localmarkdown2sms b/localmarkdown2sms
index c73a53f..8c62459 100755
--- a/localmarkdown2sms
+++ b/localmarkdown2sms
@@ -46,6 +46,7 @@ my $sms_phone = $ENV{SMS_PHONE};
 my $sms_smsc = $ENV{SMS_SMSC};
 my $sms_msgtag = $ENV{SMS_MSGTAG} || "text";
 my $sms_cp = $ENV{SMS_CP} || "utf8";
+my $sms_concatenation = $ENV{SMS_CONCATENATION};
 my $sms_concat = $ENV{SMS_CONCAT};
 my $sms_dlr_mask = $ENV{SMS_DLR_MASK};
 my $sms_dlr_url = $ENV{SMS_DLR_URL};
@@ -215,6 +216,7 @@ sub sendmsg {
 		$url .= '&api_id=' . uri_escape($sms_api) if ($sms_api);
 		$url .= '&from=' . uri_escape($sms_phone) if ($sms_phone);
 		$url .= '&smsc=' . uri_escape($sms_smsc) if ($sms_smsc);
+		$url .= '&concatenation=true' if ($sms_concatenation);
 		$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);
diff --git a/localsendsms b/localsendsms
index e1e7298..8e33cd2 100755
--- a/localsendsms
+++ b/localsendsms
@@ -24,6 +24,7 @@ my $sms_phone = $ENV{SMS_PHONE};
 my $sms_smsc = $ENV{SMS_SMSC};
 my $sms_msgtag = $ENV{SMS_MSGTAG} || "text";
 my $sms_cp = $ENV{SMS_CP} || "utf8";
+my $sms_concatenation = $ENV{SMS_CONCATENATION};
 my $sms_concat = $ENV{SMS_CONCAT};
 my $sms_dlr_mask = $ENV{SMS_DLR_MASK};
 my $sms_dlr_url = $ENV{SMS_DLR_URL};
@@ -80,6 +81,7 @@ sub sendmsg {
 		$url .= '&api_id=' . uri_escape($sms_api) if ($sms_api);
 		$url .= '&from=' . uri_escape($sms_phone) if ($sms_phone);
 		$url .= '&smsc=' . uri_escape($sms_smsc) if ($sms_smsc);
+		$url .= '&concatenation=true' if ($sms_concatenation);
 		$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);