Ticket #866 #632. Save old settings or actions to be taken for reconfiguring a route/vip on a tmp file and make use that information when apply settings buttons is clicked. This makes the gui behave as expected.

1 files changed, 5 insertions, 3 deletions

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index e4389d4..2577d22 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -3120,19 +3120,21 @@ function ip_in_interface_alias_subnet($interface, $ipalias) {
 	global $config;
 
 	if (empty($interface) || !is_ipaddr($ipalias))
-		return 0;
+		return false;
 	if (is_array($config['virtualip']['vip'])) {
                 foreach ($config['virtualip']['vip'] as $vip) {
                         switch ($vip['mode']) {
                         case "ipalias":
                                 if ($vip['interface'] <> $interface)
-                                        continue;
+                                        break;
 				if (ip_in_subnet($ipalias, gen_subnet($vip['subnet'], $vip['subnet_bits']) . "/" . $vip['subnet_bits']))
-					return 1;
+					return true;
                                 break;
                         }
                 }
 	}
+
+	return false;
 }
 
 function get_interface_ip($interface = "wan")