From 6b53d8c2553f3b0e41e410d06829a96ede335a53 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 21 Apr 2023 23:24:03 +0200 Subject: [PATCH 1/5] Handle web_domain_changes via a datalogUpdate, #6492 --- .../sites_web_vhost_domain_plugin.inc.php | 50 +++++++++++++------ 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php index 56dc825fd4..8f7d8d8041 100644 --- a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php +++ b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php @@ -54,16 +54,22 @@ class sites_web_vhost_domain_plugin { $app->uses('getconf'); $global_config = $app->getconf->get_global_config('sites'); if($global_config['client_protection'] == 'y') { - $app->db->query("UPDATE web_domain SET sys_groupid = ?, sys_perm_group = 'ru' WHERE domain_id = ?", $client_group_id, $page_form->id); + $web_domain_changes['sys_groupid'] = $client_group_id; + $web_domain_changes['sys_perm_group'] = 'ru'; } else { $sysuser = $app->db->queryOneRecord('SELECT userid FROM sys_user WHERE default_group = ?',$client_group_id); $sysuser_id = (is_array($sysuser) && isset($sysuser['userid']) && $sysuser['userid'] > 0)?$sysuser['userid']:1; - $app->db->query("UPDATE web_domain SET sys_userid = ?, sys_groupid = ?, sys_perm_group = 'riud' WHERE domain_id = ?", $sysuser_id, $client_group_id, $page_form->id); + + $web_domain_changes['sys_userid'] = $sysuser_id; + $web_domain_changes['sys_groupid'] = $client_group_id; + $web_domain_changes['sys_perm_group'] = 'riud'; } } if($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($page_form->dataRecord["client_group_id"])) { $client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]); - $app->db->query("UPDATE web_domain SET sys_groupid = ?, sys_perm_group = 'riud' WHERE domain_id = ?", $client_group_id, $page_form->id); + + $web_domain_changes['sys_groupid'] = $client_group_id; + $web_domain_changes['sys_perm_group'] = 'riud'; } // Get configuration for the web system $app->uses("getconf"); @@ -109,8 +115,9 @@ class sites_web_vhost_domain_plugin { if($event_name == 'sites:web_vhost_domain:on_after_update') { if(($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) && isset($page_form->dataRecord["client_group_id"]) && $page_form->dataRecord["client_group_id"] != $page_form->oldDataRecord["sys_groupid"]) { - $sql = "UPDATE web_domain SET system_user = ?, system_group = ?, document_root = ? WHERE domain_id = ?"; - $app->db->query($sql, $system_user, $system_group, $document_root, $page_form->id); + $web_domain_changes['system_user'] = $system_user; + $web_domain_changes['system_group'] = $system_group; + $web_domain_changes['document_root'] = $document_root; // Update the FTP user(s) too $records = $app->db->queryAllRecords("SELECT ftp_user_id FROM ftp_user WHERE parent_domain_id = ?", $page_form->id); @@ -210,7 +217,8 @@ class sites_web_vhost_domain_plugin { $tmp=$app->db->queryOneRecord("SELECT ssl_domain FROM web_domain WHERE domain_id = ?", $page_form->id); if($tmp['ssl_domain'] != '') { $plain=str_replace($page_form->oldDataRecord["domain"], $app->functions->idn_encode($page_form->dataRecord["domain"]), $tmp); - $app->db->query("UPDATE web_domain SET ssl_domain = ? WHERE domain_id = ?", $plain, $page_form->id); + + $web_domain_changes['ssl_domain'] = $plain; } $records = $app->db->queryAllRecords("SELECT domain_id,domain FROM web_domain WHERE (type = 'subdomain' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND domain LIKE ?", "%." . $page_form->oldDataRecord["domain"]); @@ -235,8 +243,7 @@ class sites_web_vhost_domain_plugin { //* Set allow_override if empty if($web_rec['allow_override'] == '') { - $sql = "UPDATE web_domain SET allow_override = ? WHERE domain_id = ?"; - $app->db->query($sql, $web_config["htaccess_allow_override"], $page_form->id); + $web_domain_changes['allow_override'] = $web_config["htaccess_allow_override"]; } //* Set php_open_basedir if empty or domain or client has been changed @@ -244,16 +251,16 @@ class sites_web_vhost_domain_plugin { (!empty($page_form->dataRecord["domain"]) && !empty($page_form->oldDataRecord["domain"]) && $app->functions->idn_encode($page_form->dataRecord["domain"]) != $page_form->oldDataRecord["domain"])) { $php_open_basedir = $web_rec['php_open_basedir']; $php_open_basedir = str_replace($page_form->oldDataRecord['domain'], $web_rec['domain'], $php_open_basedir); - $sql = "UPDATE web_domain SET php_open_basedir = ? WHERE domain_id = ?"; - $app->db->query($sql, $php_open_basedir, $page_form->id); + + $web_domain_changes['php_open_basedir'] = $php_open_basedir; } if(empty($web_rec['php_open_basedir']) || (isset($page_form->dataRecord["client_group_id"]) && $page_form->dataRecord["client_group_id"] != $page_form->oldDataRecord["sys_groupid"])) { $document_root = str_replace("[client_id]", $client_id, $document_root); $php_open_basedir = str_replace("[website_path]", $document_root, $web_config["php_open_basedir"]); $php_open_basedir = str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir); - $sql = "UPDATE web_domain SET php_open_basedir = ? WHERE domain_id = ?"; - $app->db->query($sql, $php_open_basedir, $page_form->id); + + $web_domain_changes['php_open_basedir'] = $php_open_basedir; } //* Change database backup options when web backup options have been changed @@ -289,8 +296,11 @@ class sites_web_vhost_domain_plugin { $php_open_basedir = str_replace("[website_domain]", $app->functions->idn_encode($page_form->dataRecord['domain']), $php_open_basedir); $htaccess_allow_override = $web_config["htaccess_allow_override"]; - $sql = "UPDATE web_domain SET system_user = ?, system_group = ?, document_root = ?, allow_override = ?, php_open_basedir = ? WHERE domain_id = ?"; - $app->db->query($sql, $system_user, $system_group, $document_root, $htaccess_allow_override, $php_open_basedir, $page_form->id); + $web_domain_changes['system_user'] = $system_user; + $web_domain_changes['system_group'] = $system_group; + $web_domain_changes['document_root'] = $document_root; + $web_domain_changes['allow_override'] = $htaccess_allow_override; + $web_domain_changes['php_open_basedir'] = $php_open_basedir; } } else { if(isset($page_form->dataRecord["parent_domain_id"]) && $page_form->dataRecord["parent_domain_id"] != $page_form->oldDataRecord["parent_domain_id"]) { @@ -305,10 +315,18 @@ class sites_web_vhost_domain_plugin { $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir); $php_open_basedir = str_replace("[website_domain]", $app->functions->idn_encode($page_form->dataRecord['domain']), $php_open_basedir); $htaccess_allow_override = $parent_domain['allow_override']; - $sql = "UPDATE web_domain SET sys_groupid = ?,system_user = ?, system_group = ?, document_root = ?, allow_override = ?, php_open_basedir = ? WHERE domain_id = ?"; - $app->db->query($sql, $parent_domain['sys_groupid'], $system_user, $system_group, $document_root, $htaccess_allow_override, $php_open_basedir, $page_form->id); + + $web_domain_changes['sys_groupid'] = $parent_domain['sys_groupid']; + $web_domain_changes['system_user'] = $system_user; + $web_domain_changes['system_group'] = $system_group; + $web_domain_changes['document_root'] = $document_root; + $web_domain_changes['allow_override'] = $htaccess_allow_override; + $web_domain_changes['php_open_basedir'] = $php_open_basedir; } } + + // Update the collected changes for the web_domain. + $app->db->datalogUpdate('web_domain', $web_domain_changes, 'domain_id', $page_form->id); } } -- GitLab From f37599beb97f0b81ac7a69d071b38eb82a3ae475 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 21 Apr 2023 23:57:42 +0200 Subject: [PATCH 2/5] Re-use the web_domain_changes data instead of querying the record that has not changed yet --- .../sites_web_vhost_domain_plugin.inc.php | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php index 8f7d8d8041..c31fdcfd53 100644 --- a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php +++ b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php @@ -74,8 +74,6 @@ class sites_web_vhost_domain_plugin { // Get configuration for the web system $app->uses("getconf"); $web_config = $app->getconf->get_server_config($app->functions->intval($page_form->dataRecord['server_id']), 'web'); - if(isset($app->tform) && is_object($app->tform)) $web_rec = $app->tform->getDataRecord($page_form->id); - else $web_rec = $app->remoting_lib->getDataRecord($page_form->id); if($vhostdomain_type == 'domain') { $document_root = str_replace("[website_id]", $page_form->id, $web_config["website_path"]); @@ -122,7 +120,7 @@ class sites_web_vhost_domain_plugin { // Update the FTP user(s) too $records = $app->db->queryAllRecords("SELECT ftp_user_id FROM ftp_user WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('ftp_user', array("sys_userid" => $web_rec['sys_userid'], "sys_groupid" => $web_rec['sys_groupid'], "uid" => $system_user, "gid" => $system_group, "dir" => $document_root), 'ftp_user_id', $app->functions->intval($rec['ftp_user_id'])); + $app->db->datalogUpdate('ftp_user', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid'], "uid" => $system_user, "gid" => $system_group, "dir" => $document_root), 'ftp_user_id', $app->functions->intval($rec['ftp_user_id'])); } unset($records); unset($rec); @@ -130,7 +128,7 @@ class sites_web_vhost_domain_plugin { // Update the webdav user(s) too $records = $app->db->queryAllRecords("SELECT webdav_user_id FROM webdav_user WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('webdav_user', array("sys_userid" => $web_rec['sys_userid'], "sys_groupid" => $web_rec['sys_groupid']), 'webdav_user_id', $app->functions->intval($rec['webdav_user_id'])); + $app->db->datalogUpdate('webdav_user', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'webdav_user_id', $app->functions->intval($rec['webdav_user_id'])); } unset($records); unset($rec); @@ -138,7 +136,7 @@ class sites_web_vhost_domain_plugin { // Update the web folder(s) too $records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('web_folder', array("sys_userid" => $web_rec['sys_userid'], "sys_groupid" => $web_rec['sys_groupid']), 'web_folder_id', $app->functions->intval($rec['web_folder_id'])); + $app->db->datalogUpdate('web_folder', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'web_folder_id', $app->functions->intval($rec['web_folder_id'])); } unset($records); unset($rec); @@ -146,7 +144,7 @@ class sites_web_vhost_domain_plugin { //* Update all web folder users $records = $app->db->queryAllRecords("SELECT web_folder_user.web_folder_user_id FROM web_folder_user, web_folder WHERE web_folder_user.web_folder_id = web_folder.web_folder_id AND web_folder.parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('web_folder_user', array("sys_userid" => $web_rec['sys_userid'], "sys_groupid" => $web_rec['sys_groupid']), 'web_folder_user_id', $app->functions->intval($rec['web_folder_user_id'])); + $app->db->datalogUpdate('web_folder_user', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'web_folder_user_id', $app->functions->intval($rec['web_folder_user_id'])); } unset($records); unset($rec); @@ -154,7 +152,7 @@ class sites_web_vhost_domain_plugin { // Update the Shell user(s) too $records = $app->db->queryAllRecords("SELECT shell_user_id FROM shell_user WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('shell_user', array("sys_userid" => $web_rec['sys_userid'], "sys_groupid" => $web_rec['sys_groupid'], "puser" => $system_user, "pgroup" => $system_group, "dir" => $document_root), 'shell_user_id', $app->functions->intval($rec['shell_user_id'])); + $app->db->datalogUpdate('shell_user', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid'], "puser" => $system_user, "pgroup" => $system_group, "dir" => $document_root), 'shell_user_id', $app->functions->intval($rec['shell_user_id'])); } unset($records); unset($rec); @@ -162,7 +160,7 @@ class sites_web_vhost_domain_plugin { // Update the cron(s) too $records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('cron', array("sys_userid" => $web_rec['sys_userid'], "sys_groupid" => $web_rec['sys_groupid']), 'id', $app->functions->intval($rec['id'])); + $app->db->datalogUpdate('cron', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'id', $app->functions->intval($rec['id'])); } unset($records); unset($rec); @@ -170,7 +168,7 @@ class sites_web_vhost_domain_plugin { //* Update all subdomains and alias domains $records = $app->db->queryAllRecords("SELECT domain_id, `domain`, `type`, `web_folder` FROM web_domain WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $update_columns = array("sys_userid" => $web_rec['sys_userid'], "sys_groupid" => $web_rec['sys_groupid']); + $update_columns = array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']); if($rec['type'] == 'vhostsubdomain' || $rec['type'] == 'vhostalias') { $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$rec['web_folder'], $web_config["php_open_basedir"]); $php_open_basedir = str_replace("[website_domain]/web", $rec['domain'].'/'.$rec['web_folder'], $php_open_basedir); @@ -188,13 +186,13 @@ class sites_web_vhost_domain_plugin { //* Update all databases $records = $app->db->queryAllRecords("SELECT database_id FROM web_database WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('web_database', array("sys_userid" => $web_rec['sys_userid'], "sys_groupid" => $web_rec['sys_groupid']), 'database_id', $app->functions->intval($rec['database_id'])); + $app->db->datalogUpdate('web_database', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'database_id', $app->functions->intval($rec['database_id'])); } //* Update all database users $records = $app->db->queryAllRecords("SELECT web_database_user.database_user_id FROM web_database_user, web_database WHERE web_database_user.database_user_id IN (web_database.database_user_id, web_database.database_ro_user_id) AND web_database.parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('web_database_user', array("sys_userid" => $web_rec['sys_userid'], "sys_groupid" => $web_rec['sys_groupid']), 'database_user_id', $app->functions->intval($rec['database_user_id'])); + $app->db->datalogUpdate('web_database_user', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'database_user_id', $app->functions->intval($rec['database_user_id'])); } unset($records); unset($rec); @@ -203,7 +201,7 @@ class sites_web_vhost_domain_plugin { $records = $app->db->queryAllRecords("SELECT instance_id FROM aps_instances_settings WHERE name = 'main_domain' AND value = ?", $page_form->oldDataRecord["domain"]); if(is_array($records) && !empty($records)){ foreach($records as $rec){ - $app->db->datalogUpdate('aps_instances', array("sys_userid" => $web_rec['sys_userid'], "sys_groupid" => $web_rec['sys_groupid'], "customer_id" => $client_id), 'id', $rec['instance_id']); + $app->db->datalogUpdate('aps_instances', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid'], "customer_id" => $client_id), 'id', $rec['instance_id']); } } unset($records); @@ -242,7 +240,7 @@ class sites_web_vhost_domain_plugin { } //* Set allow_override if empty - if($web_rec['allow_override'] == '') { + if($page_form->oldDataRecord['allow_override'] == '') { $web_domain_changes['allow_override'] = $web_config["htaccess_allow_override"]; } -- GitLab From d22f98250a2c66cd3e4472eb6fd177b38373768a Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sat, 22 Apr 2023 00:36:30 +0200 Subject: [PATCH 3/5] Split-off generic_domain_changes, as sys_userid is not always updated --- .../sites_web_vhost_domain_plugin.inc.php | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php index c31fdcfd53..8b75bcd2df 100644 --- a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php +++ b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php @@ -54,21 +54,21 @@ class sites_web_vhost_domain_plugin { $app->uses('getconf'); $global_config = $app->getconf->get_global_config('sites'); if($global_config['client_protection'] == 'y') { - $web_domain_changes['sys_groupid'] = $client_group_id; + $generic_domain_changes['sys_groupid'] = $client_group_id; $web_domain_changes['sys_perm_group'] = 'ru'; } else { $sysuser = $app->db->queryOneRecord('SELECT userid FROM sys_user WHERE default_group = ?',$client_group_id); $sysuser_id = (is_array($sysuser) && isset($sysuser['userid']) && $sysuser['userid'] > 0)?$sysuser['userid']:1; - $web_domain_changes['sys_userid'] = $sysuser_id; - $web_domain_changes['sys_groupid'] = $client_group_id; + $generic_domain_changes['sys_userid'] = $sysuser_id; + $generic_domain_changes['sys_groupid'] = $client_group_id; $web_domain_changes['sys_perm_group'] = 'riud'; } } if($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($page_form->dataRecord["client_group_id"])) { $client_group_id = $app->functions->intval($page_form->dataRecord["client_group_id"]); - $web_domain_changes['sys_groupid'] = $client_group_id; + $generic_domain_changes['sys_groupid'] = $client_group_id; $web_domain_changes['sys_perm_group'] = 'riud'; } // Get configuration for the web system @@ -120,7 +120,7 @@ class sites_web_vhost_domain_plugin { // Update the FTP user(s) too $records = $app->db->queryAllRecords("SELECT ftp_user_id FROM ftp_user WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('ftp_user', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid'], "uid" => $system_user, "gid" => $system_group, "dir" => $document_root), 'ftp_user_id', $app->functions->intval($rec['ftp_user_id'])); + $app->db->datalogUpdate('ftp_user', $generic_domain_changes + array("uid" => $system_user, "gid" => $system_group, "dir" => $document_root), 'ftp_user_id', $app->functions->intval($rec['ftp_user_id'])); } unset($records); unset($rec); @@ -128,7 +128,7 @@ class sites_web_vhost_domain_plugin { // Update the webdav user(s) too $records = $app->db->queryAllRecords("SELECT webdav_user_id FROM webdav_user WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('webdav_user', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'webdav_user_id', $app->functions->intval($rec['webdav_user_id'])); + $app->db->datalogUpdate('webdav_user', $generic_domain_changes + array('webdav_user_id', $app->functions->intval($rec['webdav_user_id']))); } unset($records); unset($rec); @@ -136,7 +136,7 @@ class sites_web_vhost_domain_plugin { // Update the web folder(s) too $records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('web_folder', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'web_folder_id', $app->functions->intval($rec['web_folder_id'])); + $app->db->datalogUpdate('web_folder', $generic_domain_changes + array('web_folder_id', $app->functions->intval($rec['web_folder_id']))); } unset($records); unset($rec); @@ -144,7 +144,7 @@ class sites_web_vhost_domain_plugin { //* Update all web folder users $records = $app->db->queryAllRecords("SELECT web_folder_user.web_folder_user_id FROM web_folder_user, web_folder WHERE web_folder_user.web_folder_id = web_folder.web_folder_id AND web_folder.parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('web_folder_user', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'web_folder_user_id', $app->functions->intval($rec['web_folder_user_id'])); + $app->db->datalogUpdate('web_folder_user', $generic_domain_changes + array('web_folder_user_id', $app->functions->intval($rec['web_folder_user_id']))); } unset($records); unset($rec); @@ -152,7 +152,7 @@ class sites_web_vhost_domain_plugin { // Update the Shell user(s) too $records = $app->db->queryAllRecords("SELECT shell_user_id FROM shell_user WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('shell_user', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid'], "puser" => $system_user, "pgroup" => $system_group, "dir" => $document_root), 'shell_user_id', $app->functions->intval($rec['shell_user_id'])); + $app->db->datalogUpdate('shell_user', $generic_domain_changes + array("puser" => $system_user, "pgroup" => $system_group, "dir" => $document_root), 'shell_user_id', $app->functions->intval($rec['shell_user_id'])); } unset($records); unset($rec); @@ -160,7 +160,7 @@ class sites_web_vhost_domain_plugin { // Update the cron(s) too $records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('cron', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'id', $app->functions->intval($rec['id'])); + $app->db->datalogUpdate('cron', $generic_domain_changes, 'id', $app->functions->intval($rec['id'])); } unset($records); unset($rec); @@ -186,13 +186,13 @@ class sites_web_vhost_domain_plugin { //* Update all databases $records = $app->db->queryAllRecords("SELECT database_id FROM web_database WHERE parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('web_database', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'database_id', $app->functions->intval($rec['database_id'])); + $app->db->datalogUpdate('web_database', $generic_domain_changes, 'database_id', $app->functions->intval($rec['database_id'])); } //* Update all database users $records = $app->db->queryAllRecords("SELECT web_database_user.database_user_id FROM web_database_user, web_database WHERE web_database_user.database_user_id IN (web_database.database_user_id, web_database.database_ro_user_id) AND web_database.parent_domain_id = ?", $page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('web_database_user', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid']), 'database_user_id', $app->functions->intval($rec['database_user_id'])); + $app->db->datalogUpdate('web_database_user', $generic_domain_changes, 'database_user_id', $app->functions->intval($rec['database_user_id'])); } unset($records); unset($rec); @@ -201,7 +201,7 @@ class sites_web_vhost_domain_plugin { $records = $app->db->queryAllRecords("SELECT instance_id FROM aps_instances_settings WHERE name = 'main_domain' AND value = ?", $page_form->oldDataRecord["domain"]); if(is_array($records) && !empty($records)){ foreach($records as $rec){ - $app->db->datalogUpdate('aps_instances', array("sys_userid" => $web_domain_changes['sys_userid'], "sys_groupid" => $web_domain_changes['sys_groupid'], "customer_id" => $client_id), 'id', $rec['instance_id']); + $app->db->datalogUpdate('aps_instances', $generic_domain_changes + array("customer_id" => $client_id), 'id', $rec['instance_id']); } } unset($records); @@ -270,7 +270,7 @@ class sites_web_vhost_domain_plugin { $backup_format_db = $page_form->dataRecord['backup_format_db']; $records = $app->db->queryAllRecords("SELECT database_id FROM web_database WHERE parent_domain_id = ".$page_form->id); foreach($records as $rec) { - $app->db->datalogUpdate('web_database', array("backup_interval" => $backup_interval, "backup_copies" => $backup_copies), 'database_id', $rec['database_id']); + $app->db->datalogUpdate('web_database', $generic_domain_changes + array("backup_interval" => $backup_interval, "backup_copies" => $backup_copies), 'database_id', $rec['database_id']); } unset($records); unset($rec); @@ -324,7 +324,7 @@ class sites_web_vhost_domain_plugin { } // Update the collected changes for the web_domain. - $app->db->datalogUpdate('web_domain', $web_domain_changes, 'domain_id', $page_form->id); + $app->db->datalogUpdate('web_domain', $generic_domain_changes + $web_domain_changes, 'domain_id', $page_form->id); } } -- GitLab From 6cca04adee09ac00da601f7592da35bd36181122 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sat, 22 Apr 2023 01:27:25 +0200 Subject: [PATCH 4/5] Also update the gid for the webXXX user --- server/plugins-available/shelluser_base_plugin.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php index 3e512caa56..e5ac3aef25 100755 --- a/server/plugins-available/shelluser_base_plugin.inc.php +++ b/server/plugins-available/shelluser_base_plugin.inc.php @@ -276,6 +276,8 @@ class shelluser_base_plugin { } } $app->system->usermod($data['old']['username'], 0, $app->system->getgid($data['new']['pgroup']), $homedir, $data['new']['shell'], $data['new']['password'], $data['new']['username']); + $app->system->usermod($data['old']['puser'], 0, $app->system->getgid($data['new']['pgroup']), $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['puser']); + $app->log("Updated shelluser: ".$data['old']['username'], LOGLEVEL_DEBUG); // call the ssh-rsa update function -- GitLab From ab2178a9d163ecc06cf104e0df4d56cfd081340b Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 19 May 2023 11:48:14 +0200 Subject: [PATCH 5/5] Initialize vars --- interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php index 8b75bcd2df..a3dd4cc871 100644 --- a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php +++ b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php @@ -44,6 +44,9 @@ class sites_web_vhost_domain_plugin { global $app, $conf; $vhostdomain_type = 'domain'; + $generic_domain_changes = array(); + $web_domain_changes = array(); + if($page_form->dataRecord['type'] == 'vhostalias') $vhostdomain_type = 'aliasdomain'; elseif($page_form->dataRecord['type'] == 'vhostsubdomain') $vhostdomain_type = 'subdomain'; -- GitLab