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
ac219874
Commit
ac219874
authored
Apr 27, 2016
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mvc: apply style
parent
cd949343
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
0 additions
and
25 deletions
+0
-25
services.php
src/opnsense/mvc/app/config/services.php
+0
-1
services_api.php
src/opnsense/mvc/app/config/services_api.php
+0
-1
ApiControllerBase.php
...e/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
+0
-1
SystemhealthController.php
...llers/OPNsense/Diagnostics/Api/SystemhealthController.php
+0
-7
ServiceController.php
...vc/app/controllers/OPNsense/IDS/Api/ServiceController.php
+0
-1
SettingsController.php
...app/controllers/OPNsense/Proxy/Api/SettingsController.php
+0
-1
Radius.php
src/opnsense/mvc/app/library/OPNsense/Auth/Radius.php
+0
-4
Backend.php
src/opnsense/mvc/app/library/OPNsense/Core/Backend.php
+0
-1
BaseModel.php
src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
+0
-3
BaseField.php
...nse/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+0
-2
ACL.php
src/opnsense/mvc/app/models/OPNsense/Core/ACL.php
+0
-1
BaseModelTest.php
...ense/mvc/tests/app/models/OPNsense/Base/BaseModelTest.php
+0
-1
Field_Framework_TestCase.php
...els/OPNsense/Base/FieldTypes/Field_Framework_TestCase.php
+0
-1
No files found.
src/opnsense/mvc/app/config/services.php
View file @
ac219874
...
@@ -145,7 +145,6 @@ $di->set('router', function () {
...
@@ -145,7 +145,6 @@ $di->set('router', function () {
"action"
=>
2
,
"action"
=>
2
,
"params"
=>
3
"params"
=>
3
));
));
}
}
$router
->
handle
();
$router
->
handle
();
...
...
src/opnsense/mvc/app/config/services_api.php
View file @
ac219874
...
@@ -134,7 +134,6 @@ $di->set('router', function () {
...
@@ -134,7 +134,6 @@ $di->set('router', function () {
"action"
=>
2
,
"action"
=>
2
,
"params"
=>
3
"params"
=>
3
));
));
}
}
$router
->
handle
();
$router
->
handle
();
...
...
src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
View file @
ac219874
...
@@ -199,7 +199,6 @@ class ApiControllerBase extends ControllerRoot
...
@@ -199,7 +199,6 @@ class ApiControllerBase extends ControllerRoot
}
else
{
}
else
{
echo
json_encode
(
$data
);
echo
json_encode
(
$data
);
}
}
}
else
{
}
else
{
// output raw data
// output raw data
echo
$data
;
echo
$data
;
...
...
src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/SystemhealthController.php
View file @
ac219874
...
@@ -71,7 +71,6 @@ class SystemhealthController extends ApiControllerBase
...
@@ -71,7 +71,6 @@ class SystemhealthController extends ApiControllerBase
"recorded_time"
=>
(
$step
*
(
int
)
$value
->
pdp_per_row
)
*
"recorded_time"
=>
(
$step
*
(
int
)
$value
->
pdp_per_row
)
*
(
$this
->
countRows
(
$value
)
-
$firstValue_rowNumber
)
(
$this
->
countRows
(
$value
)
-
$firstValue_rowNumber
)
]);
]);
}
}
}
}
return
(
$info
);
return
(
$info
);
...
@@ -224,7 +223,6 @@ class SystemhealthController extends ApiControllerBase
...
@@ -224,7 +223,6 @@ class SystemhealthController extends ApiControllerBase
$last
=
$rra_info
[
0
][
"firstValue_timestamp"
];
$last
=
$rra_info
[
0
][
"firstValue_timestamp"
];
$first
=
$rra_info
[
$last_rra_key
][
"firstValue_timestamp"
]
+
$rra_info
[
$last_rra_key
][
"recorded_time"
]
-
$first
=
$rra_info
[
$last_rra_key
][
"firstValue_timestamp"
]
+
$rra_info
[
$last_rra_key
][
"recorded_time"
]
-
$rra_info
[
$last_rra_key
][
"full_step"
];
$rra_info
[
$last_rra_key
][
"full_step"
];
}
else
{
}
else
{
$first
=
0
;
$first
=
0
;
$last
=
0
;
$last
=
0
;
...
@@ -370,7 +368,6 @@ class SystemhealthController extends ApiControllerBase
...
@@ -370,7 +368,6 @@ class SystemhealthController extends ApiControllerBase
$skip_nan
=
true
;
$skip_nan
=
true
;
$condensed_row_values
[
$count_values
][
$column_counter
]
=
"NaN"
;
$condensed_row_values
[
$count_values
][
$column_counter
]
=
"NaN"
;
}
elseif
(
$skip_nan
==
false
)
{
}
elseif
(
$skip_nan
==
false
)
{
if
(
$archValue
[
"type"
]
==
"overview"
)
{
if
(
$archValue
[
"type"
]
==
"overview"
)
{
// overwrite this values and skip averaging, looks better for overview
// overwrite this values and skip averaging, looks better for overview
...
@@ -424,12 +421,9 @@ class SystemhealthController extends ApiControllerBase
...
@@ -424,12 +421,9 @@ class SystemhealthController extends ApiControllerBase
}
}
}
}
$rowCount
++
;
$rowCount
++
;
}
}
}
}
}
}
}
}
$key_counter
++
;
$key_counter
++
;
...
@@ -555,7 +549,6 @@ class SystemhealthController extends ApiControllerBase
...
@@ -555,7 +549,6 @@ class SystemhealthController extends ApiControllerBase
if
(
trim
((
string
)
$xml
->
rra
[
$count
]
->
cf
)
!=
"AVERAGE"
)
{
if
(
trim
((
string
)
$xml
->
rra
[
$count
]
->
cf
)
!=
"AVERAGE"
)
{
unset
(
$xml
->
rra
[
$count
]);
unset
(
$xml
->
rra
[
$count
]);
}
}
}
}
$data_sets_full
=
$this
->
getDataSetInfo
(
$xml
);
// get dataSet information to include in answer
$data_sets_full
=
$this
->
getDataSetInfo
(
$xml
);
// get dataSet information to include in answer
...
...
src/opnsense/mvc/app/controllers/OPNsense/IDS/Api/ServiceController.php
View file @
ac219874
...
@@ -166,7 +166,6 @@ class ServiceController extends ApiControllerBase
...
@@ -166,7 +166,6 @@ class ServiceController extends ApiControllerBase
}
else
{
}
else
{
$status
=
"error generating ids template ("
.
$bckresult
.
")"
;
$status
=
"error generating ids template ("
.
$bckresult
.
")"
;
}
}
}
}
return
array
(
"status"
=>
$status
);
return
array
(
"status"
=>
$status
);
}
}
...
...
src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php
View file @
ac219874
...
@@ -85,7 +85,6 @@ class SettingsController extends ApiControllerBase
...
@@ -85,7 +85,6 @@ class SettingsController extends ApiControllerBase
$cnf
->
save
();
$cnf
->
save
();
$result
[
"result"
]
=
"saved"
;
$result
[
"result"
]
=
"saved"
;
}
}
}
}
return
$result
;
return
$result
;
...
...
src/opnsense/mvc/app/library/OPNsense/Auth/Radius.php
View file @
ac219874
...
@@ -171,7 +171,6 @@ class Radius implements IAuthConnector
...
@@ -171,7 +171,6 @@ class Radius implements IAuthConnector
break
;
break
;
default
:
default
:
syslog
(
LOG_ERR
,
"Unexpected return value:
$radius
\n
"
);
syslog
(
LOG_ERR
,
"Unexpected return value:
$radius
\n
"
);
}
}
radius_close
(
$radius
);
radius_close
(
$radius
);
}
}
...
@@ -240,7 +239,6 @@ class Radius implements IAuthConnector
...
@@ -240,7 +239,6 @@ class Radius implements IAuthConnector
break
;
break
;
default
:
default
:
syslog
(
LOG_ERR
,
"Unexpected return value:
$radius
\n
"
);
syslog
(
LOG_ERR
,
"Unexpected return value:
$radius
\n
"
);
}
}
radius_close
(
$radius
);
radius_close
(
$radius
);
}
}
...
@@ -310,7 +308,6 @@ class Radius implements IAuthConnector
...
@@ -310,7 +308,6 @@ class Radius implements IAuthConnector
break
;
break
;
default
:
default
:
syslog
(
LOG_ERR
,
"Unexpected return value:
$radius
\n
"
);
syslog
(
LOG_ERR
,
"Unexpected return value:
$radius
\n
"
);
}
}
radius_close
(
$radius
);
radius_close
(
$radius
);
}
}
...
@@ -388,7 +385,6 @@ class Radius implements IAuthConnector
...
@@ -388,7 +385,6 @@ class Radius implements IAuthConnector
default
:
default
:
break
;
break
;
}
}
}
}
return
true
;
return
true
;
break
;
break
;
...
...
src/opnsense/mvc/app/library/OPNsense/Core/Backend.php
View file @
ac219874
...
@@ -119,7 +119,6 @@ class Backend
...
@@ -119,7 +119,6 @@ class Backend
$this
->
getLogger
()
->
error
(
"Timeout ("
.
$timeout
.
") executing : "
.
$event
);
$this
->
getLogger
()
->
error
(
"Timeout ("
.
$timeout
.
") executing : "
.
$event
);
return
null
;
return
null
;
}
}
}
}
return
str_replace
(
$endOfStream
,
""
,
$resp
);
return
str_replace
(
$endOfStream
,
""
,
$resp
);
...
...
src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
View file @
ac219874
...
@@ -189,7 +189,6 @@ abstract class BaseModel
...
@@ -189,7 +189,6 @@ abstract class BaseModel
// add object as child to this node
// add object as child to this node
$internal_data
->
addChildNode
(
$xmlNode
->
getName
(),
$fieldObject
);
$internal_data
->
addChildNode
(
$xmlNode
->
getName
(),
$fieldObject
);
}
}
}
}
}
}
...
@@ -401,7 +400,6 @@ abstract class BaseModel
...
@@ -401,7 +400,6 @@ abstract class BaseModel
}
else
{
}
else
{
$target_node
=
$target_node
->
xpath
(
$str_parts
[
$i
])[
0
];
$target_node
=
$target_node
->
xpath
(
$str_parts
[
$i
])[
0
];
}
}
}
}
}
}
...
@@ -466,7 +464,6 @@ abstract class BaseModel
...
@@ -466,7 +464,6 @@ abstract class BaseModel
}
else
{
}
else
{
return
null
;
return
null
;
}
}
}
}
return
$node
;
return
$node
;
}
}
...
...
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
View file @
ac219874
...
@@ -499,8 +499,6 @@ abstract class BaseField
...
@@ -499,8 +499,6 @@ abstract class BaseField
foreach
(
$this
->
getAttributes
()
as
$AttrKey
=>
$AttrValue
)
{
foreach
(
$this
->
getAttributes
()
as
$AttrKey
=>
$AttrValue
)
{
$subnode
->
addAttribute
(
$AttrKey
,
$AttrValue
);
$subnode
->
addAttribute
(
$AttrKey
,
$AttrValue
);
}
}
}
}
foreach
(
$this
->
__items
as
$key
=>
$FieldNode
)
{
foreach
(
$this
->
__items
as
$key
=>
$FieldNode
)
{
...
...
src/opnsense/mvc/app/models/OPNsense/Core/ACL.php
View file @
ac219874
...
@@ -127,7 +127,6 @@ class ACL
...
@@ -127,7 +127,6 @@ class ACL
$this
->
ACLtags
[
$aclID
]
=
$aclPayload
;
$this
->
ACLtags
[
$aclID
]
=
$aclPayload
;
}
}
}
}
}
}
}
}
...
...
src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModelTest.php
View file @
ac219874
...
@@ -67,5 +67,4 @@ class BaseModelTest extends \PHPUnit_Framework_TestCase
...
@@ -67,5 +67,4 @@ class BaseModelTest extends \PHPUnit_Framework_TestCase
{
{
BaseModelTest
::
$model
->
general
->
FromEmailXXX
=
"test@test.nl"
;
BaseModelTest
::
$model
->
general
->
FromEmailXXX
=
"test@test.nl"
;
}
}
}
}
src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/Field_Framework_TestCase.php
View file @
ac219874
...
@@ -28,7 +28,6 @@
...
@@ -28,7 +28,6 @@
*/
*/
namespace
tests\OPNsense\Base\FieldTypes
;
namespace
tests\OPNsense\Base\FieldTypes
;
/**
/**
* Class Field_Framework_TestCase
* Class Field_Framework_TestCase
* @package tests\OPNsense\Base\FieldTypes
* @package tests\OPNsense\Base\FieldTypes
...
...
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