* Rename link_int_to_bridge_interface to link_interface_to_bridge

* Create two new function link_interface_to_{gif,gre}

9 files changed, 9 insertions, 9 deletions

diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php
index fa972ff..ab5c83c 100644
--- a/usr/local/www/diag_packet_capture.php
+++ b/usr/local/www/diag_packet_capture.php
@@ -117,7 +117,7 @@ include("head.inc"); ?>
 				<select name="interface">
                      <?php $interfaces = get_configured_interface_with_descr();
 					  foreach ($interfaces as $iface => $ifacename): ?>
-                      <option value="<?=$iface;?>" <?php if (!link_int_to_bridge_interface($iface) && $selectedif == $iface) echo "selected"; ?>>
+                      <option value="<?=$iface;?>" <?php if (!link_interface_to_bridge($iface) && $selectedif == $iface) echo "selected"; ?>>
                       <?php echo $ifacename;?>
                       </option>
                       <?php endforeach;?>
diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
index 9d2e44c..8a71f0c 100755
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -91,7 +91,7 @@ include("head.inc"); ?>
 				  <select name="interface" class="formfld">
                       <?php $interfaces = get_configured_interface_with_descr();
 					  foreach ($interfaces as $iface => $ifacename): ?>
-                      <option value="<?=$iface;?>" <?php if (!link_int_to_bridge_interface($iface) && $iface == $interface) echo "selected"; ?>> 
+                      <option value="<?=$iface;?>" <?php if (!link_interface_to_bridge($iface) && $iface == $interface) echo "selected"; ?>> 
                       <?=htmlspecialchars($ifacename);?>
                       </option>
                       <?php endforeach; ?>
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index 835da63..97fe493 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -196,7 +196,7 @@ if ($_POST['apply']) {
 if ($_GET['act'] == "del") {
 	$id = $_GET['id'];
 
-	if (link_int_to_bridge_interface($id))
+	if (link_interface_to_bridge($id))
 		$input_errors[] = "The interface is part of a bridge. Please remove it from the bridge to continue";
 	else {
 		unset($config['interfaces'][$id]['enable']);
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index 8fa01f9..e68bd4f 100755
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -100,7 +100,7 @@ if ($_POST) {
 		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 		/* make sure no interfaces are bridged */
-		if (link_int_to_bridge_interface($pconfig['cinterface'])) 
+		if (link_interface_to_bridge($pconfig['cinterface'])) 
 			$input_errors[] = "The captive portal cannot be used when one or more interfaces are bridged.";
 
 		if ($_POST['httpslogin_enable']) {
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index da7a2d7..6ddced7 100755
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -117,7 +117,7 @@ if(is_array($dhcrelaycfg)) {
 		if (isset($dhcrelayifconf['enable']) &&
 			(($dhcrelayif == "lan") ||
 			(isset($config['interfaces'][$dhcrelayif]['enable']) &&
-			$config['interfaces'][$dhcrelayif]['if'] && (!link_int_to_bridge_interface($dhcrelayif)))))
+			$config['interfaces'][$dhcrelayif]['if'] && (!link_interface_to_bridge($dhcrelayif)))))
 			$dhcrelay_enabled = true;
 	}
 }
diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php
index b7f3ab8..ee40cbb 100755
--- a/usr/local/www/services_wol.php
+++ b/usr/local/www/services_wol.php
@@ -116,7 +116,7 @@ include("head.inc");
                       <?php 
 						$interfaces = get_configured_interface_with_descr();
 					  	foreach ($interfaces as $iface => $ifacename): ?>
-                      	<option value="<?=$iface;?>" <?php if (!link_int_to_bridge_interface($iface) && $iface == $if) echo "selected"; ?>>
+                      	<option value="<?=$iface;?>" <?php if (!link_interface_to_bridge($iface) && $iface == $if) echo "selected"; ?>>
                       <?=htmlspecialchars($ifacename);?>
                       </option>
                       <?php endforeach; ?>
diff --git a/usr/local/www/services_wol_edit.php b/usr/local/www/services_wol_edit.php
index de3d271..de0b3cd 100755
--- a/usr/local/www/services_wol_edit.php
+++ b/usr/local/www/services_wol_edit.php
@@ -117,7 +117,7 @@ include("head.inc");
                       <?php 
 					  $interfaces = get_configured_interface_with_descr();
 					  foreach ($interfaces as $iface => $ifacename): ?>
-                      <option value="<?=$iface;?>" <?php if (!link_int_to_bridge_interface($iface) && $iface == $pconfig['interface']) echo "selected"; ?>> 
+                      <option value="<?=$iface;?>" <?php if (!link_interface_to_bridge($iface) && $iface == $pconfig['interface']) echo "selected"; ?>> 
                       <?=htmlspecialchars($ifacename);?>
                       </option>
                       <?php endforeach; ?>
diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php
index 27b40ef..dff0f05 100755
--- a/usr/local/www/status_services.php
+++ b/usr/local/www/status_services.php
@@ -235,7 +235,7 @@ $iflist = array();
 $ifdescrs = get_configured_interface_list();
 foreach ($ifdescrs as $if) {
 	$oc = $config['interfaces'][$if];
-	if ($oc['if'] && (!link_int_to_bridge_interface($if)))
+	if ($oc['if'] && (!link_interface_to_bridge($if)))
 		$iflist[$if] = $if;
 }
 $show_dhcprelay = false;
diff --git a/usr/local/www/widgets/widgets/services_status.widget.php b/usr/local/www/widgets/widgets/services_status.widget.php
index 79f890a..4d310cb 100644
--- a/usr/local/www/widgets/widgets/services_status.widget.php
+++ b/usr/local/www/widgets/widgets/services_status.widget.php
@@ -73,7 +73,7 @@ $iflist = array("lan" => "LAN");
 $ifdescrs = get_configured_interface_list(true);
 foreach ($ifdescrs as $if) {
 	$oc = $config['interfaces'][$if];
-	if ($oc['if'] && (!link_int_to_bridge_interface($if)))
+	if ($oc['if'] && (!link_interface_to_bridge($if)))
 		$iflist[$if] = $if;
 }
 $show_dhcprelay = false;