Don't foreach unless it's an array. Ticket #6142

Similar thing to https://github.com/pfsense/pfsense/commit/13dab3538fe8b6c1688142c89a017520ad0aaac6 should be done here in upgrade_130_to_131()

1 files changed, 60 insertions, 58 deletions

diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 8c7495f..2a52979 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -4167,74 +4167,76 @@ function upgrade_130_to_131() {
 		return;
 	}
 
-	foreach ($config['gateways']['gateway_item'] as &$gw) {
-		// dpinger uses milliseconds
-		if (isset($gw['interval']) &&
-		    is_numeric($gw['interval'])) {
-			$gw['interval'] = $gw['interval'] * 1000;
-		}
+	if (is_array($config['gateways']['gateway_item'])) {
+		foreach ($config['gateways']['gateway_item'] as &$gw) {
+			// dpinger uses milliseconds
+			if (isset($gw['interval']) &&
+				is_numeric($gw['interval'])) {
+				$gw['interval'] = $gw['interval'] * 1000;
+			}
 
-		if (isset($gw['interval'])) {
-			$effective_interval = $gw['interval'];
-		} else {
-			$effective_interval = $default_interval;
-		}
+			if (isset($gw['interval'])) {
+				$effective_interval = $gw['interval'];
+			} else {
+				$effective_interval = $default_interval;
+			}
 
-		if (isset($gw['down']) &&
-		    is_numeric($gw['down'])) {
-			$gw['time_period'] = $gw['down'] * 1000;
-			unset($gw['down']);
-		}
+			if (isset($gw['down']) &&
+				is_numeric($gw['down'])) {
+				$gw['time_period'] = $gw['down'] * 1000;
+				unset($gw['down']);
+			}
 
-		if (isset($gw['time_period'])) {
-			$effective_time_period = $gw['time_period'];
-		} else {
-			$effective_time_period = $default_time_period;
-		}
+			if (isset($gw['time_period'])) {
+				$effective_time_period = $gw['time_period'];
+			} else {
+				$effective_time_period = $default_time_period;
+			}
 
-		if (isset($gw['latencyhigh'])) {
-			// Default loss_interval is 2000, but must be set
-			// higher if latencyhigh is higher.
-			if ($gw['latencyhigh'] > $default_loss_interval) {
-				$gw['loss_interval'] = $gw['latencyhigh'];
+			if (isset($gw['latencyhigh'])) {
+				// Default loss_interval is 2000, but must be set
+				// higher if latencyhigh is higher.
+				if ($gw['latencyhigh'] > $default_loss_interval) {
+					$gw['loss_interval'] = $gw['latencyhigh'];
+				}
 			}
-		}
 
-		if (isset($gw['loss_interval'])) {
-			$effective_loss_interval = $gw['loss_interval'];
-		} else {
-			$effective_loss_interval = $default_loss_interval;
-		}
+			if (isset($gw['loss_interval'])) {
+				$effective_loss_interval = $gw['loss_interval'];
+			} else {
+				$effective_loss_interval = $default_loss_interval;
+			}
 
-		if (isset($gw['interval'])) {
-			// Default alert_interval is 1000, but must be set
-			// higher if interval is higher.
-			if ($gw['interval'] > $default_alert_interval) {
-				$gw['alert_interval'] = $gw['interval'];
+			if (isset($gw['interval'])) {
+				// Default alert_interval is 1000, but must be set
+				// higher if interval is higher.
+				if ($gw['interval'] > $default_alert_interval) {
+					$gw['alert_interval'] = $gw['interval'];
+				}
 			}
-		}
 
-		if ((($effective_interval * 2) + $effective_loss_interval) >= $effective_time_period) {
-			$gw['time_period'] = ($effective_interval * 2) + $effective_loss_interval + 1;
-		}
+			if ((($effective_interval * 2) + $effective_loss_interval) >= $effective_time_period) {
+				$gw['time_period'] = ($effective_interval * 2) + $effective_loss_interval + 1;
+			}
 
-		if (isset($gw['avg_delay_samples'])) {
-			unset($gw['avg_delay_samples']);
-		}
-		if (isset($gw['avg_delay_samples_calculated'])) {
-			unset($gw['avg_delay_samples_calculated']);
-		}
-		if (isset($gw['avg_loss_samples'])) {
-			unset($gw['avg_loss_samples']);
-		}
-		if (isset($gw['avg_loss_samples_calculated'])) {
-			unset($gw['avg_loss_samples_calculated']);
-		}
-		if (isset($gw['avg_loss_delay_samples'])) {
-			unset($gw['avg_loss_delay_samples']);
-		}
-		if (isset($gw['avg_loss_delay_samples_calculated'])) {
-			unset($gw['avg_loss_delay_samples_calculated']);
+			if (isset($gw['avg_delay_samples'])) {
+				unset($gw['avg_delay_samples']);
+			}
+			if (isset($gw['avg_delay_samples_calculated'])) {
+				unset($gw['avg_delay_samples_calculated']);
+			}
+			if (isset($gw['avg_loss_samples'])) {
+				unset($gw['avg_loss_samples']);
+			}
+			if (isset($gw['avg_loss_samples_calculated'])) {
+				unset($gw['avg_loss_samples_calculated']);
+			}
+			if (isset($gw['avg_loss_delay_samples'])) {
+				unset($gw['avg_loss_delay_samples']);
+			}
+			if (isset($gw['avg_loss_delay_samples_calculated'])) {
+				unset($gw['avg_loss_delay_samples_calculated']);
+			}
 		}
 	}
 }