1 files changed, 6 insertions, 9 deletions
diff --git a/jabberwall.pl b/jabberwall.pl
index c8c4897..e590d6d 100755
--- a/jabberwall.pl
+++ b/jabberwall.pl
@@ -10,8 +10,8 @@ use Data::Dumper;
 # options are: server, port, username, password, ressource
 # location: ~/.jabberwallrc
 
-if(@ARGV != 1) {
-  print "usage: ", basename($0), " <userlist>\n";
+if(@ARGV != 3) {
+  print "usage: ", basename($0), " <userlist> <subject> <body>\n";
   exit 1;
 }
 
@@ -38,20 +38,17 @@ if ($result[0] ne "ok") {
   die "Jabber auth error: @result\n";
 }
 
-my $body = '';
-while (<STDIN>) {
-  $body .= $_;
-}
-chomp($body);
+chomp(my $subject = $ARGV[1]);
+my $body = $ARGV[2];
 
 for my $to (@recipients) {
   chomp $to;
   next if ($to eq "");
   
   $clnt->MessageSend(to=>$to,
-    subject=>"",
+    subject=>$subject,
     body=>$body,
-    type=>"chat",
+    type=>"message",
     priority=>0);
 }