Commit b3aa303c authored by Ad Schellevis's avatar Ad Schellevis

some more php-fpm issues

parent adacd4b6
...@@ -33,10 +33,7 @@ require_once("notices.inc"); ...@@ -33,10 +33,7 @@ require_once("notices.inc");
require_once("openvpn.inc"); require_once("openvpn.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
if (isset($_GET)) $argument = str_replace("\n", "", $argv[1]);
$argument = $_GET['interface'];
else
$argument = str_replace("\n", "", $argv[1]);
if (!strstr($argument, "@")) if (!strstr($argument, "@"))
log_error("Carp MASTER event triggered from wrong source {$argument}"); log_error("Carp MASTER event triggered from wrong source {$argument}");
......
...@@ -33,10 +33,7 @@ require_once("notices.inc"); ...@@ -33,10 +33,7 @@ require_once("notices.inc");
require_once("openvpn.inc"); require_once("openvpn.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
if (isset($_GET)) $argument = str_replace("\n", "", $argv[1]);
$argument = $_GET['interface'];
else
$argument = str_replace("\n", "", $argv[1]);
if (!strstr($argument, "@")) if (!strstr($argument, "@"))
log_error("Carp MASTER event triggered from wrong source {$argument}"); log_error("Carp MASTER event triggered from wrong source {$argument}");
......
...@@ -35,10 +35,7 @@ require_once("shaper.inc"); ...@@ -35,10 +35,7 @@ require_once("shaper.inc");
/* Interface IP address has changed */ /* Interface IP address has changed */
if (isset($_GET)) $argument = trim($argv[1], " \n");
$argument = $_GET['dyndns'];
else
$argument = trim($argv[1], " \n");
if(empty($argument) || $argument == "all") { if(empty($argument) || $argument == "all") {
services_dyndns_configure(); services_dyndns_configure();
......
...@@ -32,10 +32,7 @@ require_once("functions.inc"); ...@@ -32,10 +32,7 @@ require_once("functions.inc");
require_once("filter.inc"); require_once("filter.inc");
require_once("shaper.inc"); require_once("shaper.inc");
if (isset($_GET)) $argument = str_replace("\n", "", $argv[1]);
$argument = $_GET['interface'];
else
$argument = str_replace("\n", "", $argv[1]);
if (empty($argument)) if (empty($argument))
interface_configure("wan"); interface_configure("wan");
else { else {
......
...@@ -56,10 +56,7 @@ function restart_packages() { ...@@ -56,10 +56,7 @@ function restart_packages() {
} }
/* Interface IP address has changed */ /* Interface IP address has changed */
if (isset($_GET['interface'])) $argument = str_replace("\n", "", $argv[1]);
$argument = $_GET['interface'];
else
$argument = str_replace("\n", "", $argv[1]);
log_error("rc.newwanip: Informational is starting {$argument}."); log_error("rc.newwanip: Informational is starting {$argument}.");
......
...@@ -70,10 +70,7 @@ if (file_exists('/var/run/booting')) { ...@@ -70,10 +70,7 @@ if (file_exists('/var/run/booting')) {
} }
/* Input argument is a comma-separated list of gateway names, blank or "all". */ /* Input argument is a comma-separated list of gateway names, blank or "all". */
if (isset($_GET)) $argument = trim($argv[1], " \n");
$argument = $_GET['interface'];
else
$argument = trim($argv[1], " \n");
if(is_array($config['openvpn']['openvpn-server']) || is_array($config['openvpn']['openvpn-client'])) { if(is_array($config['openvpn']['openvpn-server']) || is_array($config['openvpn']['openvpn-client'])) {
if (empty($argument) || $argument == "all") { if (empty($argument) || $argument == "all") {
......
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