From d5be8964ba83473bd5433ea79341b620d0254db6 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 18 Aug 2008 12:09:56 -0400
Subject: [PATCH] Fixed a bug were index.html gets overwriten when a subdomain is added.
---
interface/web/sites/shell_user_edit.php | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php
index 633ef46..f7189f0 100644
--- a/interface/web/sites/shell_user_edit.php
+++ b/interface/web/sites/shell_user_edit.php
@@ -58,7 +58,7 @@
// Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT limit_ftp_user FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client = $app->db->queryOneRecord("SELECT limit_shell_user 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 shell user.
if($client["limit_shell_user"] >= 0) {
@@ -70,6 +70,29 @@
}
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;
+
+ // check if the username is not blacklisted
+ $blacklist = file(ISPC_LIB_PATH.'/shelluser_blacklist');
+ foreach($blacklist as $line) {
+ if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))) $app->tform->errorMessage .= 'The username is not allowed.';
+ }
+ unset($blacklist);
}
function onAfterInsert() {
@@ -86,6 +109,17 @@
}
+ function onBeforeUpdate() {
+ global $app, $conf;
+
+ // check if the username is not blacklisted
+ $blacklist = file(ISPC_LIB_PATH.'/shelluser_blacklist');
+ foreach($blacklist as $line) {
+ if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))) $app->tform->errorMessage .= 'The username is not allowed.';
+ }
+ unset($blacklist);
+ }
+
function onAfterUpdate() {
global $app, $conf;
--
Gitblit v1.9.1