diff options
| author | jim-p <jimp@pfsense.org> | 2011-08-11 14:03:12 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-08-11 14:03:12 -0400 |
| commit | adacdf5f45c98856a691059419105aaefaf719e8 (patch) | |
| tree | 6e86289420258454e5e78d0f7739dd2f6fa982e4 /usr | |
| parent | 3f1097004e12701b6ce6712a0f4702089baa5e53 (diff) | |
| download | pfsense-adacdf5f45c98856a691059419105aaefaf719e8.zip pfsense-adacdf5f45c98856a691059419105aaefaf719e8.tar.gz | |
Populate pconfig in all cases with user info, or else when you delete a privilege, the list disappears until you go back and edit the user again. (Certs too)
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/system_usermanager.php | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index 783eb0f..07ea6ed 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -62,6 +62,19 @@ if (!is_array($config['system']['user'])) $a_user = &$config['system']['user']; +if (isset($id) && $a_user[$id]) { + $pconfig['usernamefld'] = $a_user[$id]['name']; + $pconfig['descr'] = $a_user[$id]['descr']; + $pconfig['expires'] = $a_user[$id]['expires']; + $pconfig['groups'] = local_user_get_groups($a_user[$id]); + $pconfig['utype'] = $a_user[$id]['scope']; + $pconfig['uid'] = $a_user[$id]['uid']; + $pconfig['authorizedkeys'] = base64_decode($a_user[$id]['authorizedkeys']); + $pconfig['priv'] = $a_user[$id]['priv']; + $pconfig['ipsecpsk'] = $a_user[$id]['ipsecpsk']; + $pconfig['disabled'] = isset($a_user[$id]['disabled']); +} + if ($_GET['act'] == "deluser") { if (!$a_user[$id]) { @@ -144,20 +157,6 @@ else if ($_GET['act'] == "delcert") { $savemsg = gettext("Certificate")." {$certdeleted} ". gettext("association removed.")."<br/>"; } -else if ($_GET['act'] == "edit") { - if (isset($id) && $a_user[$id]) { - $pconfig['usernamefld'] = $a_user[$id]['name']; - $pconfig['descr'] = $a_user[$id]['descr']; - $pconfig['expires'] = $a_user[$id]['expires']; - $pconfig['groups'] = local_user_get_groups($a_user[$id]); - $pconfig['utype'] = $a_user[$id]['scope']; - $pconfig['uid'] = $a_user[$id]['uid']; - $pconfig['authorizedkeys'] = base64_decode($a_user[$id]['authorizedkeys']); - $pconfig['priv'] = $a_user[$id]['priv']; - $pconfig['ipsecpsk'] = $a_user[$id]['ipsecpsk']; - $pconfig['disabled'] = isset($a_user[$id]['disabled']); - } -} else if ($_GET['act'] == "new") { /* * set this value cause the text field is read only |
