(legacy) remove itemid.inc

src/etc/inc/itemid.inc

-<?php
-
-/*
-	Copyright (C) 2009 Janne Enberg <janne.enberg@lietu.net>
-	All rights reserved.
-
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
-
-        1. Redistributions of source code must retain the above copyright notice,
-           this list of conditions and the following disclaimer.
-
-        2. Redistributions in binary form must reproduce the above copyright
-           notice, this list of conditions and the following disclaimer in the
-           documentation and/or other materials provided with the distribution.
-
-        THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-        AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-        AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-        OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-        SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-        INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-        CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-        POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/****f* itemid/delete_id
- * NAME
- *   delete_id - delete an item with ['id'] = $id from $array
- * INPUTS
- *   $id       - int: The ID to delete
- *   $array    - array to delete the item from
- * RESULT
- *   boolean   - true if item was found and deleted
- ******/
-function delete_id($id, &$array){
-	// Index to delete
-	$delete_index = NULL;
-
-	if (!is_array($array))
-		return false;
-
-	// Search for the item in the array
-	foreach ($array as $key => $item){
-		// If this item is the one we want to delete
-		if(isset($item['associated-rule-id']) && $item['associated-rule-id']==$id ){
-			$delete_index = $key;
-			break;
-		}
-	}
-
-	// If we found the item, unset it
-	if( $delete_index!==NULL ){
-		unset($array[$delete_index]);
-		return true;
-	} else {
-		return false;
-	}
-
-}
-
-/****f* itemid/get_id
- * NAME
- *   get_id - Get an item id with ['associated-rule-id'] = $id from $array
- * INPUTS
- *   $id       - string: The ID to get
- *   $array    - array to get the item from
- * RESULT
- *   mixed   - The id, NULL if not found
- ******/
-function get_id($id, &$array) {
-	// Use $foo = &get_id('id', array('id'=>'value'));
-
-	if (!is_array($array))
-		return false;
-
-	// Search for the item in the array
-	foreach ($array as $key => $item){
-		// If this item is the one we want to delete
-		if (isset($item['associated-rule-id']) && $item['associated-rule-id']==$id)
-			return $key;
-	}
-
-	return false;
-}
-
-/****f* itemid/get_unique_id
- * NAME
- *   get_unique_id - get a unique identifier
- * RESULT
- *   string     - unique id
- ******/
-function get_unique_id(){
-
-	return uniqid("nat_", true);
-}
-
-?>

src/www/firewall_nat.php

@@ -3,6 +3,7 @@
 	Copyright (C) 2014 Deciso B.V.
 	Copyright (C) 2004 Scott Ullrich
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
+	(from itemid.inc) Copyright (C) 2009 Janne Enberg <janne.enberg@lietu.net>)
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -30,7 +31,6 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
-require_once("itemid.inc");
 
 /****f* legacy/have_natpfruleint_access
  * NAME
@@ -47,6 +47,42 @@ function have_natpfruleint_access($if) {
         return false;
 }
 
+/****f* itemid/delete_id (duplicate to remove itemid.inc)
+ * NAME
+ *   delete_id - delete an item with ['id'] = $id from $array
+ * INPUTS
+ *   $id       - int: The ID to delete
+ *   $array    - array to delete the item from
+ * RESULT
+ *   boolean   - true if item was found and deleted
+ ******/
+function delete_id($id, &$array){
+	// Index to delete
+	$delete_index = NULL;
+
+	if (!is_array($array))
+		return false;
+
+	// Search for the item in the array
+	foreach ($array as $key => $item){
+		// If this item is the one we want to delete
+		if(isset($item['associated-rule-id']) && $item['associated-rule-id']==$id ){
+			$delete_index = $key;
+			break;
+		}
+	}
+
+	// If we found the item, unset it
+	if( $delete_index!==NULL ){
+		unset($array[$delete_index]);
+		return true;
+	} else {
+		return false;
+	}
+
+}
+
+
 
 if (!is_array($config['nat']['rule']))
 	$config['nat']['rule'] = array();

src/www/firewall_nat_edit.php

@@ -2,6 +2,7 @@
 /*
 	Copyright (C) 2014 Deciso B.V.
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
+	(from itemid.inc) Copyright (C) 2009 Janne Enberg <janne.enberg@lietu.net>
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -27,9 +28,81 @@
 */
 
 require_once("guiconfig.inc");
-require_once("itemid.inc");
 require_once("filter.inc");
 
+/****f* itemid/delete_id
+ * NAME
+ *   delete_id - delete an item with ['id'] = $id from $array
+ * INPUTS
+ *   $id       - int: The ID to delete
+ *   $array    - array to delete the item from
+ * RESULT
+ *   boolean   - true if item was found and deleted
+ ******/
+function delete_id($id, &$array){
+	// Index to delete
+	$delete_index = NULL;
+
+	if (!is_array($array))
+		return false;
+
+	// Search for the item in the array
+	foreach ($array as $key => $item){
+		// If this item is the one we want to delete
+		if(isset($item['associated-rule-id']) && $item['associated-rule-id']==$id ){
+			$delete_index = $key;
+			break;
+		}
+	}
+
+	// If we found the item, unset it
+	if( $delete_index!==NULL ){
+		unset($array[$delete_index]);
+		return true;
+	} else {
+		return false;
+	}
+
+}
+
+
+/****f* itemid/get_id
+ * NAME
+ *   get_id - Get an item id with ['associated-rule-id'] = $id from $array
+ * INPUTS
+ *   $id       - string: The ID to get
+ *   $array    - array to get the item from
+ * RESULT
+ *   mixed   - The id, NULL if not found
+ ******/
+function get_id($id, &$array) {
+	// Use $foo = &get_id('id', array('id'=>'value'));
+
+	if (!is_array($array))
+		return false;
+
+	// Search for the item in the array
+	foreach ($array as $key => $item){
+		// If this item is the one we want to delete
+		if (isset($item['associated-rule-id']) && $item['associated-rule-id']==$id)
+			return $key;
+	}
+
+	return false;
+}
+
+/****f* itemid/get_unique_id
+ * NAME
+ *   get_unique_id - get a unique identifier
+ * RESULT
+ *   string     - unique id
+ ******/
+function get_unique_id(){
+
+	return uniqid("nat_", true);
+}
+
+
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat.php');
 
 $specialsrcdst = explode(" ", "any (self) pptp pppoe l2tp openvpn");