Add/update sms- and Kannel-related scripts.

1 files changed, 10 insertions, 2 deletions

diff --git a/localmarkdown2sms b/localmarkdown2sms
index 7293583..2f91108 100755
--- a/localmarkdown2sms
+++ b/localmarkdown2sms
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # /usr/local/sbin/localmarkdown2sms
-# Copyright 2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright 2009-2010, Jonas Smedegaard <dr@jones.dk>
 #
 # Send series of messages through Kannel from simplified Markdown files
 
@@ -37,12 +37,16 @@ use Proc::Daemon;
 Proc::Daemon::Init unless ($debug);
 
 my $sms_url = $ENV{SMS_URL} || "http://localhost:13013/cgi-bin/sendsms";
+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_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_concat = $ENV{SMS_CONCAT};
+my $sms_dlr_mask = $ENV{SMS_DLR_MASK};
 my $path = $ENV{mdpath};
 
 my (%file, %delay, %reply);
@@ -194,12 +198,16 @@ sub sendmsg {
 		my $ua = LWP::UserAgent->new(agent => "localmarkdown2sms");
 		$ua->timeout(10);
 		my $url = $sms_url
-			. '?username=' . uri_escape($sms_user)
+			. '?' . $sms_usertag . '=' . uri_escape($sms_user)
 			. '&password=' . uri_escape($sms_pw)
 			. '&to=' . uri_escape($phone);
+		$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 .= '&concat=' . uri_escape($sms_concat) if ($sms_concat);
+		$url .= '&dlr-mask=' . uri_escape($sms_dlr_mask) if ($sms_dlr_mask);
 		$url .= '&' . $sms_msgtag . '=' . uri_escape(transliterate($sms_cp, $msg));
+		DEBUG "Sending request: $url";
 		my $response = $ua->request(HTTP::Request->new('GET', $url));
 		unless ($response->is_success) {
 			ERROR $response->status_line;