Automated merge from dev to live

# Conflicts:
#	WEBROOT/controller/DatabaseConnect.php

WEBROOT/controller/DatabaseConnect.php

@@ -13,18 +13,18 @@ function db_connect()
             'password' => 'bBHofurUJWKzPE8Z',
             'database' => 'DEV',
         ],
-        'vpn' => [
-            'hostaddr' => '100.123.136.86',
-            'username' => 'worker',
-            'password' => 'bBHofurUJWKzPE8Z',
-            'database' => 'DEV',
-        ],
         'live' => [
             'hostaddr' => '152.53.159.169',
             'username' => 'worker',
             'password' => 'bBHofurUJWKzPE8Z',
             'database' => 'LIVE',
         ],
+        'dev' => [
+            'hostaddr' => '152.53.159.169',
+            'username' => 'worker',
+            'password' => 'bBHofurUJWKzPE8Z',
+            'database' => 'DEV',
+        ],
         'error' => [
             'hostaddr' => '10.233.1.244',
             'username' => 'error',
@@ -33,7 +33,7 @@ function db_connect()
         ]
     ];
 
-    $enviroment = 'vpn';
+    $enviroment = 'live';
 
     mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 
@@ -58,4 +58,4 @@ function db_connect()
         redirectToWebsite("https://mrhossa.de");
         throw $e;
     }
-}
+}

WEBROOT/modules/Mail.php

@@ -29,9 +29,12 @@ function sendMail($subject, $message, $url, bool $log, $to = "bruno.eckhardt07@g
 function errorMail($title, $error, bool $log)
 {
     $headers = "From: bruno.eckhardt07@gmail.com\r\n";
+    $headers .= "MIME-Version: 1.0\r\n";
+    $headers .= "Content-Type: text/html; charset=UTF-8\r\n";
+
     mail(
         "bruno.eckhardt07@gmail.com",
-        "ERROR: $title",
+        "[ERROR] $title",
         $error,
         $headers,
     );
@@ -40,9 +43,9 @@ function errorMail($title, $error, bool $log)
             "Mailing",
             "DATUM, SUBJECT, MESSAGE, URL, CLIENT_IP",
             (new getSpecificData())->getRequestTime(),
-            "ERROR: $title",
+            "[ERROR] $title",
             $error,
             (new getSpecificData())->getClientIP(),
         );
     }
-}
+}