Skip to content

Commit eccd040

Browse files
author
Till Brehm
committed
Fixed: FS#3067 - open_basedir in vhost subdomain can not be changed
1 parent 4b5da4e commit eccd040

File tree

2 files changed

+39
-34
lines changed

2 files changed

+39
-34
lines changed

‎interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,27 @@ function onLoad() {
4444
*/
4545
function sites_web_vhost_subdomain_edit($event_name, $page_form) {
4646
global $app, $conf;
47+
48+
if(isset($page_form->dataRecord["parent_domain_id"]) && $page_form->dataRecord["parent_domain_id"] != $page_form->oldDataRecord["parent_domain_id"]) {
49+
// Get configuration for the web system
50+
$app->uses("getconf");
51+
$web_config = $app->getconf->get_server_config($app->functions->intval($page_form->dataRecord['server_id']), 'web');
4752

48-
// Get configuration for the web system
49-
$app->uses("getconf");
50-
$web_config = $app->getconf->get_server_config($app->functions->intval($page_form->dataRecord['server_id']), 'web');
53+
$parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = '" . $app->functions->intval($page_form->dataRecord['parent_domain_id']) . "'");
5154

52-
$parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = '" . $app->functions->intval($page_form->dataRecord['parent_domain_id']) . "'");
55+
// Set the values for document_root, system_user and system_group
56+
$system_user = $app->db->quote($parent_domain['system_user']);
57+
$system_group = $app->db->quote($parent_domain['system_group']);
58+
$document_root = $app->db->quote($parent_domain['document_root']);
59+
$php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$page_form->dataRecord['web_folder'], $web_config["php_open_basedir"]);
60+
$php_open_basedir = str_replace("[website_domain]/web", $page_form->dataRecord['domain'].'/'.$page_form->dataRecord['web_folder'], $php_open_basedir);
61+
$php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
62+
$php_open_basedir = $app->db->quote(str_replace("[website_domain]", $page_form->dataRecord['domain'], $php_open_basedir));
63+
$htaccess_allow_override = $app->db->quote($parent_domain['allow_override']);
5364

54-
// Set the values for document_root, system_user and system_group
55-
$system_user = $app->db->quote($parent_domain['system_user']);
56-
$system_group = $app->db->quote($parent_domain['system_group']);
57-
$document_root = $app->db->quote($parent_domain['document_root']);
58-
$php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$page_form->dataRecord['web_folder'], $web_config["php_open_basedir"]);
59-
$php_open_basedir = str_replace("[website_domain]/web", $page_form->dataRecord['domain'].'/'.$page_form->dataRecord['web_folder'], $php_open_basedir);
60-
$php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
61-
$php_open_basedir = $app->db->quote(str_replace("[website_domain]", $page_form->dataRecord['domain'], $php_open_basedir));
62-
$htaccess_allow_override = $app->db->quote($parent_domain['allow_override']);
63-
64-
$sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($parent_domain['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$page_form->id;
65-
$app->db->query($sql);
65+
$sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($parent_domain['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$page_form->id;
66+
$app->db->query($sql);
67+
}
6668
}
6769

6870
}

‎interface/web/sites/web_vhost_subdomain_edit.php‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -606,24 +606,27 @@ function onBeforeUpdate () {
606606

607607
function onAfterUpdate() {
608608
global $app, $conf;
609-
610-
// Get configuration for the web system
611-
$app->uses("getconf");
612-
$web_rec = $app->tform->getDataRecord($this->id);
613-
$web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'web');
614-
615-
// Set the values for document_root, system_user and system_group
616-
$system_user = $app->db->quote($this->parent_domain_record['system_user']);
617-
$system_group = $app->db->quote($this->parent_domain_record['system_group']);
618-
$document_root = $app->db->quote($this->parent_domain_record['document_root']);
619-
$php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$web_rec['web_folder'], $web_config["php_open_basedir"]);
620-
$php_open_basedir = str_replace("[website_domain]/web", $web_rec['domain'].'/'.$web_rec['web_folder'], $php_open_basedir);
621-
$php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
622-
$php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
623-
$htaccess_allow_override = $app->db->quote($this->parent_domain_record['allow_override']);
624-
625-
$sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($this->parent_domain_record['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$this->id;
626-
$app->db->query($sql);
609+
610+
//* Update settings when parent domain gets changed
611+
if(isset($this->dataRecord["parent_domain_id"]) && $this->dataRecord["parent_domain_id"] != $this->oldDataRecord["parent_domain_id"]) {
612+
// Get configuration for the web system
613+
$app->uses("getconf");
614+
$web_rec = $app->tform->getDataRecord($this->id);
615+
$web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'web');
616+
617+
// Set the values for document_root, system_user and system_group
618+
$system_user = $app->db->quote($this->parent_domain_record['system_user']);
619+
$system_group = $app->db->quote($this->parent_domain_record['system_group']);
620+
$document_root = $app->db->quote($this->parent_domain_record['document_root']);
621+
$php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$web_rec['web_folder'], $web_config["php_open_basedir"]);
622+
$php_open_basedir = str_replace("[website_domain]/web", $web_rec['domain'].'/'.$web_rec['web_folder'], $php_open_basedir);
623+
$php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
624+
$php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
625+
$htaccess_allow_override = $app->db->quote($this->parent_domain_record['allow_override']);
626+
627+
$sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($this->parent_domain_record['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$this->id;
628+
$app->db->query($sql);
629+
}
627630
}
628631

629632
}

0 commit comments

Comments
 (0)