Merge pull request #138 from Finic8/master

jaredhendrickson13 · web-flow · commit b71e5f27ab75 · 2021-07-14T10:29:44.000-06:00
Fix track6-prefix-id on interface create/update
diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceCreate.inc
@@ -667,12 +667,12 @@ class APIInterfaceCreate extends APIModel {
             $track_prefix = $this->initial_data["track6-prefix-id-hex"];
             // Check that our gateway is a valid IPv4 address
             if (is_numeric($track_prefix) and ctype_xdigit(strval($track_prefix))) {
-                $this->validated_data["track6-prefix-id--hex"] = intval($track_prefix);
+                $this->validated_data["track6-prefix-id"] = intval($track_prefix);
             } else {
                 $this->errors[] = APIResponse\get(3040);
             }
         } else {
-            $this->validated_data["track6-prefix-id--hex"] = 0;
+            $this->validated_data["track6-prefix-id"] = 0;
         }
     }
 
diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceUpdate.inc
@@ -775,12 +775,12 @@ class APIInterfaceUpdate extends APIModel {
             $track_prefix = $this->initial_data["track6-prefix-id-hex"];
             // Check that our gateway is a valid IPv4 address
             if (is_numeric($track_prefix) and ctype_xdigit(strval($track_prefix))) {
-                $this->validated_data["track6-prefix-id--hex"] = intval($track_prefix);
+                $this->validated_data["track6-prefix-id"] = intval($track_prefix);
             } else {
                 $this->errors[] = APIResponse\get(3040);
             }
-        } elseif (!isset($this->validated_data["track6-prefix-id--hex"])) {
-            $this->validated_data["track6-prefix-id--hex"] = 0;
+        } elseif (!isset($this->validated_data["track6-prefix-id"])) {
+            $this->validated_data["track6-prefix-id"] = 0;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -667,12 +667,12 @@ class APIInterfaceCreate extends APIModel {`
`667`	`667`	`$track_prefix = $this->initial_data["track6-prefix-id-hex"];`
`668`	`668`	`// Check that our gateway is a valid IPv4 address`
`669`	`669`	`if (is_numeric($track_prefix) and ctype_xdigit(strval($track_prefix))) {`
`670`		`- $this->validated_data["track6-prefix-id--hex"] = intval($track_prefix);`
	`670`	`+ $this->validated_data["track6-prefix-id"] = intval($track_prefix);`
`671`	`671`	`} else {`
`672`	`672`	`$this->errors[] = APIResponse\get(3040);`
`673`	`673`	`}`
`674`	`674`	`} else {`
`675`		`- $this->validated_data["track6-prefix-id--hex"] = 0;`
	`675`	`+ $this->validated_data["track6-prefix-id"] = 0;`
`676`	`676`	`}`
`677`	`677`	`}`
`678`	`678`
Original file line number	Diff line number	Diff line change
`@@ -775,12 +775,12 @@ class APIInterfaceUpdate extends APIModel {`
`775`	`775`	`$track_prefix = $this->initial_data["track6-prefix-id-hex"];`
`776`	`776`	`// Check that our gateway is a valid IPv4 address`
`777`	`777`	`if (is_numeric($track_prefix) and ctype_xdigit(strval($track_prefix))) {`
`778`		`- $this->validated_data["track6-prefix-id--hex"] = intval($track_prefix);`
	`778`	`+ $this->validated_data["track6-prefix-id"] = intval($track_prefix);`
`779`	`779`	`} else {`
`780`	`780`	`$this->errors[] = APIResponse\get(3040);`
`781`	`781`	`}`
`782`		`- } elseif (!isset($this->validated_data["track6-prefix-id--hex"])) {`
`783`		`- $this->validated_data["track6-prefix-id--hex"] = 0;`
	`782`	`+ } elseif (!isset($this->validated_data["track6-prefix-id"])) {`
	`783`	`+ $this->validated_data["track6-prefix-id"] = 0;`
`784`	`784`	`}`
`785`	`785`	`}`
`786`	`786`