Merge coreander:/srv/git/source.jones.dk/sbin

1 files changed, 11 insertions, 1 deletions

diff --git a/localmarkdown2sms b/localmarkdown2sms
index 6843195..cb35ca8 100755
--- a/localmarkdown2sms
+++ b/localmarkdown2sms
@@ -48,6 +48,11 @@ 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 $sms_validity = $ENV{SMS_VALIDITY};
+my $sms_req_feat = $ENV{SMS_REQ_FEAT};
+my $sms_binfo = $ENV{SMS_BINFO};
+my $stripprefix = $ENV{stripprefix};
 my $path = $ENV{mdpath};
 
 my (%file, %delay, %reply);
@@ -61,7 +66,8 @@ my ($key) = lc (shift @ARGV);
 
 # strip international prefix
 # (prefix is optional some places and illegal at other places - forgot where)
-$phone =~ s/\+/ /g;
+$phone =~ s/^\+//g if ($stripprefix);
+$sms_phone =~ s/^\+//g if ($stripprefix);
 
 # strip non-word chars from keyword (and use only first chunk of word chars)
 $key =~ s/.*?(\w+).*?/$1/;
@@ -207,6 +213,10 @@ 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 .= '&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);
 		$url .= '&' . $sms_msgtag . '=' . uri_escape(transliterate($sms_cp, $msg));
 		DEBUG "Sending request: $url";
 		my $response = $ua->request(HTTP::Request->new('GET', $url));