From e439d1c66e7cf115fd628309d575f9721e60f1f4 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Mon, 10 Dec 2012 12:57:34 -0500
Subject: [PATCH] Fixed: FS#2066 - Check if problems can occur ins ervices when the default prefix is manually changed - Notes: once the entry was created or modified after applying this update the current prefix is stored with the entry and kept even if the global prefix changes
---
interface/web/sites/webdav_user_edit.php | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/interface/web/sites/webdav_user_edit.php b/interface/web/sites/webdav_user_edit.php
index 8f11bb0..54261e2 100644
--- a/interface/web/sites/webdav_user_edit.php
+++ b/interface/web/sites/webdav_user_edit.php
@@ -78,14 +78,11 @@
if ($this->dataRecord['username'] != "") {
/* REMOVE the restriction */
- $app->tpl->setVar("username", str_replace($webdavuser_prefix , '', $this->dataRecord['username']));
+ $app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $webdavuser_prefix));
}
- if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- $app->tpl->setVar("username_prefix", $global_config['webdavuser_prefix']);
- } else {
- $app->tpl->setVar("username_prefix", $webdavuser_prefix);
- }
-
+
+ $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $webdavuser_prefix, $global_config['webdavuser_prefix']));
+
if($this->id > 0) {
//* we are editing a existing record
$app->tpl->setVar("edit_disabled", 1);
@@ -131,6 +128,8 @@
$global_config = $app->getconf->get_global_config('sites');
$webdavuser_prefix = $app->tools_sites->replacePrefix($global_config['webdavuser_prefix'], $this->dataRecord);
+ $this->dataRecord['username_prefix'] = ($webdavuser_prefix === '' ? '#' : $webdavuser_prefix);
+
/* restrict the names */
$this->dataRecord['username'] = $webdavuser_prefix . $this->dataRecord['username'];
@@ -167,6 +166,7 @@
$data = $app->db->queryOneRecord("SELECT * FROM webdav_user WHERE webdav_user_id = ".$app->functions->intval($this->id));
$this->dataRecord["username"] = $data['username'];
$this->dataRecord["dir"] = $data['dir'];
+ $this->dataRecord['username_prefix'] = $data['username_prefix'];
$passwordOld = $data['password'];
/*
--
Gitblit v1.9.1