From 45d4559674629abc2b096f9453a407cb2b679e66 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 19 Feb 2016 17:36:32 +0100
Subject: [PATCH] services: s/get_services/services_get/g

---
 src/etc/inc/services.inc                           | 9 ++++-----
 src/www/fbegin.inc                                 | 2 +-
 src/www/status_services.php                        | 2 +-
 src/www/widgets/widgets/services_status.widget.php | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 99702d2bd..033536726 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2538,8 +2538,7 @@ function is_apinger_enabled()
     return is_array(return_gateways_array());
 }
 
-
-function get_services()
+function services_get()
 {
     global $config;
 
@@ -2695,9 +2694,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;
diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index 134a17d56..1b92227c0 100644
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -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) {
diff --git a/src/www/status_services.php b/src/www/status_services.php
index 77e25bbdb..5501002e3 100644
--- a/src/www/status_services.php
+++ b/src/www/status_services.php
@@ -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");
diff --git a/src/www/widgets/widgets/services_status.widget.php b/src/www/widgets/widgets/services_status.widget.php
index 8ec2a6e08..126cd2b11 100644
--- a/src/www/widgets/widgets/services_status.widget.php
+++ b/src/www/widgets/widgets/services_status.widget.php
@@ -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);