From c3bf39efc438d869645049e17549c9644a5467c2 Mon Sep 17 00:00:00 2001 From: mcramer <m.cramer@pixcept.de> Date: Mon, 20 Aug 2012 09:34:47 -0400 Subject: [PATCH] Changes for subdomain vhosts: - Fixed missing templates and language entries - Previous subdomain mode can be used concurrently - Changed log path to a more convenient location --- interface/web/admin/system_config_edit.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/web/admin/system_config_edit.php b/interface/web/admin/system_config_edit.php index c78e919..dc615a1 100644 --- a/interface/web/admin/system_config_edit.php +++ b/interface/web/admin/system_config_edit.php @@ -88,11 +88,11 @@ $server_config_array = $app->getconf->get_global_config(); $new_config = $app->tform->encode($this->dataRecord,$section); - if($section == 'sites' && $new_config['vhost_subdomains'] != $server_config_array['vhost_subdomains']) { - // check for existing subdomains - $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'subdomain' OR `type` = 'vhostsubdomain'"); + if($section == 'sites' && $new_config['vhost_subdomains'] != 'y' && $server_config_array['vhost_subdomains'] == 'y') { + // check for existing vhost subdomains, if found the mode cannot be disabled + $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'vhostsubdomain'"); if($check['cnt'] > 0) { - $new_config['vhost_subdomains'] = $server_config_array['vhost_subdomains']; + $new_config['vhost_subdomains'] = 'y'; } } $server_config_array[$section] = $new_config; -- Gitblit v1.9.1