From c253a71b75ced8fb5126b8e62032ab158048f2fc Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Wed, 27 Dec 2023 07:19:08 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20=E2=80=94=20Small=20fixes=20afte?= =?UTF-8?q?r=20merging=20echo=20test=20|=20gpg2=20--clearsign?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG | 1 + lib/Lufi.pm | 8 ++++++++ lib/Lufi/DB/Invitation.pm | 2 +- themes/default/lib/Lufi/I18N/en.po | 4 ++-- themes/default/lib/Lufi/I18N/lufi.pot | 4 ++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9605258..d0c6e34 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Revision history for Lufi 0.08.0 ????-??-?? + - 🔧 — Rename ldap_user to auth_user for invitations (@mildis) 0.07.0 2023-12-25 - ⬆️ — Update jQuery diff --git a/lib/Lufi.pm b/lib/Lufi.pm index 318e767..7f15e83 100644 --- a/lib/Lufi.pm +++ b/lib/Lufi.pm @@ -17,6 +17,14 @@ sub startup { default => $default_config }); + # Compatibility with old send_invitation_with_ldap_user_mail setting + if (defined $self->config('invitations')) { + if (defined($self->config('invitations')->{send_invitation_with_ldap_user_mail}) && + !defined($self->config('invitations')->{send_invitation_with_auth_user_mail})) { + $self->config('invitations')->{send_invitation_with_auth_user_mail} = $self->config('invitations')->{send_invitation_with_ldap_user_mail}; + } + } + die 'You need to provide a contact information in lufi.conf!' unless (defined($self->config('contact'))); die 'You need to provide a **report** information in lufi.conf!' unless (defined($self->config('report'))); diff --git a/lib/Lufi/DB/Invitation.pm b/lib/Lufi/DB/Invitation.pm index b3b687b..2df4259 100644 --- a/lib/Lufi/DB/Invitation.pm +++ b/lib/Lufi/DB/Invitation.pm @@ -51,7 +51,7 @@ Have a look at Lufi::DB::Invitation::SQLite's code: it's simple and may be more =item B : string, optional, list of files sent by the guest -=item B : boolean, if the ldap user want to see the invitation in his/her invitations list +=item B : boolean, if the authenticated user wants to see the invitation in his/her invitations list =item B : boolean diff --git a/themes/default/lib/Lufi/I18N/en.po b/themes/default/lib/Lufi/I18N/en.po index fa3f934..f7b5900 100644 --- a/themes/default/lib/Lufi/I18N/en.po +++ b/themes/default/lib/Lufi/I18N/en.po @@ -102,7 +102,7 @@ msgstr "Back to homepage" msgid "Bad CSRF token!" msgstr "Bad CSRF token!" -#: lib/Lufi/Controller/Auth.pm:27 lib/Lufi/Controller/Auth.pm:49 +#: lib/Lufi/Controller/Auth.pm:38 lib/Lufi/Controller/Auth.pm:60 msgid "Bad CSRF token." msgstr "Bad CSRF token." @@ -461,7 +461,7 @@ msgstr "Please contact the administrator: %1" msgid "Please wait while we are getting your file. We first need to download and decrypt all parts before you can get it." msgstr "Please wait while we are getting your file. We first need to download and decrypt all parts before you can get it." -#: lib/Lufi/Controller/Auth.pm:38 +#: lib/Lufi/Controller/Auth.pm:49 msgid "Please, check your credentials or your right to access this service: unable to authenticate." msgstr "Please, check your credentials or your right to access this service: unable to authenticate." diff --git a/themes/default/lib/Lufi/I18N/lufi.pot b/themes/default/lib/Lufi/I18N/lufi.pot index 82f0394..932040e 100644 --- a/themes/default/lib/Lufi/I18N/lufi.pot +++ b/themes/default/lib/Lufi/I18N/lufi.pot @@ -102,7 +102,7 @@ msgstr "" msgid "Bad CSRF token!" msgstr "" -#: lib/Lufi/Controller/Auth.pm:27 lib/Lufi/Controller/Auth.pm:49 +#: lib/Lufi/Controller/Auth.pm:38 lib/Lufi/Controller/Auth.pm:60 msgid "Bad CSRF token." msgstr "" @@ -461,7 +461,7 @@ msgstr "" msgid "Please wait while we are getting your file. We first need to download and decrypt all parts before you can get it." msgstr "" -#: lib/Lufi/Controller/Auth.pm:38 +#: lib/Lufi/Controller/Auth.pm:49 msgid "Please, check your credentials or your right to access this service: unable to authenticate." msgstr ""