From 752ab3dc79da6fa2dbfd7bfba3c48a6b60c82fa5 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Mon, 22 Sep 2014 09:14:03 -0400
Subject: [PATCH] check always $_POST
---
interface/web/sites/web_vhost_domain_edit.php | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index 87b7a80..20544a0 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -113,12 +113,16 @@
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT client.web_servers FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
$web_servers = explode(',', $client['web_servers']);
- $app->tpl->setVar("server_id_value", $web_servers[0]);
+ $server_id = $web_servers[0];
+ $app->tpl->setVar("server_id_value", $server_id);
unset($web_servers);
} else {
$settings = $app->getconf->get_global_config('sites');
- $app->tform->formDef['tabs']['domain']['fields']['server_id']['default'] = intval($settings['default_webserver']);
+ $server_id = intval($settings['default_webserver']);
+ $app->tform->formDef['tabs']['domain']['fields']['server_id']['default'] = $server_id;
}
+ $web_config = $app->getconf->get_server_config($server_id, 'web');
+ $app->tform->formDef['tabs']['domain']['fields']['php']['default'] = $web_config['php_handler'];
$app->tform->formDef['tabs']['domain']['readonly'] = false;
$app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type);
@@ -454,9 +458,13 @@
}
$server_id = intval(@$this->dataRecord["server_id"]);
} else {
- // Get the first server ID
- $tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
- $server_id = intval($tmp['server_id']);
+ $settings = $app->getconf->get_global_config('sites');
+ $server_id = intval($settings['default_webserver']);
+ if (!$server_id) {
+ // Get the first server ID
+ $tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
+ $server_id = intval($tmp['server_id']);
+ }
}
//* get global web config
--
Gitblit v1.9.1