Project

General

Profile

« Previous | Next » 

Revision c6c398c6

Added by Jim Pingle over 6 years ago

Fix #9121: Initialize arrays to prevent PHP 7 errors

View differences:

src/usr/local/www/status_carp.php
57 57
}
58 58

  
59 59
if ($_POST['disablecarp'] != "") {
60
	init_config_arr(array('virtualip', 'vip'));
61
	$viparr = &$config['virtualip']['vip'];
60 62
	if ($status != 0) {
61 63
		set_single_sysctl('net.inet.carp.allow', '0');
62
		if (is_array($config['virtualip']['vip'])) {
63
			$viparr = &$config['virtualip']['vip'];
64
			foreach ($viparr as $vip) {
65
				if ($vip['mode'] != "carp" && $vip['mode'] != "ipalias")
66
					continue;
67
				if ($vip['mode'] == "ipalias" && substr($vip['interface'], 0, 4) != "_vip")
68
					continue;
69

  
70
				interface_vip_bring_down($vip);
71
			}
64
		foreach ($viparr as $vip) {
65
			if ($vip['mode'] != "carp" && $vip['mode'] != "ipalias")
66
				continue;
67
			if ($vip['mode'] == "ipalias" && substr($vip['interface'], 0, 4) != "_vip")
68
				continue;
69
			interface_vip_bring_down($vip);
72 70
		}
73 71
		$savemsg = sprintf(gettext("%s IPs have been disabled. Please note that disabling does not survive a reboot and some configuration changes will re-enable."), $carp_counter);
74 72
		$status = 0;
75 73
	} else {
76 74
		$savemsg = gettext("CARP has been enabled.");
77
		if (is_array($config['virtualip']['vip'])) {
78
			$viparr = &$config['virtualip']['vip'];
79
			foreach ($viparr as $vip) {
80
				switch ($vip['mode']) {
81
					case "carp":
82
						interface_carp_configure($vip);
83
						break;
84
					case 'ipalias':
85
						if (substr($vip['interface'], 0, 4) == "_vip") {
86
							interface_ipalias_configure($vip);
87
						}
88
						break;
89
				}
75
		foreach ($viparr as $vip) {
76
			switch ($vip['mode']) {
77
				case "carp":
78
					interface_carp_configure($vip);
79
					break;
80
				case 'ipalias':
81
					if (substr($vip['interface'], 0, 4) == "_vip") {
82
						interface_ipalias_configure($vip);
83
					}
84
					break;
90 85
			}
91 86
		}
92 87
		interfaces_sync_setup();

Also available in: Unified diff