Merge pull request #1738 from phil-davis/Static-Routes

1 files changed, 7 insertions, 3 deletions

diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php
index 4654232..a64580b 100644
--- a/usr/local/www/system_routes_edit.php
+++ b/usr/local/www/system_routes_edit.php
@@ -106,9 +106,13 @@ if ($_POST) {
 	if (($_POST['gateway']) && is_ipaddr($_POST['network'])) {
 		if (!isset($a_gateways[$_POST['gateway']])) {
 			$input_errors[] = gettext("A valid gateway must be specified.");
-		}
-		if (!validate_address_family($_POST['network'], $_POST['gateway'])) {
-			$input_errors[] = gettext("The gateway '{$a_gateways[$_POST['gateway']]['gateway']}' is a different Address Family as network '{$_POST['network']}'.");
+		} else if (isset($a_gateways[$_POST['gateway']]['disabled']) && !$_POST['disabled']) {
+			$input_errors[] = gettext("The gateway is disabled but the route is not. You must disable the route in order to choose a disabled gateway.");
+		} else {
+			// Note that the 3rd parameter "disabled" must be passed as explicitly true or false.
+			if (!validate_address_family($_POST['network'], $_POST['gateway'], $_POST['disabled'] ? true : false)) {
+				$input_errors[] = gettext("The gateway '{$a_gateways[$_POST['gateway']]['gateway']}' is a different Address Family than network '{$_POST['network']}'.");
+			}
 		}
 	}