diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AuthGroupField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AuthGroupField.php index fc5e57023..627819bd2 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AuthGroupField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AuthGroupField.php @@ -79,6 +79,7 @@ class AuthGroupField extends BaseField foreach ($cnf->system->group as $group) { self::$internalOptionList[(string)$group->gid] = (string)$group->name; } + natcasesort(self::$internalOptionList); } } } @@ -104,7 +105,6 @@ class AuthGroupField extends BaseField } $result[$optKey] = array("value" => $optValue, "selected" => $selected); } - return $result; } diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AuthenticationServerField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AuthenticationServerField.php index 921e7894d..32133a079 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AuthenticationServerField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AuthenticationServerField.php @@ -101,6 +101,7 @@ class AuthenticationServerField extends BaseField self::$internalOptionList[$this->internalCacheKey][$key] = $key; } } + natcasesort(self::$internalOptionList[$this->internalCacheKey]); } } diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CertificateField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CertificateField.php index 091b11c2b..e64a481ac 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CertificateField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CertificateField.php @@ -104,6 +104,7 @@ class CertificateField extends BaseField foreach ($configObj->{$this->certificateType} as $cert) { self::$internalOptionList[$this->certificateType][(string)$cert->refid] = (string)$cert->descr; } + natcasesort(self::$internalOptionList[$this->certificateType]); } } diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ConfigdActionsField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ConfigdActionsField.php index 4a190b076..fa794271c 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ConfigdActionsField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ConfigdActionsField.php @@ -110,6 +110,7 @@ class ConfigdActionsField extends BaseField } } } + natcasesort(self::$internalOptionList[$this->internalCacheKey]); } } diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CountryField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CountryField.php index e77391fe3..8dae6bd08 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CountryField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CountryField.php @@ -82,6 +82,7 @@ class CountryField extends BaseField } } } + natcasesort(self::$internalOptionList); } } diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php index 55d192652..830b34d75 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php @@ -190,6 +190,7 @@ class InterfaceField extends BaseField !empty($value->descr) ? (string)$value->descr : strtoupper($key); } } + natcasesort(self::$internalOptionList[$this->internalCacheKey]); } } diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ModelRelationField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ModelRelationField.php index b8b688c3c..33819df12 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ModelRelationField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ModelRelationField.php @@ -145,6 +145,10 @@ class ModelRelationField extends BaseField } unset($modelObj); } + if (!$this->internalIsSorted) { + natcasesort(self::$internalOptionList[$this->internalCacheKey]); + } + } }