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
4425c28e
Commit
4425c28e
authored
Aug 13, 2016
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
src: extend whitespace sweep to root dir files
parent
d137b214
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
4 deletions
+6
-4
+POST_INSTALL
+POST_INSTALL
+1
-1
Makefile
Makefile
+2
-0
BaseModelMigration.php
...sense/mvc/app/models/OPNsense/Base/BaseModelMigration.php
+1
-1
M1_0_0.php
.../app/models/OPNsense/Base/BaseModel/Migrations/M1_0_0.php
+1
-1
M1_0_1.php
.../app/models/OPNsense/Base/BaseModel/Migrations/M1_0_1.php
+1
-1
No files found.
+POST_INSTALL
View file @
4425c28e
...
@@ -52,7 +52,7 @@ fi
...
@@ -52,7 +52,7 @@ fi
echo "Flush Phalcon volt templates"
echo "Flush Phalcon volt templates"
rm -f /usr/local/opnsense/mvc/app/cache/*.php
rm -f /usr/local/opnsense/mvc/app/cache/*.php
echo "Execute model migrations"
echo "Execute model migrations"
/usr/local/opnsense/mvc/script/run_migrations.php
/usr/local/opnsense/mvc/script/run_migrations.php
echo "Reloading GUI configuration"
echo "Reloading GUI configuration"
...
...
Makefile
View file @
4425c28e
...
@@ -298,6 +298,8 @@ sweep: force
...
@@ -298,6 +298,8 @@ sweep: force
xargs
-0
-n1
scripts/cleanfile
xargs
-0
-n1
scripts/cleanfile
find
${
.CURDIR
}
/scripts
-type
f
-print0
|
\
find
${
.CURDIR
}
/scripts
-type
f
-print0
|
\
xargs
-0
-n1
scripts/cleanfile
xargs
-0
-n1
scripts/cleanfile
find
${
.CURDIR
}
-type
f
-depth
1
-print0
|
\
xargs
-0
-n1
scripts/cleanfile
style
:
want-pear-PHP_CodeSniffer
style
:
want-pear-PHP_CodeSniffer
@
(
phpcs
--tab-width
=
4
--standard
=
PSR2
${
.CURDIR
}
/src/opnsense/mvc
\
@
(
phpcs
--tab-width
=
4
--standard
=
PSR2
${
.CURDIR
}
/src/opnsense/mvc
\
...
...
src/opnsense/mvc/app/models/OPNsense/Base/BaseModelMigration.php
View file @
4425c28e
...
@@ -41,7 +41,7 @@ abstract class BaseModelMigration
...
@@ -41,7 +41,7 @@ abstract class BaseModelMigration
* Walk through all nodes and check required defaults
* Walk through all nodes and check required defaults
* @param $node
* @param $node
*/
*/
private
function
checkDefaults
(
$node
)
private
function
checkDefaults
(
$node
)
{
{
foreach
(
$node
->
__items
as
$key
=>
$subnode
)
{
foreach
(
$node
->
__items
as
$key
=>
$subnode
)
{
if
(
count
(
$subnode
->
__items
)
>
0
)
{
if
(
count
(
$subnode
->
__items
)
>
0
)
{
...
...
src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_0.php
View file @
4425c28e
...
@@ -38,4 +38,4 @@ class M1_0_0 extends BaseModelMigration
...
@@ -38,4 +38,4 @@ class M1_0_0 extends BaseModelMigration
$current_value
=
(
string
)
$model
->
general
->
FromEmail
;
$current_value
=
(
string
)
$model
->
general
->
FromEmail
;
$model
->
general
->
FromEmail
=
"100_"
.
$current_value
;
$model
->
general
->
FromEmail
=
"100_"
.
$current_value
;
}
}
}
}
\ No newline at end of file
src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/Migrations/M1_0_1.php
View file @
4425c28e
...
@@ -38,4 +38,4 @@ class M1_0_1 extends BaseModelMigration
...
@@ -38,4 +38,4 @@ class M1_0_1 extends BaseModelMigration
$current_value
=
(
string
)
$model
->
general
->
FromEmail
;
$current_value
=
(
string
)
$model
->
general
->
FromEmail
;
$model
->
general
->
FromEmail
=
"101_"
.
$current_value
;
$model
->
general
->
FromEmail
=
"101_"
.
$current_value
;
}
}
}
}
\ No newline at end of file
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