From 01e9c22695a3e495f07ab445750221af72e09fe4 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Wed, 5 Sep 2018 13:40:03 +0200 Subject: Implemented mailing abstraction Closes #434 --- config/config.default.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'config/config.default.php') diff --git a/config/config.default.php b/config/config.default.php index 0328e500..795ad1b7 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -26,8 +26,24 @@ return [ // Contact email address, linked on every page 'contact_email' => 'mailto:ticket@c3heaven.de', - // From address of all emails - 'no_reply_email' => 'noreply@engelsystem.de', + // Email config + 'email' => [ + // Can be mail, smtp, sendmail or log + 'driver' => env('MAIL_DRIVER', 'smtp'), + 'from' => [ + // From address of all emails + 'address' => env('MAIL_FROM_ADDRESS', 'noreply@engelsystem.de'), + 'name' => env('MAIL_FROM_NAME', 'Engelsystem') + ], + + 'host' => env('MAIL_HOST', 'localhost'), + 'port' => env('MAIL_PORT', 587), + // Transport encryption like tls + 'encryption' => env('MAIL_ENCRYPTION', null), + 'username' => env('MAIL_USERNAME'), + 'password' => env('MAIL_PASSWORD'), + 'sendmail' => '/usr/sbin/sendmail -bs', + ], // Default theme, 1=style1.css 'theme' => 1, -- cgit v1.2.3-54-g00ecf From 47b3d35f3609017b5f190bb7f6600b9f1bda7224 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Thu, 6 Sep 2018 16:04:41 +0200 Subject: Changed configuration comments to english --- config/config.default.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'config/config.default.php') diff --git a/config/config.default.php b/config/config.default.php index 795ad1b7..a634c28c 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -68,13 +68,11 @@ return [ // Only arrived angels can sign up for shifts 'signup_requires_arrival' => false, - // Anzahl Stunden bis zum Austragen eigener Schichten + // Number of hours that an angel has to sign out own shifts 'last_unsubscribe' => 3, - // Setzt den zu verwendenden Crypto-Algorithmus (entsprechend der Dokumentation von crypt()). - // Falls ein Benutzerpasswort in einem anderen Format gespeichert ist, - // wird es bei der ersten Benutzung des Klartext-Passworts in das neue Format - // konvertiert. + // Define the algorithm to use for `crypt()` of passwords + // If the user uses an old algorithm the password will be converted to the new format // MD5 '$1' // Blowfish '$2y$13' // SHA-256 '$5$rounds=5000' @@ -83,16 +81,16 @@ return [ 'min_password_length' => 8, - // Wenn Engel beim Registrieren oder in ihrem Profil eine T-Shirt Größe angeben sollen, auf true setzen: + // Enables the T-Shirt configuration on signup and profile 'enable_tshirt_size' => true, // Number of shifts to freeload until angel is locked for shift signup. 'max_freeloadable_shifts' => 2, - // local timezone + // Local timezone 'timezone' => 'Europe/Berlin', - // weigh every shift the same + // Weigh every shift the same //'shift_sum_formula' => 'SUM(`end` - `start`)', // Multiply 'night shifts' and freeloaded shifts (start or end between 2 and 6 exclusive) by 2 @@ -122,10 +120,11 @@ return [ 'en_US.UTF-8' => 'English', ], - 'default_locale' => 'en_US.UTF-8', + // The default locale to use + 'default_locale' => 'en_US.UTF-8', // Available T-Shirt sizes, set value to null if not available - 'tshirt_sizes' => [ + 'tshirt_sizes' => [ 'S' => 'S', 'S-G' => 'S Girl', 'M' => 'M', -- cgit v1.2.3-54-g00ecf