Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vítězslav Dvořák
ISPConfig 3
Commits
7e24f006
Commit
7e24f006
authored
Sep 14, 2020
by
Thom
🛠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ISPConfig mail function (#4500)
parent
acb7db0d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
server/lib/classes/monitor_tools.inc.php
server/lib/classes/monitor_tools.inc.php
+6
-6
No files found.
server/lib/classes/monitor_tools.inc.php
View file @
7e24f006
...
...
@@ -44,12 +44,12 @@ class monitor_tools {
//** Debian or Ubuntu
if
(
file_exists
(
'/etc/debian_version'
))
{
// Check if this is Ubuntu and not Debian
if
(
strstr
(
trim
(
file_get_contents
(
'/etc/issue'
)),
'Ubuntu'
)
||
(
is_file
(
'/etc/os-release'
)
&&
stristr
(
file_get_contents
(
'/etc/os-release'
),
'Ubuntu'
)))
{
$issue
=
file_get_contents
(
'/etc/issue'
);
// Use content of /etc/issue file
if
(
strstr
(
$issue
,
'Ubuntu'
))
{
if
(
strstr
(
trim
(
$issue
),
'LTS'
))
{
...
...
@@ -75,7 +75,7 @@ class monitor_tools {
}
else
{
$lts
=
""
;
}
$distname
=
'Ubuntu'
;
$distid
=
'debian40'
;
$distbaseid
=
'debian'
;
...
...
@@ -353,7 +353,7 @@ class monitor_tools {
}
else
{
die
(
'Unrecognized GNU/Linux distribution'
);
}
// Set $distconfid to distid, if no different id for the config is defined
if
(
!
isset
(
$distconfid
))
$distconfid
=
$distid
;
...
...
@@ -832,7 +832,7 @@ class monitor_tools {
$mailBody
=
strtr
(
$mailBody
,
$placeholders
);
for
(
$r
=
0
;
$r
<
count
(
$recipients
);
$r
++
)
{
mail
(
$recipients
[
$r
],
$mailSubject
,
$mailBody
,
$mailHeaders
);
$app
->
functions
->
mail
(
$recipients
[
$r
],
$mailSubject
,
$mailBody
,
$mailHeaders
);
}
unset
(
$mailSubject
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment