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
bde44376
Commit
bde44376
authored
May 13, 2015
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make: apparently this just happened
parent
0e5e6e8f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
9 deletions
+16
-9
Makefile
Makefile
+3
-0
BaseModel.php
src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
+1
-1
ArrayField.php
...se/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php
+0
-1
BaseField.php
...nse/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+12
-7
No files found.
Makefile
View file @
bde44376
...
@@ -50,6 +50,9 @@ style: force
...
@@ -50,6 +50,9 @@ style: force
@
cat
${
.CURDIR
}
/.style.out
@
cat
${
.CURDIR
}
/.style.out
@
rm
${
.CURDIR
}
/.style.out
@
rm
${
.CURDIR
}
/.style.out
stylefix
:
force
phpcbf
--standard
=
PSR2
${
.CURDIR
}
/src/opnsense/mvc
||
true
setup
:
force
setup
:
force
${
.CURDIR
}
/src/etc/rc.php_ini_setup
${
.CURDIR
}
/src/etc/rc.php_ini_setup
...
...
src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
View file @
bde44376
...
@@ -94,7 +94,7 @@ abstract class BaseModel
...
@@ -94,7 +94,7 @@ abstract class BaseModel
{
{
// copy xml tag attributes to Field
// copy xml tag attributes to Field
if
(
$config_data
!=
null
)
{
if
(
$config_data
!=
null
)
{
foreach
(
$config_data
->
attributes
()
as
$AttrKey
=>
$AttrValue
)
{
foreach
(
$config_data
->
attributes
()
as
$AttrKey
=>
$AttrValue
)
{
$internal_data
->
setAttributeValue
(
$AttrKey
,
$AttrValue
);
$internal_data
->
setAttributeValue
(
$AttrKey
,
$AttrValue
);
}
}
}
}
...
...
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php
View file @
bde44376
...
@@ -143,5 +143,4 @@ class ArrayField extends BaseField
...
@@ -143,5 +143,4 @@ class ArrayField extends BaseField
return
null
;
return
null
;
}
}
}
}
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
View file @
bde44376
...
@@ -88,13 +88,18 @@ abstract class BaseField
...
@@ -88,13 +88,18 @@ abstract class BaseField
/**
/**
* @return string uuid v4 number
* @return string uuid v4 number
*/
*/
protected
function
generateUUID
()
{
protected
function
generateUUID
()
return
sprintf
(
'%04x%04x-%04x-%04x-%04x-%04x%04x%04x'
,
{
mt_rand
(
0
,
0xffff
),
mt_rand
(
0
,
0xffff
),
return
sprintf
(
mt_rand
(
0
,
0xffff
),
'%04x%04x-%04x-%04x-%04x-%04x%04x%04x'
,
mt_rand
(
0
,
0x0fff
)
|
0x4000
,
mt_rand
(
0
,
0xffff
),
mt_rand
(
0
,
0x3fff
)
|
0x8000
,
mt_rand
(
0
,
0xffff
),
mt_rand
(
0
,
0xffff
),
mt_rand
(
0
,
0xffff
),
mt_rand
(
0
,
0xffff
)
mt_rand
(
0
,
0xffff
),
mt_rand
(
0
,
0x0fff
)
|
0x4000
,
mt_rand
(
0
,
0x3fff
)
|
0x8000
,
mt_rand
(
0
,
0xffff
),
mt_rand
(
0
,
0xffff
),
mt_rand
(
0
,
0xffff
)
);
);
}
}
...
...
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