From 931788ad45b4f1114e97e6ac2869ab84efa767e2 Mon Sep 17 00:00:00 2001 From: Guillaume Mazoyer Date: Mon, 13 Jun 2016 11:23:09 +0200 Subject: Per router options to disable/enable IP versions. Remove the global options to disable/enable IPv6 or IPv4. These options can now be used on the router configuration level, which seems more appropriate. --- execute.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'execute.php') diff --git a/execute.php b/execute.php index 227c6e6..7fd8fc6 100644 --- a/execute.php +++ b/execute.php @@ -54,15 +54,15 @@ if (isset($_POST['query']) && !empty($_POST['query']) && $router = Router::instance($hostname, $requester); // Check if parameter is an IPv6 and if IPv6 is disabled - if (match_ipv6($parameter) && $config['misc']['disable_ipv6']) { - $error = 'IPv6 has been disabled, you can only use IPv4.'; + if (match_ipv6($parameter) && $router->get_config()['disable_ipv6']) { + $error = 'IPv6 has been disabled for this router, you can only use IPv4.'; print(json_encode(array('error' => $error))); return; } // Check if parameter is an IPv4 and if IPv4 is disabled - if (match_ipv4($parameter) && $config['misc']['disable_ipv4']) { - $error = 'IPv4 has been disabled, you can only use IPv6.'; + if (match_ipv4($parameter) && $router->get_config()['disable_ipv4']) { + $error = 'IPv4 has been disabled for this router, you can only use IPv6.'; print(json_encode(array('error' => $error))); return; } -- cgit v1.2.3