Commit 48f2ae57 authored by Marius Burkard's avatar Marius Burkard

Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

parents 6c638517 5dece6ef
Pipeline #2741 passed with stage
in 5 minutes and 7 seconds
......@@ -309,6 +309,7 @@ class remoting_lib extends tform_base {
$username = $params["username"];
$clear_password = $params["password"];
$language = $params['language'];
$modules = $params['modules'];
$client_id = $app->functions->intval($client_id);
if(!isset($params['_ispconfig_pw_crypted']) || $params['_ispconfig_pw_crypted'] != 1) $password = $app->auth->crypt_password(stripslashes($clear_password));
......@@ -327,8 +328,14 @@ class remoting_lib extends tform_base {
$params[] = $language;
}
$modulesstring = '';
if (!empty($modules)) {
$modulesstring = ', modules = ?';
$params[] = $modules;
}
$params[] = $client_id;
$sql = "UPDATE sys_user set username = ? $pwstring $langstring WHERE client_id = ?";
$sql = "UPDATE sys_user set username = ? $pwstring $langstring $modulesstring WHERE client_id = ?";
$app->db->query($sql, true, $params);
}
......
......@@ -181,7 +181,7 @@ class page_action extends tform_actions {
}
// Create spf-record
$spf_record = [];
$spf_record = array();
if (!empty($this->dataRecord['spf_mx'])) {
$spf_record[] = 'mx';
......
This diff is collapsed.
......@@ -30,7 +30,6 @@ chdir = /
<tmpl_if name='php_fpm_chroot'>
chroot = <tmpl_var name='php_fpm_chroot_dir'>
php_admin_value[doc_root] = <tmpl_var name='php_fpm_chroot_web_folder'>
php_admin_value[cgi.fix_pathinfo] = 0
</tmpl_if>
env[HOSTNAME] = $HOSTNAME
......
......@@ -45,8 +45,8 @@ class z_php_fpm_incron_reload_plugin {
function incronUpdate($eventName, $data) {
global $app;
if ($data['new']['document_root'] === $data['old']['document_root']) {
$app->log('Document root unchanged. Not updating incron configuration.', LOGLEVEL_DEBUG);
if ($this->documentRootUnchanged($data) && $this->phpVersionUnchanged($data)) {
$app->log('Document root and PHP version unchanged. Not updating incron configuration.', LOGLEVEL_DEBUG);
return;
}
......@@ -59,6 +59,16 @@ class z_php_fpm_incron_reload_plugin {
$this->teardown($data['old']);
}
private function documentRootUnchanged($data)
{
return $data['new']['document_root'] === $data['old']['document_root'];
}
private function phpVersionUnchanged($data)
{
return $data['new']['fastcgi_php_version'] === $data['old']['fastcgi_php_version'];
}
private function setup($data)
{
$triggerFile = $this->getTriggerFilePath($data['document_root']);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment