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

allow to create an instance specific admin, user- or group-context

Browse Source
This commit is contained in:
Ralf Becker 2012-10-12 13:35:20 +00:00
parent 1093103856
commit 03fe6356cb
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
setup/account_migration.php
View File

@ -60,9 +60,9 @@ array_shift($base_parts);
$cmd = new setup_cmd_ldap(array(
'domain' => $GLOBALS['egw_setup']->ConfigDomain,
'sub_command' => 'migrate_to_'.$to,
// in regular setup we only support one ldap root user, setting him as admin user too
'ldap_admin' => $GLOBALS['egw_info']['server']['ldap_root_dn'],
'ldap_admin_pw' => $GLOBALS['egw_info']['server']['ldap_root_pw'],
// allow to set ldap root DN (ldap_admin) to create instance specific admin DN and structure
'ldap_admin' => !empty($_POST['ldap_admin']) ? $_POST['ldap_admin'] : $GLOBALS['egw_info']['server']['ldap_root_dn'],
'ldap_admin_pw' => !empty($_POST['ldap_admin']) ? $_POST['ldap_admin_pw'] : $GLOBALS['egw_info']['server']['ldap_root_pw'],
'ldap_base' => implode(',',$base_parts),
)+$GLOBALS['egw_info']['server']);
@ -74,6 +74,7 @@ if (!$_POST['migrate'])
$setup_tpl->set_block('migration','header','header');
$setup_tpl->set_block('migration','user_list','user_list');
$setup_tpl->set_block('migration','group_list','group_list');
$setup_tpl->set_block('migration','ldap_admin','ldap_admin');
$setup_tpl->set_block('migration','submit','submit');
$setup_tpl->set_block('migration','footer','footer');
@ -98,6 +99,9 @@ if (!$_POST['migrate'])
$setup_tpl->set_var('select_users',lang('Select which user(s) will be exported'));
$setup_tpl->set_var('select_groups',lang('Select which group(s) will be exported'));
$setup_tpl->set_var('memberships',lang('Group memberships will be migrated too.'));
$setup_tpl->set_var('ldap_admin_message', lang('Give LDAP root DN and password, if you need to create an instance specific admin user, user- or group-context'));
$setup_tpl->set_var('ldap_admin_label', lang('Root DN'));
$setup_tpl->set_var('ldap_admin_pw_label', lang('Root DN password'));
$setup_tpl->set_var('migrate',$direction);
$setup_tpl->set_var('cancel',lang('Cancel'));
@ -110,6 +114,10 @@ if (!$_POST['migrate'])
{
$setup_tpl->pfp('out','group_list');
}
if ($to == 'ldap')
{
$setup_tpl->pfp('out','ldap_admin');
}
$setup_tpl->pfp('out','submit');
$setup_tpl->pfp('out','footer');
}

12
setup/templates/default/account_migration.tpl
View File

@ -25,6 +25,18 @@
</td>
<!-- END group_list -->
<!-- BEGIN ldap_admin -->
<tr bgcolor="#e6e6e6">
<td colspan="2" align="center">{ldap_admin_message}:</td>
</tr>
<tr bgcolor="#e6e6e6">
<td align="right">{ldap_admin_label}: </td><td><input name="ldap_admin" value="" /></td>
</tr>
<tr bgcolor="#e6e6e6">
<td align="right">{ldap_admin_pw_label}: </td><td><input type="password" name="ldap_admin_pw" value="" /></td>
</tr>
<!-- END ldap_admin -->
<!-- BEGIN submit -->
</tr>
<tr bgcolor="#e6e6e6">