From 0ff214f27d38d8f867b4665d9e61d080da03d6f4 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 17 Jan 2013 09:31:51 -0200 Subject: [PATCH] Preserve "Idle timeout" parameter on interfaces gui. It fixes a problem pointed out on ticket #2641 --- etc/inc/pfsense-utils.inc | 12 ++++++++++++ usr/local/www/interfaces.php | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 36d04feae7..d63dfd451d 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1043,6 +1043,18 @@ function setup_serial_port($when="save", $path="") { return; } +function read_loader_conf($path = "") { + $loader_conf_file = "{$path}/boot/loader.conf"; + $loader_conf = file_get_contents($loader_conf_file); + $result = array(); + + foreach (explode("\n", $loader_conf) as $line) { + } +} + +function write_loader_conf($loader_conf, $path = "") { +} + function print_value_list($list, $count = 10, $separator = ",") { $list = implode($separator, array_slice($list, 0, $count)); if(count($list) < $count) { diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index a297cb85ad..efed8d256b 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -764,7 +764,7 @@ if ($_POST['apply']) { else $a_ppps[$pppid]['provider'] = true; $a_ppps[$pppid]['ondemand'] = $_POST['pppoe_dialondemand'] ? true : false; - if (!empty($_POST['idletimeout'])) + if (!empty($_POST['pppoe_idletimeout'])) $a_ppps[$pppid]['idletimeout'] = $_POST['pppoe_idletimeout']; else unset($a_ppps[$pppid]['idletimeout']); @@ -795,7 +795,7 @@ if ($_POST['apply']) { $a_ppps[$pppid]['subnet'] = $_POST['pptp_subnet']; $a_ppps[$pppid]['gateway'] = $_POST['pptp_remote']; $a_ppps[$pppid]['ondemand'] = $_POST['pptp_dialondemand'] ? true : false; - if (!empty($_POST['idletimeout'])) + if (!empty($_POST['pptp_idletimeout'])) $a_ppps[$pppid]['idletimeout'] = $_POST['pptp_idletimeout']; else unset($a_ppps[$pppid]['idletimeout']);