From 185f934852baedca5ac18a89af2c91765a37de99 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 16 Feb 2009 08:22:22 +0000 Subject: [PATCH] Patch from jean-charles.passard@provectio.org to fix handling of account prefixes --- admin/inc/class.boaccounts.inc.php | 4 ++++ admin/inc/class.uiaccounts.inc.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/admin/inc/class.boaccounts.inc.php b/admin/inc/class.boaccounts.inc.php index 5b994115a4..8e948c4e4e 100755 --- a/admin/inc/class.boaccounts.inc.php +++ b/admin/inc/class.boaccounts.inc.php @@ -266,6 +266,10 @@ { $accountPrefix = $GLOBALS['egw_info']['server']['account_prefix']; } + if($accountPrefix) + { + $userData['account_lid'] = $accountPrefix . $userData['account_lid']; + } $errors = $this->validate_user($userData); if(@is_array($errors)) diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php index 18933d9948..19b3194dd3 100755 --- a/admin/inc/class.uiaccounts.inc.php +++ b/admin/inc/class.uiaccounts.inc.php @@ -562,7 +562,7 @@ } $userData = array( 'account_type' => 'u', - 'account_lid' => $accountPrefix . $_POST['account_lid'], + 'account_lid' => $_POST['account_lid'], 'account_firstname' => $_POST['account_firstname'], 'account_lastname' => $_POST['account_lastname'], 'account_passwd' => $_POST['account_passwd'], @@ -855,7 +855,7 @@ $email = $GLOBALS['egw']->common->email_address($_POST['account_firstname'],$_POST['account_lastname'],$_POST['account_lid']); } $userData = array( - 'account_lid' => $accountPrefix.$_POST['account_lid'], + 'account_lid' => $_POST['account_lid'], 'account_firstname' => $_POST['account_firstname'], 'account_lastname' => $_POST['account_lastname'], 'account_passwd' => $_POST['account_passwd'],