From e7d18420a15bc341e3f820057bb897e0af2aa6a3 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 06 Jul 2008 09:05:44 -0400
Subject: [PATCH] Removed server selector from FTP- and Shell-User forms, as the server is always identical with the server ID of the selected website.
---
interface/web/sites/shell_user_edit.php | 12 ++++++++++++
interface/web/sites/ftp_user_edit.php | 12 ++++++++++++
interface/web/sites/templates/ftp_user_edit.htm | 8 --------
interface/web/sites/templates/shell_user_edit.htm | 12 ++----------
4 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/interface/web/sites/ftp_user_edit.php b/interface/web/sites/ftp_user_edit.php
index ecfeb4a..31bf0aa 100644
--- a/interface/web/sites/ftp_user_edit.php
+++ b/interface/web/sites/ftp_user_edit.php
@@ -72,6 +72,18 @@
parent::onShowNew();
}
+ function onSubmit() {
+ global $app, $conf;
+
+ // Get the record of the parent domain
+ $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".intval(@$this->dataRecord["parent_domain_id"]));
+
+ // Set a few fixed values
+ $this->dataRecord["server_id"] = $parent_domain["server_id"];
+
+ parent::onSubmit();
+ }
+
function onAfterInsert() {
global $app, $conf;
diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php
index 299d1b0..d6f52fc 100644
--- a/interface/web/sites/shell_user_edit.php
+++ b/interface/web/sites/shell_user_edit.php
@@ -72,6 +72,18 @@
parent::onShowNew();
}
+ function onSubmit() {
+ global $app, $conf;
+
+ // Get the record of the parent domain
+ $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".intval(@$this->dataRecord["parent_domain_id"]));
+
+ // Set a few fixed values
+ $this->dataRecord["server_id"] = $parent_domain["server_id"];
+
+ parent::onSubmit();
+ }
+
function onBeforeInsert() {
global $app, $conf;
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm
index 894a0d1..f06e845 100644
--- a/interface/web/sites/templates/ftp_user_edit.htm
+++ b/interface/web/sites/templates/ftp_user_edit.htm
@@ -1,13 +1,5 @@
<table width="500" border="0" cellspacing="0" cellpadding="2">
<tr>
- <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
- <td class="frmText11">
- <select name="server_id" class="text">
- {tmpl_var name='server_id'}
- </select>
- </td>
- </tr>
- <tr>
<td class="frmText11">{tmpl_var name='parent_domain_id_txt'}:</td>
<td class="frmText11">
<select name="parent_domain_id" class="text">
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index 5960efc..784d419 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -1,13 +1,5 @@
<table width="500" border="0" cellspacing="0" cellpadding="2">
<tr>
- <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
- <td class="frmText11">
- <select name="server_id" class="text">
- {tmpl_var name='server_id'}
- </select>
- </td>
- </tr>
- <tr>
<td class="frmText11">{tmpl_var name='parent_domain_id_txt'}:</td>
<td class="frmText11">
<select name="parent_domain_id" class="text">
@@ -47,6 +39,6 @@
<td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/shell_user_edit.php');"><div class="buttonEnding"></div>
<input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/shell_user_list.php');"><div class="buttonEnding"></div>
</td>
- </tr>
-</table>
+ </tr>
+</table>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
--
Gitblit v1.9.1