summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/authgui.inc4
-rw-r--r--etc/inc/util.inc23
-rwxr-xr-xusr/local/www/guiconfig.inc17
-rwxr-xr-xusr/local/www/head.inc20
-rwxr-xr-xusr/local/www/progress.php5
5 files changed, 28 insertions, 41 deletions
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc
index 8c9e3fa..e950345 100644
--- a/etc/inc/authgui.inc
+++ b/etc/inc/authgui.inc
@@ -92,7 +92,7 @@ if (!$_SESSION['Post_Login']) {
*/
function display_error_form($http_code, $desc) {
global $config, $g;
- $g['theme'] = $config['theme'];
+ $g['theme'] = get_current_theme();
if(isAjax()) {
echo "Error: {$http_code} Description: {$desc}";
return;
@@ -150,7 +150,7 @@ function display_error_form($http_code, $desc) {
function display_login_form() {
require_once("globals.inc");
global $config, $g;
- $g['theme'] = $config['theme'];
+ $g['theme'] = get_current_theme();
unset($input_errors);
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index fcfc21e..0f8d78a 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -1541,4 +1541,27 @@ function get_staticroutes($returnsubnetsonly = false) {
return $allstaticroutes;
}
}
+
+function get_current_theme() {
+ global $config, $g;
+ /*
+ * if user has selected a custom template, use it.
+ * otherwise default to pfsense tempalte
+ */
+ if (($g["disablethemeselection"] === true) && !empty($g["default_theme"]) && (is_dir($g["www_path"].'/themes/'.$g["default_theme"])))
+ $theme = $g["default_theme"];
+ elseif($config['theme'] <> "" && (is_dir($g["www_path"].'/themes/'.$config['theme'])))
+ $theme = $config['theme'];
+ else
+ $theme = "pfsense";
+ /*
+ * If this device is an apple ipod/iphone
+ * switch the theme to one that works with it.
+ */
+ $lowres_ua = array("iPhone", "iPod", "iPad", "Android", "BlackBerry", "Opera Mini", "Opera Mobi", "PlayBook");
+ foreach($lowres_ua as $useragent)
+ if(strstr($_SERVER['HTTP_USER_AGENT'], $useragent))
+ $theme = (empty($g['theme_lowres']) && (is_dir($g["www_path"].'/themes/'.$g['theme_lowres']))) ? "pfsense" : $g['theme_lowres'];
+ return $theme;
+}
?>
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 51cb475..1241fd2 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -62,23 +62,8 @@ foreach (scandir("/usr/local/www/classes/") as $file) {
require_once("classes/{$file}");
}
}
-/*
- * if user has selected a custom template, use it.
- * otherwise default to pfsense template
- */
-if($config['theme'] <> "")
- $g['theme'] = $config['theme'];
-else
- $g['theme'] = "pfsense";
-/*
- * If this device is an apple ipod/iphone
- * switch the theme to one that works with it.
- */
-$apple_ua = array("iPhone","iPod", "iPad");
-foreach($apple_ua as $useragent)
- if(strstr($_SERVER['HTTP_USER_AGENT'], $useragent))
- $g['theme'] = "pfsense";
+$g['theme'] = get_current_theme();
/* used by progress bar */
$lastseen = "-1";
diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc
index 69e2019..e4e9b5e 100755
--- a/usr/local/www/head.inc
+++ b/usr/local/www/head.inc
@@ -3,25 +3,7 @@
pfSense_MODULE: header
*/
-/*
- * if user has selected a custom template, use it.
- * otherwise default to pfsense tempalte
- */
-if (($g["disablethemeselection"] === true) && !empty($g["default_theme"]) && (is_dir($g["www_path"].'/themes/'.$g["default_theme"])))
- $g['theme'] = $g["default_theme"];
-elseif($config['theme'] <> "" && (is_dir($g["www_path"].'/themes/'.$config['theme'])))
- $g['theme'] = $config['theme'];
-else
- $g['theme'] = "pfsense";
-
-/*
- * If this device is an apple ipod/iphone
- * switch the theme to one that works with it.
- */
-$lowres_ua = array("iPhone", "iPod", "iPad", "Android", "BlackBerry", "Opera Mini", "Opera Mobi");
-foreach($lowres_ua as $useragent)
- if(strstr($_SERVER['HTTP_USER_AGENT'], $useragent))
- $g['theme'] = empty($g['theme_lowres']) ? "pfsense" : $g['theme_lowres'];
+$g['theme'] = get_current_theme();
$pagetitle = gentitle( $pgtitle );
diff --git a/usr/local/www/progress.php b/usr/local/www/progress.php
index 0a6b50d..f222215 100755
--- a/usr/local/www/progress.php
+++ b/usr/local/www/progress.php
@@ -4,10 +4,7 @@
include("guiconfig.inc");
-if($config['theme'] <> "")
- $g['theme'] = $config['theme'];
-else
- $g['theme'] = "pfsense";
+$g['theme'] = get_current_theme();
$url = 'progress.php?UPLOAD_IDENTIFIER='. $_GET["UPLOAD_IDENTIFIER"] .'&e=1';
OpenPOWER on IntegriCloud