From 6f57644af7676832c83638fcee7e70cb3831d87c Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 22 Sep 2010 14:40:18 +0200 Subject: Compose message also in dummy mode. --- localmarkdown2sms | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'localmarkdown2sms') diff --git a/localmarkdown2sms b/localmarkdown2sms index f13c097..64afeed 100755 --- a/localmarkdown2sms +++ b/localmarkdown2sms @@ -216,26 +216,26 @@ sub transliterate { sub sendmsg { my ($from, $to, $desc, $msg) = @_; + my $ua = LWP::UserAgent->new(agent => "localmarkdown2sms"); + $ua->timeout(10); + my $url = $sms_url + . '?' . $sms_usertag . '=' . uri_escape($sms_user) + . '&password=' . uri_escape($sms_pw) + . '&to=' . uri_escape($to); + $url .= '&api_id=' . uri_escape($sms_api) if ($sms_api); + $url .= '&callback=' . uri_escape($sms_callback) if ($sms_callback); + $url .= '&from=' . uri_escape($from) if ($from); + $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); + $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); + $url .= '&' . $sms_msgtag . '=' . uri_escape(transliterate($sms_cp, $msg)); unless ($dummy) { - my $ua = LWP::UserAgent->new(agent => "localmarkdown2sms"); - $ua->timeout(10); - my $url = $sms_url - . '?' . $sms_usertag . '=' . uri_escape($sms_user) - . '&password=' . uri_escape($sms_pw) - . '&to=' . uri_escape($to); - $url .= '&api_id=' . uri_escape($sms_api) if ($sms_api); - $url .= '&callback=' . uri_escape($sms_callback) if ($sms_callback); - $url .= '&from=' . uri_escape($from) if ($from); - $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); - $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); - $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) { @@ -243,6 +243,7 @@ sub sendmsg { } DEBUG "Done $desc"; } else { + DEBUG "[DUMMY] Sending request: $url"; print STDERR "\n [$from --> $to: $desc]\n\n"; print STDERR $msg . "\n"; } -- cgit v1.2.3