Merge branch 'master' of https://github.com/skangas/fripost-tools

1 files changed, 9 insertions, 10 deletions

diff --git a/fripost-adduser b/fripost-adduser
index db312a2..5c21ef1 100755
--- a/fripost-adduser
+++ b/fripost-adduser
@@ -120,6 +120,15 @@ $msg->attr('content-type.charset' => 'utf-8');
     dsay "-----------------------------------";
 }
 
+### Subscribe user to announce-list
+if (confirm("Subscribe user to announce mailing list? ")) {
+    $msg->replace(From => $user->{username});
+    $msg->replace(To => 'announce-subscribe@lists.fripost.org');
+    $msg->replace(Subject => '');
+    $msg->replace(Data => '');
+    $msg->send();
+}
+
 ### Send login credentials to new user
 {
     my ($vars, $data);
@@ -151,16 +160,6 @@ $msg->attr('content-type.charset' => 'utf-8');
     }
 }
 
-### Subscribe user to announce-list
-{
-    confirm_or_abort("Subscribe user to announce mailing list? ");
-    $msg->replace(From => $user->{username});
-    $msg->replace(To => 'announce-subscribe@lists.fripost.org');
-    $msg->replace(Subject => '');
-    $msg->replace(Data => '');
-    $msg->send();
-}
-
 =head1 AUTHOR
 
 Stefan Kangas C<< <skangas at skangas.se> >>