Skip to content

Commit 073df62

Browse files
author
Thom Pol
committed
Fix reseller notifications (#6347)
1 parent 5bbec2b commit 073df62

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

‎server/lib/classes/cron.d/300-quota_notify.inc.php‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function onRunJob() {
108108
//* Send email to reseller
109109
if($web_config['overtraffic_notify_reseller'] == 'y') {
110110
$client_group_id = $rec["sys_groupid"];
111-
$app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
111+
$client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
112112
if($client['parent_client_id'] > 0) {
113113
$reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']);
114114
}
@@ -246,7 +246,7 @@ public function onRunJob() {
246246
//* Send email to reseller
247247
if($web_config['overquota_notify_reseller'] == 'y') {
248248
$client_group_id = $rec["sys_groupid"];
249-
$app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
249+
$client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
250250
if($client['parent_client_id'] > 0) {
251251
$reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']);
252252
}
@@ -293,7 +293,7 @@ public function onRunJob() {
293293
//* Send email to reseller
294294
if($web_config['overquota_notify_reseller'] == 'y') {
295295
$client_group_id = $rec["sys_groupid"];
296-
$app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
296+
$client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
297297
if($client['parent_client_id'] > 0) {
298298
$reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']);
299299
}
@@ -398,7 +398,7 @@ public function onRunJob() {
398398
//* Send email to reseller
399399
if($web_config['overquota_notify_reseller'] == 'y') {
400400
$client_group_id = $rec["sys_groupid"];
401-
$app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
401+
$client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
402402
if($client['parent_client_id'] > 0) {
403403
$reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']);
404404
}
@@ -445,7 +445,7 @@ public function onRunJob() {
445445
//* Send email to reseller
446446
if($web_config['overquota_notify_reseller'] == 'y') {
447447
$client_group_id = $rec["sys_groupid"];
448-
$app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
448+
$client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
449449
if($client['parent_client_id'] > 0) {
450450
$reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']);
451451
}
@@ -544,7 +544,7 @@ public function onRunJob() {
544544
//* Send email to reseller
545545
if($web_config['overquota_db_notify_reseller'] == 'y') {
546546
$client_group_id = $rec["sys_groupid"];
547-
$app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
547+
$client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
548548
if($client['parent_client_id'] > 0) {
549549
$reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']);
550550
}
@@ -578,13 +578,14 @@ public function onRunJob() {
578578
$recipients = array();
579579

580580
//* send email to admin
581-
if($global_config['admin_mail'] != '' && $web_config['overquota_db_notify_admin'] == 'y')
581+
if($global_config['admin_mail'] != '' && $web_config['overquota_db_notify_admin'] == 'y') {
582582
$recipients[] = $global_config['admin_mail'];
583+
}
583584

584585
//* Send email to reseller
585586
if($web_config['overquota_db_notify_reseller'] == 'y') {
586587
$client_group_id = $rec["sys_groupid"];
587-
$app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
588+
$client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
588589
if($client['parent_client_id'] > 0) {
589590
$reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']);
590591
}
@@ -594,8 +595,14 @@ public function onRunJob() {
594595
}
595596

596597
//* Send email to client
597-
if($web_config['overquota_db_notify_client'] == 'y' && $client['email'] != '')
598-
$recipients[] = $client['email'];
598+
if($mail_config['overquota_notify_client'] == 'y') {
599+
$client_group_id = $rec["sys_groupid"];
600+
$client = $app->db->queryOneRecord("SELECT client.email FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
601+
if($client['email'] != '') {
602+
$recipients[] = $client['email'];
603+
}
604+
}
605+
599606

600607
$this->_tools->send_notification_email('db_quota_ok_notification', $placeholders, $recipients);
601608

0 commit comments

Comments
 (0)