diff options
| -rw-r--r-- | etc/inc/functions.inc | 31 | ||||
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 31 |
2 files changed, 31 insertions, 31 deletions
diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc index 38bbd48..a9ecbea 100644 --- a/etc/inc/functions.inc +++ b/etc/inc/functions.inc @@ -69,35 +69,6 @@ if(!function_exists("pfSenseHeader")) { } /* END compatibility goo with HEAD */ -if(!function_exists("outputJavaScriptFileInline")) { - // Return inline javascript file or CSS to minimizie - // request count going back to server. - function outputJavaScriptFileInline($javascript) { - if(file_exists($javascript)) { - echo "<script type=\"text/javascript\">"; - include($javascript); - echo "</script>"; - } else { - echo "<p/>ERROR! COULD NOT LOCATE $javascript"; - echo "<p/>Please contact webmaster."; - exit; - } - } -} - -if(!function_exists("outputCSSFileInline")) { - function outputCSSFileInline($css) { - if(file_exists($css)) { - echo "<style type=\"text/css\">"; - include($css); - echo "</style>"; - } else { - echo "<p/>ERROR! COULD NOT LOCATE $css"; - echo "<p/>Please contact webmaster."; - exit; - } - } -} /* include all configuration functions */ require_once("auth.inc"); require_once("captiveportal.inc"); @@ -115,4 +86,4 @@ require_once("gwlb.inc"); require_once("notices.inc"); require_once("cmd_chain.inc"); -?> +?>
\ No newline at end of file diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index acb3c1f..c76fdc4 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -797,4 +797,33 @@ function display_widget_tabs(& $tab_array) { echo "</div>"; } -?> + +// Return inline javascript file or CSS to minimizie +// request count going back to server. +function outputJavaScriptFileInline($javascript) { + if(file_exists($javascript)) { + echo "<script type=\"text/javascript\">"; + include($javascript); + echo "</script>"; + } else { + echo "<p/>ERROR! COULD NOT LOCATE $javascript"; + echo "<p/>Please contact webmaster."; + exit; + } +} + + +function outputCSSFileInline($css) { + if(file_exists($css)) { + echo "<style type=\"text/css\">"; + include($css); + echo "</style>"; + } else { + echo "<p/>ERROR! COULD NOT LOCATE $css"; + echo "<p/>Please contact webmaster."; + exit; + } +} + + +?>
\ No newline at end of file |
