(legacy) move services.inc out of fbegin.inc to pages with service shortcut

src/www/diag_ipsec.php

@@ -35,8 +35,9 @@ $pgtitle = array(gettext("Status"),gettext("IPsec"));
 $shortcut_section = "ipsec";
 
 require_once("guiconfig.inc");
-include("head.inc");
 require_once("ipsec.inc");
+require_once("services.inc");
+include("head.inc");
 
 function ipsec_get_descr($ikeid) {
 	global $config;

src/www/diag_ipsec_leases.php

@@ -28,6 +28,8 @@
 
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
+require_once("services.inc");
+
 
 $pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("Leases"));
 $shortcut_section = "ipsec";

src/www/diag_ipsec_sad.php

@@ -29,6 +29,8 @@
 
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
+require_once("services.inc");
+
 
 $pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("SAD"));
 $shortcut_section = "ipsec";

src/www/diag_ipsec_spd.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
+require_once("services.inc");
 
 $pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("SPD"));
 $shortcut_section = "ipsec";

src/www/diag_logs_auth.php

@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 $portal_logfile = '/var/log/portalauth.log';
 

src/www/diag_logs_dhcp.php

@@ -29,6 +29,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 $dhcpd_logfile = '/var/log/dhcpd.log';
 

src/www/diag_logs_gateways.php

@@ -30,6 +30,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 $system_logfile = '/var/log/gateways.log';
 

src/www/diag_logs_ipsec.php

@@ -30,6 +30,8 @@
 
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
+require_once("services.inc");
+
 
 function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert = "", $grepreverse = false) {
 	global $g, $config;

src/www/diag_logs_ntpd.php

@@ -29,6 +29,8 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
+
 
 $ntpd_logfile = '/var/log/ntpd.log';
 

src/www/diag_logs_openvpn.php

@@ -28,11 +28,12 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("OpenVPN"));
-$shortcut_section = "openvpn";
-
 require_once("guiconfig.inc");
 require_once("vpn.inc");
+require_once("services.inc");
+
+$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("OpenVPN"));
+$shortcut_section = "openvpn";
 
 $openvpn_logfile = '/var/log/openvpn.log';
 

src/www/diag_logs_relayd.php

@@ -29,6 +29,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 $relayd_logfile = '/var/log/relayd.log';
 

src/www/diag_logs_resolver.php

@@ -30,6 +30,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 $system_logfile = '/var/log/resolver.log';
 

src/www/fbegin.inc

@@ -30,7 +30,6 @@
 
 require_once("functions.inc");
 require_once("shortcuts.inc");
