diff options
| -rwxr-xr-x | usr/local/www/system.php | 33 | ||||
| -rwxr-xr-x | usr/local/www/system_advanced.php | 34 |
2 files changed, 32 insertions, 35 deletions
diff --git a/usr/local/www/system.php b/usr/local/www/system.php index 78d0675..624649a 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -46,6 +46,7 @@ $pconfig['webguiport'] = $config['system']['webgui']['port']; $pconfig['timezone'] = $config['system']['timezone']; $pconfig['timeupdateinterval'] = $config['system']['time-update-interval']; $pconfig['timeservers'] = $config['system']['timeservers']; +$pconfig['theme'] = $config['system']['theme']; if (!isset($pconfig['timeupdateinterval'])) $pconfig['timeupdateinterval'] = 300; @@ -122,6 +123,9 @@ if ($_POST) { update_if_changed("NTP servers", $config['system']['timeservers'], strtolower($_POST['timeservers'])); update_if_changed("NTP update interval", $config['system']['time-update-interval'], $_POST['timeupdateinterval']); + /* pfSense themes */ + update_if_changed("System Theme", $config['theme'], $_POST['theme']); + /* XXX - billm: these still need updating after figuring out how to check if they actually changed */ unset($config['system']['dnsserver']); if ($_POST['dns1']) @@ -269,7 +273,34 @@ include("head.inc"); hosts (only one required). Remember to set up at least one DNS server if you enter a host name here!</span></td> </tr> - <tr> + <tr> + <td colspan="2" class="list" height="12"> </td> + </tr> + <tr> + <td colspan="2" valign="top" class="listtopic">Theme</td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"> </td> + <td width="78%" class="vtable"> + <select name="theme"> +<?php + $files = return_dir_as_array("/usr/local/www/themes/"); + foreach($files as $f) { + if ( (substr($f, 0, 1) == "_") && !isset($config['system']['developer']) ) continue; + if($f == "CVS") continue; + $selected = ""; + if($f == $config['theme']) + $selected = " SELECTED"; + if($config['theme'] == "" and $f == "pfsense") + $selceted = " SELECTED"; + echo "\t\t\t\t\t"."<option{$selected}>{$f}</option>\n"; + } +?> + </select> + <strong>This will change the look and feel of pfSense</strong> + </td> + </tr> + <tr> <td width="22%" valign="top"> </td> <td width="78%"> <input name="Submit" type="submit" class="formbtn" value="Save"> </td> diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php index cfa5360..e193fac 100755 --- a/usr/local/www/system_advanced.php +++ b/usr/local/www/system_advanced.php @@ -46,7 +46,6 @@ $pconfig['noantilockout'] = isset($config['system']['webgui']['noantilockout']); $pconfig['filteringbridge_enable'] = isset($config['bridge']['filteringbridge']); $pconfig['tcpidletimeout'] = $config['filter']['tcpidletimeout']; $pconfig['maximumstates'] = $config['system']['maximumstates']; -$pconfig['theme'] = $config['system']['theme']; $pconfig['disablerendevouz'] = $config['system']['disablerendevouz']; $pconfig['enableserial'] = $config['system']['enableserial']; $pconfig['disablefirmwarecheck'] = isset($config['system']['disablefirmwarecheck']); @@ -202,9 +201,6 @@ if ($_POST) { $config['bridge']['filteringbridge'] = $_POST['filteringbridge_enable'] ? true : false; - /* pfSense themes */ - $config['theme'] = $_POST['theme']; - write_config(); $retval = 0; @@ -309,33 +305,6 @@ include("head.inc"); </td> </tr> <tr> - <td colspan="2" class="list" height="12"> </td> - </tr> - <tr> - <td colspan="2" valign="top" class="listtopic">Theme</td> - </tr> - <tr> - <td width="22%" valign="top" class="vncell"> </td> - <td width="78%" class="vtable"> - <select name="theme"> -<?php - $files = return_dir_as_array("/usr/local/www/themes/"); - foreach($files as $f) { - if ( (substr($f, 0, 1) == "_") && !isset($config['system']['developer']) ) continue; - if($f == "CVS") continue; - $selected = ""; - if($f == $config['theme']) - $selected = " SELECTED"; - if($config['theme'] == "" and $f == "pfsense") - $selceted = " SELECTED"; - echo "\t\t\t\t\t"."<option{$selected}>{$f}</option>\n"; - } -?> - </select> - <strong>This will change the look and feel of pfSense</strong> - </td> - </tr> - <tr> <td width="22%" valign="top"> </td> <td width="78%"> <input name="Submit" type="submit" class="formbtn" value="Save" onclick="enable_change(true)" /> @@ -696,9 +665,6 @@ if ($_POST) { $config['bridge']['filteringbridge'] = $_POST['filteringbridge_enable'] ? true : false; - /* pfSense themes */ - $config['theme'] = $_POST['theme']; - write_config(); $retval = 0; |
