aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem.moulin@fripost.org>2013-06-24 12:49:09 -0500
committerGuilhem Moulin <guilhem.moulin@fripost.org>2013-06-24 12:49:09 -0500
commitbba36787e016d56290ba3bfac10960425f5a8cc0 (patch)
treead1b554bec23e12846665378c0d751fef0648a53
parent7afd7f9a787a6a88d2544ed1c5a5598821dfd138 (diff)
Bug fixes.HEADmaster
-rw-r--r--README2
-rwxr-xr-xfripost21
-rwxr-xr-xlib/Fripost/Email.pm5
3 files changed, 14 insertions, 14 deletions
diff --git a/README b/README
index af386f1..9281576 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
These are administrative tools used by Fripost - the Free E-mail Association.
Visit our website for more information:
-http://fripost.org/
+https://fripost.org/
Please send patches, bug reports and comments to:
skangas@skangas.se
diff --git a/fripost b/fripost
index 161ef75..f250e6c 100755
--- a/fripost
+++ b/fripost
@@ -315,17 +315,6 @@ use Getopt::Long qw /:config noauto_abbrev no_ignore_case
use Pod::Usage;
use YAML::Syck;
-use Fripost::Schema;
-use Fripost::Commands::mkpass;
-use Fripost::Commands::add_user;
-use Fripost::Commands::search_user;
-use Fripost::Commands::user_passwd;
-use Fripost::Commands::add_domain;
-use Fripost::Commands::search_domain;
-use Fripost::Commands::add_alias;
-use Fripost::Commands::search_alias;
-
-
## Get global command line options
our $conf = LoadFile( catfile ($HOME, '.fripost.yml') );
@@ -352,6 +341,16 @@ GetOptions(
'g|goto' => \$conf->{goto},
) or pod2usage(2);
+require Fripost::Schema;
+require Fripost::Commands::mkpass;
+require Fripost::Commands::add_user;
+require Fripost::Commands::search_user;
+require Fripost::Commands::user_passwd;
+require Fripost::Commands::add_domain;
+require Fripost::Commands::search_domain;
+require Fripost::Commands::add_alias;
+require Fripost::Commands::search_alias;
+
## Set the default values
$conf->{server_host} //= 'ldap://127.0.0.1:389';
diff --git a/lib/Fripost/Email.pm b/lib/Fripost/Email.pm
index 2e35070..552e82c 100755
--- a/lib/Fripost/Email.pm
+++ b/lib/Fripost/Email.pm
@@ -36,8 +36,9 @@ sub new {
my ($conf, $h) = @_;
my $msg = MIME::Entity->build(
- From => encode('MIME-Q', 'Friposts administratörer')
- . $conf->{admin_email},
+ From => encode('MIME-Q', 'Friposts administratörer').
+ ' <'.$conf->{admin_email}.'>',
+ 'Reply-To' => 'admin@fripost.org',
To => $h->{To},
Subject => $h->{Subject},
Encoding => 'quoted-printable',