From b3ac2871e242f57e66312cc1357c38f633868133 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Sat, 22 Jul 2017 17:03:19 +0200 Subject: [PATCH] php 7.1 style fixes for https://github.com/opnsense/core/issues/1733 --- dns/dyndns/src/www/services_dyndns.php | 5 +---- dns/dyndns/src/www/services_dyndns_edit.php | 5 +---- .../www/widgets/widgets/dyn_dns_status.widget.php | 6 +----- dns/rfc2136/src/www/services_rfc2136.php | 6 +----- dns/rfc2136/src/www/services_rfc2136_edit.php | 5 +---- .../src/www/widgets/widgets/rfc2136.widget.php | 6 +----- net/igmp-proxy/src/www/services_igmpproxy.php | 5 +---- net/igmp-proxy/src/www/services_igmpproxy_edit.php | 5 +---- net/l2tp/src/www/vpn_l2tp.php | 2 +- net/l2tp/src/www/vpn_l2tp_users.php | 5 +---- net/l2tp/src/www/vpn_l2tp_users_edit.php | 5 +---- net/pppoe/src/www/vpn_pppoe.php | 6 +----- net/pppoe/src/www/vpn_pppoe_edit.php | 6 +----- net/pptp/src/www/vpn_pptp.php | 5 +---- net/pptp/src/www/vpn_pptp_users.php | 5 +---- net/pptp/src/www/vpn_pptp_users_edit.php | 5 +---- net/relayd/src/www/load_balancer_monitor.php | 5 +---- net/relayd/src/www/load_balancer_monitor_edit.php | 5 +---- net/relayd/src/www/load_balancer_pool.php | 5 +---- net/relayd/src/www/load_balancer_pool_edit.php | 5 +---- net/relayd/src/www/load_balancer_virtual_server.php | 5 +---- .../src/www/load_balancer_virtual_server_edit.php | 8 +------- net/relayd/src/www/status_lb_pool.php | 9 +-------- net/relayd/src/www/status_lb_vs.php | 12 ++---------- .../widgets/widgets/load_balancer_status.widget.php | 13 ++----------- net/wol/src/www/services_wol.php | 6 +----- net/wol/src/www/services_wol_edit.php | 6 +----- 27 files changed, 29 insertions(+), 132 deletions(-) diff --git a/dns/dyndns/src/www/services_dyndns.php b/dns/dyndns/src/www/services_dyndns.php index 9d3b9a2c6..86869fa4e 100644 --- a/dns/dyndns/src/www/services_dyndns.php +++ b/dns/dyndns/src/www/services_dyndns.php @@ -33,10 +33,7 @@ require_once("services.inc"); require_once("system.inc"); require_once("plugins.inc.d/dyndns.inc"); -if (empty($config['dyndnses']['dyndns']) || !isset($config['dyndnses']['dyndns'])) { - $config['dyndnses']['dyndns'] = array(); -} -$a_dyndns = &$config['dyndnses']['dyndns']; +$a_dyndns = &config_read_array('dyndnses', 'dyndns'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { if (isset($_POST['act']) && $_POST['act'] == "del" && isset($_POST['id'])) { diff --git a/dns/dyndns/src/www/services_dyndns_edit.php b/dns/dyndns/src/www/services_dyndns_edit.php index f3dd6bf14..d39d45faf 100644 --- a/dns/dyndns/src/www/services_dyndns_edit.php +++ b/dns/dyndns/src/www/services_dyndns_edit.php @@ -45,10 +45,7 @@ function is_dyndns_username($uname) } } -if (!isset($config['dyndnses']['dyndns'])) { - $config['dyndnses']['dyndns'] = array(); -} -$a_dyndns = &$config['dyndnses']['dyndns']; +$a_dyndns = &config_read_array('dyndnses', 'dyndns'); if ($_SERVER['REQUEST_METHOD'] === 'GET') { if (isset($_GET['id']) && !empty($a_dyndns[$_GET['id']])) { diff --git a/dns/dyndns/src/www/widgets/widgets/dyn_dns_status.widget.php b/dns/dyndns/src/www/widgets/widgets/dyn_dns_status.widget.php index 5cad1f5bf..0cd6d3105 100644 --- a/dns/dyndns/src/www/widgets/widgets/dyn_dns_status.widget.php +++ b/dns/dyndns/src/www/widgets/widgets/dyn_dns_status.widget.php @@ -34,11 +34,7 @@ require_once("services.inc"); require_once("interfaces.inc"); require_once("plugins.inc.d/dyndns.inc"); -if (!isset($config['dyndnses']['dyndns'])) { - $config['dyndnses']['dyndns'] = array(); -} - -$a_dyndns = &$config['dyndnses']['dyndns']; +$a_dyndns = &config_read_array('dyndnses', 'dyndns'); if (!empty($_REQUEST['getdyndnsstatus'])) { $first_entry = true; diff --git a/dns/rfc2136/src/www/services_rfc2136.php b/dns/rfc2136/src/www/services_rfc2136.php index f0587da89..f08c1b3ab 100644 --- a/dns/rfc2136/src/www/services_rfc2136.php +++ b/dns/rfc2136/src/www/services_rfc2136.php @@ -33,11 +33,7 @@ require_once("services.inc"); require_once("system.inc"); require_once("plugins.inc.d/rfc2136.inc"); -if (!isset($config['dnsupdates']['dnsupdate'])) { - $config['dnsupdates']['dnsupdate'] = array(); -} - -$a_rfc2136 = &$config['dnsupdates']['dnsupdate']; +$a_rfc2136 = &config_read_array('dnsupdates', 'dnsupdate'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { if (isset($_POST['act']) && $_POST['act'] == "del" && isset($_POST['id'])) { diff --git a/dns/rfc2136/src/www/services_rfc2136_edit.php b/dns/rfc2136/src/www/services_rfc2136_edit.php index 68fcf22a6..ae7f14213 100644 --- a/dns/rfc2136/src/www/services_rfc2136_edit.php +++ b/dns/rfc2136/src/www/services_rfc2136_edit.php @@ -33,10 +33,7 @@ require_once("system.inc"); require_once("interfaces.inc"); require_once("plugins.inc.d/rfc2136.inc"); -if (!isset($config['dnsupdates']['dnsupdate'])) { - $config['dnsupdates']['dnsupdate'] = array(); -} -$a_rfc2136 = &$config['dnsupdates']['dnsupdate']; +$a_rfc2136 = &config_read_array('dnsupdates', 'dnsupdate'); if ($_SERVER['REQUEST_METHOD'] === 'GET') { if (isset($_GET['id']) && !empty($a_rfc2136[$_GET['id']])) { diff --git a/dns/rfc2136/src/www/widgets/widgets/rfc2136.widget.php b/dns/rfc2136/src/www/widgets/widgets/rfc2136.widget.php index ef6962c8b..f8cd636a9 100644 --- a/dns/rfc2136/src/www/widgets/widgets/rfc2136.widget.php +++ b/dns/rfc2136/src/www/widgets/widgets/rfc2136.widget.php @@ -35,11 +35,7 @@ require_once("services.inc"); require_once("interfaces.inc"); require_once("plugins.inc.d/rfc2136.inc"); -if (!isset($config['dnsupdates']['dnsupdate'])) { - $config['dnsupdates']['dnsupdate'] = array(); -} - -$a_rfc2136 = &$config['dnsupdates']['dnsupdate']; +$a_rfc2136 = &config_read_array('dnsupdates', 'dnsupdate'); if (!empty($_REQUEST['getrfc2136status'])) { $first_entry = true; diff --git a/net/igmp-proxy/src/www/services_igmpproxy.php b/net/igmp-proxy/src/www/services_igmpproxy.php index 7c0361aed..0a5fdef5d 100644 --- a/net/igmp-proxy/src/www/services_igmpproxy.php +++ b/net/igmp-proxy/src/www/services_igmpproxy.php @@ -34,10 +34,7 @@ require_once("interfaces.inc"); require_once("services.inc"); require_once('plugins.inc.d/igmpproxy.inc'); -$a_igmpproxy = array(); -if (isset($config['igmpproxy']['igmpentry'])) { - $a_igmpproxy = &$config['igmpproxy']['igmpentry']; -} +$a_igmpproxy = &config_read_array('igmpproxy', 'igmpentry'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { if (isset($_POST['act']) && $_POST['act'] == "del") { diff --git a/net/igmp-proxy/src/www/services_igmpproxy_edit.php b/net/igmp-proxy/src/www/services_igmpproxy_edit.php index c1d4970cf..936304a1d 100644 --- a/net/igmp-proxy/src/www/services_igmpproxy_edit.php +++ b/net/igmp-proxy/src/www/services_igmpproxy_edit.php @@ -33,10 +33,7 @@ require_once("guiconfig.inc"); require_once("services.inc"); require_once('plugins.inc.d/igmpproxy.inc'); -if (!isset($config['igmpproxy']['igmpentry'])) { - $config['igmpproxy']['igmpentry'] = array(); -} -$a_igmpproxy = &$config['igmpproxy']['igmpentry']; +$a_igmpproxy = &config_read_array('igmpproxy', 'igmpentry'); if ($_SERVER['REQUEST_METHOD'] === 'GET') { if (isset($_GET['id']) && !empty($a_igmpproxy[$_GET['id']])) { diff --git a/net/l2tp/src/www/vpn_l2tp.php b/net/l2tp/src/www/vpn_l2tp.php index 05ffd0802..a7d947403 100644 --- a/net/l2tp/src/www/vpn_l2tp.php +++ b/net/l2tp/src/www/vpn_l2tp.php @@ -33,10 +33,10 @@ require_once("services.inc"); require_once("system.inc"); require_once("plugins.inc.d/if_l2tp.inc"); +$l2tpcfg = &config_read_array('l2tp'); if (!isset($config['l2tp']['radius']) || !is_array($config['l2tp']['radius'])) { $config['l2tp']['radius'] = array(); } -$l2tpcfg = &$config['l2tp']; if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig['remoteip'] = $l2tpcfg['remoteip']; diff --git a/net/l2tp/src/www/vpn_l2tp_users.php b/net/l2tp/src/www/vpn_l2tp_users.php index 2862ebac2..bde8ccd68 100644 --- a/net/l2tp/src/www/vpn_l2tp_users.php +++ b/net/l2tp/src/www/vpn_l2tp_users.php @@ -32,10 +32,7 @@ require_once("services.inc"); require_once("system.inc"); require_once("plugins.inc.d/if_l2tp.inc"); -if (!isset($config['l2tp']['user'])) { - $config['l2tp']['user'] = array(); -} -$a_secret = &$config['l2tp']['user']; +$a_secret = &config_read_array('l2tp', 'user'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { // delete entry diff --git a/net/l2tp/src/www/vpn_l2tp_users_edit.php b/net/l2tp/src/www/vpn_l2tp_users_edit.php index 783dcd214..a2ce5813b 100644 --- a/net/l2tp/src/www/vpn_l2tp_users_edit.php +++ b/net/l2tp/src/www/vpn_l2tp_users_edit.php @@ -48,10 +48,7 @@ require_once("services.inc"); require_once("system.inc"); require_once("plugins.inc.d/if_l2tp.inc"); -if (empty($config['l2tp']['user']) || !is_array($config['l2tp']['user'])) { - $config['l2tp']['user'] = array(); -} -$a_secret = &$config['l2tp']['user']; +$a_secret = &config_read_array('l2tp', 'user'); if ($_SERVER['REQUEST_METHOD'] === 'GET') { if (isset($_GET['id']) && !empty($a_secret[$_GET['id']])) { diff --git a/net/pppoe/src/www/vpn_pppoe.php b/net/pppoe/src/www/vpn_pppoe.php index 2add77a8e..02bc17145 100644 --- a/net/pppoe/src/www/vpn_pppoe.php +++ b/net/pppoe/src/www/vpn_pppoe.php @@ -32,11 +32,7 @@ require_once("filter.inc"); require_once("plugins.inc.d/if_pppoe.inc"); require_once("interfaces.inc"); -if (empty($config['pppoes']['pppoe']) || !is_array($config['pppoes']['pppoe'])) { - $config['pppoes'] = array(); - $config['pppoes']['pppoe'] = array(); -} -$a_pppoes = &$config['pppoes']['pppoe']; +$a_pppoes = &config_read_array('pppoes', 'pppoe'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { if (!empty($_POST['apply'])) { diff --git a/net/pppoe/src/www/vpn_pppoe_edit.php b/net/pppoe/src/www/vpn_pppoe_edit.php index 28a79dfc5..994a34fa8 100644 --- a/net/pppoe/src/www/vpn_pppoe_edit.php +++ b/net/pppoe/src/www/vpn_pppoe_edit.php @@ -50,11 +50,7 @@ function vpn_pppoe_get_id() return $vpnid; } -if (empty($config['pppoes']['pppoe']) || !is_array($config['pppoes']['pppoe'])) { - $config['pppoes'] = array(); - $config['pppoes']['pppoe'] = array(); -} -$a_pppoes = &$config['pppoes']['pppoe']; +$a_pppoes = &config_read_array('pppoes', 'pppoe'); $copy_fields = array('remoteip', 'localip', 'mode', 'interface', 'n_pppoe_units', 'pppoe_subnet', 'dns1', 'dns2', 'descr', 'pppoeid'); diff --git a/net/pptp/src/www/vpn_pptp.php b/net/pptp/src/www/vpn_pptp.php index 2ceba4c6e..74a16c0b1 100644 --- a/net/pptp/src/www/vpn_pptp.php +++ b/net/pptp/src/www/vpn_pptp.php @@ -34,10 +34,7 @@ require_once('services.inc'); require_once("system.inc"); require_once('plugins.inc.d/if_pptp.inc'); -if (!is_array($config['pptpd']['radius'])) { - $config['pptpd']['radius'] = array(); -} -$pptpcfg = &$config['pptpd']; +$pptpcfg = &config_read_array('pptpd'); if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig['remoteip'] = $pptpcfg['remoteip']; diff --git a/net/pptp/src/www/vpn_pptp_users.php b/net/pptp/src/www/vpn_pptp_users.php index d9b0534ee..bb7ff6fb1 100644 --- a/net/pptp/src/www/vpn_pptp_users.php +++ b/net/pptp/src/www/vpn_pptp_users.php @@ -32,10 +32,7 @@ require_once('services.inc'); require_once("system.inc"); require_once('plugins.inc.d/if_pptp.inc'); -if (!is_array($config['pptpd']['user'])) { - $config['pptpd']['user'] = array(); -} -$a_secret = &$config['pptpd']['user']; +$a_secret = &config_read_array('pptpd', 'user'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { // delete entry diff --git a/net/pptp/src/www/vpn_pptp_users_edit.php b/net/pptp/src/www/vpn_pptp_users_edit.php index ed43125af..9a4ecd6a6 100644 --- a/net/pptp/src/www/vpn_pptp_users_edit.php +++ b/net/pptp/src/www/vpn_pptp_users_edit.php @@ -48,10 +48,7 @@ require_once('services.inc'); require_once("system.inc"); require_once('plugins.inc.d/if_pptp.inc'); -if (!is_array($config['pptpd']['user'])) { - $config['pptpd']['user'] = array(); -} -$a_secret = &$config['pptpd']['user']; +$a_secret = &config_read_array('pptpd', 'user'); if ($_SERVER['REQUEST_METHOD'] === 'GET') { if (isset($_GET['id']) && !empty($a_secret[$_GET['id']])) { diff --git a/net/relayd/src/www/load_balancer_monitor.php b/net/relayd/src/www/load_balancer_monitor.php index 39ed042a3..807420f33 100644 --- a/net/relayd/src/www/load_balancer_monitor.php +++ b/net/relayd/src/www/load_balancer_monitor.php @@ -33,10 +33,7 @@ require_once("services.inc"); require_once("plugins.inc.d/relayd.inc"); require_once("interfaces.inc"); -if (empty($config['load_balancer']['monitor_type']) || !is_array($config['load_balancer']['monitor_type'])) { - $config['load_balancer']['monitor_type'] = array(); -} -$a_monitor = &$config['load_balancer']['monitor_type']; +$a_monitor = &config_read_array('load_balancer', 'monitor_type'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { if (isset($_POST['act']) && $_POST['act'] == "del") { diff --git a/net/relayd/src/www/load_balancer_monitor_edit.php b/net/relayd/src/www/load_balancer_monitor_edit.php index 09cd208dd..b608005cd 100644 --- a/net/relayd/src/www/load_balancer_monitor_edit.php +++ b/net/relayd/src/www/load_balancer_monitor_edit.php @@ -75,10 +75,7 @@ $rfc2616 = array( 505 => "505 HTTP Version Not Supported" ); -if (empty($config['load_balancer']['monitor_type']) || !is_array($config['load_balancer']['monitor_type'])) { - $config['load_balancer']['monitor_type'] = array(); -} -$a_monitor = &$config['load_balancer']['monitor_type']; +$a_monitor = &config_read_array('load_balancer', 'monitor_type'); if ($_SERVER['REQUEST_METHOD'] === 'GET') { diff --git a/net/relayd/src/www/load_balancer_pool.php b/net/relayd/src/www/load_balancer_pool.php index db5dc7386..1f74b75bf 100644 --- a/net/relayd/src/www/load_balancer_pool.php +++ b/net/relayd/src/www/load_balancer_pool.php @@ -33,10 +33,7 @@ require_once("services.inc"); require_once("plugins.inc.d/relayd.inc"); require_once("interfaces.inc"); -if (empty($config['load_balancer']['lbpool']) || !is_array($config['load_balancer']['lbpool'])) { - $config['load_balancer']['lbpool'] = array(); -} -$a_pool = &$config['load_balancer']['lbpool']; +$a_pool = &config_read_array('load_balancer', 'lbpool'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { if (isset($_POST['act']) && $_POST['act'] == "del") { diff --git a/net/relayd/src/www/load_balancer_pool_edit.php b/net/relayd/src/www/load_balancer_pool_edit.php index 035cf10c1..bb323e193 100644 --- a/net/relayd/src/www/load_balancer_pool_edit.php +++ b/net/relayd/src/www/load_balancer_pool_edit.php @@ -32,10 +32,7 @@ require_once("services.inc"); require_once("interfaces.inc"); -if (empty($config['load_balancer']['lbpool']) || !is_array($config['load_balancer']['lbpool'])) { - $config['load_balancer']['lbpool'] = array(); -} -$a_pool = &$config['load_balancer']['lbpool']; +$a_pool = &config_read_array('load_balancer', 'lbpool'); $copy_fields = array('name', 'mode', 'descr', 'port', 'retry', 'monitor', 'servers', 'serversdisabled'); diff --git a/net/relayd/src/www/load_balancer_virtual_server.php b/net/relayd/src/www/load_balancer_virtual_server.php index 68feb8586..abc5ee421 100644 --- a/net/relayd/src/www/load_balancer_virtual_server.php +++ b/net/relayd/src/www/load_balancer_virtual_server.php @@ -33,10 +33,7 @@ require_once("plugins.inc.d/relayd.inc"); require_once("services.inc"); require_once("interfaces.inc"); -if (empty($config['load_balancer']['virtual_server']) || !is_array($config['load_balancer']['virtual_server'])) { - $config['load_balancer']['virtual_server'] = array(); -} -$a_vs = &$config['load_balancer']['virtual_server']; +$a_vs = &config_read_array('load_balancer', 'virtual_server'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { if (isset($_POST['act']) && $_POST['act'] == "del") { diff --git a/net/relayd/src/www/load_balancer_virtual_server_edit.php b/net/relayd/src/www/load_balancer_virtual_server_edit.php index c6f88f5a8..36f5fce16 100644 --- a/net/relayd/src/www/load_balancer_virtual_server_edit.php +++ b/net/relayd/src/www/load_balancer_virtual_server_edit.php @@ -32,13 +32,7 @@ require_once("services.inc"); require_once("plugins.inc.d/relayd.inc"); require_once("interfaces.inc"); -if (empty($config['load_balancer']) || !is_array($config['load_balancer'])) { - $config['load_balancer'] = array(); -} -if (empty($config['load_balancer']['virtual_server']) || !is_array($config['load_balancer']['virtual_server'])) { - $config['load_balancer']['virtual_server'] = array(); -} -$a_vs = &$config['load_balancer']['virtual_server']; +$a_vs = &config_read_array('load_balancer', 'virtual_server'); $copy_fields=array('name', 'descr', 'poolname', 'port', 'sitedown', 'ipaddr', 'mode', 'relay_protocol', 'sessiontimeout'); diff --git a/net/relayd/src/www/status_lb_pool.php b/net/relayd/src/www/status_lb_pool.php index 7b7bbaed4..5e82ff741 100644 --- a/net/relayd/src/www/status_lb_pool.php +++ b/net/relayd/src/www/status_lb_pool.php @@ -33,14 +33,7 @@ require_once("plugins.inc.d/relayd.inc"); require_once("services.inc"); require_once("interfaces.inc"); -if (empty($config['load_balancer']) || !is_array($config['load_balancer'])) { - $config['load_balancer'] = array(); -} - -if (empty($config['load_balancer']['lbpool']) || !is_array($config['load_balancer']['lbpool'])) { - $config['load_balancer']['lbpool'] = array(); -} -$a_pool = &$config['load_balancer']['lbpool']; +$a_pool = &config_read_array('load_balancer', 'lbpool'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { diff --git a/net/relayd/src/www/status_lb_vs.php b/net/relayd/src/www/status_lb_vs.php index efa211e94..20c8a9a28 100644 --- a/net/relayd/src/www/status_lb_vs.php +++ b/net/relayd/src/www/status_lb_vs.php @@ -32,16 +32,8 @@ require_once("filter.inc"); require_once("services.inc"); require_once("plugins.inc.d/relayd.inc"); -if (empty($config['load_balancer']['lbpool']) || !is_array($config['load_balancer']['lbpool'])) { - $a_pool = array(); -} else { - $a_pool = &$config['load_balancer']['lbpool']; -} -if (empty($config['load_balancer']['virtual_server']) || !is_array($config['load_balancer']['virtual_server'])) { - $a_vs = array(); -} else { - $a_vs = &$config['load_balancer']['virtual_server']; -} +$a_pool = &config_read_array('load_balancer', 'lbpool'); +$a_vs = &config_read_array('load_balancer', 'virtual_server'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { if (!empty($_POST['apply'])) { diff --git a/net/relayd/src/www/widgets/widgets/load_balancer_status.widget.php b/net/relayd/src/www/widgets/widgets/load_balancer_status.widget.php index 16ff7274a..d3f82cfa9 100644 --- a/net/relayd/src/www/widgets/widgets/load_balancer_status.widget.php +++ b/net/relayd/src/www/widgets/widgets/load_balancer_status.widget.php @@ -38,17 +38,8 @@ require_once("plugins.inc.d/relayd.inc"); $now = time(); $year = date("Y"); -if (!is_array($config['load_balancer'])) { - $config['load_balancer'] = array(); -} -if (!is_array($config['load_balancer']['lbpool'])) { - $config['load_balancer']['lbpool'] = array(); -} -if (!is_array($config['load_balancer']['virtual_server'])) { - $config['load_balancer']['virtual_server'] = array(); -} -$a_vs = &$config['load_balancer']['virtual_server']; -$a_pool = &$config['load_balancer']['lbpool']; +$a_vs = &config_read_array('load_balancer', 'virtual_server'); +$a_pool = &config_read_array('load_balancer', 'lbpool'); $rdr_a = relayd_get_lb_redirects(); $relay_hosts = relayd_get_lb_summary(); diff --git a/net/wol/src/www/services_wol.php b/net/wol/src/www/services_wol.php index 64e782089..a8d0b09b1 100644 --- a/net/wol/src/www/services_wol.php +++ b/net/wol/src/www/services_wol.php @@ -30,11 +30,7 @@ require_once("guiconfig.inc"); require_once("interfaces.inc"); -if (empty($config['wol']['wolentry']) || !is_array($config['wol']['wolentry'])) { - $config['wol'] = array(); - $config['wol']['wolentry'] = array(); -} -$a_wol = &$config['wol']['wolentry']; +$a_wol = &config_read_array('wol', 'wolentry'); if ($_SERVER['REQUEST_METHOD'] === 'POST') { diff --git a/net/wol/src/www/services_wol_edit.php b/net/wol/src/www/services_wol_edit.php index a3cfa93b6..6394099f5 100644 --- a/net/wol/src/www/services_wol_edit.php +++ b/net/wol/src/www/services_wol_edit.php @@ -35,11 +35,7 @@ function wolcmp($a, $b) { } -if (empty($config['wol']['wolentry']) || !is_array($config['wol']['wolentry'])) { - $config['wol'] = array(); - $config['wol']['wolentry'] = array(); -} -$a_wol = &$config['wol']['wolentry']; +$a_wol = &config_read_array('wol', 'wolentry'); if ($_SERVER['REQUEST_METHOD'] === 'GET') { if (isset($_GET['id']) && !empty($a_wol[$_GET['id']])) {