Skip to content

Commit 2f0e632

Browse files
ms217ms217
committed
Resolve merge conflict
2 parents 62afa4f + b2e6841 commit 2f0e632

File tree

12 files changed

+75
-24
lines changed

12 files changed

+75
-24
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
ALTER TABLE `server_php` ADD `php_cli_binary` varchar(255) DEFAULT NULL AFTER `php_fpm_socket_dir`;
2+
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
3+
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Amazon Trust Services', 'amazontrust.com', 'Y', '', 0);

‎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/classes/tpl.inc.php‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public function newTemplate($tmplfile)
233233
public function setVar($k, $v = null, $encode = false)
234234
{
235235
global $app;
236-
236+
237237
if (is_array($k)) {
238238
foreach($k as $key => $value){
239239
$key = ($this->OPTIONS['CASELESS']) ? strtolower(trim($key)) : trim($key);
@@ -917,9 +917,17 @@ private function _fileSearch($file)
917917
$filename = basename($file);
918918
$filepath = dirname($file);
919919

920-
if(isset($_SESSION['s']['module']['name']) && isset($_SESSION['s']['theme'])) {
921-
if(is_file(ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$_SESSION['s']['module']['name'].'/'.$filename)) {
922-
return ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$_SESSION['s']['module']['name'].'/'.$filename;
920+
$modulename = false;
921+
922+
if(isset($_SESSION['s']['module']['name'])) {
923+
$modulename = $_SESSION['s']['module']['name'];
924+
} elseif(strpos($_SERVER['PHP_SELF'], '/login/') === 0) {
925+
$modulename = 'login';
926+
}
927+
928+
if($modulename && isset($_SESSION['s']['theme'])) {
929+
if(is_file(ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$modulename.'/'.$filename)) {
930+
return ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$modulename.'/'.$filename;
923931
}
924932
}
925933

@@ -1079,12 +1087,12 @@ private function _parseIf($varname, $value = null, $op = null, $namespace = null
10791087
private function _parseHook ($name)
10801088
{
10811089
global $app;
1082-
1090+
10831091
if(!$name) return false;
1084-
1092+
10851093
$module = isset($_SESSION['s']['module']['name']) ? $_SESSION['s']['module']['name'] : '';
10861094
$form = isset($app->tform->formDef['name']) ? $app->tform->formDef['name'] : '';
1087-
1095+
10881096
$events = array();
10891097
if($module) {
10901098
$events[] = $module . ':' . ($form ? $form : '') . ':' . $name;
@@ -1093,9 +1101,9 @@ private function _parseHook ($name)
10931101
$events[] = $name;
10941102
$events[] = 'on_template_content';
10951103
}
1096-
1104+
10971105
$events = array_unique($events);
1098-
1106+
10991107
for($e = 0; $e < count($events); $e++) {
11001108
$tmpresult = $app->plugin->raiseEvent($events[$e], array(
11011109
'name' => $name,
@@ -1104,10 +1112,10 @@ private function _parseHook ($name)
11041112
), true);
11051113
if(!$tmpresult) $tmpresult = '';
11061114
else $tmpresult = $this->_getData($tmpresult, false, true);
1107-
1115+
11081116
$result .= $tmpresult;
11091117
}
1110-
1118+
11111119
return $result;
11121120
}
11131121

@@ -1225,7 +1233,7 @@ private function _parseTag ($args)
12251233
$wholetag = $args[0];
12261234
$openclose = $args[1];
12271235
$tag = strtolower($args[2]);
1228-
1236+
12291237
if ($tag == 'else') return '<?php } else { ?>';
12301238
if ($tag == 'tmpl_include') return $wholetag; // ignore tmpl_include tags
12311239

@@ -1303,10 +1311,10 @@ private function _parseTag ($args)
13031311
if ($this->OPTIONS['ENABLE_PHPINCLUDE']) {
13041312
return '<?php include(\''.$file.'\'); ?>';
13051313
}
1306-
1314+
13071315
case 'hook':
13081316
return $this->_parseHook(@$var);
1309-
1317+
13101318
case 'include':
13111319
return '<?php $this->_getData($this->_fileSearch(\''.$file.'\'), 1); ?>';
13121320

‎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
}

0 commit comments

Comments
 (0)