From e8fa56c5acbf4352bc7917cb9b4225dd6032238e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 20 Feb 2016 12:18:33 +0100
Subject: [PATCH] services: bubble down plugins_services hook

This way, the caller only needs to specify plugins.inc on the
top to let the subsystem(s) know plugin hooks need to be executed.
---
 src/etc/inc/services.inc                           | 14 +++++++-------
 src/www/status_services.php                        |  4 ----
 src/www/widgets/widgets/services_status.widget.php |  4 ----
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 4ca59623f..4089c96bd 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2736,6 +2736,13 @@ function services_get()
         'name' => 'configd',
     );
 
+    if (function_exists('plugins_services')) {
+        /* only pull plugins if plugins.inc was included before */
+        foreach (plugins_services() as $service) {
+            $services[] = $service;
+        }
+    }
+
     return $services;
 }
 
@@ -2747,13 +2754,6 @@ function find_service_by_name($names, $filter = array())
 
     $services = services_get();
 
-    if (function_exists('plugins_services')) {
-        /* only pull plugins if plugins.inc was included before */
-        foreach (plugins_services() as $service) {
-            $services[] = $service;
-        }
-    }
-
     foreach ($services as $service) {
         foreach ($names as $name) {
             if ($service['name'] != $name) {
diff --git a/src/www/status_services.php b/src/www/status_services.php
index f645f5297..a8873cebb 100644
--- a/src/www/status_services.php
+++ b/src/www/status_services.php
@@ -178,10 +178,6 @@ function service_control_restart($name, $extras)
 
 $services = services_get();
 
-foreach (plugins_services() as $service) {
-    $services[] = $service;
-}
-
 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 a002d9656..cd4325c69 100644
--- a/src/www/widgets/widgets/services_status.widget.php
+++ b/src/www/widgets/widgets/services_status.widget.php
@@ -40,10 +40,6 @@ require_once("widgets/include/services_status.inc");
 
 $services = services_get();
 
-foreach (plugins_services() as $service) {
-    $services[] = $service;
-}
-
 if (isset($_POST['servicestatusfilter'])) {
     $config['widgets']['servicestatusfilter'] = htmlspecialchars($_POST['servicestatusfilter'], ENT_QUOTES | ENT_HTML401);
     write_config("Saved Service Status Filter via Dashboard");