13 changes: 2 additions & 11 deletions src/www/vpn_ipsec_mobile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,8 @@
require_once("services.inc");
require_once("plugins.inc.d/ipsec.inc");

if (!isset($config['ipsec']) || !is_array($config['ipsec'])) {
$config['ipsec'] = array();
}

if (!isset($config['ipsec']['phase1'])) {
$config['ipsec']['phase1'] = array();
}

if (!isset($config['ipsec']['client'])) {
$config['ipsec']['client'] = array();
}
config_read_array('ipsec', 'client');
config_read_array('ipsec', 'phase1');

// define formfields
$form_fields = "user_source,group_source,pool_address,pool_netbits,net_list
Expand Down
13 changes: 2 additions & 11 deletions src/www/vpn_ipsec_phase2.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,8 @@ function getIndexByUniqueId($uniqid)
return $p2index;
}

if (!isset($config['ipsec']) || !is_array($config['ipsec'])) {
$config['ipsec'] = array();
}

if (!isset($config['ipsec']['client'])) {
$config['ipsec']['client'] = array();
}

if (!isset($config['ipsec']['phase2'])) {
$config['ipsec']['phase2'] = array();
}
config_read_array('ipsec', 'client');
config_read_array('ipsec', 'phase2');

if ($_SERVER['REQUEST_METHOD'] === 'GET') {
// lookup p2index
Expand Down
4 changes: 1 addition & 3 deletions src/www/vpn_ipsec_settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
require_once("services.inc");
require_once("interfaces.inc");

if (!isset($config['ipsec']) || !is_array($config['ipsec'])) {
$config['ipsec'] = array();
}
config_read_array('ipsec');

if ($_SERVER['REQUEST_METHOD'] === 'GET') {
// fetch form data
Expand Down
4 changes: 1 addition & 3 deletions src/www/widgets/widgets/carp_status.widget.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
require_once("guiconfig.inc");
require_once("interfaces.inc");

if (!isset($config['virtualip']['vip'])) {
$config['virtualip']['vip'] = array();
}
config_read_array('virtualip', 'vip');

?>
<table class="table table-striped table-condensed">
Expand Down
6 changes: 2 additions & 4 deletions src/www/widgets/widgets/thermal_sensors.widget.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@

require_once("guiconfig.inc");

config_read_array('widgets', 'thermal_sensors_widget');

function validate_temp_value($value)
{
if (is_numeric($value) && (int)$value == $value && $value >= 0 and $value <= 100) {
Expand All @@ -45,10 +47,6 @@ function validate_temp_value($value)
$pconfig[$fieldname] = !empty($config['widgets']['thermal_sensors_widget'][$fieldname]) ? $config['widgets']['thermal_sensors_widget'][$fieldname] : $defaultValue;
}
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
// save widget config
if (empty($config['widgets']['thermal_sensors_widget']) || !is_array($config['widgets']['thermal_sensors_widget'])) {
$config['widgets']['thermal_sensors_widget'] = array();
}
foreach ($fieldnames as $fieldname) {
$defaultValue = strpos($fieldname, 'critical') !== false ? 80 : 70;
$newValue = !empty($_POST[$fieldname]) ? $_POST[$fieldname] : "";
Expand Down