From 3721d3e94ebc2d839492f11b3be8847344060eb3 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 28 Jun 2009 09:04:20 -0400
Subject: [PATCH] Fixed: FS#764 - spamfilter not well updated after change of domain
---
interface/web/sites/shell_user_edit.php | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php
index d288baa..8c92732 100644
--- a/interface/web/sites/shell_user_edit.php
+++ b/interface/web/sites/shell_user_edit.php
@@ -82,7 +82,8 @@
$app->uses('getconf');
$global_config = $app->getconf->get_global_config('sites');
- $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
+ //$shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
+ $shelluser_prefix = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
if ($this->dataRecord['username'] != ""){
/* REMOVE the restriction */
@@ -92,6 +93,14 @@
$app->tpl->setVar("username_prefix", $global_config['shelluser_prefix']);
} else {
$app->tpl->setVar("username_prefix", $shelluser_prefix);
+ }
+
+ if($this->id > 0) {
+ //* we are editing a existing record
+ $app->tpl->setVar("edit_disabled", 1);
+ $app->tpl->setVar("parent_domain_id_value", $this->dataRecord["parent_domain_id"]);
+ } else {
+ $app->tpl->setVar("edit_disabled", 0);
}
parent::onShowEnd();
@@ -128,8 +137,9 @@
$app->uses('getconf');
$global_config = $app->getconf->get_global_config('sites');
- $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
-
+ // $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
+ $shelluser_prefix = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
+
/* restrict the names */
$this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
}
@@ -174,7 +184,8 @@
*/
$app->uses('getconf');
$global_config = $app->getconf->get_global_config('sites');
- $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
+ // $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
+ $shelluser_prefix = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
/* restrict the names */
$this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
--
Gitblit v1.9.1