Compose message also in dummy mode.

1 files changed, 20 insertions, 19 deletions

diff --git a/localsendsms b/localsendsms
index 6b69e93..eb857b1 100755
--- a/localsendsms
+++ b/localsendsms
@@ -72,26 +72,26 @@ sub transliterate {
 sub sendmsg {
 	my ($from, $to, $desc, $msg) = @_;
 
+	my $ua = LWP::UserAgent->new(agent => "localsendsms");
+	$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 => "localsendsms");
-		$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) {
@@ -99,6 +99,7 @@ sub sendmsg {
 		}
 		DEBUG "Done $desc";
 	} else {
+		DEBUG "[DUMMY] Sending request: $url";
 		print STDERR "\n  [$from --> $to: $desc]\n\n";
 		print STDERR $msg . "\n";
 	}