summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2007-12-01 23:46:05 +0000
committerScott Ullrich <sullrich@pfsense.org>2007-12-01 23:46:05 +0000
commitee0a49a06604b9b0fe73300f028230924e950ee9 (patch)
tree16212d47e4cf4d5816ce84bc47aa0d19bc3d3ae4
parent8837f72d4b5158460566c84f330bc2dca1e7890e (diff)
downloadpfsense-ee0a49a06604b9b0fe73300f028230924e950ee9.zip
pfsense-ee0a49a06604b9b0fe73300f028230924e950ee9.tar.gz
* Bring back privs. They are fare more feature complete than I thought they where. * Convert javascript code from the HEAD system to RELENG_1_2
-rw-r--r--usr/local/www/system_usermanager.php2
-rw-r--r--usr/local/www/system_usermanager_edit.php3
2 files changed, 2 insertions, 3 deletions
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index 80bc40c..4e56e45 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -237,7 +237,7 @@ if (isSystemAdmin($HTTP_SERVER_VARS['AUTH_USER'])) {
<?=gettext("Indicates whether this is a system (aka non-deletable) user or a user created by a particular user.");?>
</td>
</tr>
- <?php if (isSystemAdmin($HTTP_SERVER_VARS['AUTH_USER']) and $not_now == true): ?>
+ <?php if (isSystemAdmin($HTTP_SERVER_VARS['AUTH_USER'])): ?>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("User Privileges");?></td>
<td width="78%" class="vtable">
diff --git a/usr/local/www/system_usermanager_edit.php b/usr/local/www/system_usermanager_edit.php
index 0070370..e002610 100644
--- a/usr/local/www/system_usermanager_edit.php
+++ b/usr/local/www/system_usermanager_edit.php
@@ -216,14 +216,13 @@ $jscriptstr .= <<<EOD
EOD;
-#$pfSenseHead->addScript($jscriptstr);
-#echo $pfSenseHead->getHTML();
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="<?= $jsevents["body"]["onload"] ?>">
<?php include("fbegin.inc"); ?>
+<?php echo $jscriptstr; ?>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<?php if ($savemsg) print_info_box($savemsg); ?>
<form action="system_usermanager_edit.php" method="post" name="iform" id="iform">
OpenPOWER on IntegriCloud