diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 3496f0999..47806b6f4 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -2687,7 +2687,7 @@ function services_get() $services[] = array( 'pidfile' => '/var/run/lighttpd-api-dispatcher.pid', 'description' => gettext('Captive Portal'), - 'confidg' => array( + 'configd' => array( 'restart' => array('captiveportal restart'), 'start' => array('captiveportal start'), 'stop' => array('captiveportal stop'), @@ -2782,26 +2782,28 @@ function get_service_status_icon($service, $withtext = true, $smallicon = false) return $output; } -function get_service_control_links($service, $addname = false) +function get_service_control_links($service, $addname = false, $add_script = true) { $stitle = $addname ? $service['name'] . ' ' : ''; - $output = " - - "; + + "; + } if (get_service_status($service)) { if (isset($service['id'])) { diff --git a/src/www/status_services.php b/src/www/status_services.php index 0b2e2eb13..478de9b94 100644 --- a/src/www/status_services.php +++ b/src/www/status_services.php @@ -45,13 +45,13 @@ if (!empty($_POST['service'])) { $service_name = $_POST['service']; switch ($_POST['action']) { case 'restart': - service_control_restart($service_name, $_POST); + echo service_control_restart($service_name, $_POST); break; case 'start': - service_control_start($service_name, $_POST); + echo service_control_start($service_name, $_POST); break; case 'stop': - service_control_stop($service_name, $_POST); + echo service_control_stop($service_name, $_POST); break; } exit; @@ -69,7 +69,6 @@ function service_control_start($name, $extras) if (!isset($service['name'])) { return sprintf(gettext("Could not start unknown service `%s'"), htmlspecialchars($name)); } - if (isset($service['configd']['start'])) { foreach ($service['configd']['start'] as $cmd) { configd_run($cmd); @@ -180,6 +179,22 @@ include("head.inc"); ?> + +
@@ -205,7 +220,7 @@ include("head.inc"); - +