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
27b4d61b
Commit
27b4d61b
authored
Feb 02, 2016
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(mvc) gettext some defaults, closes
https://github.com/opnsense/core/issues/727
parent
394ad989
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
AuthenticationServerField.php
...ls/OPNsense/Base/FieldTypes/AuthenticationServerField.php
+1
-1
CertificateField.php
.../app/models/OPNsense/Base/FieldTypes/CertificateField.php
+2
-2
ConfigdActionsField.php
...p/models/OPNsense/Base/FieldTypes/ConfigdActionsField.php
+2
-2
InterfaceField.php
...vc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php
+2
-2
No files found.
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/AuthenticationServerField.php
View file @
27b4d61b
...
@@ -135,7 +135,7 @@ class AuthenticationServerField extends BaseField
...
@@ -135,7 +135,7 @@ class AuthenticationServerField extends BaseField
$result
=
array
();
$result
=
array
();
// if authentication server is not required and single, add empty option
// if authentication server is not required and single, add empty option
if
(
!
$this
->
internalIsRequired
&&
!
$this
->
internalMultiSelect
)
{
if
(
!
$this
->
internalIsRequired
&&
!
$this
->
internalMultiSelect
)
{
$result
[
""
]
=
array
(
"value"
=>
"none"
,
"selected"
=>
0
);
$result
[
""
]
=
array
(
"value"
=>
gettext
(
"none"
)
,
"selected"
=>
0
);
}
}
// explode authentication servers
// explode authentication servers
...
...
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/CertificateField.php
View file @
27b4d61b
...
@@ -90,7 +90,7 @@ class CertificateField extends BaseField
...
@@ -90,7 +90,7 @@ class CertificateField extends BaseField
$result
=
array
();
$result
=
array
();
// if certificate is not required, add empty option
// if certificate is not required, add empty option
if
(
!
$this
->
internalIsRequired
)
{
if
(
!
$this
->
internalIsRequired
)
{
$result
[
""
]
=
array
(
"value"
=>
"none"
,
"selected"
=>
0
);
$result
[
""
]
=
array
(
"value"
=>
gettext
(
"none"
)
,
"selected"
=>
0
);
}
}
foreach
(
self
::
$internalOptionList
as
$optKey
=>
$optValue
)
{
foreach
(
self
::
$internalOptionList
as
$optKey
=>
$optValue
)
{
if
(
$optKey
==
$this
->
internalValue
)
{
if
(
$optKey
==
$this
->
internalValue
)
{
...
@@ -98,7 +98,7 @@ class CertificateField extends BaseField
...
@@ -98,7 +98,7 @@ class CertificateField extends BaseField
}
else
{
}
else
{
$selected
=
0
;
$selected
=
0
;
}
}
$result
[
$optKey
]
=
array
(
"value"
=>
$optValue
,
"selected"
=>
$selected
);
$result
[
$optKey
]
=
array
(
"value"
=>
$optValue
,
"selected"
=>
$selected
);
}
}
return
$result
;
return
$result
;
...
...
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ConfigdActionsField.php
View file @
27b4d61b
...
@@ -128,7 +128,7 @@ class ConfigdActionsField extends BaseField
...
@@ -128,7 +128,7 @@ class ConfigdActionsField extends BaseField
$result
=
array
();
$result
=
array
();
// if interface is not required, add empty option
// if interface is not required, add empty option
if
(
!
$this
->
internalIsRequired
)
{
if
(
!
$this
->
internalIsRequired
)
{
$result
[
""
]
=
array
(
"value"
=>
"none"
,
"selected"
=>
0
);
$result
[
""
]
=
array
(
"value"
=>
gettext
(
"none"
)
,
"selected"
=>
0
);
}
}
foreach
(
self
::
$internalOptionList
[
$this
->
internalCacheKey
]
as
$optKey
=>
$optValue
)
{
foreach
(
self
::
$internalOptionList
[
$this
->
internalCacheKey
]
as
$optKey
=>
$optValue
)
{
...
@@ -137,7 +137,7 @@ class ConfigdActionsField extends BaseField
...
@@ -137,7 +137,7 @@ class ConfigdActionsField extends BaseField
}
else
{
}
else
{
$selected
=
0
;
$selected
=
0
;
}
}
$result
[
$optKey
]
=
array
(
"value"
=>
$optValue
,
"selected"
=>
$selected
);
$result
[
$optKey
]
=
array
(
"value"
=>
$optValue
,
"selected"
=>
$selected
);
}
}
...
...
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/InterfaceField.php
View file @
27b4d61b
...
@@ -141,7 +141,7 @@ class InterfaceField extends BaseField
...
@@ -141,7 +141,7 @@ class InterfaceField extends BaseField
$result
=
array
();
$result
=
array
();
// if interface is not required and single, add empty option
// if interface is not required and single, add empty option
if
(
!
$this
->
internalIsRequired
&&
!
$this
->
internalMultiSelect
)
{
if
(
!
$this
->
internalIsRequired
&&
!
$this
->
internalMultiSelect
)
{
$result
[
""
]
=
array
(
"value"
=>
"none"
,
"selected"
=>
0
);
$result
[
""
]
=
array
(
"value"
=>
gettext
(
"none"
)
,
"selected"
=>
0
);
}
}
// explode interfaces
// explode interfaces
...
@@ -152,7 +152,7 @@ class InterfaceField extends BaseField
...
@@ -152,7 +152,7 @@ class InterfaceField extends BaseField
}
else
{
}
else
{
$selected
=
0
;
$selected
=
0
;
}
}
$result
[
$optKey
]
=
array
(
"value"
=>
$optValue
,
"selected"
=>
$selected
);
$result
[
$optKey
]
=
array
(
"value"
=>
$optValue
,
"selected"
=>
$selected
);
}
}
return
$result
;
return
$result
;
...
...
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