summaryrefslogtreecommitdiffstats
path: root/usr/local/www
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2012-11-02 10:47:50 -0400
committerjim-p <jimp@pfsense.org>2012-11-02 10:50:35 -0400
commit1e1e1ec8b1bf4c7bc0737c1caa82ff4f0a6a922e (patch)
tree36efab59fa4a7d2f899c7159d76121bebb737767 /usr/local/www
parent158f0e7de9c2b4bfb90b7f535e219a144360a51a (diff)
downloadpfsense-1e1e1ec8b1bf4c7bc0737c1caa82ff4f0a6a922e.zip
pfsense-1e1e1ec8b1bf4c7bc0737c1caa82ff4f0a6a922e.tar.gz
Make a function to get the current theme and use it everywhere rather than duplicating code or missing functions. (Fixes forced themes using the wrong theme for login screen)
Diffstat (limited to 'usr/local/www')
-rwxr-xr-xusr/local/www/guiconfig.inc17
-rwxr-xr-xusr/local/www/head.inc20
-rwxr-xr-xusr/local/www/progress.php5
3 files changed, 3 insertions, 39 deletions
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index c8962c8..68d0a02 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();
/* Set the default interface language */
if($config['system']['language'] <> "") {
diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc
index 5063728..c8454a6 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", "PlayBook");
-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