Skip to content

Commit ec64cf5

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1'
2 parents b6a0ab0 + 6332aca commit ec64cf5

19 files changed

+582
-1
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,14 @@ ALTER TABLE `web_domain` ADD `ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n
192192

193193
ALTER TABLE `openvz_template` CHANGE `vmguarpages` `vmguarpages` varchar(255) DEFAULT '65536:unlimited';
194194
ALTER TABLE `openvz_template` CHANGE `privvmpages` `privvmpages` varchar(255) DEFAULT '131072:139264';
195+
196+
CREATE TABLE `ftp_traffic` (
197+
`hostname` varchar(255) NOT NULL,
198+
`traffic_date` date NOT NULL,
199+
`in_bytes` bigint(32) unsigned NOT NULL,
200+
`out_bytes` bigint(32) unsigned NOT NULL,
201+
PRIMARY KEY (`hostname`,`traffic_date`)
202+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
203+
204+
ALTER TABLE `mail_forwarding` ADD COLUMN `allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n' AFTER `active`;
205+
UPDATE `mail_forwarding` SET `allow_send_as` = 'y' WHERE `type` = 'alias';

‎install/sql/ispconfig3.sql‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,20 @@ CREATE TABLE `ftp_user` (
638638

639639
-- --------------------------------------------------------
640640

641+
--
642+
-- Table structure for table `ftp_traffic`
643+
--
644+
645+
CREATE TABLE `ftp_traffic` (
646+
`hostname` varchar(255) NOT NULL,
647+
`traffic_date` date NOT NULL,
648+
`in_bytes` bigint(32) unsigned NOT NULL,
649+
`out_bytes` bigint(32) unsigned NOT NULL,
650+
PRIMARY KEY (`hostname`,`traffic_date`)
651+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
652+
653+
-- --------------------------------------------------------
654+
641655
--
642656
-- Table structure for table `help_faq`
643657
--
@@ -800,6 +814,7 @@ CREATE TABLE `mail_forwarding` (
800814
`destination` text,
801815
`type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias',
802816
`active` enum('n','y') NOT NULL DEFAULT 'n',
817+
`allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n',
803818
`greylisting` enum('n','y' ) NOT NULL DEFAULT 'n',
804819
PRIMARY KEY (`forwarding_id`),
805820
KEY `server_id` (`server_id`,`source`),

‎install/tpl/mysql-virtual_sender_login_maps.cf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
4-
query = SELECT destination FROM mail_forwarding WHERE source = '%s' AND active = 'y' AND type = 'alias' AND server_id = {server_id} UNION SELECT email FROM mail_user WHERE email = '%s' AND disablesmtp = 'n' AND server_id = {server_id};
4+
query = SELECT destination FROM mail_forwarding WHERE source = '%s' AND active = 'y' AND allow_send_as = 'y' AND server_id = {server_id} UNION SELECT email FROM mail_user WHERE email = '%s' AND disablesmtp = 'n' AND server_id = {server_id};
55
hosts = {mysql_server_ip}

‎interface/lib/classes/quota_lib.inc.php‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,67 @@ public function get_trafficquota_data($clientid = null, $lastdays = 0) {
156156

157157
return $traffic_data;
158158
}
159+
160+
public function get_ftptrafficquota_data($clientid = null, $lastdays = 0) {
161+
global $app;
162+
163+
$traffic_data = array();
164+
165+
// select vhosts (belonging to client)
166+
if($clientid != null){
167+
$sql_where = " AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)";
168+
}
169+
$sites = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' AND (type = 'vhost' OR type = 'vhostsubdomain' OR type = 'vhostalias')".$sql_where, $clientid);
170+
171+
$hostnames = array();
172+
$traffic_data = array();
173+
174+
foreach ($sites as $site) {
175+
$hostnames[] = $site['domain'];
176+
$traffic_data[$site['domain']]['domain_id'] = $site['domain_id'];
177+
}
178+
179+
// fetch all traffic-data of selected vhosts
180+
if (!empty($hostnames)) {
181+
$tmp_year = date('Y');
182+
$tmp_month = date('m');
183+
// This Month
184+
$tmp_recs = $app->db->queryAllRecords("SELECT hostname, SUM(in_bytes) AS ftp_in, SUM(out_bytes) AS ftp_out FROM ftp_traffic WHERE YEAR(traffic_date) = ? AND MONTH(traffic_date) = ? AND hostname IN ? GROUP BY hostname", $tmp_year, $tmp_month, $hostnames);
185+
foreach ($tmp_recs as $tmp_rec) {
186+
$traffic_data[$tmp_rec['hostname']]['this_month'] = $tmp_rec['t'];
187+
}
188+
// This Year
189+
$tmp_recs = $app->db->queryAllRecords("SELECT hostname, SUM(in_bytes) AS ftp_in, SUM(out_bytes) AS ftp_out FROM ftp_traffic WHERE YEAR(traffic_date) = ? AND hostname IN ? GROUP BY hostname", $tmp_year, $hostnames);
190+
foreach ($tmp_recs as $tmp_rec) {
191+
$traffic_data[$tmp_rec['hostname']]['this_year'] = $tmp_rec['t'];
192+
}
193+
194+
$tmp_year = date('Y', mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
195+
$tmp_month = date('m', mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
196+
// Last Month
197+
$tmp_recs = $app->db->queryAllRecords("SELECT hostname, SUM(in_bytes) AS ftp_in, SUM(out_bytes) AS ftp_out FROM ftp_traffic WHERE YEAR(traffic_date) = ? AND MONTH(traffic_date) = ? AND hostname IN ? GROUP BY hostname", $tmp_year, $tmp_month, $hostnames);
198+
foreach ($tmp_recs as $tmp_rec) {
199+
$traffic_data[$tmp_rec['hostname']]['last_month'] = $tmp_rec['t'];
200+
}
201+
202+
$tmp_year = date('Y', mktime(0, 0, 0, date("m"), date("d"), date("Y")-1));
203+
// Last Year
204+
$tmp_recs = $app->db->queryAllRecords("SELECT hostname, SUM(in_bytes) AS ftp_in, SUM(out_bytes) AS ftp_out FROM ftp_traffic WHERE YEAR(traffic_date) = ? AND hostname IN ? GROUP BY hostname", $tmp_year, $hostnames);
205+
foreach ($tmp_recs as $tmp_rec) {
206+
$traffic_data[$tmp_rec['hostname']]['last_year'] = $tmp_rec['t'];
207+
}
208+
209+
if (is_int($lastdays) && ($lastdays > 0)) {
210+
// Last xx Days
211+
$tmp_recs = $app->db->queryAllRecords("SELECT hostname, SUM(in_bytes) AS ftp_in, SUM(out_bytes) AS ftp_out FROM ftp_traffic WHERE (traffic_date >= DATE_SUB(NOW(), INTERVAL ? DAY)) AND hostname IN ? GROUP BY hostname", $lastdays, $hostnames);
212+
foreach ($tmp_recs as $tmp_rec) {
213+
$traffic_data[$tmp_rec['hostname']]['lastdays'] = $tmp_rec['t'];
214+
}
215+
}
216+
}
217+
218+
return $traffic_data;
219+
}
159220

160221
public function get_mailquota_data($clientid = null, $readable = true) {
161222
global $app;

‎interface/lib/classes/remote.d/sites.inc.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,21 @@ public function trafficquota_get_by_user($session_id, $client_id, $lastdays = 0)
980980
return $app->quota_lib->get_trafficquota_data($client_id, $lastdays);
981981
}
982982

983+
public function ftptrafficquota_data($session_id, $client_id, $lastdays = 0)
984+
{
985+
global $app;
986+
$app->uses('quota_lib');
987+
988+
if(!$this->checkPerm($session_id, 'trafficquota_get_by_user')) {
989+
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
990+
return false;
991+
}
992+
if ($client_id != null)
993+
$client_id = $app->functions->intval($client_id);
994+
995+
return $app->quota_lib->get_ftptrafficquota_data($client_id, $lastdays);
996+
}
997+
983998
public function databasequota_get_by_user($session_id, $client_id)
984999
{
9851000
global $app;

‎interface/web/mail/form/mail_alias.tform.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@
124124
'default' => 'y',
125125
'value' => array(0 => 'n', 1 => 'y')
126126
),
127+
'allow_send_as' => array (
128+
'datatype' => 'VARCHAR',
129+
'formtype' => 'CHECKBOX',
130+
'default' => 'y',
131+
'value' => array(1 => 'y', 0 => 'n')
132+
),
127133
'greylisting' => array (
128134
'datatype' => 'VARCHAR',
129135
'formtype' => 'CHECKBOX',

‎interface/web/mail/form/mail_forward.tform.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,12 @@
118118
'default' => 'y',
119119
'value' => array(0 => 'n', 1 => 'y')
120120
),
121+
'allow_send_as' => array (
122+
'datatype' => 'VARCHAR',
123+
'formtype' => 'CHECKBOX',
124+
'default' => 'n',
125+
'value' => array(1 => 'y', 0 => 'n')
126+
),
121127
'greylisting' => array (
122128
'datatype' => 'VARCHAR',
123129
'formtype' => 'CHECKBOX',

‎interface/web/mail/lib/lang/de_mail_alias.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ $wb['duplicate_mailbox_txt'] = 'Es existiert bereits eine E-Mail Konto mit diese
1111
$wb['domain_txt'] = 'Domain';
1212
$wb['duplicate_email_alias_txt'] = 'Dieser E-Mail Alias existiert bereits.';
1313
$wb['source_txt'] = 'Alias';
14+
$wb['send_as_txt'] = 'Senden als';
15+
$wb['send_as_exp'] = 'Ziel erlauben, den alias als Absender zu benutzen';
1416
$wb['greylisting_txt'] = 'Aktiviere Greylisting';
1517
?>

‎interface/web/mail/lib/lang/de_mail_forward.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Es existiert bereits ein E-Mail Konto mit dieser
77
$wb['domain_txt'] = 'Domain';
88
$wb['source_txt'] = 'Quell E-Mail Adresse';
99
$wb['email_error_isemail'] = 'Bitte geben Sie eine gültige E-Mail Adresse an.';
10+
$wb['send_as_txt'] = 'Senden als';
11+
$wb['send_as_exp'] = 'Ziel erlauben, die Adresse als Absender zu nutzen (Nur, falls das Ziel intern ist)';
1012
$wb['greylisting_txt'] = 'Aktiviere greylisting';
1113
?>

‎interface/web/mail/lib/lang/en_mail_alias.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ $wb["duplicate_mailbox_txt"] = 'There is already a mailbox with this email addre
1111
$wb['domain_txt'] = 'Domain';
1212
$wb["duplicate_email_alias_txt"] = 'This email alias does already exist.';
1313
$wb["source_txt"] = 'Alias';
14+
$wb['send_as_txt'] = 'Send as';
15+
$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
1416
$wb['greylisting_txt'] = 'Enable greylisting';
1517
?>

0 commit comments

Comments
 (0)