Skip to content

Commit 7e24f00

Browse files
author
thom
committed
Use ISPConfig mail function (#4500)
1 parent acb7db0 commit 7e24f00

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

server/lib/classes/monitor_tools.inc.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ function get_distname() {
4444

4545
//** Debian or Ubuntu
4646
if(file_exists('/etc/debian_version')) {
47-
47+
4848
// Check if this is Ubuntu and not Debian
4949
if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu') || (is_file('/etc/os-release') && stristr(file_get_contents('/etc/os-release'), 'Ubuntu'))) {
50-
50+
5151
$issue = file_get_contents('/etc/issue');
52-
52+
5353
// Use content of /etc/issue file
5454
if(strstr($issue,'Ubuntu')) {
5555
if (strstr(trim($issue), 'LTS')) {
@@ -75,7 +75,7 @@ function get_distname() {
7575
} else {
7676
$lts = "";
7777
}
78-
78+
7979
$distname = 'Ubuntu';
8080
$distid = 'debian40';
8181
$distbaseid = 'debian';
@@ -353,7 +353,7 @@ function get_distname() {
353353
} else {
354354
die('Unrecognized GNU/Linux distribution');
355355
}
356-
356+
357357
// Set $distconfid to distid, if no different id for the config is defined
358358
if(!isset($distconfid)) $distconfid = $distid;
359359

@@ -832,7 +832,7 @@ public function send_notification_email($template, $placeholders, $recipients) {
832832
$mailBody = strtr($mailBody, $placeholders);
833833

834834
for($r = 0; $r < count($recipients); $r++) {
835-
mail($recipients[$r], $mailSubject, $mailBody, $mailHeaders);
835+
$app->functions->mail($recipients[$r], $mailSubject, $mailBody, $mailHeaders);
836836
}
837837

838838
unset($mailSubject);

0 commit comments

Comments
 (0)