Skip to content

Commit aec1333

Browse files
author
horfic
committed
*) Changed remote function sites_web_domain_add to allow readonly website to be created
*) Forgot to add the entries for mailman in the main.cf of postfix
1 parent 0740565 commit aec1333

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

install/lib/installer_base.lib.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,10 @@ public function configure_postfix($options = '') {
558558
'myhostname = '.$conf['hostname'],
559559
'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
560560
'mynetworks = 127.0.0.0/8 [::1]/128',
561+
'alias_maps = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases',
562+
'alias_database = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases',
561563
'virtual_alias_domains =',
562-
'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
564+
'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf, hash:/var/lib/mailman/data/virtual-mailman',
563565
'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
564566
'virtual_mailbox_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailboxes.cf',
565567
'virtual_mailbox_base = '.$cf['vmail_mailbox_base'],
@@ -591,7 +593,8 @@ public function configure_postfix($options = '') {
591593
'header_checks = regexp:'.$config_dir.'/header_checks',
592594
'mime_header_checks = regexp:'.$config_dir.'/mime_header_checks',
593595
'nested_header_checks = regexp:'.$config_dir.'/nested_header_checks',
594-
'body_checks = regexp:'.$config_dir.'/body_checks'
596+
'body_checks = regexp:'.$config_dir.'/body_checks',
597+
'owner_request_special = no'
595598
);
596599

597600
//* Create the header and body check files

interface/lib/classes/remoting.inc.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1238,13 +1238,16 @@ public function sites_web_domain_get($session_id, $primary_id)
12381238
}
12391239

12401240
//* Add a record
1241-
public function sites_web_domain_add($session_id, $client_id, $params)
1241+
public function sites_web_domain_add($session_id, $client_id, $params, $readonly = false)
12421242
{
1243+
global $app;
12431244
if(!$this->checkPerm($session_id, 'sites_web_domain_add')) {
12441245
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
12451246
return false;
12461247
}
12471248
$affected_rows = $this->insertQuery('../sites/form/web_domain.tform.php',$client_id,$params, 'sites:web_domain:on_after_insert');
1249+
if ($readonly === true)
1250+
$app->db->query("UPDATE web_domain SET `sys_userid` = '1' WHERE domain_id = ".$affected_rows);
12481251
return $affected_rows;
12491252
}
12501253

0 commit comments

Comments
 (0)