Fix url encoding. Make URL options environment overridable.

1 files changed, 12 insertions, 7 deletions

diff --git a/localmarkdown2sms b/localmarkdown2sms
index 745ae83..71ca9ea 100755
--- a/localmarkdown2sms
+++ b/localmarkdown2sms
@@ -33,9 +33,10 @@ use Encode;
 use LWP::UserAgent;
 use URI::Escape;
 
-my $sms_url = "http://localhost:13013/cgi-bin/sendsms";
-my $sms_user = "tester";
-my $sms_pw = "foobar";
+my $sms_url = $ENV{SMS_URL} || "http://localhost:13013/cgi-bin/sendsms";
+my $sms_user = $ENV{SMS_USER} || "tester";
+my $sms_pw = $ENV{SMS_PW} || "foobar";
+my $sms_phone = $ENV{SMS_PHONE};
 
 my (%file, %delay, %reply);
 my ($path) = shift @ARGV;
@@ -155,12 +156,16 @@ sub sendmsg {
 	unless ($dummy) {
 		my $ua = LWP::UserAgent->new(agent => "localmarkdown2sms");
 		$ua->timeout(10);
-		$ua->request(HTTP::Request->new('GET', $sms_url
+		my $url = $sms_url
 			. '?username=' . uri_escape($sms_user)
 			. '&password=' . uri_escape($sms_pw)
-			. '&to=' . uri_escape($phone)
-			. '&text=' . uri_escape(encode("cp1252", $msg))
-		));
+			. '&to=' . uri_escape($phone);
+		$url .= '&from=' . uri_escape($sms_phone) if ($sms_phone);
+		$url .= '&message=' . uri_escape(encode("cp1252", $msg));
+		my $response = $ua->request(HTTP::Request->new('GET', $url));
+		unless ($response->is_success) {
+			ERROR $response->status_line;
+		}
 		DEBUG "Done $desc";
 	} else {
 		print STDERR "\n --> $phone: $desc\n";