diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-11-11 12:49:54 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-11-11 12:49:54 -0500 |
commit | 64c3161521991761dcfc9cb6ca0b648e552cdcd9 (patch) | |
tree | f8d4b6eb42073bbfd5845f2ecb5ff81d3192cdca /src/usr/local/www | |
parent | 564599fa0923be91b465c642f9f9783476f86853 (diff) | |
download | pfsense-64c3161521991761dcfc9cb6ca0b648e552cdcd9.zip pfsense-64c3161521991761dcfc9cb6ca0b648e552cdcd9.tar.gz |
Fixed #5416
Diffstat (limited to 'src/usr/local/www')
-rw-r--r-- | src/usr/local/www/system_usermanager.php | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 6024b2c..88a040d 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -135,7 +135,7 @@ else if ($act == "new") { $pconfig['lifetime'] = 3650; } -if (isset($_POST['dellall_x'])) { +if (isset($_POST['dellall'])) { $del_users = $_POST['delete_check']; @@ -144,7 +144,7 @@ if (isset($_POST['dellall_x'])) { if (isset($a_user[$userid]) && $a_user[$userid]['scope'] != "system") { conf_mount_rw(); local_user_del($a_user[$userid]); - conf_mount_ro(); + conf_mount_ro(); unset($a_user[$userid]); } } @@ -167,8 +167,8 @@ if ($_POST['act'] == "delcert") { $_POST['act'] = "edit"; $savemsg = gettext("Certificate") . " {$certdeleted} " . gettext("association removed.") . "<br />"; } -if ($_POST['act'] == "delprivid") { - +if ($_POST['act'] == "delprivid") { + if ($a_user[$id] && !empty($_POST['privid'])) { unset($a_user[$id]['priv'][$_POST['privid']]); local_user_set($a_user[$id]); @@ -278,7 +278,7 @@ if ($_POST['save']) { input_errors2Ajax($input_errors); exit; } - + if (!$input_errors) { @@ -472,7 +472,7 @@ display_top_tabs($tab_array); if (!($act == "new" || $act == "edit" || $input_errors)) { ?> - +<form method="post"> <div class="table-responsive"> <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> @@ -517,10 +517,15 @@ foreach($a_user as $i => $userent): </table> </div> <nav class="action-buttons"> - <a href="?act=new" class="btn btn-success"> + <a href="?act=new" class="btn btn-sm btn-success"> <i class="fa fa-plus icon-embed-btn"></i> <?=gettext("Add")?> </a> + + <button type="submit" class="btn btn-sm btn-danger" name="dellall" value="dellall" title="<?=gettext('Delete selected users')?>"> + <i class="fa fa-trash icon-embed-btn"></i> + <?=gettext("Delete")?> + </button> </nav> <div id="infoblock"> @@ -529,7 +534,7 @@ foreach($a_user as $i => $userent): "An icon that appears grey indicates that it is a system defined object. " . "Some system object properties can be modified but they cannot be deleted.") . '<br /><br />' . - gettext("Accounts created here are also used for other parts of the system " . + gettext("Accounts added here are also used for other parts of the system " . "such as OpenVPN, IPsec, and Captive Portal."), info)?> </div> @@ -903,7 +908,7 @@ events.push(function(){ $('form').submit(); } }); - + // ---------- On initial page load ------------------------------------------------------------ |