holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using default group as specified in Setup >> Configuration for the primary group too, if none is given

Browse Source
This commit is contained in:
Ralf Becker 2004-07-10 08:22:07 +00:00
parent e1599a19c0
commit ee82c376f6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpgwapi/inc/class.accounts_sql.inc.php
View File

@ -351,9 +351,14 @@
$expires = mktime(2,0,0,date('n',$expiredate), (int)date('d',$expiredate), date('Y',$expiredate)); $expires = mktime(2,0,0,date('n',$expiredate), (int)date('d',$expiredate), date('Y',$expiredate));
} }
} }
$default_group_id = $this->name2id($GLOBALS['phpgw_info']['server']['default_group_lid']);
if (!$default_group_id)
{
$default_group_id = (int) $this->name2id('Default');
}
$primary_group = $GLOBALS['auto_create_acct']['primary_group'] && $primary_group = $GLOBALS['auto_create_acct']['primary_group'] &&
$this->get_type((int)$GLOBALS['auto_create_acct']['primary_group']) == 'g' ? $this->get_type((int)$GLOBALS['auto_create_acct']['primary_group']) == 'g' ?
(int) $GLOBALS['auto_create_acct']['primary_group'] : 0; (int) $GLOBALS['auto_create_acct']['primary_group'] : $default_group_id;
$acct_info = array( $acct_info = array(
'account_id' => (int) $GLOBALS['auto_create_acct']['id'], 'account_id' => (int) $GLOBALS['auto_create_acct']['id'],
@ -388,13 +393,10 @@
} }
if ($default_acls == False) if ($default_acls == False)
{ {
$default_group_lid = $GLOBALS['phpgw_info']['server']['default_group_lid']; if ($default_group_id)
$default_group_id = $this->name2id($default_group_lid);
$defaultgroupid = $default_group_id ? $default_group_id : $this->name2id('Default');
if ($defaultgroupid)
{ {
$this->db->query("insert into phpgw_acl (acl_appname, acl_location, acl_account, acl_rights) values('phpgw_group', " $this->db->query("insert into phpgw_acl (acl_appname, acl_location, acl_account, acl_rights) values('phpgw_group', "
. $defaultgroupid . ', ' . $accountid . ', 1)',__LINE__,__FILE__); . $default_group_id . ', ' . $accountid . ', 1)',__LINE__,__FILE__);
$this->db->query("insert into phpgw_acl (acl_appname, acl_location, acl_account, acl_rights) values('preferences', 'changepassword', " . $accountid . ', 1)',__LINE__,__FILE__); $this->db->query("insert into phpgw_acl (acl_appname, acl_location, acl_account, acl_rights) values('preferences', 'changepassword', " . $accountid . ', 1)',__LINE__,__FILE__);
} }
else else