diff options
| author | Phil Davis <phil.davis@inf.org> | 2016-06-28 09:01:31 +0930 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-06-28 22:01:42 -0500 |
| commit | 6dfb6b27d8320947fb07865ae5e2ebfa17c1e3fc (patch) | |
| tree | 7d391fe718cb04ec61d0593c2568e87d5ebee1cb /src/etc/inc/priv.inc | |
| parent | e8019bcde8dc8db6349f93b963d41172a60f06f8 (diff) | |
| download | pfsense-6dfb6b27d8320947fb07865ae5e2ebfa17c1e3fc.zip pfsense-6dfb6b27d8320947fb07865ae5e2ebfa17c1e3fc.tar.gz | |
Update include() to include_once()
For safety, use include_once() when including various "side" files.
There are a couple of instances of include("guiconfig,inc") that I
changes to use require_once() to be consistent with everywhere else.
The remaining cases of include() are just (hundreds of) head.inc and
footer.inc - those are only at the start/end of the ordinary top-level
interactive PHP files. There is no nested interaction of those to think
about, so that should be fine.
Diffstat (limited to 'src/etc/inc/priv.inc')
| -rw-r--r-- | src/etc/inc/priv.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/priv.inc b/src/etc/inc/priv.inc index 6315f72..b0fcea0 100644 --- a/src/etc/inc/priv.inc +++ b/src/etc/inc/priv.inc @@ -88,14 +88,14 @@ function get_priv_files($directory) { $dir_array = get_priv_files("/etc/inc/priv"); foreach ($dir_array as $file) { if (!is_dir("/etc/inc/priv/{$file}") && stristr($file, ".inc")) { - include("/etc/inc/priv/{$file}"); + include_once("/etc/inc/priv/{$file}"); } } if (is_dir("/usr/local/pkg/priv")) { $dir_array = get_priv_files("/usr/local/pkg/priv"); foreach ($dir_array as $file) { if (!is_dir("/usr/local/pkg/priv/{$file}") && stristr($file, ".inc")) { - include("/usr/local/pkg/priv/{$file}"); + include_once("/usr/local/pkg/priv/{$file}"); } } } |