-require_once("services.inc");
 
 function find_service_by_name($name) {
 	$services = get_services();

src/www/load_balancer_monitor.php

@@ -31,6 +31,8 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("load_balancer_maintable.inc");
+require_once("services.inc");
+
 
 if (!is_array($config['load_balancer']['monitor_type'])) {
 	$config['load_balancer']['monitor_type'] = array();

src/www/load_balancer_monitor_edit.php

@@ -27,6 +27,8 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
+
 
 $rfc2616 = array(
 	100 => "100 Continue",

src/www/load_balancer_pool.php

@@ -31,6 +31,8 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("load_balancer_maintable.inc");
+require_once("services.inc");
+
 
 if (!is_array($config['load_balancer']['lbpool'])) {
 	$config['load_balancer']['lbpool'] = array();

src/www/load_balancer_pool_edit.php

@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_pool.php');
 

src/www/load_balancer_relay_action.php

@@ -31,6 +31,8 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("load_balancer_maintable.inc");
+require_once("services.inc");
+
 
 if (!is_array($config['load_balancer']['lbaction'])) {
 	$config['load_balancer']['lbaction'] = array();

src/www/load_balancer_relay_action_edit.php

@@ -27,6 +27,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_relay_action.php');
 

src/www/load_balancer_relay_protocol.php

@@ -31,6 +31,8 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("load_balancer_maintable.inc");
+require_once("services.inc");
+
 
 if (!is_array($config['load_balancer']['lbprotocol'])) {
 	$config['load_balancer']['lbprotocol'] = array();

src/www/load_balancer_relay_protocol_edit.php

@@ -28,6 +28,8 @@
 
 
 require_once("guiconfig.inc");
+require_once("services.inc");
+
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_relay_protocol.php');
 

src/www/load_balancer_setting.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
+require_once("services.inc");
 
 if (!is_array($config['load_balancer']['setting'])) {
 	$config['load_balancer']['setting'] = array();

src/www/load_balancer_virtual_server.php

@@ -32,6 +32,7 @@ require_once("functions.inc");
 require_once("filter.inc");
 require_once("vslb.inc");
 require_once("load_balancer_maintable.inc");
+require_once("services.inc");
 
 /* Cleanup relayd anchors that have been marked for cleanup. */
 function cleanup_lb_marked()

src/www/load_balancer_virtual_server_edit.php

@@ -27,6 +27,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_virtual_server.php');
 

src/www/services_captiveportal.php

@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("filter.inc");
+require_once("services.inc");
 
 if (substr($_GET['act'], 0, 3) == "get")
 	$nocsrf = true;

src/www/services_captiveportal_filemanager.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
+require_once("services.inc");
 
 
 $captiveportal_element_sizelimit = 1048576;

src/www/services_captiveportal_ip.php

@@ -29,6 +29,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
+require_once("services.inc");
 
 $cpzone = $_GET['zone'];
 if (isset($_POST['zone'])) {

src/www/services_captiveportal_ip_edit.php

@@ -31,6 +31,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
+require_once("services.inc");
 
 
 function allowedipscmp($a, $b)

src/www/services_captiveportal_mac.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
+require_once("services.inc");
 
 global $cpzone;
 global $cpzoneid;

src/www/services_captiveportal_mac_edit.php

@@ -29,6 +29,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
+require_once("services.inc");
 
 
 function passthrumacscmp($a, $b)

src/www/services_captiveportal_vouchers.php

@@ -35,6 +35,7 @@ require_once('guiconfig.inc');
 require_once('functions.inc');
 require_once('captiveportal.inc');
 require_once('voucher.inc');
+require_once("services.inc");
 
 function voucher_unlink_db($roll)
 {

src/www/services_captiveportal_vouchers_edit.php

@@ -30,6 +30,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
+require_once("services.inc");
 
 $pgtitle = array(gettext("Services"), gettext("Captive portal"), gettext("Edit Voucher Rolls"));
 $shortcut_section = "captiveportal-vouchers";

src/www/services_captiveportal_zones.php

@@ -28,6 +28,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
+require_once("services.inc");
 
 global $cpzone;
 global $cpzoneid;

src/www/services_captiveportal_zones_edit.php

@@ -29,6 +29,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
+require_once("services.inc");
 
 $pgtitle = array(gettext("Services"),gettext("Captive portal"),gettext("Edit Zones"));
 $shortcut_section = "captiveportal";

src/www/services_dhcp.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
+require_once("services.inc");
 
 /* This function will remove entries from dhcpd.leases that would otherwise
  * overlap with static DHCP reservations. If we don't clean these out,

src/www/services_dhcp_edit.php

@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 function staticmapcmp($a, $b) {
 	return ipcmp($a['ipaddr'], $b['ipaddr']);

src/www/services_dhcp_relay.php

@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 $pconfig['enable'] = isset($config['dhcrelay']['enable']);
 if (empty($config['dhcrelay']['interface']))

src/www/services_dnsmasq.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
+require_once("services.inc");
 
 $pconfig['enable'] = isset($config['dnsmasq']['enable']);
 $pconfig['regdhcp'] = isset($config['dnsmasq']['regdhcp']);

src/www/services_dnsmasq_domainoverride_edit.php

@@ -27,6 +27,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
 

src/www/services_dnsmasq_edit.php

@@ -26,6 +26,10 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
+require_once("services.inc");
+
+
 function hostcmp($a, $b) {
 	return strcasecmp($a['host'], $b['host']);
 }
@@ -39,8 +43,6 @@ function hosts_sort() {
         usort($config['dnsmasq']['hosts'], "hostcmp");
 }
 
-require_once("guiconfig.inc");
-
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
 
 if (!is_array($config['dnsmasq']['hosts']))

src/www/services_ntpd.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once('rrd.inc');
+require_once("services.inc");
 
 if (!is_array($config['ntpd']))
 	$config['ntpd'] = array();

src/www/services_ntpd_gps.php

@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 function set_default_gps() {
 	global $config;

src/www/services_ntpd_pps.php

@@ -27,6 +27,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 if (!is_array($config['ntpd']))
 	$config['ntpd'] = array();

src/www/services_snmp.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
+require_once("services.inc");
 
 if (!is_array($config['snmpd'])) {
 	$config['snmpd'] = array();

src/www/services_unbound.php

@@ -29,6 +29,8 @@
 
 require_once("guiconfig.inc");
 require_once("unbound.inc");
+require_once("services.inc");
+
 
 if (!is_array($config['unbound']))
 	$config['unbound'] = array();

src/www/services_unbound_domainoverride_edit.php

@@ -28,6 +28,8 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
+
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_unbound.php');
 

src/www/services_unbound_host_edit.php

@@ -27,6 +27,9 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
+require_once("services.inc");
+
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_unbound.php');
 
 function hostcmp($a, $b) {
@@ -42,8 +45,6 @@ function hosts_sort() {
 	usort($config['unbound']['hosts'], "hostcmp");
 }
 
-require_once("guiconfig.inc");
-
 if (!is_array($config['unbound']['hosts']))
 	$config['unbound']['hosts'] = array();
 

src/www/services_upnp.php

@@ -34,6 +34,7 @@ $shortcut_section = "upnp";
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once('miniupnpd.inc');
+require_once("services.inc");
 
 function upnp_validate_ip($ip, $check_cdir) {
 	/* validate cidr */

src/www/status_captiveportal.php

@@ -29,6 +29,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
+require_once("services.inc");
 
 $cpzone = $_GET['zone'];
 if (isset($_POST['zone']))

src/www/status_captiveportal_test.php

@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
+require_once("services.inc");
 
 $cpzone = $_GET['zone'];
 if (isset($_POST['zone'])) {

src/www/status_captiveportal_voucher_rolls.php

@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
+require_once("services.inc");
 
 /* return how many vouchers are marked used on a roll */
 function voucher_used_count($roll) {

src/www/status_captiveportal_vouchers.php

@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
+require_once("services.inc");
 
 $cpzone = $_GET['zone'];
 if (isset($_POST['zone'])) {

src/www/status_dhcp_leases.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("config.inc");
+require_once("services.inc");
 
 $pgtitle = array(gettext("Status"),gettext("DHCP leases"));
 $shortcut_section = "dhcp";

src/www/status_gateways.php

@@ -27,6 +27,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 $a_gateways = return_gateways_array();
 $gateways_status = array();

src/www/status_lb_pool.php

@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("vslb.inc");
+require_once("services.inc");
 
 if (!is_array($config['load_balancer'])) {
 	$config['load_balancer'] = array();

src/www/status_ntpd.php

@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 if(!isset($config['ntpd']['noquery'])) {
 

src/www/status_openvpn.php

@@ -29,14 +29,14 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$pgtitle = array(gettext("Status"), gettext("OpenVPN"));
-$shortcut_section = "openvpn";
-
 require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("shortcuts.inc");
 require_once("services.inc");
 
+$pgtitle = array(gettext("Status"), gettext("OpenVPN"));
+$shortcut_section = "openvpn";
+
 /* Handle AJAX */
 if($_GET['action']) {
 	if($_GET['action'] == "kill") {

src/www/status_upnp.php

@@ -27,6 +27,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 if ($_POST) {
 	if ($_POST['clear'] == "Clear") {

src/www/system_gateways.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
+require_once("services.inc");
 
 $a_gateways = return_gateways_array(true, false, true);
 $a_gateways_arr = array();

src/www/system_gateways_edit.php

@@ -28,6 +28,7 @@
 
 require_once("guiconfig.inc");
 require_once("gwlb.inc");
+require_once("services.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_gateways.php');
 

src/www/vpn_ipsec.php

@@ -32,6 +32,7 @@ require_once("functions.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
+require_once("services.inc");
 
 if (!is_array($config['ipsec'])) {
     $config['ipsec'] = array();

src/www/vpn_ipsec_keys.php

@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("filter.inc");
+require_once("services.inc");
 
 if (!is_array($config['ipsec'])) {
         $config['ipsec'] = array();

src/www/vpn_ipsec_keys_edit.php

@@ -30,6 +30,7 @@ require_once("functions.inc");
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
+require_once("services.inc");
 
 if (!is_array($config['ipsec'])) {
         $config['ipsec'] = array();

src/www/vpn_ipsec_mobile.php

@@ -31,6 +31,8 @@ require_once("functions.inc");
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
+require_once("services.inc");
+
 
 if (!is_array($config['ipsec'])) {
         $config['ipsec'] = array();

src/www/vpn_ipsec_phase1.php

@@ -33,6 +33,8 @@ require_once("functions.inc");
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
+require_once("services.inc");
+
 
 $my_identifier_list = array(
 	'myaddress' => array( 'desc' => gettext('My IP address'), 'mobile' => true ),

src/www/vpn_ipsec_phase2.php

@@ -31,6 +31,7 @@ require_once("functions.inc");
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
+require_once("services.inc");
 
 $p2_modes = array(
 	'tunnel' => 'Tunnel IPv4',

src/www/vpn_ipsec_settings.php

@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
+require_once("services.inc");
 
 if (!is_array($config['ipsec'])) {
         $config['ipsec'] = array();

src/www/vpn_openvpn_client.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("openvpn.inc");
+require_once("services.inc");
 
 function openvpn_validate_host($value, $name) {
 	$value = trim($value);

src/www/vpn_openvpn_csc.php

@@ -28,6 +28,8 @@
 
 require_once("guiconfig.inc");
 require_once("openvpn.inc");
+require_once("services.inc");
+
 
 function openvpn_cleanup_csc($common_name)
 {

src/www/vpn_openvpn_server.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("openvpn.inc");
+require_once("services.inc");
 
 $openvpn_dh_lengths = array(1024, 2048, 4096 );
 $openvpn_cert_depths = array(