diff options
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | default.yml | 1 | ||||
| -rwxr-xr-x | fripost-adduser | 19 | ||||
| -rwxr-xr-x | lib/Fripost/Prompt.pm | 8 |
4 files changed, 20 insertions, 12 deletions
@@ -1,4 +1,4 @@ -You need several cpan modules to use these scripts. +You need several CPAN modules to use these scripts. If you use Debian GNU/Linux, you can install them like so: @@ -6,3 +6,5 @@ sudo aptitude install -R libdatetime-format-mysql-perl libdatetime-perl \ libdbix-class-perl libemail-valid-perl libfile-slurp-perl libio-prompt-perl \ libmime-base64-perl libmime-lite-perl libstring-mkpasswd-perl \ libtemplate-perl libyaml-syck-perl + +This will most probably work for Ubuntu as well. diff --git a/default.yml b/default.yml index f7eaad3..5df20cb 100644 --- a/default.yml +++ b/default.yml @@ -1,3 +1,4 @@ # default.yml -- defaults for fripost administrative scripts --- dbi_dsn: dbi:mysql:mail;host=127.0.0.1;port=3306 +admin_email: admin@fripost.org 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> >> diff --git a/lib/Fripost/Prompt.pm b/lib/Fripost/Prompt.pm index 0a9d5c6..d90d42d 100755 --- a/lib/Fripost/Prompt.pm +++ b/lib/Fripost/Prompt.pm @@ -17,9 +17,15 @@ use Exporter; use IO::Prompt; use String::MkPasswd qw/mkpasswd/; -our @EXPORT = qw(confirm_or_abort fix_username prompt_email prompt_password); +our @EXPORT = qw(confirm confirm_or_abort fix_username prompt_email prompt_password); our @ISA = qw(Exporter); +sub confirm { + my ($msg) = @_; + $msg //= "Is this OK? [no will abort] "; + return prompt $msg, -ynt; +} + sub confirm_or_abort { my ($msg) = @_; $msg //= "Is this OK? [no will abort] "; |