maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/master' into 0.10.0

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-16 09:24:14 +01:00
parent 81602f17be 350e3d733a
commit 4d12a4f37b
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/configfiles/precise.xml
View File

@@ -726,7 +726,7 @@ smtpd_sasl_local_domain = $myhostname
broken_sasl_auth_clients = yes broken_sasl_auth_clients = yes
# Virtual delivery settings # Virtual delivery settings
virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE> virtual_mailbox_base = /
virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf

2
lib/configfiles/trusty.xml
View File

@@ -761,7 +761,7 @@ smtpd_sasl_local_domain = $myhostname
broken_sasl_auth_clients = yes broken_sasl_auth_clients = yes
# Virtual delivery settings # Virtual delivery settings
virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE> virtual_mailbox_base = /
virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf

2
lib/functions/formfields/option/function.validateFormFieldOption.php
View File

@@ -34,7 +34,7 @@ function validateFormFieldOption($fieldname, $fielddata, $newfieldvalue)
$returnvalue = isset($fielddata['option_options'][$newfieldvalue]); $returnvalue = isset($fielddata['option_options'][$newfieldvalue]);
} }
if($returnvalue === true) if($returnvalue === true || $fielddata['visible'] == false)
{ {
return true; return true;
} }

13
lib/functions/validate/function.checkFcgidPhpFpm.php
View File

@@ -24,12 +24,14 @@ function checkFcgidPhpFpm($fieldname, $fielddata, $newfieldvalue, $allnewfieldva
'system_mod_fcgid_enabled' => array( 'system_mod_fcgid_enabled' => array(
'other_post_field' => 'system_phpfpm_enabled', 'other_post_field' => 'system_phpfpm_enabled',
'other_enabled' => 'phpfpm.enabled', 'other_enabled' => 'phpfpm.enabled',
'other_enabled_lng' => 'phpfpmstillenabled' 'other_enabled_lng' => 'phpfpmstillenabled',
'deactivate' => array('phpfpm.enabled_ownvhost' => 0)
), ),
'system_phpfpm_enabled' => array( 'system_phpfpm_enabled' => array(
'other_post_field' => 'system_mod_fcgid_enabled', 'other_post_field' => 'system_mod_fcgid_enabled',
'other_enabled' => 'system.mod_fcgid', 'other_enabled' => 'system.mod_fcgid',
'other_enabled_lng' => 'fcgidstillenabled' 'other_enabled_lng' => 'fcgidstillenabled',
'deactivate' => array('system.mod_fcgid_ownvhost' => 0)
) )
); );
@@ -56,6 +58,13 @@ function checkFcgidPhpFpm($fieldname, $fielddata, $newfieldvalue, $allnewfieldva
} }
} }
} }
if (in_array(FORMFIELDS_PLAUSIBILITY_CHECK_OK, $returnvalue)) {
// be sure to deactivate the other one for the froxlor-vhost
// to avoid having a settings-deadlock
foreach ($check_array[$fieldname]['deactivate'] as $setting => $value) {
Settings::Set($setting, $value, true);
}
}
} }
return $returnvalue; return $returnvalue;