From 0af0e9edbe9e466fb90bc5142912e2cd0e504e9d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Mar 2009 05:36:26 -0500
Subject: [PATCH] Removed document root input field from interface.
---
interface/web/sites/web_domain_edit.php | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index eb3a79a..63854fa 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -60,7 +60,7 @@
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT limit_web_domain FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
- // Check if the user may add another maildomain.
+ // Check if the user may add another website.
if($client["limit_web_domain"] >= 0) {
$tmp = $app->db->queryOneRecord("SELECT count(domain_id) as number FROM web_domain WHERE sys_groupid = $client_group_id and type = 'vhost'");
if($tmp["number"] >= $client["limit_web_domain"]) {
@@ -75,7 +75,7 @@
function onShowEnd() {
global $app, $conf;
- // If the logged in user is not admin and has no sub clients (no rseller)
+ //* Client: If the logged in user is not admin and has no sub clients (no rseller)
if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
// Get the limits of the client
@@ -88,15 +88,28 @@
unset($tmp);
// Fill the IP select field with the IP addresses that are allowed for this client
+ // $ip_select = "<option value='*'>*</option>";
+ // $app->tpl->setVar("ip_address",$ip_select);
+ $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver'];
+ $ips = $app->db->queryAllRecords($sql);
$ip_select = "<option value='*'>*</option>";
+ //$ip_select = "";
+ if(is_array($ips)) {
+ foreach( $ips as $ip) {
+ $selected = ($ip["ip_address"] == $this->dataRecord["ip_address"])?'SELECTED':'';
+ $ip_select .= "<option value='$ip[ip_address]' $selected>$ip[ip_address]</option>\r\n";
+ }
+ }
$app->tpl->setVar("ip_address",$ip_select);
+ unset($tmp);
+ unset($ips);
- // If the logged in user is not admin and has sub clients (is a rseller)
+ //* Reseller: If the logged in user is not admin and has sub clients (is a rseller)
} elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
// Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT client_id, limit_web_domain, default_webserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client = $app->db->queryOneRecord("SELECT client.client_id, limit_web_domain, default_webserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// Set the webserver to the default server of the client
$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]");
@@ -104,7 +117,7 @@
unset($tmp);
// Fill the client select field
- $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.parent_client_id AND client.parent_client_id = ".$client['client_id'];
+ $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id'];
$clients = $app->db->queryAllRecords($sql);
$client_select = '';
if(is_array($clients)) {
@@ -116,10 +129,23 @@
$app->tpl->setVar("client_group_id",$client_select);
// Fill the IP select field with the IP addresses that are allowed for this client
+ //$ip_select = "<option value='*'>*</option>";
+ //$app->tpl->setVar("ip_address",$ip_select);
+ $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver'];
+ $ips = $app->db->queryAllRecords($sql);
$ip_select = "<option value='*'>*</option>";
+ //$ip_select = "";
+ if(is_array($ips)) {
+ foreach( $ips as $ip) {
+ $selected = ($ip["ip_address"] == $this->dataRecord["ip_address"])?'SELECTED':'';
+ $ip_select .= "<option value='$ip[ip_address]' $selected>$ip[ip_address]</option>\r\n";
+ }
+ }
$app->tpl->setVar("ip_address",$ip_select);
+ unset($tmp);
+ unset($ips);
- // If the logged in user is admin
+ //* Admin: If the logged in user is admin
} else {
// The user is admin, so we fill in all IP addresses of the server
@@ -304,15 +330,16 @@
$client_id = intval($client["client_id"]);
}
- /*
- // Set the values for document_root, system_user and system_group
- $system_user = 'web'.$this->id;
- $system_group = 'client'.$client_id;
- $document_root = str_replace("[client_id]",$client_id,$document_root);
+ if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($this->dataRecord["client_group_id"]) && $this->dataRecord["client_group_id"] != $this->oldDataRecord["client_group_id"]) {
+ // Set the values for document_root, system_user and system_group
+ $system_user = 'web'.$this->id;
+ $system_group = 'client'.$client_id;
+ //$document_root = str_replace("[client_id]",$client_id,$document_root);
- $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root' WHERE domain_id = ".$this->id;
- $app->db->query($sql);
- */
+ // $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root' WHERE domain_id = ".$this->id;
+ $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group' WHERE domain_id = ".$this->id;
+ $app->db->query($sql);
+ }
}
--
Gitblit v1.9.1