extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed a problem with the primary group

Browse Source 
fixed german translation
This commit is contained in:
Lars Kneschke 2003-09-19 20:43:04 +00:00
parent 04f83c5aee
commit 2f986a6667
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
admin/inc/class.boaccounts.inc.php
View File

@ -327,15 +327,28 @@
'account_expires_never' => $_POST['never_expires']
/* 'file_space' => $_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'] */
);
if ($userData['account_primary_group'] && !in_array($userData['account_primary_group'],$userData['account_groups']))
// add the primary group, to the users other groups, if not already added
if(is_array($userData['account_groups']))
{
if(!in_array($userData['account_primary_group'],$userData['account_groups']))
{
$userData['account_groups'][] = intval($userData['account_primary_group']);
}
}
else
{
$userData['account_groups'] = array(intval($userData['account_primary_group']));
}
// when does the account expire
if ($_POST['expires'] !== '' && !$_POST['never_expires'])
{
$jscal = CreateObject('phpgwapi.jscalendar',False);
$userData += $jscal->input2date($_POST['expires'],False,'account_expires_day','account_expires_month','account_expires_year');
}
// do we have all needed data??
if (!$errors = $this->validate_user($userData))
{
$account_id = $this->so->add_user($userData);

2
admin/setup/phpgw_de.lang
View File

@ -363,4 +363,4 @@ you must enter an application name. admin de Sie m
you must enter an application title. admin de Sie müssen der Anwendung einen Titel geben.
you must select a file type admin de Sie müssen einen Dateityp auswählen
you will need to remove the subcategories before you can delete this category admin de Sie müssen erst die Unterkategorien löschen bevor Sie diese Kategorie löschen können !
primary Group admin de primäre Groupe
primary Group admin de primäre Gruppe