summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-05-21 22:20:44 -0400
committerScott Ullrich <sullrich@pfsense.org>2010-05-21 22:20:44 -0400
commit38080cc14c677802493b3a7670498dca8a5e851f (patch)
tree5d7be138b5631faa9800580923b199b709cfebfa
parent7a7e94a7be45209c9043678e292e7b7873d0a5a4 (diff)
downloadpfsense-38080cc14c677802493b3a7670498dca8a5e851f.zip
pfsense-38080cc14c677802493b3a7670498dca8a5e851f.tar.gz
Move get_include_contents function to pfsense-utils.inc
-rw-r--r--etc/inc/pfsense-utils.inc14
-rwxr-xr-xusr/local/captiveportal/index.php10
2 files changed, 13 insertions, 11 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 703d421..0b8317a 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -2039,4 +2039,16 @@ function nanobsd_detect_slice_info() {
$COMPLETE_BOOT_PATH="{$BOOT_DRIVE}s{$OLDSLICE}";
$BOOTFLASH="{$BOOT_DRIVE}s{$OLDSLICE}";
}
-?>
+
+function get_include_contents($filename) {
+ if (is_file($filename)) {
+ ob_start();
+ include $filename;
+ $contents = ob_get_contents();
+ ob_end_clean();
+ return $contents;
+ }
+ return false;
+}
+
+?> \ No newline at end of file
diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php
index 41ebc9c..4908371 100755
--- a/usr/local/captiveportal/index.php
+++ b/usr/local/captiveportal/index.php
@@ -228,16 +228,6 @@ function portal_reply_page($redirurl, $type = null, $message = null, $clientmac
echo $htmltext;
}
-function get_include_contents($filename) {
- if (is_file($filename)) {
- ob_start();
- include $filename;
- $contents = ob_get_contents();
- ob_end_clean();
- return $contents;
- }
- return false;
-}
function portal_mac_radius($clientmac,$clientip) {
global $config ;
OpenPOWER on IntegriCloud