Commit bb211655 authored by Franco Fichtner's avatar Franco Fichtner

www: filter_configure() has no return value

parent 23beb4b9
......@@ -192,16 +192,10 @@ if ($_POST) {
}
write_config();
$savemsg = get_std_save_message();
$retval = 0;
system_resolvconf_generate(true);
$retval = filter_configure();
if (stristr($retval, "error") <> true) {
$savemsg = get_std_save_message(gettext($retval));
} else {
$savemsg = gettext($retval);
}
filter_configure();
activate_powerd();
load_crypto();
load_thermal_hardware();
......
......@@ -107,7 +107,6 @@ if (isset($_POST) && count($_POST) > 0) {
unset($config['system']['disablevlanhwfilter']);
}
// save when no errors are found
if (count($input_errors) == 0) {
setup_polling();
if (isset($config['system']['sharednet'])) {
......@@ -117,18 +116,11 @@ if (isset($_POST) && count($_POST) > 0) {
}
setup_microcode();
// Write out configuration (config.xml)
write_config();
$savemsg = get_std_save_message();
// Set preferred protocol
prefer_ipv4_or_ipv6();
$retval = filter_configure();
if (stristr($retval, "error") <> true) {
$savemsg = get_std_save_message(gettext($retval));
} else {
$savemsg = gettext($retval);
}
filter_configure();
}
}
......
......@@ -98,12 +98,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
write_config();
$retval = filter_configure();
if (stristr($retval, "error") <> true) {
$savemsg = get_std_save_message(gettext($retval));
} else {
$savemsg = gettext($retval);
}
$savemsg = get_std_save_message();
filter_configure();
vpn_ipsec_configure();
}
......
......@@ -43,7 +43,7 @@ if (!is_array($config['pppoes']['pppoe'])) {
$a_pppoes = &$config['pppoes']['pppoe'];
if ($_POST) {
$pconfig = $_POST;
$pconfig = $_POST;
if ($_POST['apply']) {
if (file_exists('/tmp/.vpn_pppoe.apply')) {
......@@ -61,12 +61,12 @@ if ($_POST) {
}
}
}
@unlink('/tmp/.vpn_pppoe.apply');
@unlink('/tmp/.vpn_pppoe.apply');
}
$retval = 0;
$retval |= filter_configure();
$savemsg = get_std_save_message();
clear_subsystem_dirty('vpnpppoe');
filter_configure();
$savemsg = get_std_save_message();
clear_subsystem_dirty('vpnpppoe');
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment