From 54afe0e3036f339e623e98f5d3fbb397376c7ca2 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 15 Feb 2015 04:05:48 -0500
Subject: [PATCH] allow ipv6 for openvz-container
---
interface/web/sites/ftp_user_edit.php | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/interface/web/sites/ftp_user_edit.php b/interface/web/sites/ftp_user_edit.php
index edf47a3..bdbf3c2 100644
--- a/interface/web/sites/ftp_user_edit.php
+++ b/interface/web/sites/ftp_user_edit.php
@@ -82,7 +82,11 @@
$app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $ftpuser_prefix));
}
- $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $ftpuser_prefix, $global_config['ftpuser_prefix']));
+ if($this->dataRecord['username'] == "") {
+ $app->tpl->setVar("username_prefix", $ftpuser_prefix);
+ } else {
+ $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $ftpuser_prefix, $global_config['ftpuser_prefix']));
+ }
parent::onShowEnd();
}
@@ -153,14 +157,6 @@
function onBeforeUpdate() {
global $app, $conf, $interfaceConf;
-
-
- // Check system user and group
- if(isset($this->dataRecord['uid'])) {
- if($app->functions->is_allowed_user(strtolower($this->dataRecord['uid']),true) == false || $app->functions->is_allowed_group(strtolower($this->dataRecord['gid']),true) == false) {
- $app->tform->errorMessage .= $app->tform->lng('invalid_system_user_or_group_txt');
- }
- }
/*
* If the names should be restricted -> do it!
--
Gitblit v1.9.1