extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes for negative group-id and others

Browse Source
This commit is contained in:
Ralf Becker 2005-11-24 20:49:23 +00:00
parent 43ae18fb7a
commit 2b083935ec
3 changed files with 59 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
setup/ldapexport.php
View File

@ -56,19 +56,9 @@
),__LINE__,__FILE__);
while ($GLOBALS['egw_setup']->db->next_record())
{
$config[$GLOBALS['egw_setup']->db->f('config_name')] = $GLOBALS['egw_setup']->db->f('config_value');
$GLOBALS['egw_info']['server'][$GLOBALS['egw_setup']->db->f('config_name')] = $GLOBALS['egw_setup']->db->f('config_value');
}
$phpgw_info['server']['ldap_host'] = $config['ldap_host'];
$phpgw_info['server']['ldap_context'] = $config['ldap_context'];
$phpgw_info['server']['ldap_group_context'] = $config['ldap_group_context'];
$phpgw_info['server']['ldap_root_dn'] = $config['ldap_root_dn'];
$phpgw_info['server']['ldap_root_pw'] = $config['ldap_root_pw'];
$phpgw_info['server']['ldap_account_home'] = $config['ldap_account_home'];
$phpgw_info['server']['ldap_account_shell'] = $config['ldap_account_shell'];
$phpgw_info['server']['ldap_extra_attributes'] = $config['ldap_extra_attributes'];
$phpgw_info['server']['ldap_version3'] = $config['ldap_version3'];
$phpgw_info['server']['account_repository'] = 'ldap';
$GLOBALS['egw_info']['server']['account_repository'] = 'ldap';
$egw->accounts = CreateObject('phpgwapi.accounts');
$acct = $egw->accounts;
@ -99,7 +89,7 @@
$account_info[$i]['account_lastname'] = $GLOBALS['egw_setup']->db->f('account_lastname');
$account_info[$i]['account_status'] = $GLOBALS['egw_setup']->db->f('account_status');
$account_info[$i]['account_expires'] = $GLOBALS['egw_setup']->db->f('account_expires');
$account_info[$i]['account_primary_group'] = $GLOBALS['egw_setup']->db->f('account_primary_group');
$account_info[$i]['account_primary_group'] = $GLOBALS['egw_setup']->db->f('account_primary_group');
}
$sql = "SELECT * FROM ".$GLOBALS['egw_setup']->accounts_table." WHERE account_type='g'";
@ -145,7 +135,6 @@
if(!empty($thisacctid) && !empty($thisacctlid))
{
$groups = CreateObject('phpgwapi.accounts',(int)$thisacctid);
copyobj($GLOBALS['egw_setup']->db,$groups->db);
// Check if the account is already there.
// If so, we won't try to create it again.
@ -194,7 +183,6 @@
if(!empty($thisacctid) && !empty($thisacctlid))
{
$accounts = CreateObject('phpgwapi.accounts',(int)$thisacctid);
copyobj($GLOBALS['egw_setup']->db,$accounts->db);
// Check if the account is already there.
// If so, we won't try to create it again.
@ -217,8 +205,8 @@
'account_lastname' => $thislastname,
'account_status' => 'A',
'account_expires' => -1,
'homedirectory' => $config['ldap_account_home'] . '/' . $thisacctlid,
'loginshell' => $config['ldap_account_shell'],
'homedirectory' => $GLOBALS['egw_info']['server']['ldap_account_home'] . '/' . $thisacctlid,
'loginshell' => $GLOBALS['egw_info']['server']['ldap_account_shell'],
'account_primary_group' => $thisprimarygroup,
);
$accounts->create($thisaccount_info);

104
setup/ldapimport.php
View File

@ -51,7 +51,7 @@
'T_alert_msg' => 'msg_alert_msg.tpl'
));
$phpgw_info['server']['auth_type'] = 'ldap';
$GLOBALS['egw_info']['server']['auth_type'] = 'ldap';
$phpgw->applications = CreateObject('phpgwapi.applications');
$applications = $phpgw->applications;
@ -63,13 +63,13 @@
{
$config[$GLOBALS['egw_setup']->db->f('config_name')] = $GLOBALS['egw_setup']->db->f('config_value');
}
$phpgw_info['server']['ldap_host'] = $config['ldap_host'];
$phpgw_info['server']['ldap_context'] = $config['ldap_context'];
$phpgw_info['server']['ldap_group_context'] = $config['ldap_group_context'];
$phpgw_info['server']['ldap_root_dn'] = $config['ldap_root_dn'];
$phpgw_info['server']['ldap_root_pw'] = $config['ldap_root_pw'];
$phpgw_info['server']['ldap_version3'] = $config['ldap_version3'] == "True" ? True : False;
$phpgw_info['server']['account_repository'] = $config['account_repository'];
$GLOBALS['egw_info']['server']['ldap_host'] = $config['ldap_host'];
$GLOBALS['egw_info']['server']['ldap_context'] = $config['ldap_context'];
$GLOBALS['egw_info']['server']['ldap_group_context'] = $config['ldap_group_context'];
$GLOBALS['egw_info']['server']['ldap_root_dn'] = $config['ldap_root_dn'];
$GLOBALS['egw_info']['server']['ldap_root_pw'] = $config['ldap_root_pw'];
$GLOBALS['egw_info']['server']['ldap_version3'] = $config['ldap_version3'] == "True" ? True : False;
$GLOBALS['egw_info']['server']['account_repository'] = $config['account_repository'];
$phpgw->accounts = CreateObject('phpgwapi.accounts');
$acct = $phpgw->accounts;
@ -89,47 +89,46 @@
exit;
}
$sr = ldap_search($ldap,$config['ldap_context'],'(|(uid=*))',array('sn','givenname','uid','uidnumber'));
$sr = ldap_search($ldap,$config['ldap_context'],'(|(uid=*))',array('sn','givenname','uid','uidnumber','email','gidnumber'));
$info = ldap_get_entries($ldap, $sr);
$tmp = '';
$account_info = $group_info = array();
for($i=0; $i<$info['count']; $i++)
{
if(!$phpgw_info['server']['global_denied_users'][$info[$i]['uid'][0]])
if(!$GLOBALS['egw_info']['server']['global_denied_users'][$info[$i]['uid'][0]])
{
$tmp = $info[$i]['uidnumber'][0];
$account_info[$tmp]['account_id'] = $info[$i]['uidnumber'][0];
$account_info[$tmp]['account_lid'] = $info[$i]['uid'][0];
$account_info[$tmp]['account_firstname'] = $info[$i]['givenname'][0];
$account_info[$tmp]['account_lastname'] = $info[$i]['sn'][0];
$account_info[$tmp]['account_passwd'] = $info[$i]['userpassword'][0];
$account_info[$info[$i]['uidnumber'][0]] = array(
'account_id' => $info[$i]['uidnumber'][0],
'account_lid' => $info[$i]['uid'][0],
'account_firstname' => $info[$i]['givenname'][0],
'account_lastname' => $info[$i]['sn'][0],
'account_passwd' => $info[$i]['userpassword'][0],
'account_email' => $info[$i]['email'][0],
'account_primary_group' => -$info[$i]['gidnumber'][0],
);
}
}
if($phpgw_info['server']['ldap_group_context'])
if($GLOBALS['egw_info']['server']['ldap_group_context'])
{
$srg = ldap_search($ldap,$config['ldap_group_context'],'(|(cn=*))',array('gidnumber','cn','memberuid'));
$info = ldap_get_entries($ldap, $srg);
$tmp = '';
for($i=0; $i<$info['count']; $i++)
{
if(!$phpgw_info['server']['global_denied_groups'][$info[$i]['cn'][0]] &&
if(!$GLOBALS['egw_info']['server']['global_denied_groups'][$info[$i]['cn'][0]] &&
!$account_info[$i][$info[$i]['cn'][0]])
{
$tmp = $info[$i]['gidnumber'][0];
$group_info[$tmp]['account_id'] = $info[$i]['gidnumber'][0];
$group_info[$tmp]['account_lid'] = $info[$i]['cn'][0];
$group_info[$tmp]['members'] = $info[$i]['memberuid'];
$group_info[$tmp]['account_firstname'] = $info[$i]['cn'][0];
$group_info[$tmp]['account_lastname'] = 'Group';
$group_info[-$info[$i]['gidnumber'][0]] = array(
'account_id' => -$info[$i]['gidnumber'][0],
'account_lid' => $info[$i]['cn'][0],
'members' => $info[$i]['memberuid'],
'account_firstname' => $info[$i]['cn'][0],
'account_lastname' => 'Group'
);
}
}
}
else
{
$group_info = array();
}
$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'app_name','app_enabled != 0 AND app_enabled != 3',__LINE__,__FILE__);
while($GLOBALS['egw_setup']->db->next_record())
@ -166,20 +165,15 @@
{
if($users)
{
while(list($key,$id) = each($users))
foreach($users as $id)
{
$id_exist = 0;
$thisacctid = $account_info[$id]['account_id'];
$thisacctlid = $account_info[$id]['account_lid'];
$thisfirstname = $account_info[$id]['account_firstname'];
$thislastname = $account_info[$id]['account_lastname'];
$thispasswd = $account_info[$id]['account_passwd'];
// Do some checks before we try to import the data.
if(!empty($thisacctid) && !empty($thisacctlid))
{
$accounts = CreateObject('phpgwapi.accounts',(int)$thisacctid);
copyobj($GLOBALS['egw_setup']->db,$accounts->db);
$accounts =& CreateObject('phpgwapi.accounts',(int)$thisacctid);
// Check if the account is already there.
// If so, we won't try to create it again.
@ -192,17 +186,11 @@
// If not, create it now.
if(!$id_exist)
{
$thisaccount_info = array(
$thisacctid = $accounts->create($account_info[$id]+array(
'account_type' => 'u',
'account_lid' => $thisacctlid,
'account_passwd' => 'x',
/* 'account_passwd' => $thispasswd, */
'account_firstname' => $thisfirstname,
'account_lastname' => $thislastname,
'account_status' => 'A',
'account_expires' => -1
);
$thisacctid = $accounts->create($thisaccount_info);
'account_expires' => -1,
));
}
if (!$thisacctid) // if we have no account_id, we cant continue
{
@ -248,7 +236,7 @@
if($ldapgroups)
{
while(list($key,$groupid) = each($ldapgroups))
foreach($ldapgroups as $groupid)
{
$id_exist = 0;
$thisacctid = $group_info[$groupid]['account_id'];
@ -261,7 +249,6 @@
if(!empty($thisacctid) && !empty($thisacctlid))
{
$groups = CreateObject('phpgwapi.accounts',(int)$thisacctid);
copyobj($GLOBALS['egw_setup']->db,$groups->db);
// Check if the account is already there.
// If so, we won't try to create it again.
@ -275,23 +262,22 @@
// If not, create it now.
if(!$id_exist)
{
$thisgroup_info = array(
$thisacctid = $groups->create(array(
'account_type' => 'g',
'account_lid' => $thisacctlid,
'account_passwd' => $passwd,
'account_passwd' => 'x',
'account_firstname' => $thisfirstname,
'account_lastname' => $thislastname,
'account_status' => 'A',
'account_expires' => -1
);
$thisacctid = $groups->create($thisgroup_info);
));
}
if (!$thisacctid) // if we have no account_id, we cant continue
{
continue;
}
// Now make them a member of this group in phpgw.
while(list($key,$members) = each($thismembers))
foreach($thismembers as $key =>$members)
{
if($key == 'count')
{
@ -316,7 +302,6 @@
if($tmpid)
{
$acl = CreateObject('phpgwapi.acl',$tmpid);
copyobj($GLOBALS['egw_setup']->db,$acl->db);
$acl->account_id = (int)$tmpid;
$acl->read_repository();
@ -345,9 +330,8 @@
}
}
/* Now give this group some rights */
$phpgw_info['user']['account_id'] = $thisacctid;
$GLOBALS['egw_info']['user']['account_id'] = $thisacctid;
$acl = CreateObject('phpgwapi.acl');
copyobj($GLOBALS['egw_setup']->db,$acl->db);
$acl->account_id = (int)$thisacctid;
$acl->read_repository();
@reset($s_apps);
@ -365,7 +349,6 @@
{
/* Create the 'Default' group */
$groups = CreateObject('phpgwapi.accounts',$defaultgroupid);
copyobj($GLOBALS['egw_setup']->db,$groups->db);
// Check if the group account is already there.
// If so, set our group_id to that account's id for use below.
@ -389,12 +372,9 @@
'account_status' => 'A',
'account_expires' => -1
);
$acct->create($thisgroup_info);
$defaultgroupid = $acct->name2id('Default');
$defaultgroupid = $acct->create($thisgroup_info);
$acl = CreateObject('phpgwapi.acl',$defaultgroupid);
copyobj($GLOBALS['egw_setup']->db,$acl->db);
$acl->account_id = (int)$defaultgroupid;
$acl->read_repository();
@reset($s_apps);

27
setup/ldapmodify.php
View File

@ -58,13 +58,13 @@
{
$config[$GLOBALS['egw_setup']->db->f('config_name')] = $GLOBALS['egw_setup']->db->f('config_value');
}
$phpgw_info['server']['ldap_host'] = $config['ldap_host'];
$phpgw_info['server']['ldap_context'] = $config['ldap_context'];
$phpgw_info['server']['ldap_group_context'] = $config['ldap_group_context'];
$phpgw_info['server']['ldap_root_dn'] = $config['ldap_root_dn'];
$phpgw_info['server']['ldap_root_pw'] = $config['ldap_root_pw'];
$phpgw_info['server']['account_repository'] = $config['account_repository'];
$phpgw_info['server']['ldap_version3'] = $config['ldap_version3'];
$GLOBALS['egw_info']['server']['ldap_host'] = $config['ldap_host'];
$GLOBALS['egw_info']['server']['ldap_context'] = $config['ldap_context'];
$GLOBALS['egw_info']['server']['ldap_group_context'] = $config['ldap_group_context'];
$GLOBALS['egw_info']['server']['ldap_root_dn'] = $config['ldap_root_dn'];
$GLOBALS['egw_info']['server']['ldap_root_pw'] = $config['ldap_root_pw'];
$GLOBALS['egw_info']['server']['account_repository'] = $config['account_repository'];
$GLOBALS['egw_info']['server']['ldap_version3'] = $config['ldap_version3'];
$GLOBALS['egw']->accounts = CreateObject('phpgwapi.accounts');
$acct = $GLOBALS['egw']->accounts;
@ -87,13 +87,13 @@
for($i=0; $i<$info['count']; $i++)
{
if(!$phpgw_info['server']['global_denied_users'][$info[$i]['uid'][0]])
if(!$GLOBALS['egw_info']['server']['global_denied_users'][$info[$i]['uid'][0]])
{
$account_info[$info[$i]['uidnumber'][0]] = $info[$i];
}
}
if($phpgw_info['server']['ldap_group_context'])
if($GLOBALS['egw_info']['server']['ldap_group_context'])
{
$srg = ldap_search($ldap,$config['ldap_group_context'],'(|(cn=*))',array('gidnumber','cn','memberuid'));
$info = ldap_get_entries($ldap, $srg);
@ -101,10 +101,10 @@
for($i=0; $i<$info['count']; $i++)
{
if(!$phpgw_info['server']['global_denied_groups'][$info[$i]['cn'][0]] &&
if(!$GLOBALS['egw_info']['server']['global_denied_groups'][$info[$i]['cn'][0]] &&
!$account_info[$i][$info[$i]['cn'][0]])
{
$group_info[$info[$i]['gidnumber'][0]] = $info[$i];
$group_info[-$info[$i]['gidnumber'][0]] = $info[$i];
}
}
}
@ -130,11 +130,9 @@
if(isset($_POST['submit']))
{
$acl = CreateObject('phpgwapi.acl');
copyobj($GLOBALS['egw_setup']->db,$acl->db);
if(isset($_POST['ldapgroups']))
{
$groups = CreateObject('phpgwapi.accounts');
copyobj($GLOBALS['egw_setup']->db,$groups->db);
while(list($key,$groupid) = each($_POST['ldapgroups']))
{
$id_exist = 0;
@ -232,7 +230,7 @@
}
}
/* Now give this group some rights */
$phpgw_info['user']['account_id'] = $thisacctid;
$GLOBALS['egw_info']['user']['account_id'] = $thisacctid;
$acl->account_id = (int)$thisacctid;
$acl->read_repository();
@reset($_POST['s_apps']);
@ -250,7 +248,6 @@
if(isset($_POST['users']))
{
$accounts = CreateObject('phpgwapi.accounts');
copyobj($GLOBALS['egw_setup']->db,$accounts->db);
while(list($key,$id) = each($_POST['users']))
{
$id_exist = 0;