Project

General

Profile

« Previous | Next » 

Revision a08d5055

Added by Phil Davis over 10 years ago

Update get_possible_traffic_source_addresses returned array format

With this change it looks to me like the way it is intended to be, based
on what was done to get_possible_listen_ips()
Please review and check if this is what was intended for the code. With
this change it should make the returned $sourceips array be in a
consistent format the same way as get_possible_listen_ips()
This is a fix for code that was only committed in master. So at this
time the fix is only needed in master.

View differences:

etc/inc/interfaces.inc
5266 5266
		if (is_array($config['openvpn']["openvpn-{$mode}"])) {
5267 5267
			foreach ($config['openvpn']["openvpn-{$mode}"] as $id => $setting) {
5268 5268
				if (!isset($setting['disable'])) {
5269
					$vpn = array();
5270
					$vpn['value'] = 'ovpn' . substr($mode, 0, 1) . $setting['vpnid'];
5271
					$vpn['name'] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']);
5272
					$sourceips[] = $vpn;
5269
					$sourceips_key = 'ovpn' . substr($mode, 0, 1) . $setting['vpnid'];
5270
					$sourceips[$sourceips_key] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']);
5273 5271
				}
5274 5272
			}
5275 5273
		}

Also available in: Unified diff