From 01d133cdb2b03acf9d49148be51f67acd042a331 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 24 Sep 2010 12:29:49 +0000
Subject: [PATCH] Fixed: FS#1328 - edit ftp/ssh user: mangled usernames with
duplicate prefix
---
interface/web/sites/ftp_user_edit.php | 2 +-
interface/web/sites/shell_user_edit.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/ftp_user_edit.php b/interface/web/sites/ftp_user_edit.php
index e286fab56f..337fe16d24 100644
--- a/interface/web/sites/ftp_user_edit.php
+++ b/interface/web/sites/ftp_user_edit.php
@@ -81,7 +81,7 @@ class page_action extends tform_actions {
if ($this->dataRecord['username'] != ""){
/* REMOVE the restriction */
- $app->tpl->setVar("username", str_replace($ftpuser_prefix , '', $this->dataRecord['username']));
+ $app->tpl->setVar("username", preg_replace('/'.$ftpuser_prefix.'/' , '', $this->dataRecord['username'], 1));
}
if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
$app->tpl->setVar("username_prefix", $global_config['ftpuser_prefix']);
diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php
index c3102cd439..cf4a585a97 100644
--- a/interface/web/sites/shell_user_edit.php
+++ b/interface/web/sites/shell_user_edit.php
@@ -81,7 +81,7 @@ class page_action extends tform_actions {
if ($this->dataRecord['username'] != ""){
/* REMOVE the restriction */
- $app->tpl->setVar("username", str_replace($shelluser_prefix , '', $this->dataRecord['username']));
+ $app->tpl->setVar("username", preg_replace('/'.$shelluser_prefix.'/', '', $this->dataRecord['username'], 1));
}
if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
$app->tpl->setVar("username_prefix", $global_config['shelluser_prefix']);
--
GitLab