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
ec4ca735
Commit
ec4ca735
authored
Feb 19, 2016
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
services: s/get_services/services_get/g
(cherry picked from commit
45d45596
)
parent
d6f0e34e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
services.inc
src/etc/inc/services.inc
+4
-5
fbegin.inc
src/www/fbegin.inc
+1
-1
status_services.php
src/www/status_services.php
+1
-1
services_status.widget.php
src/www/widgets/widgets/services_status.widget.php
+1
-1
No files found.
src/etc/inc/services.inc
View file @
ec4ca735
...
...
@@ -2545,8 +2545,7 @@ function is_apinger_enabled()
return
is_array
(
return_gateways_array
());
}
function
get_services
()
function
services_get
()
{
global
$config
;
...
...
@@ -2702,9 +2701,9 @@ function get_services()
return
$services
;
}
function
find_service_by_openvpn_vpnid
(
$vpnid
)
{
$services
=
get_services
();
function
find_service_by_openvpn_vpnid
(
$vpnid
)
{
$services
=
services_get
();
foreach
(
$services
as
$service
)
{
if
((
$service
[
"name"
]
==
"openvpn"
)
&&
isset
(
$service
[
"vpnid"
])
&&
(
$service
[
"vpnid"
]
==
$vpnid
))
{
return
$service
;
...
...
src/www/fbegin.inc
View file @
ec4ca735
...
...
@@ -35,7 +35,7 @@ function find_service_by_name($names)
$names
=
array
(
$names
);
}
$services
=
get_services
();
$services
=
services_get
();
foreach
(
$services
as
$service
)
{
foreach
(
$names
as
$name
)
{
...
...
src/www/status_services.php
View file @
ec4ca735
...
...
@@ -291,7 +291,7 @@ function service_control_restart($name, $extras) {
return
sprintf
(
gettext
(
"%s has been restarted."
),
htmlspecialchars
(
$name
));
}
$services
=
get_services
();
$services
=
services_get
();
if
(
count
(
$services
)
>
0
)
{
uasort
(
$services
,
"service_name_compare"
);
...
...
src/www/widgets/widgets/services_status.widget.php
View file @
ec4ca735
...
...
@@ -37,7 +37,7 @@ require_once("vpn.inc");
require_once
(
"widgets/include/services_status.inc"
);
require_once
(
"interfaces.inc"
);
$services
=
get_services
();
$services
=
services_get
();
if
(
isset
(
$_POST
[
'servicestatusfilter'
]))
{
$config
[
'widgets'
][
'servicestatusfilter'
]
=
htmlspecialchars
(
$_POST
[
'servicestatusfilter'
],
ENT_QUOTES
|
ENT_HTML401
);
...
...
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