Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
ca51eab3
Commit
ca51eab3
authored
May 18, 2022
by
Thom
🛠
Browse files
Fix checks to send email also if only reseller should receive it (
#6346
)
parent
d685b853
Pipeline
#11315
passed with stage
in 7 minutes and 22 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
server/lib/classes/cron.d/300-quota_notify.inc.php
View file @
ca51eab3
...
...
@@ -426,7 +426,7 @@ class cronjob_quota_notify extends cronjob {
if
(
!
$rec
[
'last_quota_notification'
])
$send_notification
=
true
;
// not yet notified
elseif
(
$mail_config
[
'overquota_notify_freq'
]
>
0
&&
$rec
[
'notified_before'
]
>=
$mail_config
[
'overquota_notify_freq'
])
$send_notification
=
true
;
if
((
$mail_config
[
'overquota_notify_admin'
]
==
'y'
||
$mail_config
[
'overquota_notify_client'
]
==
'y'
)
&&
$send_notification
==
true
)
{
if
((
$mail_config
[
'overquota_notify_admin'
]
==
'y'
||
$mail_config
[
'overquota_notify_reseller'
]
==
'y'
||
$mail_config
[
'overquota_notify_client'
]
==
'y'
)
&&
$send_notification
==
true
)
{
$app
->
dbmaster
->
datalogUpdate
(
'mail_user'
,
array
(
"last_quota_notification"
=>
date
(
'Y-m-d'
)),
'mailuser_id'
,
$rec
[
'mailuser_id'
]);
$placeholders
=
array
(
'{email}'
=>
$rec
[
'email'
],
...
...
@@ -525,7 +525,7 @@ class cronjob_quota_notify extends cronjob {
//* Send quota notifications
if
((
$web_config
[
'overquota_db_notify_admin'
]
==
'y'
||
$web_config
[
'overquota_db_notify_client'
]
==
'y'
)
&&
$send_notification
==
true
)
{
if
((
$web_config
[
'overquota_db_notify_admin'
]
==
'y'
||
$web_config
[
'overquota_db_notify_reseller'
]
==
'y'
||
$web_config
[
'overquota_db_notify_client'
]
==
'y'
)
&&
$send_notification
==
true
)
{
$app
->
dbmaster
->
datalogUpdate
(
'web_database'
,
array
(
"last_quota_notification"
=>
date
(
'Y-m-d'
)),
'database_id'
,
$rec
[
'database_id'
]);
$placeholders
=
array
(
'{database_name}'
=>
$rec
[
'database_name'
],
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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