Skip to content
Snippets Groups Projects
Commit eccd0403 authored by Till Brehm's avatar Till Brehm
Browse files

Fixed: FS#3067 - open_basedir in vhost subdomain can not be changed

parent 4b5da4ef
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php
+ 18
− 16
View file @ eccd0403
...@@ -44,25 +44,27 @@ class sites_web_vhost_subdomain_plugin { ...@@ -44,25 +44,27 @@ class sites_web_vhost_subdomain_plugin {
*/ */
function sites_web_vhost_subdomain_edit($event_name, $page_form) { function sites_web_vhost_subdomain_edit($event_name, $page_form) {
global $app, $conf; global $app, $conf;
if(isset($page_form->dataRecord["parent_domain_id"]) && $page_form->dataRecord["parent_domain_id"] != $page_form->oldDataRecord["parent_domain_id"]) {
// 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');
// Get configuration for the web system $parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = '" . $app->functions->intval($page_form->dataRecord['parent_domain_id']) . "'");
$app->uses("getconf");
$web_config = $app->getconf->get_server_config($app->functions->intval($page_form->dataRecord['server_id']), 'web');
$parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = '" . $app->functions->intval($page_form->dataRecord['parent_domain_id']) . "'"); // Set the values for document_root, system_user and system_group
$system_user = $app->db->quote($parent_domain['system_user']);
$system_group = $app->db->quote($parent_domain['system_group']);
$document_root = $app->db->quote($parent_domain['document_root']);
$php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$page_form->dataRecord['web_folder'], $web_config["php_open_basedir"]);
$php_open_basedir = str_replace("[website_domain]/web", $page_form->dataRecord['domain'].'/'.$page_form->dataRecord['web_folder'], $php_open_basedir);
$php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
$php_open_basedir = $app->db->quote(str_replace("[website_domain]", $page_form->dataRecord['domain'], $php_open_basedir));
$htaccess_allow_override = $app->db->quote($parent_domain['allow_override']);
// Set the values for document_root, system_user and system_group $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;
$system_user = $app->db->quote($parent_domain['system_user']); $app->db->query($sql);
$system_group = $app->db->quote($parent_domain['system_group']); }
$document_root = $app->db->quote($parent_domain['document_root']);
$php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$page_form->dataRecord['web_folder'], $web_config["php_open_basedir"]);
$php_open_basedir = str_replace("[website_domain]/web", $page_form->dataRecord['domain'].'/'.$page_form->dataRecord['web_folder'], $php_open_basedir);
$php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
$php_open_basedir = $app->db->quote(str_replace("[website_domain]", $page_form->dataRecord['domain'], $php_open_basedir));
$htaccess_allow_override = $app->db->quote($parent_domain['allow_override']);
$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;
$app->db->query($sql);
} }
} }
interface/web/sites/web_vhost_subdomain_edit.php
+ 21
− 18
View file @ eccd0403
...@@ -606,24 +606,27 @@ class page_action extends tform_actions { ...@@ -606,24 +606,27 @@ class page_action extends tform_actions {
function onAfterUpdate() { function onAfterUpdate() {
global $app, $conf; global $app, $conf;
// Get configuration for the web system //* Update settings when parent domain gets changed
$app->uses("getconf"); if(isset($this->dataRecord["parent_domain_id"]) && $this->dataRecord["parent_domain_id"] != $this->oldDataRecord["parent_domain_id"]) {
$web_rec = $app->tform->getDataRecord($this->id); // Get configuration for the web system
$web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'web'); $app->uses("getconf");
$web_rec = $app->tform->getDataRecord($this->id);
// Set the values for document_root, system_user and system_group $web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]), 'web');
$system_user = $app->db->quote($this->parent_domain_record['system_user']);
$system_group = $app->db->quote($this->parent_domain_record['system_group']); // Set the values for document_root, system_user and system_group
$document_root = $app->db->quote($this->parent_domain_record['document_root']); $system_user = $app->db->quote($this->parent_domain_record['system_user']);
$php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$web_rec['web_folder'], $web_config["php_open_basedir"]); $system_group = $app->db->quote($this->parent_domain_record['system_group']);
$php_open_basedir = str_replace("[website_domain]/web", $web_rec['domain'].'/'.$web_rec['web_folder'], $php_open_basedir); $document_root = $app->db->quote($this->parent_domain_record['document_root']);
$php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir); $php_open_basedir = str_replace("[website_path]/web", $document_root.'/'.$web_rec['web_folder'], $web_config["php_open_basedir"]);
$php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir)); $php_open_basedir = str_replace("[website_domain]/web", $web_rec['domain'].'/'.$web_rec['web_folder'], $php_open_basedir);
$htaccess_allow_override = $app->db->quote($this->parent_domain_record['allow_override']); $php_open_basedir = str_replace("[website_path]", $document_root, $php_open_basedir);
$php_open_basedir = $app->db->quote(str_replace("[website_domain]", $web_rec['domain'], $php_open_basedir));
$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; $htaccess_allow_override = $app->db->quote($this->parent_domain_record['allow_override']);
$app->db->query($sql);
$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;
$app->db->query($sql);
}
} }
} }
......
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