Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
115d63b9
Commit
115d63b9
authored
Feb 29, 2016
by
Ad Schellevis
Committed by
Franco Fichtner
Mar 03, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(mvc) regression JsonKeyValueStoreField
(cherry picked from commit
4bb60ba2
)
parent
2f1266e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
JsonKeyValueStoreField.php
...odels/OPNsense/Base/FieldTypes/JsonKeyValueStoreField.php
+2
-3
No files found.
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/JsonKeyValueStoreField.php
View file @
115d63b9
...
@@ -121,7 +121,6 @@ class JsonKeyValueStoreField extends BaseField
...
@@ -121,7 +121,6 @@ class JsonKeyValueStoreField extends BaseField
protected
function
actionPostLoadingEvent
()
protected
function
actionPostLoadingEvent
()
{
{
if
(
$this
->
internalSourceField
!=
null
&&
$this
->
internalSourceFile
!=
null
)
{
if
(
$this
->
internalSourceField
!=
null
&&
$this
->
internalSourceFile
!=
null
)
{
//$this->internalOptionList[$key] = $value ;
$sourcefile
=
sprintf
(
$this
->
internalSourceFile
,
$this
->
internalSourceField
);
$sourcefile
=
sprintf
(
$this
->
internalSourceFile
,
$this
->
internalSourceField
);
if
(
is_file
(
$sourcefile
))
{
if
(
is_file
(
$sourcefile
))
{
$data
=
json_decode
(
file_get_contents
(
$sourcefile
),
true
);
$data
=
json_decode
(
file_get_contents
(
$sourcefile
),
true
);
...
@@ -185,11 +184,11 @@ class JsonKeyValueStoreField extends BaseField
...
@@ -185,11 +184,11 @@ class JsonKeyValueStoreField extends BaseField
if
(
$this
->
internalMultiSelect
)
{
if
(
$this
->
internalMultiSelect
)
{
// field may contain more than one authentication server
// field may contain more than one authentication server
$validators
[]
=
new
CsvListValidator
(
array
(
'message'
=>
$this
->
internalValidationMessage
,
$validators
[]
=
new
CsvListValidator
(
array
(
'message'
=>
$this
->
internalValidationMessage
,
'domain'
=>
array_keys
(
self
::
$
internalOptionList
[
$this
->
internalCacheKey
])));
'domain'
=>
array_keys
(
$this
->
internalOptionList
[
$this
->
internalCacheKey
])));
}
else
{
}
else
{
// single authentication server selection
// single authentication server selection
$validators
[]
=
new
InclusionIn
(
array
(
'message'
=>
$this
->
internalValidationMessage
,
$validators
[]
=
new
InclusionIn
(
array
(
'message'
=>
$this
->
internalValidationMessage
,
'domain'
=>
array_keys
(
self
::
$
internalOptionList
[
$this
->
internalCacheKey
])));
'domain'
=>
array_keys
(
$this
->
internalOptionList
[
$this
->
internalCacheKey
])));
}
}
}
}
return
$validators
;
return
$validators
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment