X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FApp-EzPz.git;a=blobdiff_plain;f=lib%2FApp%2FEzPz%2FUserStore.pm;fp=lib%2FApp%2FEzPz%2FUserStore.pm;h=73669c553499ae5fa17f3b10fabf914db7325e76;hp=8b0a557d9d2940f64c3e180247f76a79a63733d8;hb=396f4b0bc4a7e5a42cf276de9ff38aaa63748a23;hpb=5b26866ea3dc1b51e669b9e213d002c05de81e14

diff --git a/lib/App/EzPz/UserStore.pm b/lib/App/EzPz/UserStore.pm
index 8b0a557..73669c5 100644
--- a/lib/App/EzPz/UserStore.pm
+++ b/lib/App/EzPz/UserStore.pm
@@ -1,8 +1,7 @@
 package App::EzPz::UserStore;
 
-use App::EzPz::User;
+use Module::Runtime qw(use_module);
 use Scalar::Util 'blessed';
-use Authen::Htpasswd;
 use Moo;
 
 has ezmlm_bindir => (is => 'ro', required => 1);
@@ -13,7 +12,7 @@ has _htpasswd => (is => 'lazy');
 
 sub _build__htpasswd {
   my ($self) = @_;
-  return Authen::Htpasswd->new($self->htpasswd_file);
+  return use_module('Authen::Htpasswd')->new($self->htpasswd_file);
 }
 
 sub all {
@@ -33,12 +32,13 @@ sub get {
 sub add {
   my ($self, $user) = @_;
   unless (blessed($user)) {
-    $user = App::EzPz::User->new($user);
+    $user = use_module('App::EzPz::User')->new($user);
   }
   my $htp_file = $self->_htpasswd;
   my $htp_user = $user->_htpasswd_user;
   $htp_file->add_user($htp_user);
   $htp_user->file($htp_file);
+  $user->_set_ezmlm_bindir($self->ezmlm_bindir);
   return $user;
 }
 
@@ -50,8 +50,9 @@ sub remove {
 
 sub _inflate_user {
   my ($self, $htp_user) = @_;
-  return App::EzPz::User->new(
+  return use_module('App::EzPz::User')->new(
     htpasswd_user => $htp_user,
+    ezmlm_bindir => $self->ezmlm_bindir,
   );
 }