Merge remote-tracking branch 'MyIgel/mailing'

2 files changed, 41 insertions, 12 deletions

diff --git a/config/app.php b/config/app.php
index e309abe4..efe745e8 100644
--- a/config/app.php
+++ b/config/app.php
@@ -5,9 +5,13 @@
 return [
     // Service providers
     'providers'  => [
+
+        // Application bootstrap
         \Engelsystem\Logger\LoggerServiceProvider::class,
         \Engelsystem\Exceptions\ExceptionsServiceProvider::class,
         \Engelsystem\Config\ConfigServiceProvider::class,
+
+        // Request handling
         \Engelsystem\Http\UrlGeneratorServiceProvider::class,
         \Engelsystem\Renderer\RendererServiceProvider::class,
         \Engelsystem\Database\DatabaseServiceProvider::class,
@@ -19,13 +23,22 @@ return [
         \Engelsystem\Renderer\TwigServiceProvider::class,
         \Engelsystem\Middleware\RouteDispatcherServiceProvider::class,
         \Engelsystem\Middleware\RequestHandlerServiceProvider::class,
+
+        // Additional services
+        \Engelsystem\Mail\MailerServiceProvider::class,
     ],
 
     // Application middleware
     'middleware' => [
+
+        // Basic initialization
         \Engelsystem\Middleware\SendResponseHandler::class,
         \Engelsystem\Middleware\ExceptionHandler::class,
+
+        // Changes of request/response parameters
         \Engelsystem\Middleware\SetLocale::class,
+
+        // The application code
         \Engelsystem\Middleware\ErrorHandler::class,
         \Engelsystem\Middleware\RouteDispatcher::class,
         \Engelsystem\Middleware\RequestHandler::class,
diff --git a/config/config.default.php b/config/config.default.php
index dfccab0a..659a26b7 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'           => env('CONTACT_EMAIL', 'mailto:ticket@c3heaven.de'),
 
-    // From address of all emails
-    'no_reply_email'          => env('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'   => env('MAIL_SENDMAIL', '/usr/sbin/sendmail -bs'),
+    ],
 
     // Default theme, 1=style1.css
     'theme'                   => env('THEME', 1),
@@ -55,28 +71,27 @@ 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'
     //  SHA-512     '$6$rounds=5000'
     'crypt_alg'               => '$6$rounds=5000',
 
+    // The minimum length for passwords
     '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'                => env('TIMEZONE', 'Europe/Berlin'),
 
     // Multiply 'night shifts' and freeloaded shifts (start or end between 2 and 6 exclusive) by 2
@@ -99,10 +114,11 @@ return [
         'en_US.UTF-8' => 'English',
     ],
 
-    'default_locale'  => env('DEFAULT_LOCALE', 'en_US.UTF-8'),
+    // The default locale to use
+    'default_locale'          => env('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',
@@ -117,5 +133,5 @@ return [
     ],
 
     // IP addresses of reverse proxies that are trusted, can be an array or a comma separated list
-    'trusted_proxies' => env('TRUSTED_PROXIES', ['127.0.0.0/8', '::ffff:127.0.0.0/8', '::1/128']),
+    'trusted_proxies'         => env('TRUSTED_PROXIES', ['127.0.0.0/8', '::ffff:127.0.0.0/8', '::1/128']),
 ];