diff options
| author | sullrich <sullrich@pfsense.org> | 2009-12-03 15:37:07 -0500 |
|---|---|---|
| committer | sullrich <sullrich@pfsense.org> | 2009-12-03 15:37:07 -0500 |
| commit | ae2951d351024dad570e6ee3554120ef85437847 (patch) | |
| tree | 94d91da2b29c3f3e0bbcc06f259195945d96bdb0 | |
| parent | b7dbef8efe5bcd093939cd0734f210073d6a98a4 (diff) | |
| download | pfsense-ae2951d351024dad570e6ee3554120ef85437847.zip pfsense-ae2951d351024dad570e6ee3554120ef85437847.tar.gz | |
Make item a global
| -rw-r--r-- | etc/inc/priv.inc | 3 | ||||
| -rw-r--r-- | etc/inc/priv/user.priv.inc | 2 | ||||
| -rwxr-xr-x | usr/local/www/index.php | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/priv.inc b/etc/inc/priv.inc index 863566f..ad00a3b 100644 --- a/etc/inc/priv.inc +++ b/etc/inc/priv.inc @@ -44,8 +44,6 @@ pfSense_MODULE: auth */ -require_once("util.inc"); - /* Load and process custom privs. */ run_plugins("/etc/inc/priv/"); @@ -63,7 +61,6 @@ function cmp_privkeys($a, $b) { } function sort_privs(& $privs) { - uksort($privs, "cmp_privkeys"); } diff --git a/etc/inc/priv/user.priv.inc b/etc/inc/priv/user.priv.inc index 11ba657..d97f690 100644 --- a/etc/inc/priv/user.priv.inc +++ b/etc/inc/priv/user.priv.inc @@ -1,5 +1,7 @@ <?php +global $priv_list; + /* * USER PRIVILEGE DEFINITIONS */ diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 35f5d07..4c05a10 100755 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -49,8 +49,9 @@ ob_start(null, "100000"); ## Load Essential Includes - require("priv.inc"); require_once('guiconfig.inc'); + require("priv.defs.inc"); + require("priv.inc"); require_once('notices.inc'); if ($_POST && $_POST['submit']) { |
