mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* When sending email alerts use CRLF for windows clients

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

* there is no down really
This commit is contained in:
Tony Murray
2019-10-02 14:08:10 +00:00
committed by GitHub
parent c8bcdbb916
commit 7482422614
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
LibreNMS/Alert/Transport/Mail.php
View File

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

28
database/migrations/2019_08_28_105051_fix-template-linefeeds.php Normal file
View File

@@ -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()
{
}
}