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

Add new setup configs for ldap homedir and shell

Browse Source
This commit is contained in:
Miles Lott 2001-03-29 03:39:40 +00:00
parent 3ae25525a8
commit 3690501ca1
5 changed files with 72 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
admin/editaccount.php
View File

@ -26,11 +26,22 @@
$t = new Template($phpgw->common->get_tpl_dir('admin'));
$t->set_unknowns('remove');
$t->set_file(array(
'form' => 'account_form.tpl',
'form_passwordinfo' => 'account_form_password.tpl',
'form_buttons_' => 'account_form_buttons.tpl',
));
if ($phpgw_info["server"]["ldap_extra_attributes"] && ($phpgw_info['server']['account_repository'] == 'ldap')) {
$t->set_file(array(
'form' => 'account_form_ldap.tpl',
'form_passwordinfo' => 'account_form_password.tpl',
'form_buttons_' => 'account_form_buttons.tpl'
));
}
else
{
$t->set_file(array(
'form' => 'account_form.tpl',
'form_passwordinfo' => 'account_form_password.tpl',
'form_buttons_' => 'account_form_buttons.tpl',
));
}
if ($_userData)
{
@ -77,6 +88,13 @@
$t->set_var('account_lid','<input name="account_lid" value="' . $userData['account_lid'] . '">');
if ($phpgw_info["server"]["ldap_extra_attributes"]) {
$t->set_var("lang_homedir",lang("home directory"));
$t->set_var("lang_shell",lang("shell"));
$t->set_var("homedirectory",'<input name="homedirectory" value="' . $userData['homedirectory']. '">');
$t->set_var("loginshell",'<input name="loginshell" value="' . $userData['loginshell']. '">');
}
$t->set_var('account_passwd',$account_passwd);
$t->set_var('account_passwd_2',$account_passwd_2);
$t->parse('password_fields','form_passwordinfo',True);
@ -263,7 +281,7 @@
if ($_userData['old_loginid'] != $_userData['account_lid'])
{
if (account_exsists($_userData['account_loginid']))
if (account_exists($_userData['account_loginid']))
{
$error[$totalerrors] = lang('That loginid has already been taken');
$totalerrors++;
@ -314,7 +332,9 @@
'account_id' => $account_id,
'account_passwd_2' => $account_passwd_2,
'account_groups' => $account_groups,
'account_permissions' => $account_permissions
'account_permissions' => $account_permissions,
'homedirectory' => $homedirectory,
'loginshell' => $loginshell
);
if (!$errors = userDataInvalid($userData))

32
admin/newaccount.php
View File

@ -83,7 +83,7 @@
'phpgw_acl',
'phpgw_applications'
));
$phpgw->accounts->create('u', $account_lid, $account_passwd, $account_firstname, $account_lastname, $account_status);
$phpgw->accounts->create('u', $account_lid, $account_passwd, $account_firstname, $account_lastname, $account_status,$homedirectory,$loginshell);
$account_id = $phpgw->accounts->name2id($account_lid);
@ -173,11 +173,22 @@
}
$phpgw->template->set_unknowns('remove');
$phpgw->template->set_file(array(
'form' => 'account_form.tpl',
'form_passwordinfo' => 'account_form_password.tpl',
'form_buttons_' => 'account_form_buttons.tpl',
));
if ($phpgw_info["server"]["ldap_extra_attributes"] && $phpgw_info['server']['account_repository'] == 'ldap') {
$phpgw->template->set_file(array(
'form' => 'account_form_ldap.tpl',
'form_passwordinfo' => 'account_form_password.tpl',
'form_buttons_' => 'account_form_buttons.tpl'
));
}
else
{
$phpgw->template->set_file(array(
'form' => 'account_form.tpl',
'form_passwordinfo' => 'account_form_password.tpl',
'form_buttons_' => 'account_form_buttons.tpl',
));
}
$phpgw->common->phpgw_header();
echo parse_navbar();
@ -211,7 +222,14 @@
$phpgw->template->set_var('lang_password',lang('Password'));
$phpgw->template->set_var('account_passwd',$account_passwd);
if ($phpgw_info["server"]["ldap_extra_attributes"]) {
$phpgw->template->set_var("lang_homedir",lang("home directory"));
$phpgw->template->set_var("lang_shell",lang("shell"));
$phpgw->template->set_var("homedirectory",'<input name="homedirectory" value="' . $phpgw_info["server"]["ldap_account_home"].SEP.$account_lid . '">');
$phpgw->template->set_var("loginshell",'<input name="loginshell" value="' . $phpgw_info["server"]["ldap_account_shell"] . '">');
}
$phpgw->template->set_var('lang_reenter_password',lang('Re-Enter Password'));
$phpgw->template->set_var('account_passwd_2',$account_passwd_2);
$phpgw->template->parse('password_fields','form_passwordinfo',True);

16
admin/setup/config.inc.php
View File

@ -33,6 +33,22 @@
</tr>
<?php $selected = array(); ?>
<tr bgcolor="e6e6e6">
<td>If using LDAP, do you want to store homedirectory and loginshell attributes for new accounts?:</td>
<td><input type="checkbox" name="newsettings[ldap_extra_attributes]" value="True"<?php echo ($current_config["ldap_extra_attributes"]?" checked":""); ?>></td>
</tr>
<tr bgcolor="e6e6e6">
<td>&nbsp;&nbsp;&nbsp;LDAP Default homedirectory prefix (e.g. /home for /home/username):</td>
<td><input name="newsettings[ldap_account_home]" value="<?php echo $current_config["ldap_account_home"]; ?>"></td>
</tr>
<tr bgcolor="e6e6e6">
<td>&nbsp;&nbsp;&nbsp;LDAP Default shell (e.g. /bin/bash):</td>
<td><input name="newsettings[ldap_account_shell]" value="<?php echo $current_config["ldap_account_shell"]; ?>"></td>
</tr>
<?php $selected = array(); ?>
<tr bgcolor="e6e6e6">
<td>Auto create account records for authenticated users:</td>
<td><input type="checkbox" name="newsettings[auto_create_acct]" value="True"<?php echo ($current_config["auto_create_acct"]?" checked":""); ?>></td>

4
admin/templates/default/account_form_ldap.tpl
View File

@ -25,9 +25,9 @@
<tr bgcolor="{tr_color2}">
<td>{lang_homedir}</td>
<td>{account_home}&nbsp;</td>
<td>{homedirectory}&nbsp;</td>
<td>{lang_shell}</td>
<td>{account_shell}&nbsp;</td>
<td>{loginshell}&nbsp;</td>
</tr>
{password_fields}

4
admin/templates/verdilak/account_form_ldap.tpl
View File

@ -25,9 +25,9 @@
<tr bgcolor="{tr_color2}">
<td>{lang_homedir}</td>
<td>{account_home}&nbsp;</td>
<td>{homedirectory}&nbsp;</td>
<td>{lang_shell}</td>
<td>{account_shell}&nbsp;</td>
<td>{loginshell}&nbsp;</td>
</tr>
{password_fields}