When sending email alerts use CRLF for windows clients (#10563)

* When sending email alerts use CRLF for windows clients

* Convert hard \r\n into line return in templates

* there is no down really

LibreNMS/Alert/Transport/Mail.php

@@ -35,12 +35,10 @@ class Mail extends Transport
 
     public function contactMail($obj)
     {
-        if (empty($this->config['email'])) {
+        $email = $this->config['email'] ?? $obj['contacts'];
-            $email = $obj['contacts'];
+        $msg = preg_replace("/(?<!\r)\n/", "\r\n", $obj['msg']); // fix line returns for windows mail clients
-        } else {
+
-            $email = $this->config['email'];
+        return send_mail($email, $obj['title'], $msg, (Config::get('email_html') == 'true') ? true : false);
-        }
-        return send_mail($email, $obj['title'], $obj['msg'], (Config::get('email_html') == 'true') ? true : false);
     }
 
     public static function configTemplate()

database/migrations/2019_08_28_105051_fix-template-linefeeds.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FixTemplateLinefeeds extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::table('alert_templates')->update(['template' => DB::raw('REPLACE(`template`, \'\\\\r\\\\n\', char(10))')]);
+        DB::table('alert_templates')->update(['template' => DB::raw('REPLACE(`template`, \'\\\\n\', \'\')')]);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+}