Skip to content

v1.6.3 #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaredhendrickson13 merged 4 commits into from
Sep 11, 2023
Merged

v1.6.3 #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
080783a
fix: use version_compare for api update checks #390
jaredhendrickson13 Sep 7, 2023
33048b0
docs: added note about unsupported archs to readme
jaredhendrickson13 Sep 7, 2023
3f703a2
Merge pull request #394 from jaredhendrickson13/fix/v163_fixes
jaredhendrickson13 Sep 7, 2023
369b890
fix: prevent blank alias detail when adding first alias address #395
jaredhendrickson13 Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ are made preventing the need for a reboot. All this results in the fastest, safe
<details>
<summary>Supported pfSense Versions</summary>

- pfSense CE 2.7.0 (AMD64)
- pfSense Plus 23.01 (AMD64)
- pfSense Plus 23.05 (AMD64)
- pfSense CE 2.7.0 (amd64)
- pfSense Plus 23.01 (amd64)
- pfSense Plus 23.05 (amd64)

---
_This package is not supported on other architectures such as arm64 and aarch64. However, the package should still
install and operate on these systems. Compatibility on unsupported systems is not guaranteed and is at your own risk._
---

</details>

Expand Down
10 changes: 9 additions & 1 deletion pfSense-pkg-API/files/etc/inc/api/models/APIFirewallAliasEntryCreate.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,15 @@ class APIFirewallAliasEntryCreate extends APIModel {
# Get a list of the new addresses and details requested
$this->initial_data["address"] = $this->__value_to_array($this->initial_data["address"]);
$this->initial_data["detail"] = $this->__value_to_array($this->initial_data["detail"]);
$this->validated_data["detail"] = $this->__value_to_array(explode("||", $this->validated_data["detail"]));

# Only expand existing details if they exist
if ($this->validated_data["detail"]) {
$this->validated_data["detail"] = $this->__value_to_array(explode("||", $this->validated_data["detail"]));
}
# Otherwise, default to an empty array
else {
$this->validated_data["detail"] = [];
}

# Ensure the number of addresses is greater than or equal to the number details
if (count($this->initial_data["address"]) >= count($this->initial_data["detail"])) {
Expand Down
5 changes: 1 addition & 4 deletions pfSense-pkg-API/files/etc/inc/api/models/APISystemAPIVersionRead.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ class APISystemAPIVersionRead extends APIModel {
}

public static function is_update_available() {
# Check if the current version is less than the latest version
$curr_ver_num = intval(str_replace(".", "", self::get_api_version()));
$latest_ver_num = intval(str_replace(".", "", self::get_latest_api_version()));
return $curr_ver_num < $latest_ver_num;
return version_compare(self::get_api_version(), self::get_latest_api_version(), operator: "<");
}

public static function get_github_releases() {
Expand Down