mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
* Move the interface detection of which interface is configured to the top so the pppoe reset function work correctly.
* Check is the array isset before referenceing it.
This commit is contained in:
parent
7a6148e4ef
commit
67473d80ef
@ -38,6 +38,15 @@
|
||||
##|*MATCH=interfaces_wan.php*
|
||||
##|-PRIV
|
||||
|
||||
unset($if);
|
||||
if ($_GET['if'])
|
||||
$if = $_GET['if'];
|
||||
else if ($_POST['if'])
|
||||
$if = $_POST['if'];
|
||||
|
||||
if (!$if)
|
||||
$if = "wan";
|
||||
|
||||
|
||||
define("CRON_MONTHLY_PATTERN", "0 0 1 * *");
|
||||
define("CRON_WEEKLY_PATTERN", "0 0 * * 0");
|
||||
@ -80,15 +89,6 @@ function remove_bad_chars($string) {
|
||||
|
||||
require("guiconfig.inc");
|
||||
|
||||
unset($if);
|
||||
if ($_GET['if'])
|
||||
$if = $_GET['if'];
|
||||
else if ($_POST['if'])
|
||||
$if = $_POST['if'];
|
||||
|
||||
if (!$if)
|
||||
$if = "wan";
|
||||
|
||||
if (!is_array($config['gateways']['gateway_item']))
|
||||
$config['gateways']['gateway_item'] = array();
|
||||
$a_gateways = &$config['gateways']['gateway_item'];
|
||||
@ -363,7 +363,8 @@ n already exists.";
|
||||
unset($wancfg['provider']);
|
||||
unset($wancfg['ondemand']);
|
||||
unset($wancfg['timeout']);
|
||||
unset($wancfg['pppoe']['pppoe-reset-type']);
|
||||
if ($wancfg['pppoe']['pppoe-reset-type'])
|
||||
unset($wancfg['pppoe']['pppoe-reset-type']);
|
||||
unset($wancfg['local']);
|
||||
unset($wancfg['subnet']);
|
||||
unset($wancfg['remote']);
|
||||
|
||||
@ -38,6 +38,15 @@
|
||||
##|*MATCH=interfaces_wan.php*
|
||||
##|-PRIV
|
||||
|
||||
unset($if);
|
||||
if ($_GET['if'])
|
||||
$if = $_GET['if'];
|
||||
else if ($_POST['if'])
|
||||
$if = $_POST['if'];
|
||||
|
||||
if (!$if)
|
||||
$if = "wan";
|
||||
|
||||
|
||||
define("CRON_MONTHLY_PATTERN", "0 0 1 * *");
|
||||
define("CRON_WEEKLY_PATTERN", "0 0 * * 0");
|
||||
@ -80,15 +89,6 @@ function remove_bad_chars($string) {
|
||||
|
||||
require("guiconfig.inc");
|
||||
|
||||
unset($if);
|
||||
if ($_GET['if'])
|
||||
$if = $_GET['if'];
|
||||
else if ($_POST['if'])
|
||||
$if = $_POST['if'];
|
||||
|
||||
if (!$if)
|
||||
$if = "wan";
|
||||
|
||||
if (!is_array($config['gateways']['gateway_item']))
|
||||
$config['gateways']['gateway_item'] = array();
|
||||
$a_gateways = &$config['gateways']['gateway_item'];
|
||||
@ -363,7 +363,8 @@ n already exists.";
|
||||
unset($wancfg['provider']);
|
||||
unset($wancfg['ondemand']);
|
||||
unset($wancfg['timeout']);
|
||||
unset($wancfg['pppoe']['pppoe-reset-type']);
|
||||
if ($wancfg['pppoe']['pppoe-reset-type'])
|
||||
unset($wancfg['pppoe']['pppoe-reset-type']);
|
||||
unset($wancfg['local']);
|
||||
unset($wancfg['subnet']);
|
||||
unset($wancfg['remote']);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user