From ed1260a13c005e5cdbdafacf28fbbdc1ddbe2d56 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Mon, 08 Jul 2013 09:33:26 -0400
Subject: [PATCH] - Implemented: - send quota notifications each X days instead of each day - send notification when quota is ok again - cleaned up mail sending code
---
interface/web/admin/templates/server_config_web_edit.htm | 10 +
interface/web/admin/lib/lang/en_server_config.lng | 5
install/sql/incremental/upd_0053.sql | 2
install/tpl/server.ini.master | 4
interface/web/admin/templates/server_config_mail_edit.htm | 10 +
interface/web/admin/form/server_config.tform.php | 28 +++
interface/web/admin/lib/lang/de_server_config.lng | 3
server/conf/mail/web_quota_ok_notification_en.txt | 14 +
install/sql/ispconfig3.sql | 2
server/conf/mail/mail_quota_ok_notification_en.txt | 14 +
server/conf/mail/web_quota_ok_notification_de.txt | 14 +
server/cron_daily.php | 313 ++++++++++++++++++++------------------
server/conf/mail/mail_quota_ok_notification_de.txt | 14 +
13 files changed, 286 insertions(+), 147 deletions(-)
diff --git a/install/sql/incremental/upd_0053.sql b/install/sql/incremental/upd_0053.sql
new file mode 100644
index 0000000..14487c6
--- /dev/null
+++ b/install/sql/incremental/upd_0053.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `web_domain` ADD `last_quota_notification` DATE NULL DEFAULT NULL;
+ALTER TABLE `mail_user` ADD `last_quota_notification` DATE NULL DEFAULT NULL;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 2150aa1..a9ed18c 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -837,6 +837,7 @@
`disablesieve` enum('n','y') NOT NULL default 'n',
`disablelda` enum('n','y') NOT NULL default 'n',
`disabledoveadm` enum('n','y') NOT NULL default 'n',
+ `last_quota_notification` date NULL default NULL,
PRIMARY KEY (`mailuser_id`),
KEY `server_id` (`server_id`,`email`),
KEY `email_access` (`email`,`access`)
@@ -1758,6 +1759,7 @@
`traffic_quota_lock` enum('n','y') NOT NULL default 'n',
`fastcgi_php_version` varchar(255) DEFAULT NULL,
`proxy_directives` mediumtext,
+ `last_quota_notification` date NULL default NULL,
PRIMARY KEY (`domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 9d4e18d..bbdc0cf 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -35,6 +35,8 @@
realtime_blackhole_list=
overquota_notify_admin=y
overquota_notify_client=y
+overquota_notify_freq=7
+overquota_notify_onok=n
[getmail]
getmail_config_dir=/etc/getmail
@@ -83,6 +85,8 @@
web_folder_protection=y
overquota_notify_admin=y
overquota_notify_client=y
+overquota_notify_freq=7
+overquota_notify_onok=n
[dns]
bind_user=root
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index d9bd317..d0dc295 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -339,6 +339,20 @@
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
+ 'overquota_notify_freq' => array(
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'default' => '7',
+ 'value' => '',
+ 'width' => '20',
+ 'maxlength' => '255'
+ ),
+ 'overquota_notify_onok' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
##################################
# ENDE Datatable fields
##################################
@@ -565,6 +579,20 @@
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
+ 'overquota_notify_freq' => array(
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'default' => '7',
+ 'value' => '',
+ 'width' => '20',
+ 'maxlength' => '255'
+ ),
+ 'overquota_notify_onok' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
'user' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 6b3f20d..d258c03 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -173,4 +173,7 @@
$wb['rbl_error_regex'] = 'Bitte geben Sie gültige RBL-Hostnamen an.';
$wb['overquota_notify_admin_txt'] = 'Quota-Warnungen an den Administrator senden';
$wb['overquota_notify_client_txt'] = 'Quota-Warnungen an den Kunden senden';
+$wb['overquota_notify_onok_txt'] = 'Meldung an den Kunden senden, wenn Belegung wieder ok';
+$wb['overquota_notify_freq_txt'] = 'Quota-Warnung alle X Tage versenden';
+$wb['overquota_notify_freq_note_txt'] = '0 = Meldung nur einmalig versenden, keine Wiederholung';
?>
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 6616299..ab568b3 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -172,5 +172,8 @@
$wb["overtraffic_notify_client_txt"] = 'Send overtraffic notification to client';
$wb["rbl_error_regex"] = 'Please specify valid RBL hostnames.';
$wb["overquota_notify_admin_txt"] = 'Send quota warnings to admin';
-$wb["overquota_notify_client_txt"] = 'Send quota warnings to client';
+$wb["overquota_notify_client_txt"] = 'Send quota warnings to client';
+$wb["overquota_notify_onok_txt"] = 'Send quota ok message to client';
+$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days';
+$wb['overquota_notify_freq_note_txt'] = '0 = send message just once, no repeated messages';
?>
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index 08900fe..752bc22 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -93,6 +93,16 @@
{tmpl_var name='overquota_notify_client'}
</div>
</div>
+ <div class="ctrlHolder">
+ <label for="overquota_notify_freq">{tmpl_var name='overquota_notify_freq_txt'}</label>
+ <input name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='overquota_notify_freq_note_txt'}
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='overquota_notify_onok_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='overquota_notify_onok'}
+ </div>
+ </div>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 21cf585..7e75f50 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -127,6 +127,16 @@
{tmpl_var name='overquota_notify_client'}
</div>
</div>
+ <div class="ctrlHolder">
+ <label for="overquota_notify_freq">{tmpl_var name='overquota_notify_freq_txt'}</label>
+ <input name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='overquota_notify_freq_note_txt'}
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='overquota_notify_onok_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='overquota_notify_onok'}
+ </div>
+ </div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
<div style="display:none;">
<div class="ctrlHolder">
diff --git a/server/conf/mail/mail_quota_ok_notification_de.txt b/server/conf/mail/mail_quota_ok_notification_de.txt
new file mode 100644
index 0000000..ee6bb73
--- /dev/null
+++ b/server/conf/mail/mail_quota_ok_notification_de.txt
@@ -0,0 +1,14 @@
+MIME-Version: 1.0
+Content-type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+From: {admin_mail}
+Reply-To: {admin_mail}
+Subject: E-Mail Kontobelegungshinweis
+
+Der belegte Speicherplatz Ihres E-Mail Kontos {email} ist wieder ok.
+
+E-Mail Konto: {email}
+Name: {name}
+Belegter Speicher: {used}
+Verfügbarer Speicher: {quota}
+Belegt: {ratio}
\ No newline at end of file
diff --git a/server/conf/mail/mail_quota_ok_notification_en.txt b/server/conf/mail/mail_quota_ok_notification_en.txt
new file mode 100644
index 0000000..ed5a2e3
--- /dev/null
+++ b/server/conf/mail/mail_quota_ok_notification_en.txt
@@ -0,0 +1,14 @@
+MIME-Version: 1.0
+Content-type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+From: {admin_mail}
+Reply-To: {admin_mail}
+Subject: Mailbox quota ok
+
+The mailbox {email} is no longer near or over quota.
+
+Mailbox: {email}
+Name: {name}
+Used space: {used}
+Quota: {quota}
+Usage ratio: {ratio}
\ No newline at end of file
diff --git a/server/conf/mail/web_quota_ok_notification_de.txt b/server/conf/mail/web_quota_ok_notification_de.txt
new file mode 100644
index 0000000..98f67d6
--- /dev/null
+++ b/server/conf/mail/web_quota_ok_notification_de.txt
@@ -0,0 +1,14 @@
+MIME-Version: 1.0
+Content-type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+From: {admin_mail}
+Reply-To: {admin_mail}
+Subject: Webseiten-Speicherhinweis
+
+Der belegte Speicherplatz Ihrer Webseite {domain} ist wieder ok.
+
+Webseite: {domain}
+Belegter Speicherplatz: {used}
+Verfügbarer Speicherplatz: {soft}
+Verfügbarer Speicherplatz (hard quota): {hard}
+Belegter Speicher in %: {ratio}
\ No newline at end of file
diff --git a/server/conf/mail/web_quota_ok_notification_en.txt b/server/conf/mail/web_quota_ok_notification_en.txt
new file mode 100644
index 0000000..693f676
--- /dev/null
+++ b/server/conf/mail/web_quota_ok_notification_en.txt
@@ -0,0 +1,14 @@
+MIME-Version: 1.0
+Content-type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+From: {admin_mail}
+Reply-To: {admin_mail}
+Subject: Website quota ok
+
+The website {domain} is no longer near or over quota.
+
+Domain: {domain}
+Used space: {used}
+Soft limit: {soft}
+Hard limit: {hard}
+Usage ratio: {ratio}
\ No newline at end of file
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 652e3a9..1e5b0c9 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -641,6 +641,64 @@
}
}
+#########
+// function for sending notification emails
+#########
+function send_notification_email($template, $placeholders, $recipients) {
+ global $conf;
+
+ if(!is_array($recipients) || count($recipients) < 1) return false;
+ if(!is_array($replacements)) $replacements = array();
+
+ if(file_exists($conf['rootpath'].'/conf-custom/mail/' . $template . '_'.$conf['language'].'.txt')) {
+ $lines = file($conf['rootpath'].'/conf-custom/mail/' . $template . '_'.$conf['language'].'.txt');
+ } elseif(file_exists($conf['rootpath'].'/conf-custom/mail/' . $template . '_en.txt')) {
+ $lines = file($conf['rootpath'].'/conf-custom/mail/' . $template . '_en.txt');
+ } elseif(file_exists($conf['rootpath'].'/conf/mail/' . $template . '_'.$conf['language'].'.txt')) {
+ $lines = file($conf['rootpath'].'/conf/mail/' . $template . '_'.$conf['language'].'.txt');
+ } else {
+ $lines = file($conf['rootpath'].'/conf/mail/' . $template . '_en.txt');
+ }
+
+ //* get mail headers, subject and body
+ $mailHeaders = '';
+ $mailBody = '';
+ $mailSubject = '';
+ $inHeader = true;
+ for($l = 0; $l < count($lines); $l++) {
+ if($lines[$l] == '') {
+ $inHeader = false;
+ continue;
+ }
+ if($inHeader == true) {
+ $parts = explode(':', $lines[$l], 2);
+ if(strtolower($parts[0]) == 'subject') $mailSubject = trim($parts[1]);
+ unset($parts);
+ $mailHeaders .= trim($lines[$l]) . "\n";
+ } else {
+ $mailBody .= trim($lines[$l]) . "\n";
+ }
+ }
+ $mailBody = trim($mailBody);
+
+ //* Replace placeholders
+ $mailHeaders = strtr($mailHeaders, $placeholders);
+ $mailSubject = strtr($mailSubject, $placeholders);
+ $mailBody = strtr($mailBody, $placeholders);
+
+ for($r = 0; $r < count($recipients); $r++) {
+ mail($recipients[$r], $mailSubject, $mailBody, $mailHeaders);
+ }
+
+ unset($mailSubject);
+ unset($mailHeaders);
+ unset($mailBody);
+ unset($lines);
+
+ return true;
+}
+
+
#######################################################################################################
// enforce traffic quota (run only on the "master-server")
#######################################################################################################
@@ -683,50 +741,15 @@
$app->log('Traffic quota for '.$rec['domain'].' exceeded. Disabling website.',LOGLEVEL_DEBUG);
//* Send traffic notifications
- if($web_config['overtraffic_notify_admin'] == 'y' || $web_config['overtraffic_notify_client'] == 'y') {
-
- if(file_exists($conf['rootpath'].'/conf-custom/mail/web_traffic_notification_'.$conf['language'].'.txt')) {
- $lines = file($conf['rootpath'].'/conf-custom/mail/web_traffic_notification_'.$conf['language'].'.txt');
- } elseif(file_exists($conf['rootpath'].'/conf-custom/mail/web_traffic_notification_en.txt')) {
- $lines = file($conf['rootpath'].'/conf-custom/mail/web_traffic_notification_en.txt');
- } elseif(file_exists($conf['rootpath'].'/conf/mail/web_traffic_notification_'.$conf['language'].'.txt')) {
- $lines = file($conf['rootpath'].'/conf/mail/web_traffic_notification_'.$conf['language'].'.txt');
- } else {
- $lines = file($conf['rootpath'].'/conf/mail/web_traffic_notification_en.txt');
- }
-
- //* get mail headers, subject and body
- $mailHeaders = '';
- $mailBody = '';
- $mailSubject = '';
- $inHeader = true;
- for($l = 0; $l < count($lines); $l++) {
- if($lines[$l] == '') {
- $inHeader = false;
- continue;
- }
- if($inHeader == true) {
- $parts = explode(':', $lines[$l], 2);
- if(strtolower($parts[0]) == 'subject') $mailSubject = trim($parts[1]);
- unset($parts);
- $mailHeaders .= trim($lines[$l]) . "\n";
- } else {
- $mailBody .= trim($lines[$l]) . "\n";
- }
- }
- $mailBody = trim($mailBody);
+ if($rec['traffic_quota_lock'] != 'y' && ($web_config['overtraffic_notify_admin'] == 'y' || $web_config['overtraffic_notify_client'] == 'y')) {
$placeholders = array('{domain}' => $rec['domain'],
'{admin_mail}' => $global_config['admin_mail']);
- //* Replace placeholders
- $mailHeaders = strtr($mailHeaders, $placeholders);
- $mailSubject = strtr($mailSubject, $placeholders);
- $mailBody = strtr($mailBody, $placeholders);
-
- //* send email to admin
+ $recipients = array();
+ //* send email to admin
if($global_config['admin_mail'] != '' && $web_config['overtraffic_notify_admin'] == 'y') {
- mail($global_config['admin_mail'], $mailSubject, $mailBody, $mailHeaders);
+ $recipients[] = $global_config['admin_mail'];
}
//* Send email to client
@@ -734,13 +757,11 @@
$client_group_id = $rec["sys_groupid"];
$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");
if($client['email'] != '') {
- mail($client['email'], $mailSubject, $mailBody, $mailHeaders);
+ $recipients[] = $client['email'];
}
}
- unset($mailSubject);
- unset($mailHeaders);
- unset($mailBody);
- unset($lines);
+
+ send_notification_email('web_traffic_notification', $placeholders, $recipients);
}
@@ -767,7 +788,7 @@
$global_config = $app->getconf->get_global_config('mail');
//* Check website disk quota
- $sql = "SELECT sys_groupid,domain,system_user FROM web_domain WHERE hd_quota > 0 and (type = 'vhost' OR type = 'vhostsubdomain')";
+ $sql = "SELECT domain_id,sys_groupid,domain,system_user,last_quota_notification,DATEDIFF(CURDATE(), last_quota_notification) as `notified_before` FROM web_domain WHERE hd_quota > 0 and (type = 'vhost' OR type = 'vhostsubdomain')";
$records = $app->db->queryAllRecords($sql);
if(is_array($records) && !empty($records)) {
@@ -809,7 +830,39 @@
}
// send notifications only if 90% or more of the quota are used
- if($used_ratio < 0.9) continue;
+ if($used_ratio < 0.9) {
+ // reset notification date
+ if($rec['last_quota_notification']) $app->dbmaster->datalogUpdate('web_domain', "last_quota_notification = NULL", 'domain_id', $rec['domain_id']);
+
+ // send notification - everything ok again
+ if($rec['last_quota_notification'] && $web_config['overquota_notify_onok'] == 'y' && ($web_config['overquota_notify_admin'] == 'y' || $web_config['overquota_notify_client'] == 'y')) {
+ $placeholders = array('{domain}' => $rec['domain'],
+ '{admin_mail}' => $global_config['admin_mail'],
+ '{used}' => $rec['used'],
+ '{soft}' => $rec['soft'],
+ '{hard}' => $rec['hard'],
+ '{ratio}' => $rec['ratio']);
+
+ $recipients = array();
+
+ //* send email to admin
+ if($global_config['admin_mail'] != '' && $web_config['overquota_notify_admin'] == 'y') {
+ $recipients[] = $global_config['admin_mail'];
+ }
+
+ //* Send email to client
+ if($web_config['overquota_notify_client'] == 'y') {
+ $client_group_id = $rec["sys_groupid"];
+ $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");
+ if($client['email'] != '') {
+ $recipients[] = $client['email'];
+ }
+ }
+ send_notification_email('web_quota_ok_notification', $placeholders, $recipients);
+ }
+
+ continue;
+ }
$rec['ratio'] = number_format($used_ratio * 100, 2, '.', '').'%';
if($rec['used'] > 1024) {
@@ -829,41 +882,15 @@
} else {
$rec['hard'] .= ' KB';
}
-
+
+ // could a notification be sent?
+ $send_notification = false;
+ if(!$rec['last_quota_notification']) $send_notification = true; // not yet notified
+ elseif($web_config['overquota_notify_freq'] > 0 && $rec['notified_before'] >= $web_config['overquota_notify_freq']) $send_notification = true;
+
//* Send quota notifications
- if($web_config['overquota_notify_admin'] == 'y' || $web_config['overquota_notify_client'] == 'y') {
-
- if(file_exists($conf['rootpath'].'/conf-custom/mail/web_quota_notification_'.$conf['language'].'.txt')) {
- $lines = file($conf['rootpath'].'/conf-custom/mail/web_quota_notification_'.$conf['language'].'.txt');
- } elseif(file_exists($conf['rootpath'].'/conf-custom/mail/web_quota_notification_en.txt')) {
- $lines = file($conf['rootpath'].'/conf-custom/mail/web_quota_notification_en.txt');
- } elseif(file_exists($conf['rootpath'].'/conf/mail/web_quota_notification_'.$conf['language'].'.txt')) {
- $lines = file($conf['rootpath'].'/conf/mail/web_quota_notification_'.$conf['language'].'.txt');
- } else {
- $lines = file($conf['rootpath'].'/conf/mail/web_quota_notification_en.txt');
- }
-
-
- //* get mail headers, subject and body
- $mailHeaders = '';
- $mailBody = '';
- $mailSubject = '';
- $inHeader = true;
- for($l = 0; $l < count($lines); $l++) {
- if($lines[$l] == '') {
- $inHeader = false;
- continue;
- }
- if($inHeader == true) {
- $parts = explode(':', $lines[$l], 2);
- if(strtolower($parts[0]) == 'subject') $mailSubject = trim($parts[1]);
- unset($parts);
- $mailHeaders .= trim($lines[$l]) . "\n";
- } else {
- $mailBody .= trim($lines[$l]) . "\n";
- }
- }
- $mailBody = trim($mailBody);
+ if(($web_config['overquota_notify_admin'] == 'y' || $web_config['overquota_notify_client'] == 'y') && $send_notification == true) {
+ $app->dbmaster->datalogUpdate('web_domain', "last_quota_notification = CURDATE()", 'domain_id', $rec['domain_id']);
$placeholders = array('{domain}' => $rec['domain'],
'{admin_mail}' => $global_config['admin_mail'],
@@ -871,15 +898,12 @@
'{soft}' => $rec['soft'],
'{hard}' => $rec['hard'],
'{ratio}' => $rec['ratio']);
-
- //* Replace placeholders
- $mailHeaders = strtr($mailHeaders, $placeholders);
- $mailSubject = strtr($mailSubject, $placeholders);
- $mailBody = strtr($mailBody, $placeholders);
+
+ $recipients = array();
//* send email to admin
if($global_config['admin_mail'] != '' && $web_config['overquota_notify_admin'] == 'y') {
- mail($global_config['admin_mail'], $mailSubject, $mailBody, $mailHeaders);
+ $recipients[] = $global_config['admin_mail'];
}
//* Send email to client
@@ -887,15 +911,11 @@
$client_group_id = $rec["sys_groupid"];
$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");
if($client['email'] != '') {
- mail($client['email'], $mailSubject, $mailBody, $mailHeaders);
+ $recipients[] = $client['email'];
}
}
-
- unset($mailSubject);
- unset($mailHeaders);
- unset($mailBody);
- unset($lines);
- }
+ send_notification_email('web_quota_notification', $placeholders, $recipients);
+ }
}
}
}
@@ -910,7 +930,7 @@
$global_config = $app->getconf->get_global_config('mail');
//* Check email quota
- $sql = "SELECT sys_groupid,email,name,quota FROM mail_user WHERE quota > 0";
+ $sql = "SELECT mailuser_id,sys_groupid,email,name,quota,last_quota_notification,DATEDIFF(CURDATE(), last_quota_notification) as `notified_before` FROM mail_user WHERE quota > 0";
$records = $app->db->queryAllRecords($sql);
if(is_array($records) && !empty($records)) {
@@ -940,7 +960,39 @@
$used_ratio = $rec['used']/$rec['quota'];
// send notifications only if 90% or more of the quota are used
- if($used_ratio < 0.9) continue;
+ if($used_ratio < 0.9) {
+ // reset notification date
+ if($rec['last_quota_notification']) $app->dbmaster->datalogUpdate('mail_user', "last_quota_notification = NULL", 'mailuser_id', $rec['mailuser_id']);
+
+ // send notification - everything ok again
+ if($rec['last_quota_notification'] && $mail_config['overquota_notify_onok'] == 'y' && ($mail_config['overquota_notify_admin'] == 'y' || $mail_config['overquota_notify_client'] == 'y')) {
+ $placeholders = array('{email}' => $rec['email'],
+ '{admin_mail}' => $global_config['admin_mail'],
+ '{used}' => $rec['used'],
+ '{name}' => $rec['name'],
+ '{quota}' => $rec['quota'],
+ '{ratio}' => $rec['ratio']);
+
+ $recipients = array();
+ //* send email to admin
+ if($global_config['admin_mail'] != '' && $mail_config['overquota_notify_admin'] == 'y') {
+ $recipients[] = $global_config['admin_mail'];
+ }
+
+ //* Send email to client
+ if($mail_config['overquota_notify_client'] == 'y') {
+ $client_group_id = $rec["sys_groupid"];
+ $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");
+ if($client['email'] != '') {
+ $recipients[] = $client['email'];
+ }
+ }
+
+ send_notification_email('mail_quota_ok_notification', $placeholders, $recipients);
+ }
+
+ continue;
+ }
$rec['ratio'] = number_format($used_ratio * 100, 2, '.', '').'%';
$rec['quota'] = round($rec['quota'] / 1048576,4).' MB';
@@ -953,69 +1005,38 @@
//* Send quota notifications
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
- if($mail_config['overquota_notify_admin'] == 'y' || $mail_config['overquota_notify_client'] == 'y') {
-
- if(file_exists($conf['rootpath'].'/conf-custom/mail/mail_quota_notification_'.$conf['language'].'.txt')) {
- $lines = file($conf['rootpath'].'/conf-custom/mail/mail_quota_notification_'.$conf['language'].'.txt');
- } elseif(file_exists($conf['rootpath'].'/conf-custom/mail/mail_quota_notification_en.txt')) {
- $lines = file($conf['rootpath'].'/conf-custom/mail/mail_quota_notification_en.txt');
- } elseif(file_exists($conf['rootpath'].'/conf/mail/mail_quota_notification_'.$conf['language'].'.txt')) {
- $lines = file($conf['rootpath'].'/conf/mail/mail_quota_notification_'.$conf['language'].'.txt');
- } else {
- $lines = file($conf['rootpath'].'/conf/mail/mail_quota_notification_en.txt');
- }
-
- //* get mail headers, subject and body
- $mailHeaders = '';
- $mailBody = '';
- $mailSubject = '';
- $inHeader = true;
- for($l = 0; $l < count($lines); $l++) {
- if($lines[$l] == '') {
- $inHeader = false;
- continue;
- }
- if($inHeader == true) {
- $parts = explode(':', $lines[$l], 2);
- if(strtolower($parts[0]) == 'subject') $mailSubject = trim($parts[1]);
- unset($parts);
- $mailHeaders .= trim($lines[$l]) . "\n";
- } else {
- $mailBody .= trim($lines[$l]) . "\n";
- }
- }
- $mailBody = trim($mailBody);
+
+ // could a notification be sent?
+ $send_notification = false;
+ 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) {
+ $app->dbmaster->datalogUpdate('mail_user', "last_quota_notification = CURDATE()", 'mailuser_id', $rec['mailuser_id']);
$placeholders = array('{email}' => $rec['email'],
- '{admin_mail}' => $global_config['admin_mail'],
- '{used}' => $rec['used'],
- '{name}' => $rec['name'],
- '{quota}' => $rec['quota'],
- '{ratio}' => $rec['ratio']);
-
- //* Replace placeholders
- $mailHeaders = strtr($mailHeaders, $placeholders);
- $mailSubject = strtr($mailSubject, $placeholders);
- $mailBody = strtr($mailBody, $placeholders);
-
+ '{admin_mail}' => $global_config['admin_mail'],
+ '{used}' => $rec['used'],
+ '{name}' => $rec['name'],
+ '{quota}' => $rec['quota'],
+ '{ratio}' => $rec['ratio']);
+
+ $recipients = array();
//* send email to admin
- if($global_config['admin_mail'] != '' && $web_config['overquota_notify_admin'] == 'y') {
- mail($global_config['admin_mail'], $mailSubject, $mailBody, $mailHeaders);
+ if($global_config['admin_mail'] != '' && $mail_config['overquota_notify_admin'] == 'y') {
+ $recipients[] = $global_config['admin_mail'];
}
//* Send email to client
- if($web_config['overquota_notify_client'] == 'y') {
+ if($mail_config['overquota_notify_client'] == 'y') {
$client_group_id = $rec["sys_groupid"];
$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");
if($client['email'] != '') {
- mail($client['email'], $mailSubject, $mailBody, $mailHeaders);
+ $recipients[] = $client['email'];
}
}
- unset($mailSubject);
- unset($mailHeaders);
- unset($mailBody);
- unset($lines);
+ send_notification_email('mail_quota_notification', $placeholders, $recipients);
}
}
}
--
Gitblit v1.9.1