Skip to content

Commit 1fdafb2

Browse files
helmohelmo
committed
Merge remote-tracking branch 'origin/develop' into 5374-mail-last-accessed-frontend
2 parents 555031d + b2e6841 commit 1fdafb2

File tree

11 files changed

+54
-10
lines changed

11 files changed

+54
-10
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2098,6 +2098,18 @@ public function configure_rspamd() {
20982098
$tpl->setVar('rspamd_password', $rspamd_password);
20992099
wf('/etc/rspamd/local.d/worker-controller.inc', $tpl->grab());
21002100
chmod('/etc/rspamd/local.d/worker-controller.inc', 0644);
2101+
2102+
// rspamd.local.lua
2103+
if(file_exists($conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd.local.lua.master")) {
2104+
exec('cp '.$conf['ispconfig_install_dir']."/server/conf-custom/install/rspamd.local.lua.master /etc/rspamd/rspamd.local.lua");
2105+
} else {
2106+
exec("cp tpl/rspamd.local.lua.master /etc/rspamd/rspamd.local.lua");
2107+
}
2108+
if(file_exists('/etc/rspamd/rspamd.local.lua')) {
2109+
exec('chgrp _rspamd /etc/rspamd/rspamd.local.lua');
2110+
exec('chmod 640 /etc/rspamd/rspamd.local.lua');
2111+
}
2112+
21012113
}
21022114

21032115
public function configure_spamassassin() {

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
INSERT IGNORE INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `active`, `ca_name`, `ca_issue`, `ca_wildcard`, `ca_iodef`, `ca_critical`) VALUES
2+
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Amazon Trust Services', 'amazontrust.com', 'Y', '', 0);
13

4+
-- 5374-mail-last-accessed-frontend
25
ALTER TABLE `mail_user` ADD `last_access` int(11) NULL DEFAULT NULL after `disabledoveadm`;

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@ INSERT INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `s
559559
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'ACCV', 'accv.es', 'Y', '', 0),
560560
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Actalis', 'actalis.it', 'Y', '', 0),
561561
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Amazon', 'amazon.com', 'Y', '', 0),
562+
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Amazon Trust Services', 'amazontrust.com', 'Y', '', 0),
562563
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Asseco', 'certum.pl', 'Y', '', 0),
563564
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Buypass', 'buypass.com', 'Y', '', 0),
564565
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'CA Disig', 'disig.sk', 'Y', '', 0),

‎install/tpl/rspamd.local.lua.master‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
rspamd_config.R_DUMMY = {
2+
callback = function(task)
3+
return true
4+
end,
5+
score = 0,
6+
description = 'dummy symbol',
7+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ public function datalogStatus($login = '') {
847847

848848
$result = $this->queryAllRecords("SELECT COUNT( * ) AS cnt, sys_datalog.action, sys_datalog.dbtable
849849
FROM sys_datalog, server
850-
WHERE (server.server_id = sys_datalog.server_id or sys_datalog.server_id = 0) AND sys_datalog.user = ? AND sys_datalog.datalog_id > server.updated
850+
WHERE (server.server_id = sys_datalog.server_id or sys_datalog.server_id = 0) AND sys_datalog.user = ? AND sys_datalog.datalog_id > server.updated AND server.active = 1
851851
GROUP BY sys_datalog.dbtable, sys_datalog.action",
852852
$login);
853853
foreach($result as $row) {

‎interface/lib/plugins/mail_mail_domain_plugin.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function mail_mail_domain_edit($event_name, $page_form) {
6060
}
6161

6262
//** If the domain name or owner has been changed, change the domain and owner in all mailbox records
63-
if($page_form->oldDataRecord && ($page_form->oldDataRecord['domain'] != $domain ||
63+
if($page_form->oldDataRecord && !empty($page_form->oldDataRecord['domain']) && ($page_form->oldDataRecord['domain'] != $domain ||
6464
(isset($page_form->dataRecord['client_group_id']) && $page_form->oldDataRecord['sys_groupid'] != $page_form->dataRecord['client_group_id']))) {
6565
$app->uses('getconf');
6666
$mail_config = $app->getconf->get_server_config($page_form->dataRecord["server_id"], 'mail');
@@ -255,7 +255,7 @@ function mail_mail_domain_edit($event_name, $page_form) {
255255
// If domain changes, update spamfilter_users
256256
// and fire spamfilter_wblist_update events so rspamd files are rewritten
257257
if ($old_domain != $domain) {
258-
$tmp_users = $app->db->queryOneRecord("SELECT id,fullname FROM spamfilter_users WHERE email LIKE ?", '%@' . $old_domain);
258+
$tmp_users = $app->db->queryAllRecords("SELECT id,fullname FROM spamfilter_users WHERE email LIKE ?", '%@' . $old_domain);
259259
if(is_array($tmp_users)) {
260260
foreach ($tmp_users as $tmp_old) {
261261
$tmp_new = $app->db->queryOneRecord("SELECT id,fullname FROM spamfilter_users WHERE email = ?", '@' . $domain);

‎interface/web/mail/mail_domain_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ function onAfterInsert() {
355355
// We create a new record
356356
$insert_data = array(
357357
"sys_userid" => $_SESSION["s"]["user"]["userid"],
358-
"sys_groupid" => $tmp_domain["sys_groupid"],
358+
"sys_groupid" => (isset($this->dataRecord["client_group_id"]))?$this->dataRecord["client_group_id"]:$tmp_domain["sys_groupid"],
359359
"sys_perm_user" => 'riud',
360360
"sys_perm_group" => 'riud',
361361
"sys_perm_other" => '',

‎interface/web/mail/spamfilter_policy_edit.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ function onSubmit() {
9393
function onAfterUpdate() {
9494
$this->record_has_changed = false;
9595
foreach($this->dataRecord as $key => $val) {
96+
if ($key == 'policy_name') { continue; } // Don't trigger update of all spamfilter users if only policy_name is changed
9697
if(isset($this->oldDataRecord[$key]) && @$this->oldDataRecord[$key] != $val) {
9798
// Record has changed
9899
$this->record_has_changed = true;

‎interface/web/nav.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
}
125125
$nav['title'] = $app->lng($nav['title']);
126126
$nav['startpage'] = $nav['items'][0]['link'];
127+
$nav['startpage_target'] = $nav['items'][0]['target'];
127128
$nav['items'] = $tmp_items;
128129
$nav_translated[] = $nav;
129130
}

‎interface/web/themes/default/templates/sidenav.tpl.htm‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
11
<tmpl_loop name="nav_left">
2-
<tmpl_if name="title"><header><tmpl_if name="is_link" op="!=" value="no"><tmpl_if name="startpage"><a href="#" class="subnav-header" data-load-content="<tmpl_var name='startpage'>"></tmpl_if></tmpl_if><tmpl_var name="title"><tmpl_if name="is_link" op="!=" value="no"><tmpl_if name="startpage"></a></tmpl_if></tmpl_if></header></tmpl_if>
2+
<tmpl_if name="title">
3+
<header>
4+
<tmpl_if name="is_link" op="!=" value="no">
5+
<tmpl_if name="startpage">
6+
<tmpl_if name="startpage_target" op="==" value="_blank">
7+
<a href="{tmpl_var name='startpage'}" target="_blank">
8+
<tmpl_elseif name="startpage_target" op="==" value="_top">
9+
<a href="{tmpl_var name='startpage'}" target="_top">
10+
<tmpl_else>
11+
<a href="#" class="subnav-header" data-load-content="{tmpl_var name='startpage'}">
12+
</tmpl_if>
13+
</tmpl_if>
14+
</tmpl_if>
15+
<tmpl_var name="title">
16+
<tmpl_if name="is_link" op="!=" value="no">
17+
<tmpl_if name="startpage">
18+
</a>
19+
</tmpl_if>
20+
</tmpl_if>
21+
</header>
22+
</tmpl_if>
323
<ul id="sub-navigation">
424
<tmpl_loop name="items">
525
<li<tmpl_if name="html_id"> id='<tmpl_var name="html_id">' </tmpl_if>>
626
<tmpl_if name="link">
727
<tmpl_if name="target" op="==" value="_blank">
8-
<a href="<tmpl_var name='link'>" target="_blank">
28+
<a href="{tmpl_var name='link'}" target="_blank">
929
<tmpl_elseif name="target" op="==" value="_top">
10-
<a href="<tmpl_var name='link'>" target="_top">
30+
<a href="{tmpl_var name='link'}" target="_top">
1131
<tmpl_else>
12-
<a href="#" data-load-content="<tmpl_var name='link'>">
32+
<a href="#" data-load-content="{tmpl_var name='link'}">
1333
</tmpl_if>
1434
</tmpl_if>
15-
<div{tmpl_if name="css"} style="{tmpl_var name='css'}"{/tmpl_if}>
35+
<div{tmpl_if name='css'} style="{tmpl_var name='css'}"{/tmpl_if}>
1636
<tmpl_if name="title"><strong><tmpl_var name="title"></strong></tmpl_if>
1737
<tmpl_if name="image"><div align="center"><tmpl_var name="image"></div></tmpl_if>
1838
</div>

0 commit comments

Comments
 (0)