From 90e1a949623ead173c0952f802d7b5c5487251b1 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Fri, 5 Oct 2018 15:35:14 +0200 Subject: [PATCH] Make application name configurable * Added app_name configuration option * Extended `EngelsystemMailer` to prepend the application name to all mails Closes #426 --- config/config.default.php | 5 +- includes/engelsystem.php | 4 +- includes/mailer/shifts_mailer.php | 8 +-- includes/mailer/users_mailer.php | 7 ++- includes/pages/guest_login.php | 5 +- includes/pages/user_atom.php | 2 +- includes/pages/user_ical.php | 2 +- includes/view/EventConfig_view.php | 3 +- includes/view/User_view.php | 5 +- .../lang/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 45040 -> 44968 bytes .../lang/de_DE.UTF-8/LC_MESSAGES/default.po | 22 ++++---- .../lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo | Bin 41310 -> 41256 bytes .../lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po | 17 +++--- resources/views/emails/mail.twig | 4 +- resources/views/layouts/app.twig | 2 +- resources/views/layouts/maintenance.html | 6 +-- resources/views/layouts/parts/navbar.twig | 2 +- src/Mail/EngelsystemMailer.php | 40 ++++++++++++++ src/Mail/MailerServiceProvider.php | 3 +- tests/Unit/Mail/EngelsystemMailerTest.php | 50 ++++++++++++++++++ tests/Unit/Mail/MailerServiceProviderTest.php | 4 +- 21 files changed, 153 insertions(+), 38 deletions(-) diff --git a/config/config.default.php b/config/config.default.php index 56ac6e6a..4207754b 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -17,6 +17,9 @@ return [ // Enable maintenance mode (show a static page) 'maintenance' => (bool)env('MAINTENANCE', false), + // Application name (not the event name!) + 'app_name' => env('APP_NAME', 'Engelsystem'), + // Set to development to enable debugging messages 'environment' => env('ENVIRONMENT', 'production'), @@ -36,7 +39,7 @@ return [ 'from' => [ // From address of all emails 'address' => env('MAIL_FROM_ADDRESS', 'noreply@engelsystem.de'), - 'name' => env('MAIL_FROM_NAME', 'Engelsystem') + 'name' => env('MAIL_FROM_NAME', env('APP_NAME', 'Engelsystem')) ], 'host' => env('MAIL_HOST', 'localhost'), diff --git a/includes/engelsystem.php b/includes/engelsystem.php index a5dee186..caebe09b 100644 --- a/includes/engelsystem.php +++ b/includes/engelsystem.php @@ -16,7 +16,9 @@ require __DIR__ . '/includes.php'; * Check for maintenance */ if ($app->get('config')->get('maintenance')) { - echo file_get_contents(__DIR__ . '/../resources/views/layouts/maintenance.html'); + $maintenance = file_get_contents(__DIR__ . '/../resources/views/layouts/maintenance.html'); + $maintenance = str_replace('%APP_NAME%', $app->get('config')->get('app_name'), $maintenance); + echo $maintenance; die(); } diff --git a/includes/mailer/shifts_mailer.php b/includes/mailer/shifts_mailer.php index 4dd430d3..0c4e381c 100644 --- a/includes/mailer/shifts_mailer.php +++ b/includes/mailer/shifts_mailer.php @@ -65,7 +65,7 @@ function mail_shift_change($old_shift, $new_shift) if ($user['email_shiftinfo']) { engelsystem_email_to_user( $user, - '[engelsystem] ' . __('Your Shift has changed'), + __('Your Shift has changed'), $message, true ); @@ -90,7 +90,7 @@ function mail_shift_delete($shift) foreach ($users as $user) { if ($user['email_shiftinfo']) { - engelsystem_email_to_user($user, '[engelsystem] ' . __('Your Shift was deleted'), $message, true); + engelsystem_email_to_user($user, __('Your Shift was deleted'), $message, true); } } } @@ -113,7 +113,7 @@ function mail_shift_assign($user, $shift) $message .= date('Y-m-d H:i', $shift['start']) . ' - ' . date('H:i', $shift['end']) . "\n"; $message .= $room['Name'] . "\n"; - engelsystem_email_to_user($user, '[engelsystem] ' . __('Assigned to Shift'), $message, true); + engelsystem_email_to_user($user, __('Assigned to Shift'), $message, true); } /** @@ -134,5 +134,5 @@ function mail_shift_removed($user, $shift) $message .= date('Y-m-d H:i', $shift['start']) . ' - ' . date('H:i', $shift['end']) . "\n"; $message .= $room['Name'] . "\n"; - engelsystem_email_to_user($user, '[engelsystem] ' . __('Removed from Shift'), $message, true); + engelsystem_email_to_user($user, __('Removed from Shift'), $message, true); } diff --git a/includes/mailer/users_mailer.php b/includes/mailer/users_mailer.php index 5f1e6e79..23a13806 100644 --- a/includes/mailer/users_mailer.php +++ b/includes/mailer/users_mailer.php @@ -8,7 +8,10 @@ function mail_user_delete($user) { return engelsystem_email_to_user( $user, - '[engelsystem] ' . __('Your account has been deleted'), - __('Your angelsystem account has been deleted. If you have any questions regarding your account deletion, please contact heaven.') + __('Your account has been deleted'), + __( + 'Your %s account has been deleted. If you have any questions regarding your account deletion, please contact heaven.', + [config('app_name')] + ) ); } diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 797aaea7..95e63bbc 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -309,7 +309,10 @@ function guest_register() form_email('mail', __('E-Mail') . ' ' . entry_required(), $mail), form_checkbox( 'email_shiftinfo', - __('The engelsystem is allowed to send me an email (e.g. when my shifts change)'), + __( + 'The %s is allowed to send me an email (e.g. when my shifts change)', + [config('app_name')] + ), $email_shiftinfo ), form_checkbox( diff --git a/includes/pages/user_atom.php b/includes/pages/user_atom.php index 9934fb92..f6a67a15 100644 --- a/includes/pages/user_atom.php +++ b/includes/pages/user_atom.php @@ -47,7 +47,7 @@ function make_atom_entries_from_news($news_entries) $request = app('request'); $html = ' - Engelsystem + ' . config('app_name') . ' ' . $request->getHttpHost() . htmlspecialchars(preg_replace( '#[&?]key=[a-f\d]{32}#', diff --git a/includes/pages/user_ical.php b/includes/pages/user_ical.php index 3430c3b3..f7ed64dd 100644 --- a/includes/pages/user_ical.php +++ b/includes/pages/user_ical.php @@ -36,7 +36,7 @@ function send_ical_from_shifts($shifts) { header('Content-Type: text/calendar; charset=utf-8'); header('Content-Disposition: attachment; filename=shifts.ics'); - $output = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//-//Engelsystem//DE\r\nCALSCALE:GREGORIAN\r\n"; + $output = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//-//" . config('app_name') . "//DE\r\nCALSCALE:GREGORIAN\r\n"; foreach ($shifts as $shift) { $output .= make_ical_entry_from_shift($shift); } diff --git a/includes/view/EventConfig_view.php b/includes/view/EventConfig_view.php index cd657c67..730593b1 100644 --- a/includes/view/EventConfig_view.php +++ b/includes/view/EventConfig_view.php @@ -1,6 +1,7 @@ ENGELSYSTEM' + $name . ' ' . Str::upper(config('app_name')) ), 2) ]); diff --git a/includes/view/User_view.php b/includes/view/User_view.php index ddf49885..fb541619 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -54,7 +54,10 @@ function User_settings_view( form_text('mail', __('E-Mail') . ' ' . entry_required(), $user_source['email']), form_checkbox( 'email_shiftinfo', - __('The engelsystem is allowed to send me an email (e.g. when my shifts change)'), + __( + 'The %s is allowed to send me an email (e.g. when my shifts change)', + [config('app_name')] + ), $user_source['email_shiftinfo'] ), form_checkbox( diff --git a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo index 4909145a1c03795ce7c4d8cbbd34f4581c34b8ff..a1765a6b2becede4ddf86ca743321dabe9234fe4 100644 GIT binary patch delta 6207 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 DVx_!{ delta 6258 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 OU1NU#O4;rV&;J0s0oarP diff --git a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po index 54e819c8..263d1641 100644 --- a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" "POT-Creation-Date: 2017-12-29 19:01+0100\n" -"PO-Revision-Date: 2018-09-17 12:10+0200\n" +"PO-Revision-Date: 2018-10-05 15:35+0200\n" "Last-Translator: msquare \n" "Language-Team: \n" "Language: de_DE\n" @@ -669,16 +669,18 @@ msgid "Hi %s," msgstr "Hallo %s," #: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:21 -msgid "here is a message for you from the engelsystem:" -msgstr "hier ist eine Nachricht aus dem Engelsystem für Dich:" +#, php-format +msgid "here is a message for you from the %s:" +msgstr "hier ist eine Nachricht aus dem %s für Dich:" #: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:23 +#, php-format msgid "" "This email is autogenerated and has not been signed. You got this email " -"because you are registered in the engelsystem." +"because you are registered in the %s." msgstr "" "Diese E-Mail wurde automatisch generiert und muss daher nicht unterschrieben " -"werden. Du hast diese E-Mail bekommen, weil Du im Engelsystem registriert " +"werden. Du hast diese E-Mail bekommen, weil Du im %s registriert " "bist." #: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:15 @@ -747,11 +749,12 @@ msgid "Your account has been deleted" msgstr "Dein Konto wurde gelöscht." #: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:12 +#, php-format msgid "" -"Your angelsystem account has been deleted. If you have any questions " +"Your %s account has been deleted. If you have any questions " "regarding your account deletion, please contact heaven." msgstr "" -"Dein Engelsystem-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere " +"Dein %s-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere " "bitte den Himmel." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:10 @@ -1591,10 +1594,11 @@ msgstr "" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:316 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55 +#, php-format msgid "" -"The engelsystem is allowed to send me an email (e.g. when my shifts change)" +"The %s is allowed to send me an email (e.g. when my shifts change)" msgstr "" -"Das Engelsystem darf mir E-Mails senden (z.B. wenn sich meine Schichten " +"Das %s darf mir E-Mails senden (z.B. wenn sich meine Schichten " "ändern)" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:321 diff --git a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo index 5ad4898481d3255aaca4b2c5f77826050779908a..95251feb85fead203c8e17739e7b2a139d008363 100644 GIT binary patch delta 5491 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 Hwrl?fV&x$C delta 5544 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 d7{z<_^(^0>(w4s-`p$~s)qXj&_mwR-{s$))HB\n" "Language-Team: \n" "Language: pt_BR\n" @@ -560,14 +560,16 @@ msgid "Hi %s," msgstr "Oi %s," #: includes/helper/email_helper.php:12 -msgid "here is a message for you from the engelsystem:" -msgstr "aqui está uma mensagem do engelsystem para você:" +#, php-format +msgid "here is a message for you from the %s:" +msgstr "aqui está uma mensagem do %s para você:" #: includes/helper/email_helper.php:12 +#, php-format msgid "" "This email is autogenerated and has not been signed. You got this email " -"because you are registered in the engelsystem." -msgstr "Você recebeu esse email porque está registrado no engelsystem." +"because you are registered in the %s." +msgstr "Você recebeu esse email porque está registrado no %s." #: includes/mailer/shifts_mailer.php:10 msgid "A Shift you are registered on has changed:" @@ -1344,10 +1346,11 @@ msgstr "" "Esse script criará uma conta no sistema." #: includes/pages/guest_login.php:229 includes/view/User_view.php:50 +#, php-format msgid "" -"The engelsystem is allowed to send me an email (e.g. when my shifts change)" +"The %s is allowed to send me an email (e.g. when my shifts change)" msgstr "" -"Permito que o engelsystem me envie emails (por exemplo, quando meus turnos " +"Permito que o %s me envie emails (por exemplo, quando meus turnos " "mudam)" #: includes/pages/guest_login.php:230 includes/view/User_view.php:51 diff --git a/resources/views/emails/mail.twig b/resources/views/emails/mail.twig index f5ac5860..c99fc104 100644 --- a/resources/views/emails/mail.twig +++ b/resources/views/emails/mail.twig @@ -1,6 +1,6 @@ {{ __('Hi %s,', [user]) }} -{{ __('here is a message for you from the engelsystem:') }} +{{ __('here is a message for you from the %s:', [config('app_name')]) }} {{ message|raw }} -{{ __('This email is autogenerated and has not been signed. You got this email because you are registered in the engelsystem.') }} +{{ __('This email is autogenerated and has not been signed. You got this email because you are registered in the %s.', [config('app_name')]) }} diff --git a/resources/views/layouts/app.twig b/resources/views/layouts/app.twig index d8f8d10f..ed0d96af 100644 --- a/resources/views/layouts/app.twig +++ b/resources/views/layouts/app.twig @@ -3,7 +3,7 @@ {% block head %} - {% block title %}{{ title }}{% endblock %} - Engelsystem + {% block title %}{{ title }}{% endblock %} - {{ config('app_name') }} diff --git a/resources/views/layouts/maintenance.html b/resources/views/layouts/maintenance.html index f7ab5772..85b95168 100644 --- a/resources/views/layouts/maintenance.html +++ b/resources/views/layouts/maintenance.html @@ -1,7 +1,7 @@ - Maintenance - Engelsystem + Maintenance - %APP_NAME% @@ -19,7 +19,7 @@ - ENGELSYSTEM + %APP_NAME%