From 926ec7a6b85e6e3f7335a8c5ddcccd51937ee2d8 Mon Sep 17 00:00:00 2001
From: "Jannis M. Hoffmann" <jannis@fehcom.de>
Date: Fri, 8 Sep 2023 23:32:10 +0200
Subject: added a build configuration step

---
 lib/JWebmail/Model/ReadMails/QMailAuthuser.pm | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'lib/JWebmail/Model/ReadMails/QMailAuthuser.pm')

diff --git a/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm b/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
index 19f8b12..b2015aa 100644
--- a/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
+++ b/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
@@ -1,10 +1,9 @@
 package JWebmail::Model::ReadMails::QMailAuthuser;
 
-use v5.22;
+use v5.24;
 use warnings;
 use utf8;
 
-use File::Basename 'fileparse';
 use IPC::Open2;
 use JSON::PP 'decode_json';
 use Params::Check 'check';
@@ -12,6 +11,8 @@ use Role::Tiny::With;
 use Scalar::Util 'blessed';
 use namespace::clean;
 
+use JWebmail::Config 'MAILDIR_EXTRACTOR';
+
 with 'JWebmail::Model::ReadMails::Role';
 
 
@@ -73,12 +74,9 @@ package JWebmail::Model::ReadMails::QMailAuthuser::Error {
 
 
 my $QMailAuthuserCheck = {
-    user      => {required => 1},
-    maildir   => {required => 1},
-    prog      => {required => 1},
-    prefix    => {default => ''},
-    qmail_dir => {default => '/var/qmail/'},
-    logfile   => {default => '/dev/null'},
+    virtual_user => {required => 1},
+    mailbox_path => {required => 1},
+    qmail_dir    => {default => '/var/qmail/'},
 };
 
 sub new {
@@ -94,6 +92,7 @@ sub new {
     local $Params::Check::WARNINGS_FATAL = 1;
     my $s = check($QMailAuthuserCheck, $self)
         or die __PACKAGE__ . " creation failed!";
+    $s->{prog} = MAILDIR_EXTRACTOR;
     return bless $s, $cls;
 }
 
@@ -180,11 +179,9 @@ sub build_arg {
 
     my ($user_name) = $user_mail_addr =~ /(\w*)@/;
 
-    return $self->{qmail_dir}.'/bin/qmail-authuser'
-    . $self->{prefix} . ' '
-    . join(' ', map { my $x = s/(['\\])/\\$1/gr; "'$x'" } ($self->{prog}, $self->{maildir}, $self->{user}, $user_name, $mode, @$args))
-    . ' 3<&0'
-    . ' 2>>'.$self->{logfile};
+    return $self->{qmail_dir}.'/bin/qmail-authuser '
+    . join(' ', map { my $x = s/(['\\])/\\$1/gr; "'$x'" } ($self->{prog}, $self->{mailbox_path}, $self->{virtual_user}, $user_name, $mode, @$args))
+    . ' 3<&0';
 }
 
 sub start_qmauth {
-- 
cgit v1.2.3