diff --git a/src/etc/rc.carpbackup b/src/etc/rc.carpbackup index 36cf6a2a9..4fc8b99b2 100755 --- a/src/etc/rc.carpbackup +++ b/src/etc/rc.carpbackup @@ -33,10 +33,7 @@ require_once("notices.inc"); require_once("openvpn.inc"); require_once("interfaces.inc"); -if (isset($_GET)) - $argument = $_GET['interface']; -else - $argument = str_replace("\n", "", $argv[1]); +$argument = str_replace("\n", "", $argv[1]); if (!strstr($argument, "@")) log_error("Carp MASTER event triggered from wrong source {$argument}"); diff --git a/src/etc/rc.carpmaster b/src/etc/rc.carpmaster index 2fb88f77a..3d49a2dcb 100755 --- a/src/etc/rc.carpmaster +++ b/src/etc/rc.carpmaster @@ -33,10 +33,7 @@ require_once("notices.inc"); require_once("openvpn.inc"); require_once("interfaces.inc"); -if (isset($_GET)) - $argument = $_GET['interface']; -else - $argument = str_replace("\n", "", $argv[1]); +$argument = str_replace("\n", "", $argv[1]); if (!strstr($argument, "@")) log_error("Carp MASTER event triggered from wrong source {$argument}"); diff --git a/src/etc/rc.dyndns.update b/src/etc/rc.dyndns.update index 9d5e94983..753b03bb7 100755 --- a/src/etc/rc.dyndns.update +++ b/src/etc/rc.dyndns.update @@ -35,10 +35,7 @@ require_once("shaper.inc"); /* Interface IP address has changed */ -if (isset($_GET)) - $argument = $_GET['dyndns']; -else - $argument = trim($argv[1], " \n"); +$argument = trim($argv[1], " \n"); if(empty($argument) || $argument == "all") { services_dyndns_configure(); diff --git a/src/etc/rc.interfaces_wan_configure b/src/etc/rc.interfaces_wan_configure index 006450e44..34b0acc42 100755 --- a/src/etc/rc.interfaces_wan_configure +++ b/src/etc/rc.interfaces_wan_configure @@ -32,10 +32,7 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); -if (isset($_GET)) - $argument = $_GET['interface']; -else - $argument = str_replace("\n", "", $argv[1]); +$argument = str_replace("\n", "", $argv[1]); if (empty($argument)) interface_configure("wan"); else { diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip index 67f30a84c..b72497525 100755 --- a/src/etc/rc.newwanip +++ b/src/etc/rc.newwanip @@ -56,10 +56,7 @@ function restart_packages() { } /* Interface IP address has changed */ -if (isset($_GET['interface'])) - $argument = $_GET['interface']; -else - $argument = str_replace("\n", "", $argv[1]); +$argument = str_replace("\n", "", $argv[1]); log_error("rc.newwanip: Informational is starting {$argument}."); diff --git a/src/etc/rc.openvpn b/src/etc/rc.openvpn index 327896bdc..5fde70893 100755 --- a/src/etc/rc.openvpn +++ b/src/etc/rc.openvpn @@ -70,10 +70,7 @@ if (file_exists('/var/run/booting')) { } /* Input argument is a comma-separated list of gateway names, blank or "all". */ -if (isset($_GET)) - $argument = $_GET['interface']; -else - $argument = trim($argv[1], " \n"); +$argument = trim($argv[1], " \n"); if(is_array($config['openvpn']['openvpn-server']) || is_array($config['openvpn']['openvpn-client'])) { if (empty($argument) || $argument == "all") {