lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 17:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

(model) CertificateField missing cert type in cache, closes https://github.com/opnsense/core/issues/1095

Browse Source
This commit is contained in:
Ad Schellevis 2016-08-02 21:27:07 +02:00
parent 59f43c120e
commit 2dc8de2c9d
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CertificateField.php
View File

@ -1,7 +1,7 @@
<?php
/**
* Copyright (C) 2015 Deciso B.V.
* Copyright (C) 2016 Deciso B.V.
*
* All rights reserved.
*
@ -98,11 +98,12 @@ class CertificateField extends BaseField
*/
public function eventPostLoading()
{
if (count($this->internalOptionList) ==0) {
$configObj = Config::getInstance()->object();
foreach ($configObj->{$this->certificateType} as $cert) {
self::$internalOptionList[(string)$cert->refid] = (string)$cert->descr ;
}
if (!array_key_exists($this->certificateType, self::$internalOptionList)) {
self::$internalOptionList[$this->certificateType] = array();
$configObj = Config::getInstance()->object();
foreach ($configObj->{$this->certificateType} as $cert) {
self::$internalOptionList[$this->certificateType][(string)$cert->refid] = (string)$cert->descr ;
}
}
}
@ -119,7 +120,7 @@ class CertificateField extends BaseField
}
$certs = explode(',', $this->internalValue);
foreach (self::$internalOptionList as $optKey => $optValue) {
foreach (self::$internalOptionList[$this->certificateType] as $optKey => $optValue) {
if (in_array($optKey, $certs)) {
$selected = 1;
} else {
@ -140,13 +141,13 @@ class CertificateField extends BaseField
$validators = parent::getValidators();
if ($this->internalValue != null) {
if ($this->internalMultiSelect) {
// field may contain more than one country
// field may contain more than one cert
$validators[] = new CsvListValidator(array('message' => $this->internalValidationMessage,
'domain'=>array_keys(self::$internalOptionList)));
'domain'=>array_keys(self::$internalOptionList[$this->certificateType])));
} else {
// single country selection
// single cert selection
$validators[] = new InclusionIn(array('message' => $this->internalValidationMessage,
'domain'=>array_keys(self::$internalOptionList)));
'domain'=>array_keys(self::$internalOptionList[$this->certificateType])));
}
}
return $validators;