Commit df76de91 authored by tbrehm's avatar tbrehm

- Added overtraffic notifications to traffic quota system (part of FS#2059 -...

- Added overtraffic notifications to traffic quota system (part of FS#2059 - Extend Traffic quota system)
parent e9ff7852
......@@ -66,6 +66,8 @@ php_ini_path_cgi=/etc/php5/cgi/php.ini
check_apache_config=y
enable_sni=y
enable_ip_wildcard=y
overtraffic_notify_admin=y
overtraffic_notify_client=y
nginx_cgi_socket=/var/run/fcgiwrap.socket
php_fpm_init_script=php5-fpm
php_fpm_ini_path=/etc/php5/fpm/php.ini
......
......@@ -500,6 +500,18 @@ $form["tabs"]['web'] = array(
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
'overtraffic_notify_admin' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
'overtraffic_notify_client' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
'user' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
......
......@@ -168,4 +168,6 @@ $wb["firewall_txt"] = 'Firewall';
$wb["mailbox_quota_stats_txt"] = 'Mailbox quota statistics';
$wb["enable_ip_wildcard_txt"] = 'Enable IP wildcard (*)';
$wb["web_folder_protection_txt"] = 'Web folder protection';
$wb["overtraffic_notify_admin_txt"] = 'Send overtraffic notification to admin';
$wb["overtraffic_notify_client_txt"] = 'Send overtraffic notification to client';
?>
\ No newline at end of file
......@@ -94,6 +94,18 @@
<div class="multiField">
{tmpl_var name='enable_ip_wildcard'}
</div>
</div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='overtraffic_notify_admin_txt'}</p>
<div class="multiField">
{tmpl_var name='overtraffic_notify_admin'}
</div>
</div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='overtraffic_notify_client_txt'}</p>
<div class="multiField">
{tmpl_var name='overtraffic_notify_client'}
</div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
<div style="display:none;">
......
Subject:Website traffic notification
The website {domain} is over traffic and has been disabled.
\ No newline at end of file
......@@ -447,6 +447,8 @@ if ($app->dbmaster == $app->db) {
if ($app->dbmaster == $app->db) {
$global_config = $app->getconf->get_global_config('mail');
$current_month = date('Y-m');
//* Check website traffic quota
......@@ -478,12 +480,63 @@ if ($app->dbmaster == $app->db) {
($reseller_traffic_quota > 0 && $web_traffic > $reseller_traffic_quota)) {*/
if($web_traffic_quota > 0 && $web_traffic > $web_traffic_quota) {
$app->dbmaster->datalogUpdate('web_domain', "traffic_quota_lock = 'y',active = 'n'", 'domain_id', $rec['domain_id']);
$app->log('Traffic quota for '.$rec['domain_id'].' exceeded. Disabling website.',LOGLEVEL_DEBUG);
$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 subject
$parts = explode(':',trim($lines[0]));
unset($parts[0]);
$traffic_mail_subject = implode(':',$parts);
unset($lines[0]);
//* Get message
$traffic_mail_message = trim(implode($lines));
unset($tmp);
//* Replace placeholders
$traffic_mail_message = str_replace('{domain}',$rec['domain'],$traffic_mail_message);
$mailHeaders = "MIME-Version: 1.0" . "\n";
$mailHeaders .= "Content-type: text/plain; charset=utf-8" . "\n";
$mailHeaders .= "Content-Transfer-Encoding: 8bit" . "\n";
$mailHeaders .= "From: ". $global_config['admin_mail'] . "\n";
$mailHeaders .= "Reply-To: ". $global_config['admin_mail'] . "\n";
$mailSubject = "=?utf-8?B?".base64_encode($traffic_mail_subject)."?=";
//* send email to admin
if($global_config['admin_mail'] != '' && $web_config['overtraffic_notify_admin'] == 'y') {
mail($global_config['admin_mail'], $mailSubject, $traffic_mail_message, $mailHeaders);
}
//* Send email to client
if($web_config['overtraffic_notify_admin'] == '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, $traffic_mail_message, $mailHeaders);
}
}
}
} else {
//* unlock the website, if traffic is lower then quota
if($rec['traffic_quota_lock'] == 'y') {
$app->dbmaster->datalogUpdate('web_domain', "traffic_quota_lock = 'n',active = 'y'", 'domain_id', $rec['domain_id']);
$app->log('Traffic quota for '.$rec['domain_id'].' ok again. Re-enabling website.',LOGLEVEL_DEBUG);
$app->log('Traffic quota for '.$rec['domain'].' ok again. Re-enabling website.',LOGLEVEL_DEBUG);
}
}
}
......
......@@ -52,7 +52,7 @@ class getconf {
public function get_global_config($section = '') {
global $app;
if(!is_array($this->config['global'])) {
if(!@is_array($this->config['global'])) {
$app->uses('ini_parser');
$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
$this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment