Remove more duplicate code

4 files changed, 9 insertions, 27 deletions

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 02e9d05..c916519 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -54,15 +54,6 @@ if (isset($_GET['dup'])) {
 	$after = $_GET['dup'];
 }
 
-function is_specialnet($net) {
-	global $specialsrcdst;
-
-	if (in_array($net, $specialsrcdst) || strstr($net, "opt"))
-		return true;
-	else
-		return false;
-}
-
 if (isset($id) && $a_filter[$id]) {
 	$pconfig['interface'] = $a_filter[$id]['interface'];
 
diff --git a/usr/local/www/firewall_shaper_edit.php b/usr/local/www/firewall_shaper_edit.php
index 059a6a9..eae126d 100755
--- a/usr/local/www/firewall_shaper_edit.php
+++ b/usr/local/www/firewall_shaper_edit.php
@@ -52,15 +52,6 @@ if (isset($_GET['dup'])) {
 	$after = $_GET['dup'];
 }
 
-function is_specialnet($net) {
-	global $specialsrcdst;
-
-	if (in_array($net, $specialsrcdst) || strstr($net, "opt"))
-		return true;
-	else
-		return false;
-}
-
 if (isset($id) && $a_shaper[$id]) {
 	$pconfig['interface'] = $a_shaper[$id]['interface'];
 
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 78b0f7c..119a172 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -675,4 +675,13 @@ function pconfig_to_address(&$adr, $padr, $pmask, $pnot=false, $pbeginport=0, $p
         }
 }
 
+function is_specialnet($net) {
+        global $specialsrcdst;
+
+        if (in_array($net, $specialsrcdst) || strstr($net, "opt"))
+                return true;
+        else
+                return false;
+}
+
 ?>
diff --git a/usr/local/www/vpn_ipsec_edit.php b/usr/local/www/vpn_ipsec_edit.php
index b290bb9..33659eb 100755
--- a/usr/local/www/vpn_ipsec_edit.php
+++ b/usr/local/www/vpn_ipsec_edit.php
@@ -45,15 +45,6 @@ $id = $_GET['id'];
 if (isset($_POST['id']))
 	$id = $_POST['id'];
 
-function is_specialnet($net) {
-	global $specialsrcdst;
-
-	if (in_array($net, $specialsrcdst))
-		return true;
-	else
-		return false;
-}
-
 if (isset($id) && $a_ipsec[$id]) {
 	$pconfig['disabled'] = isset($a_ipsec[$id]['disabled']);
 	$pconfig['auto'] = isset($a_ipsec[$id]['auto']);