From 6e8071c5e2eb86a280180638a73ad80e7264f133 Mon Sep 17 00:00:00 2001
From: Dominik Müller <info@profi-webdesign.net>
Date: Sun, 19 Jan 2014 17:13:54 -0500
Subject: [PATCH] Merge branch 'vhostalias' of /home/git/repositories/renky/ispconfig3
---
interface/web/admin/system_config_edit.php | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/interface/web/admin/system_config_edit.php b/interface/web/admin/system_config_edit.php
index 35140b4..9c69cfa 100644
--- a/interface/web/admin/system_config_edit.php
+++ b/interface/web/admin/system_config_edit.php
@@ -147,6 +147,12 @@
if($check['cnt'] > 0) {
$new_config['vhost_subdomains'] = 'y';
}
+ } elseif($section == 'sites' && $new_config['vhost_aliasdomains'] != 'y' && $server_config_array['vhost_aliasdomains'] == 'y') {
+ // check for existing vhost aliasdomains, if found the mode cannot be disabled
+ $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'vhostalias'");
+ if($check['cnt'] > 0) {
+ $new_config['vhost_aliasdomains'] = 'y';
+ }
} elseif($section == 'mail') {
if($new_config['smtp_pass'] == '') $new_config['smtp_pass'] = $server_config_array['mail']['smtp_pass'];
} elseif($section == 'misc' && $new_config['session_timeout'] != $server_config_array['misc']['session_timeout']) {
--
Gitblit v1.9.1