Packages repo cleanup:

- Drop support for pfSense < 2
- Remove archive/, old files can be reached using git
- Remove old and unused packages
- Move stale files from config subdir to a package subdir

2 files changed, 0 insertions, 2016 deletions

diff --git a/config/Fit123/bin/ltsp/services.inc b/config/Fit123/bin/ltsp/services.inc
deleted file mode 100644
index f999868a..00000000
--- a/config/Fit123/bin/ltsp/services.inc
+++ /dev/null
@@ -1,1320 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	services.inc
-	part of m0n0wall (http://m0n0.ch/wall)
-
-	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* include all configuration functions */
-require_once("functions.inc");
-
-function load_balancer_use_sticky() {
-	global $config, $g;
-	if (isset ($config['system']['lb_use_sticky']))
-		touch("/var/etc/use_pf_pool__stickyaddr");
-	else
-		unlink_if_exists("/var/etc/use_pf_pool__stickyaddr");
-}
-
-function services_dhcpd_configure() {
-	global $config, $g;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "services_dhcpd_configure($if) being called $mt\n";
-	}
-
-	/* if OLSRD is enabled, allow WAN to house DHCP. */
-	if($config['installedpackages']['olsrd'])
-		foreach($config['installedpackages']['olsrd']['config'] as $olsrd)
-				if($olsrd['enable'])
-					$is_olsr_enabled = true;
-
-	/* configure DHCPD chroot */
-	$fd = fopen("/tmp/dhcpd.sh","w");
-	$status = `mount | grep "{$g['dhcpd_chroot_path']}/dev"`;
-	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}\n");
-	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/dev\n");
-	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/etc\n");
-	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/usr/local/sbin\n");
-	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/var/db\n");
-	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/var/run\n");
-	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/usr\n");
-	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/lib\n");
-	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/run\n");
-	fwrite($fd, "chown -R dhcpd:_dhcp {$g['dhcpd_chroot_path']}/*\n");
-	fwrite($fd, "cp /lib/libc.so.* {$g['dhcpd_chroot_path']}/lib/\n");
-	fwrite($fd, "cp /usr/local/sbin/dhcpd {$g['dhcpd_chroot_path']}/usr/local/sbin/\n");
-	fwrite($fd, "chmod a+rx {$g['dhcpd_chroot_path']}/usr/local/sbin/dhcpd\n");
-	if(!trim($status))
-		fwrite($fd, "mount -t devfs devfs {$g['dhcpd_chroot_path']}/dev\n");
-	fclose($fd);
-	mwexec("/bin/sh /tmp/dhcpd.sh");
-
-	/* kill any running dhcpd */
-	if(is_process_running("dhcpd"))
-		mwexec("killall dhcpd", true);
-
-	$syscfg = $config['system'];
-	$dhcpdcfg = $config['dhcpd'];
-
-	/* DHCP enabled on any interfaces? */
-	$dhcpdenable = false;
-	if(is_array($dhcpdcfg))
-		foreach ($dhcpdcfg as $dhcpif => $dhcpifconf) {
-			if (isset($dhcpifconf['enable']) &&
-				(($dhcpif == "lan") ||
-				(isset($config['interfaces'][$dhcpif]['enable']) &&
-				$config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
-				$dhcpdenable = true;
-			if (isset($dhcpifconf['enable']) &&
-				(($dhcpif == "wan") || (isset($config['interfaces'][$dhcpif]['enable']) &&
-				$config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
-				$dhcpdenable = true;
-		}
-
-	if (!$dhcpdenable)
-		return 0;
-
-	if ($g['booting'])
-		echo "Starting DHCP service...";
-	else
-		sleep(1);
-
-	/* write dhcpd.conf */
-	$fd = fopen("{$g['dhcpd_chroot_path']}/etc/dhcpd.conf", "w");
-	if (!$fd) {
-		printf("Error: cannot open dhcpd.conf in services_dhcpd_configure().\n");
-		return 1;
-	}
-
-
-
-	$dhcpdconf = <<<EOD
-option domain-name "{$syscfg['domain']}";
-default-lease-time 7200;
-max-lease-time 86400;
-authoritative;
-log-facility local7;
-ddns-update-style none;
-one-lease-per-client true;
-deny duplicates;
-
-EOD;
-
-	$dhcpdifs = array();
-
-	/*    loop through and deterimine if we need to setup
-	 *    failover peer "bleh" entries
-	 */
-	$dhcpnum = 0;
-	foreach ($dhcpdcfg as $dhcpif => $dhcpifconf) {
-		if($dhcpifconf['failover_peerip'] <> "") {
-			/*
-			 *    yep, failover peer is defined.
-			 *    does it match up to a defined vip?
-			 */
-			$skew = 110;
-			$a_vip = &$config['virtualip']['vip'];
-			if(is_array($a_vip)) {
-				foreach ($a_vip as $vipent) {
-					$int = guess_interface_from_ip($dhcpifconf['failover_peerip']);
-					$intip = find_interface_ip($int);
-					$real_dhcpif = convert_friendly_interface_to_real_interface_name($dhcpif);
-					if($int == $real_dhcpif) {
-						/* this is the interface! */
-						if($vipent['advskew'] < "20")
-							$skew = 0;
-					}
-				}
-			} else {
-				log_error("Warning!  DHCP Failover setup and no CARP virtual IP's defined!");
-			}
-			if($skew > 10) {
-				$type = "secondary";
-				$dhcpdconf_pri  = "mclt 600;\n";
-				$my_port = "520";
-				$peer_port = "519";
-			} else {
-				$my_port = "519";
-				$peer_port = "520";
-				$type = "primary";
-				$dhcpdconf_pri  = "split 128;\n";
-				$dhcpdconf_pri .= "  mclt 600;\n";
-			}
-			$dhcpdconf .= <<<EOPP
-failover peer "dhcp{$dhcpnum}" {
-  {$type};
-  address {$intip};
-  port {$my_port};
-  peer address {$dhcpifconf['failover_peerip']};
-  peer port {$peer_port};
-  max-response-delay 10;
-  max-unacked-updates 10;
-  {$dhcpdconf_pri}
-  load balance max seconds 3;
-}
-
-EOPP;
-		$dhcpnum++;
-		}
-	}
-
-	$dhcpnum = 0;
-
-	foreach ($dhcpdcfg as $dhcpif => $dhcpifconf) {
-
-		$ifcfg = $config['interfaces'][$dhcpif];
-
-		if (!isset($dhcpifconf['enable']) ||
-			($ifcfg['ipaddr'] == "dhcp") ||
-			(($dhcpif != "lan") &&
-			(!isset($ifcfg['enable']) || !$ifcfg['if'] || $ifcfg['bridge'])))
-			continue;
-
-		if($dhcpif == "lan" && $ifcfg['bridge'])
-			log_error("NOTE: DHCP Server on LAN is enabled.");
-
-		$subnet = gen_subnet($ifcfg['ipaddr'], $ifcfg['subnet']);
-		$subnetmask = gen_subnet_mask($ifcfg['subnet']);
-
-		if($is_olsr_enabled == true)
-			if($dhcpifconf['netmask'])
-				$subnetmask = gen_subnet_mask($dhcpifconf['netmask']);
-
-		$dnscfg = "";
-
-		if ($dhcpifconf['domain']) {
-			$dnscfg .= "	option domain-name \"{$dhcpifconf['domain']}\";\n";
-		}
-		if (isset($dhcpifconf['ddnsupdate'])) {
-			if($dhcpifconf['ddnsdomain'] <> "") {
-				$dnscfg .= "	ddns-domainname \"{$dhcpifconf['ddnsdomain']}\";\n";
-			}
-			$dnscfg .= "	ddns-update-style interim;\n";
-		}
-
-
-		if (is_array($dhcpifconf['dnsserver']) && ($dhcpifconf['dnsserver'][0])) {
-			$dnscfg .= "	option domain-name-servers " . join(",", $dhcpifconf['dnsserver']) . ";";
-		} else if (isset($config['dnsmasq']['enable'])) {
-			$dnscfg .= "	option domain-name-servers " . $ifcfg['ipaddr'] . ";";
-		} else if (is_array($syscfg['dnsserver']) && ($syscfg['dnsserver'][0])) {
-			$dnscfg .= "	option domain-name-servers " . join(",", $syscfg['dnsserver']) . ";";
-		}
-
-		$dhcpdconf .= "subnet $subnet netmask $subnetmask {\n";
-		$dhcpdconf .= "	pool {\n";
-
-		/* is failover dns setup? */
-		if (is_array($dhcpifconf['dnsserver']) && $dhcpifconf['dnsserver'][0] <> "") {
-			$dhcpdconf .= "		option domain-name-servers {$dhcpifconf['dnsserver'][0]}";
-			if($dhcpifconf['dnsserver'][1] <> "")
-				$dhcpdconf .= ",{$dhcpifconf['dnsserver'][1]}";
-			$dhcpdconf .= ";\n";
-		}
-
-		if($dhcpifconf['failover_peerip'] <> "")
-			$dhcpdconf .= "		deny dynamic bootp clients;\n";
-
-		if (isset($dhcpifconf['denyunknown']))
-		   $dhcpdconf .= "		deny unknown clients;\n";
-
-		if ($dhcpifconf['gateway'])
-			$routers = $dhcpifconf['gateway'];
-		else
-			$routers = $ifcfg['ipaddr'];
-
-		if($dhcpifconf['failover_peerip'] <> "") {
-			$dhcpdconf .= "		failover peer \"dhcp{$dhcpnum}\";\n";
-			$dhcpnum++;
-		}
-
-		$dhcpdconf .= <<<EOD
-		range {$dhcpifconf['range']['from']} {$dhcpifconf['range']['to']};
-	}
-	option routers {$routers};
-$dnscfg
-
-EOD;
-
-		if ($dhcpifconf['defaultleasetime'])
-			$dhcpdconf .= "	default-lease-time {$dhcpifconf['defaultleasetime']};\n";
-		if ($dhcpifconf['maxleasetime'])
-			$dhcpdconf .= "	max-lease-time {$dhcpifconf['maxleasetime']};\n";
-
-		if (is_array($dhcpifconf['winsserver']) && $dhcpifconf['winsserver'][0]) {
-			$dhcpdconf .= "	option netbios-name-servers " . join(",", $dhcpifconf['winsserver']) . ";\n";
-			$dhcpdconf .= "	option netbios-node-type 8;\n";
-		}
-
-		if (is_array($dhcpifconf['ntpserver']) && $dhcpifconf['ntpserver'][0])
-			$dhcpdconf .= "	option ntp-servers " . join(",", $dhcpifconf['ntpserver']) . ";\n";
-
-		if(isset($dhcpifconf['netboot'])) {
-			if (($dhcpifconf['next-server'] <> "") && ($dhcpifconf['filename'] <> "")) {
-				$dhcpdconf .= "	next-server {$dhcpifconf['next-server']};\n";
-				$dhcpdconf .= "	filename \"{$dhcpifconf['filename']}\";\n";
-			}
-                if ($dhcpifconf['rootpath'] <> "") {
-                                $dhcpdconf .= " option root-path \"{$dhcpifconf['rootpath']}\";\n";
-       }
-		}
-		$dhcpdconf .= <<<EOD
-}
-
-EOD;
-
-		/* add static mappings */
-		if (is_array($dhcpifconf['staticmap'])) {
-
-			$i = 0;
-			foreach ($dhcpifconf['staticmap'] as $sm) {
-				$dhcpdconf .= <<<EOD
-host s_{$dhcpif}_{$i} {
-	hardware ethernet {$sm['mac']};
-
-EOD;
-				if ($sm['ipaddr'])
-					$dhcpdconf .= "	fixed-address {$sm['ipaddr']};\n";
-
-				$dhcpdconf .= "}\n";
-				$i++;
-			}
-		}
-
-		$dhcpdifs[] = $ifcfg['if'];
-	}
-
-	fwrite($fd, $dhcpdconf);
-	fclose($fd);
-
-	/* create an empty leases database */
-	touch("{$g['dhcpd_chroot_path']}/var/db/dhcpd.leases");
-
-	/* fire up dhcpd in a chroot */
-	mwexec("/usr/local/sbin/dhcpd -user dhcpd -group _dhcp -chroot {$g['dhcpd_chroot_path']} -cf {$g['dhcpd_chroot_path']}/etc/dhcpd.conf " .
-		join(" ", $dhcpdifs));
-
-	if ($g['booting']) {
-		print "done.\n";
-	}
-
-	return 0;
-}
-
-function interfaces_staticarp_configure($if) {
-	global $config, $g;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "interfaces_staticarp_configure($if) being called $mt\n";
-	}
-
-        $ifcfg = $config['interfaces'][$if];
-
-        /* Enable staticarp, if enabled */
-        if(isset($config['dhcpd'][$if]['staticarp'])) {
-                mwexec("/sbin/ifconfig " . escapeshellarg($ifcfg['if']) . " staticarp " );
-                mwexec("/usr/sbin/arp -ad > /dev/null 2>&1 ");
-                if (is_array($config['dhcpd'][$if]['staticmap'])) {
-
-                        foreach ($config['dhcpd'][$if]['staticmap'] as $arpent) {
-                                mwexec("/usr/sbin/arp -s " . escapeshellarg($arpent['ipaddr']) . " " . escapeshellarg($arpent['mac']));
-								log_error("/usr/sbin/arp -s " . escapeshellarg($arpent['ipaddr']) . " " . escapeshellarg($arpent['mac']));
-                        }
-
-                }
-        } else {
-                mwexec("/sbin/ifconfig " . escapeshellarg($ifcfg['if']) . " -staticarp " );
-                mwexec("/usr/sbin/arp -da > /dev/null 2>&1 ");
-        }
-
-        return 0;
-}
-
-function services_dhcrelay_configure() {
-	global $config, $g;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "services_dhcrelay_configure() being called $mt\n";
-	}
-
-	/* kill any running dhcrelay */
-	killbypid("{$g['varrun_path']}/dhcrelay.pid");
-
-	$dhcrelaycfg = $config['dhcrelay'];
-
-	/* DHCPRelay enabled on any interfaces? */
-	$dhcrelayenable = false;
-	if(is_array($dhcrelaycfg)) {
-		foreach ($dhcrelaycfg as $dhcrelayif => $dhcrelayifconf) {
-			if (isset($dhcrelayifconf['enable']) &&
-				(($dhcrelayif == "lan") ||
-				(isset($config['interfaces'][$dhcrelayif]['enable']) &&
-				$config['interfaces'][$dhcrelayif]['if'] && (!$config['interfaces'][$dhcrelayif]['bridge']))))
-				$dhcrelayenable = true;
-		}
-	}
-
-	if (!$dhcrelayenable)
-		return 0;
-
-	if ($g['booting'])
-		echo "Starting DHCP relay service...";
-	else
-		sleep(1);
-
-	$dhcrelayifs = array();
-	foreach ($dhcrelaycfg as $dhcrelayif => $dhcrelayifconf) {
-
-		$ifcfg = $config['interfaces'][$dhcrelayif];
-
-		if (!isset($dhcrelayifconf['enable']) ||
-			(($dhcrelayif != "lan") &&
-			(!isset($ifcfg['enable']) || !$ifcfg['if'] || $ifcfg['bridge'])))
-			continue;
-
-		$dhcrelayifs[] = $ifcfg['if'];
-	}
-
-	/* In order for the relay to work, it needs to be active on the
-	   interface in which the destination server sits */
-	foreach ($config['interfaces'] as $ifname) {
-		$subnet = $ifname['ipaddr'] . "/" . $ifname['subnet'];
-		if (ip_in_subnet($dhcrelaycfg['server'],$subnet))
-			$destif = $ifname['if'];
-	}
-
-	if (!isset($destif))
-		$destif = $config['interfaces']['wan']['if'];
-
-	$dhcrelayifs[] = $destif;
-	$dhcrelayifs = array_unique($dhcrelayifs);
-
-	/* fire up dhcrelay */
-	$cmd = "/usr/local/sbin/dhcrelay -i " .  join(" -i ", $dhcrelayifs);
-
-	if (isset($dhcrelaycfg['agentoption']))
-		$cmd .=  " -a -m replace";
-
-	$cmd .= " {$dhcrelaycfg['server']}";
-	mwexec($cmd);
-
-	if (!$g['booting']) {
-		/* set the reload filter dity flag */
-		touch("{$g['tmp_path']}/filter_dirty");
-	}
-
-	return 0;
-}
-
-function services_dyndns_reset() {
-	global $config, $g;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "services_dyndns_reset() being called $mt\n";
-	}
-
-	if (file_exists("{$g['vardb_path']}/ez-ipupdate.cache")) {
-		conf_mount_rw();
-		unlink("{$g['vardb_path']}/ez-ipupdate.cache");
-		conf_mount_ro();
-	}
-
-	if (file_exists("{$g['conf_path']}/ez-ipupdate.cache")) {
-		conf_mount_rw();
-		unlink("{$g['conf_path']}/ez-ipupdate.cache");
-		conf_mount_ro();
-	}
-	
-	if (file_exists("{$g['conf_path']}/dyndns.cache")) {
-		conf_mount_rw();
-		unlink("{$g['conf_path']}/dyndns.cache");
-		conf_mount_ro();
-	}
-
-	return 0;
-}
-
-function services_dyndns_configure() {
-	global $config, $g;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "services_dyndns_configure() being called $mt\n";
-	}
-
-	$dyndnscfg = $config['dyndns'];
-	$wancfg = $config['interfaces']['wan'];
-
-	if (isset($dyndnscfg['enable'])) {
-
-		if ($g['booting']) {
-			echo "Starting DynDNS client...";
-			if(isset($config['system']['use_old_dyndns'])) {
-				echo " [Using ez-ipupdate] ";
-				services_dyndns_configure_old();
-				return;
-			}
-		} else {
-			sleep(1);
-			if(isset($config['system']['use_old_dyndns'])) {
-				services_dyndns_configure_old();
-				return;
-			}
-		}
-
-		/* load up the dyndns.class */
-		require_once("dyndns.class");
-
-		log_error("DynDns: Running updatedns()");
-
-		/* determine WAN interface name */
-		$wanif = get_real_wan_interface();
-		/* get ip */
-		$ip = find_interface_ip($wanif);
-
-		$dns = new updatedns($dnsService = $config['dyndns']['type'],
-							 $dnsHost = $config['dyndns']['host'],
-							 $dnsUser = $config['dyndns']['username'],
-							 $dnsPass = $config['dyndns']['password'],
-							 $dnsWilcard = $config['dyndns']['wildcard'],
-							 $dnsMX = $config['dyndns']['mx']);
-
-		if ($g['booting'])
-			echo "done.\n";
-	}
-
-	return 0;
-}
-
-function services_dyndns_configure_old() {
-	global $config, $g;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "services_dyndns_configure_old() being called $mt\n";
-	}
-
-        /* kill any running ez-ipupdate */
-        /* ez-ipupdate needs SIGQUIT instead of SIGTERM */
-        sigkillbypid("{$g['varrun_path']}/ez-ipupdate.pid", "QUIT");
-
-        $dyndnscfg = $config['dyndns'];
-        $wancfg = $config['interfaces']['wan'];
-
-        if (isset($dyndnscfg['enable'])) {
-
-                if ($g['booting'])
-                        echo "Starting DynDNS client...";
-                else
-                        sleep(1);
-
-                /* determine WAN interface name */
-                $wanif = get_real_wan_interface();
-
-                /* write ez-ipupdate.conf */
-                $fd = fopen("{$g['varetc_path']}/ez-ipupdate.conf", "w");
-                if (!$fd) {
-                        printf("Error: cannot open ez-ipupdate.conf in services_dyndns_configure().\n");
-                        return 1;
-                }
-
-                $ezipupdateconf = <<<EOD
-service-type={$dyndnscfg['type']}
-user={$dyndnscfg['username']}:{$dyndnscfg['password']}
-host={$dyndnscfg['host']}
-interface={$wanif}
-max-interval=2073600
-pid-file={$g['varrun_path']}/ez-ipupdate.pid
-cache-file={$g['vardb_path']}/ez-ipupdate.cache
-execute=/etc/rc.dyndns.storecache
-daemon
-
-EOD;
-
-                /* enable server[:port]? */
-                if ($dyndnscfg['server']) {
-                        if ($dyndnscfg['port'])
-                                $ezipupdateconf .= "server={$dyndnscfg['server']}:{$dyndnscfg['port']}\n";
-                        else
-                                $ezipupdateconf .= "server={$dyndnscfg['server']}\n";
-                }
-
-                /* enable MX? */
-                if ($dyndnscfg['mx']) {
-                        $ezipupdateconf .= "mx={$dyndnscfg['mx']}\n";
-                }
-
-                /* enable wildcards? */
-                if (isset($dyndnscfg['wildcard'])) {
-                        $ezipupdateconf .= "wildcard\n";
-                }
-
-                fwrite($fd, $ezipupdateconf);
-                fclose($fd);
-
-                /* if we're booting, copy the cache file from /conf */
-                if ($g['booting']) {
-                        if (file_exists("{$g['conf_path']}/ez-ipupdate.cache")) {
-                                copy("{$g['conf_path']}/ez-ipupdate.cache", "{$g['vardb_path']}/ez-ipupdate.cache");
-                       }
-                }
-
-                /* run ez-ipupdate */
-                mwexec("/usr/local/bin/ez-ipupdate -c {$g['varetc_path']}/ez-ipupdate.conf");
-
-                if ($g['booting'])
-                        echo "done\n";
-        }
-
-        return 0;
-}
-
-function services_dnsmasq_configure() {
-	global $config, $g;
-	$return = 0;
-	
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "services_dnsmasq_configure() being called $mt\n";
-	}
-
-	/* kill any running dnsmasq */
-	sigkillbypid("{$g['varrun_path']}/dnsmasq.pid", "TERM");
-
-	if (isset($config['dnsmasq']['enable'])) {
-
-		if ($g['booting'])
-			echo "Starting DNS forwarder...";
-		else
-			sleep(1);
-
-		/* generate hosts file */
-		if(system_hosts_generate()!=0)
-			$return = 1;
-
-		$args = "";
-
-		if (isset($config['dnsmasq']['regdhcp'])) {
-
-			$args .= " -l {$g['dhcpd_chroot_path']}/var/db/dhcpd.leases" .
-				" -s {$config['system']['domain']}";
-		}
-
-                if (isset($config['dnsmasq']['domainoverrides']) && is_array($config['dnsmasq']['domainoverrides'])) {
-                        foreach($config['dnsmasq']['domainoverrides'] as $override) {
-                                $args .= ' --server=/' . $override['domain'] . '/' . $override['ip'];
-                        }
-                }
-
-		/* suppose that dnsmasq handles our domain and don't send
-		requests for our local domain to upstream servers */
-		//if (!empty($config['system']['domain'])) {
-		//	$args .= sprintf(' --local=/%s/', $config['system']['domain']);
-		//}
-
-		/* run dnsmasq */
-		mwexec("/usr/local/sbin/dnsmasq --all-servers {$args}");
-
-		if ($g['booting'])
-			echo "done.\n";
-	}
-
-	if (!$g['booting']) {
-		if(services_dhcpd_configure()!=0)
-			$return = 1;
-	}
-
-	return $return;
-}
-
-function services_snmpd_configure() {
-	global $config, $g;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "services_snmpd_configure() being called $mt\n";
-	}
-
-	/* kill any running snmpd */
-	sigkillbypid("{$g['varrun_path']}/snmpd.pid", "TERM");
-	if(is_process_running("bsnmpd")) 
-		mwexec("/usr/bin/killall bsnmpd", true);
-
-	if (isset($config['snmpd']['enable'])) {
-
-		if ($g['booting'])
-			echo "Starting SNMP daemon... ";
-
-		/* generate snmpd.conf */
-		$fd = fopen("{$g['varetc_path']}/snmpd.conf", "w");
-		if (!$fd) {
-			printf("Error: cannot open snmpd.conf in services_snmpd_configure().\n");
-			return 1;
-		}
-
-
-		$snmpdconf = <<<EOD
-location := "{$config['snmpd']['syslocation']}"
-contact := "{$config['snmpd']['syscontact']}"
-read := "{$config['snmpd']['rocommunity']}"
-
-EOD;
-
-/* No docs on what write strings do there for disable for now.
-		if(isset($config['snmpd']['rwenable']) && preg_match('/^\S+$/', $config['snmpd']['rwcommunity'])){
-		    $snmpdconf .= <<<EOD
-# write string
-write := "{$config['snmpd']['rwcommunity']}"
-
-EOD;
-		}
-*/
-
-
-		if(isset($config['snmpd']['trapenable']) && preg_match('/^\S+$/', $config['snmpd']['trapserver'])){
-		    $snmpdconf .= <<<EOD
-# SNMP Trap support.
-traphost := {$config['snmpd']['trapserver']}
-trapport := {$config['snmpd']['trapserverport']}
-trap := "{$config['snmpd']['trapstring']}"
-
-
-EOD;
-		}
-
-
-		$snmpdconf .= <<<EOD
-system := 1     # pfSense
-%snmpd
-begemotSnmpdDebugDumpPdus       = 2
-begemotSnmpdDebugSyslogPri      = 7
-begemotSnmpdCommunityString.0.1 = $(read)
-
-EOD;
-
-/* No docs on what write strings do there for disable for now.
-		if(isset($config['snmpd']['rwcommunity']) && preg_match('/^\S+$/', $config['snmpd']['rwcommunity'])){
-		    $snmpdconf .= <<<EOD
-begemotSnmpdCommunityString.0.2 = $(write)
-
-EOD;
-		}
-*/
-
-
-		if(isset($config['snmpd']['trapenable']) && preg_match('/^\S+$/', $config['snmpd']['trapserver'])){
-		    $snmpdconf .= <<<EOD
-begemotTrapSinkStatus.[$(traphost)].$(trapport) = 4
-begemotTrapSinkVersion.[$(traphost)].$(trapport) = 2
-begemotTrapSinkComm.[$(traphost)].$(trapport) = $(trap)
-
-EOD;
-		}
-
-
-		$snmpdconf .= <<<EOD
-begemotSnmpdCommunityDisable    = 1
-
-EOD;
-
-		if(isset($config['snmpd']['bindlan'])) {
-			$bind_to_ip = $config['interfaces']['lan']['ipaddr'];
-		} else {
-			$bind_to_ip = "0.0.0.0";
-		}
-
-		if(is_port( $config['snmpd']['pollport'] )) {
-		    $snmpdconf .= <<<EOD
-begemotSnmpdPortStatus.{$bind_to_ip}.{$config['snmpd']['pollport']} = 1
-
-EOD;
-
-		}
-
-		$snmpdconf .= <<<EOD
-begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1
-begemotSnmpdLocalPortType."/var/run/snmpd.sock" = 4
-
-# These are bsnmp macros not php vars.
-sysContact      = $(contact)
-sysLocation     = $(location)
-sysObjectId     = 1.3.6.1.4.1.12325.1.1.2.1.$(system)
-
-snmpEnableAuthenTraps = 2
-
-EOD;
-
-		if (is_array( $config['snmpd']['modules'] )) {
-		    if(isset($config['snmpd']['modules']['mibii'])) {
-			$snmpdconf .= <<<EOD
-begemotSnmpdModulePath."mibII"  = "/usr/lib/snmp_mibII.so"
-
-EOD;
-		    }
-
-		    if(isset($config['snmpd']['modules']['netgraph'])) {
-			$snmpdconf .= <<<EOD
-begemotSnmpdModulePath."netgraph" = "/usr/lib/snmp_netgraph.so"
-%netgraph
-begemotNgControlNodeName = "snmpd"
-
-EOD;
-		    }
-
-		    if(isset($config['snmpd']['modules']['pf'])) {
-			$snmpdconf .= <<<EOD
-begemotSnmpdModulePath."pf"     = "/usr/lib/snmp_pf.so"
-
-EOD;
-		    }
-
-		    if(isset($config['snmpd']['modules']['hostres'])) {
-			$snmpdconf .= <<<EOD
-begemotSnmpdModulePath."hostres"     = "/usr/lib/snmp_hostres.so"
-
-EOD;
-		    }
-		    if(isset($config['snmpd']['modules']['bridge'])) {
-			$snmpdconf .= <<<EOD
-begemotSnmpdModulePath."bridge"     = "/usr/lib/snmp_bridge.so"
-# config must end with blank line
-
-
-EOD;
-		    }
-		}
-
-		fwrite($fd, $snmpdconf);
-		fclose($fd);
-
-		if (isset($config['snmpd']['bindlan'])) {
-			$bindlan = "";
-		}
-
-		/* run bsnmpd */
-		mwexec("/usr/sbin/bsnmpd -c {$g['varetc_path']}/snmpd.conf" .
-			"{$bindlan} -p {$g['varrun_path']}/snmpd.pid");
-
-		if ($g['booting'])
-			echo "done.\n";
-	}
-
-	return 0;
-}
-
-function services_proxyarp_configure() {
-	global $config, $g;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "services_proxyarp_configure() being called $mt\n";
-	}
-
-	/* kill any running choparp */
-	killbyname("choparp");
-
-	if (isset($config['virtualip']) && is_array($config['virtualip']['vip'])) {
-		$paa = array();
-
-		/* group by interface */
-		foreach ($config['virtualip']['vip'] as $vipent) {
-			if ($vipent['mode'] === "proxyarp") {
-				if ($vipent['interface'])
-					$if = $vipent['interface'];
-				else
-					$if = "wan";
-
-				if (!is_array($paa[$if]))
-					$paa[$if] = array();
-
-				$paa[$if][] = $vipent;
-			}
-		}
-
-		if (count($paa))
-		foreach ($paa as $paif => $paents) {
-			if ($paif == "wan" && !(is_ipaddr($config['interfaces']['wan']['ipaddr']) ||
-                                       ($config['interfaces']['wan']['ipaddr'] == "dhcp") ||
-                                       ($config['interfaces']['wan']['ipaddr'] == "bigpond")))
-                               continue;
-
-			$args = $config['interfaces'][$paif]['if'] . " auto";
-
-			foreach ($paents as $paent) {
-
-				if (isset($paent['subnet']))
-					$args .= " " . escapeshellarg("{$paent['subnet']}/{$paent['subnet_bits']}");
-				else if (isset($paent['range']))
-					$args .= " " . escapeshellarg($paent['range']['from'] . "-" .
-						$paent['range']['to']);
-			}
-
-			mwexec_bg("/usr/local/sbin/choparp " . $args);
-		}
-	}
-}
-
-function services_dnsupdate_process() {
-	global $config, $g;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "services_dnsupdate_process() being called $mt\n";
-	}
-
-	/* Dynamic DNS updating active? */
-	if (isset($config['dnsupdate']['enable'])) {
-
-		$wanip = get_current_wan_address();
-		if ($wanip) {
-
-			$keyname = $config['dnsupdate']['keyname'];
-			/* trailing dot */
-			if (substr($keyname, -1) != ".")
-				$keyname .= ".";
-
-			$hostname = $config['dnsupdate']['host'];
-			/* trailing dot */
-			if (substr($hostname, -1) != ".")
-				$hostname .= ".";
-
-			/* write private key file
-			   this is dumb - public and private keys are the same for HMAC-MD5,
-			   but nsupdate insists on having both */
-			$fd = fopen("{$g['varetc_path']}/K{$keyname}+157+00000.private", "w");
-			$privkey .= <<<EOD
-Private-key-format: v1.2
-Algorithm: 157 (HMAC)
-Key: {$config['dnsupdate']['keydata']}
-
-EOD;
-			fwrite($fd, $privkey);
-			fclose($fd);
-
-			/* write public key file */
-			if ($config['dnsupdate']['keytype'] == "zone") {
-				$flags = 257;
-				$proto = 3;
-			} else if ($config['dnsupdate']['keytype'] == "host") {
-				$flags = 513;
-				$proto = 3;
-			} else if ($config['dnsupdate']['keytype'] == "user") {
-				$flags = 0;
-				$proto = 2;
-			}
-
-			$fd = fopen("{$g['varetc_path']}/K{$keyname}+157+00000.key", "w");
-			fwrite($fd, "{$keyname} IN KEY {$flags} {$proto} 157 {$config['dnsupdate']['keydata']}\n");
-			fclose($fd);
-
-			/* generate update instructions */
-			$upinst = "";
-			if ($config['dnsupdate']['server'])
-				$upinst .=  "server {$config['dnsupdate']['server']}\n";
-			$upinst .= "update delete {$config['dnsupdate']['host']} A\n";
-			$upinst .= "update add {$config['dnsupdate']['host']} {$config['dnsupdate']['ttl']} A {$wanip}\n";
-			$upinst .= "\n";	/* mind that trailing newline! */
-
-			$fd = fopen("{$g['varetc_path']}/nsupdatecmds", "w");
-			fwrite($fd, $upinst);
-			fclose($fd);
-
-			/* invoke nsupdate */
-			$cmd = "/usr/bin/nsupdate -k {$g['varetc_path']}/K{$keyname}+157+00000.key";
-			if (isset($config['dnsupdate']['usetcp']))
-				$cmd .= " -v";
-			$cmd .= " {$g['varetc_path']}/nsupdatecmds";
-
-			mwexec_bg($cmd);
-		}
-	}
-
-	return 0;
-}
-
-function setup_wireless_olsr() {
-	global $config, $g;
-	if(!$config['installedpackages']['olsrd'] || !$config['installedpackages'])
-		return;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "setup_wireless_olsr($interface) being called $mt\n";
-	}
-	conf_mount_rw();
-	foreach($config['installedpackages']['olsrd']['config'] as $olsrd) {
-		$olsr_enable = $olsrd['enable'];
-		if($olsr_enable <> "on")
-			return;
-		$fd = fopen("{$g['varetc_path']}/olsr.conf", "w");
-
-		if($olsrd['announcedynamicroute'] or $olsrd['enableannounce'] == "on") {
-			$enableannounce .= "\nHna4\n";
-			$enableannounce .= "{\n";
-		if($olsrd['announcedynamicroute'])
-			$enableannounce .= "\t{$olsrd['announcedynamicroute']}\n";
-		if($olsrd['enableannounce'] == "on")
-			$enableannounce .= "0.0.0.0 0.0.0.0";
-			$enableannounce .= "\n}\n";
-		} else {
-			$enableannounce = "";
-		}
-
-		$olsr .= <<<EODA
-#
-# olsr.org OLSR daemon config file
-#
-# Lines starting with a # are discarded
-#
-# This file was generated by setup_wireless_olsr() in services.inc
-#
-
-# This file is an example of a typical
-# configuration for a mostly static
-# network(regarding mobility) using
-# the LQ extention
-
-# Debug level(0-9)
-# If set to 0 the daemon runs in the background
-
-DebugLevel	2
-
-# IP version to use (4 or 6)
-
-IpVersion	4
-
-# Clear the screen each time the internal state changes
-
-ClearScreen     yes
-
-{$enableannounce}
-
-# Should olsrd keep on running even if there are
-# no interfaces available? This is a good idea
-# for a PCMCIA/USB hotswap environment.
-# "yes" OR "no"
-
-AllowNoInt	yes
-
-# TOS(type of service) value for
-# the IP header of control traffic.
-# If not set it will default to 16
-
-#TosValue	16
-
-# The fixed willingness to use(0-7)
-# If not set willingness will be calculated
-# dynamically based on battery/power status
-# if such information is available
-
-#Willingness    	4
-
-# Allow processes like the GUI front-end
-# to connect to the daemon.
-
-IpcConnect
-{
-     # Determines how many simultaneously
-     # IPC connections that will be allowed
-     # Setting this to 0 disables IPC
-
-     MaxConnections  0
-
-     # By default only 127.0.0.1 is allowed
-     # to connect. Here allowed hosts can
-     # be added
-
-     Host            127.0.0.1
-     #Host            10.0.0.5
-
-     # You can also specify entire net-ranges
-     # that are allowed to connect. Multiple
-     # entries are allowed
-
-     #Net             192.168.1.0 255.255.255.0
-}
-
-# Wether to use hysteresis or not
-# Hysteresis adds more robustness to the
-# link sensing but delays neighbor registration.
-# Used by default. 'yes' or 'no'
-
-UseHysteresis	no
-
-# Hysteresis parameters
-# Do not alter these unless you know
-# what you are doing!
-# Set to auto by default. Allowed
-# values are floating point values
-# in the interval 0,1
-# THR_LOW must always be lower than
-# THR_HIGH.
-
-#HystScaling	0.50
-#HystThrHigh	0.80
-#HystThrLow	0.30
-
-
-# Link quality level
-# 0 = do not use link quality
-# 1 = use link quality for MPR selection
-# 2 = use link quality for MPR selection and routing
-# Defaults to 0
-
-LinkQualityLevel	{$olsrd['enablelqe']}
-
-# Link quality window size
-# Defaults to 10
-
-LinkQualityWinSize	10
-
-# Polling rate in seconds(float).
-# Default value 0.05 sec
-
-Pollrate	0.05
-
-
-# TC redundancy
-# Specifies how much neighbor info should
-# be sent in TC messages
-# Possible values are:
-# 0 - only send MPR selectors
-# 1 - send MPR selectors and MPRs
-# 2 - send all neighbors
-#
-# defaults to 0
-
-TcRedundancy	2
-
-#
-# MPR coverage
-# Specifies how many MPRs a node should
-# try select to reach every 2 hop neighbor
-#
-# Can be set to any integer >0
-#
-# defaults to 1
-
-MprCoverage	3
-
-# Example plugin entry with parameters:
-
-EODA;
-
-if($olsrd['enablehttpinfo'] == "on") {
-	$olsr .= <<<EODB
-
-LoadPlugin "/usr/local/lib/olsrd_httpinfo.so.0.1"
-{
-    PlParam     "port"   "{$olsrd['port']}"
-    PlParam     "Net"    "{$olsrd['allowedhttpinfohost']} {$olsrd['allowedhttpinfosubnet']}"
-}
-
-EODB;
-
-}
-
-if($olsrd['enabledsecure'] == "on") {
-	$olsr .= <<<EODC
-
-LoadPlugin "/usr/local/lib/olsrd_secure.so.0.5"
-{
-    PlParam     "Keyfile"   "/usr/local/etc/olsrkey.txt"
-}
-
-EODC;
-
-}
-
-if($olsrd['enabledyngw'] == "on") {
-
-	/* unset default route, olsr auto negotiates */
-	mwexec("/sbin/route delete default");
-
-	$olsr .= <<<EODE
-
-LoadPlugin "/usr/local/lib/olsrd_dyn_gw.so.0.4"
-{
-    # how often to look for a inet gw, in seconds
-    # defaults to 5 secs, if commented out
-    PlParam     "Interval"   "{$olsrd['polling']}"
-
-    # if one or more IPv4 addresses are given, do a ping on these in
-    # descending order to validate that there is not only an entry in
-    # routing table, but also a real internet connection. If any of
-    # these addresses could be pinged successfully, the test was
-    # succesful, i.e. if the ping on the 1st address was successful,the
-    # 2nd won't be pinged
-    PlParam     "Ping"       "{$olsrd['ping']}"
-    #PlParam     "HNA"   "192.168.81.0 255.255.255.0"
-}
-
-EODE;
-
-}
-
-foreach($config['installedpackages']['olsrd']['config'] as $conf) {
-	$interfaces = explode(',', $conf['iface_array']);
-	foreach($interfaces as $interface) {
-		$realinterface = convert_friendly_interface_to_real_interface_name($interface);
-$olsr .= <<<EODAD
-Interface "{$realinterface}"
-{
-
-    # Hello interval in seconds(float)
-    HelloInterval    2.0
-
-    # HELLO validity time
-    HelloValidityTime	20.0
-
-    # TC interval in seconds(float)
-    TcInterval        5.0
-
-    # TC validity time
-    TcValidityTime	30.0
-
-    # MID interval in seconds(float)
-    MidInterval	5.0
-
-    # MID validity time
-    MidValidityTime	30.0
-
-    # HNA interval in seconds(float)
-    HnaInterval	5.0
-
-    # HNA validity time
-    HnaValidityTime 	30.0
-
-    # When multiple links exist between hosts
-    # the weight of interface is used to determine
-    # the link to use. Normally the weight is
-    # automatically calculated by olsrd based
-    # on the characteristics of the interface,
-    # but here you can specify a fixed value.
-    # Olsrd will choose links with the lowest value.
-
-    # Weight 0
-
-
-}
-
-EODAD;
-
-	}
-	break;
-}
-		fwrite($fd, $olsr);
-		fclose($fd);
-	}
-
-	if(is_process_running("olsrd"))
-		mwexec("/usr/bin/killall olsrd", true);
-
-	sleep(2);
-
-	mwexec_bg("/usr/local/sbin/olsrd -f {$g['varetc_path']}/olsr.conf");
-
-	conf_mount_ro();
-}
-
-/* configure cron service */
-function configure_cron() {
-	global $g, $config;
-	conf_mount_rw();
-	/* preserve existing crontab entries */
-	$crontab_contents = file_get_contents("/etc/crontab");
-	$crontab_contents_a = split("\n", $crontab_contents);
-	
-	for ($i = 0; $i < count($crontab_contents_a); $i++) {
-		$item =& $crontab_contents_a[$i];
-		if (strpos($item, "# pfSense specific crontab entries") !== false) {
-			array_splice($crontab_contents_a, $i - 1);
-			break;
-		}
-	}
-	$crontab_contents = implode("\n", $crontab_contents_a) . "\n";
-	
-	
-	if (is_array($config['cron']['item'])) {
-		$crontab_contents .= "#\n";
-		$crontab_contents .= "# pfSense specific crontab entries\n";
-		$crontab_contents .= "# Created: " . date("F j, Y, g:i a") . "\n";
-		$crontab_contents .= "#\n";
-
-		foreach ($config['cron']['item'] as $item) {
-			$crontab_contents .= "\n{$item['minute']}\t";
-			$crontab_contents .= "{$item['hour']}\t";
-			$crontab_contents .= "{$item['mday']}\t";
-			$crontab_contents .= "{$item['month']}\t";
-			$crontab_contents .= "{$item['wday']}\t";
-			$crontab_contents .= "{$item['who']}\t";
-			$crontab_contents .= "{$item['command']}";
-		}
-    
-		$crontab_contents .= "\n#\n";
-		$crontab_contents .= "# If possible do not add items to this file manually.\n";
-		$crontab_contents .= "# If you do so, this file must be terminated with a blank line (e.g. new line)\n";
-		$crontab_contents .= "#\n\n";
-	}
-	
-	/* please maintain the newline at the end of file */
-	file_put_contents("/etc/crontab", $crontab_contents);
-	
-	if (!$g['booting'])
-		conf_mount_ro();
-}
-
-function upnp_action ($action) {
-	switch($action) {
-		case "start":
-			if(file_exists('/var/etc/miniupnpd.conf'))
-				mwexec_bg('/usr/local/sbin/miniupnpd -f /var/etc/miniupnpd.conf');
-			break;
-		case "stop":
-			while((int)exec("pgrep miniupnpd | wc -l") > 0)
-				mwexec('killall miniupnpd 2>/dev/null', true);
-			mwexec('/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null');
-			mwexec('/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null');
-			break;
-		case "restart":
-			upnp_action('stop');
-			upnp_action('start');
-			break;
-	}
-}
-
-function upnp_start() {
-	global $config, $g;
-	if($config['installedpackages']['miniupnpd']['config'][0]['enable']) {
-		if($g['booting']) {
-			echo "Starting UPnP service...";
-			include('/usr/local/pkg/miniupnpd.inc');
-			sync_package_miniupnpd();
-			echo "done.\n";
-		}
-		else {
-			upnp_action('start');
-		}
-	}
-}
-
-?>
diff --git a/config/Fit123/bin/ltsp/services_dhcp.abc b/config/Fit123/bin/ltsp/services_dhcp.abc
deleted file mode 100755
index 7a203491..00000000
--- a/config/Fit123/bin/ltsp/services_dhcp.abc
+++ /dev/null
@@ -1,696 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	services_dhcp.php
-	part of m0n0wall (http://m0n0.ch/wall)
-
-	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require("guiconfig.inc");
-
-/*  Fix failover DHCP problem 
- *  http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749
- */
-ini_set("memory_limit","64M");
-
-/* This function will remove entries from dhcpd.leases that would otherwise
- * overlap with static DHCP reservations. If we don't clean these out,
- * then DHCP will print a warning in the logs about a duplicate lease
- */
-function dhcp_clean_leases() {
-	global $g, $config;
-	$leasesfile = "{$g['dhcpd_chroot_path']}/var/db/dhcpd.leases";
-	if (!file_exists($leasesfile))
-		return;
-	/* Build list of static MACs */
-	$staticmacs = array();
-	foreach($config['interfaces'] as $ifname => $ifarr)
-		if (is_array($config['dhcpd'][$ifname]['staticmap']))
-			foreach($config['dhcpd'][$ifname]['staticmap'] as $static)
-				$staticmacs[] = $static['mac'];
-	/* Read existing leases */
-	$leases_contents = explode("\n", file_get_contents($leasesfile));
-	$newleases_contents = array();
-	$i=0;
-	while ($i < count($leases_contents)) {
-		/* Find a lease definition */
-		if (substr($leases_contents[$i], 0, 6) == "lease ") {
-			$templease = array();
-			$thismac = "";
-			/* Read to the end of the lease declaration */
-			do {
-				if (substr($leases_contents[$i], 0, 20) == "  hardware ethernet ")
-					$thismac = substr($leases_contents[$i], 20, 17);
-				$templease[] = $leases_contents[$i];
-				$i++;
-			} while ($leases_contents[$i-1] != "}");
-			/* Check for a matching MAC address and if not present, keep it. */
-			if (! in_array($thismac, $staticmacs))
-				$newleases_contents = array_merge($newleases_contents, $templease);
-		} else {
-			/* It's a line we want to keep, copy it over. */
-			$newleases_contents[] = $leases_contents[$i];
-			$i++;
-		}
-	}
-	/* Write out the new leases file */
-	$fd = fopen($leasesfile, 'w');
-	fwrite($fd, implode("\n", $newleases_contents));
-	fclose($fd);
-}
-
-$if = $_GET['if'];
-if ($_POST['if'])
-	$if = $_POST['if'];
-
-/* if OLSRD is enabled, allow WAN to house DHCP. */
-if($config['installedpackages']['olsrd']) {
-	foreach($config['installedpackages']['olsrd']['config'] as $olsrd) {
-			if($olsrd['enable']) {
-				$iflist = array("lan" => "LAN", "wan" => "WAN");
-				$is_olsr_enabled = true;
-				break;
-			}
-	}
-}
-
-if(!$iflist)
-	$iflist = array("lan" => "LAN");
-
-for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) {
-	$oc = $config['interfaces']['opt' . $i];
-
-	if (isset($oc['enable']) && $oc['if'] && (!$oc['bridge'])) {
-		$iflist['opt' . $i] = $oc['descr'];
-	}
-}
-
-if (!$if || !isset($iflist[$if]))
-	$if = "lan";
-
-$pconfig['range_from'] = $config['dhcpd'][$if]['range']['from'];
-$pconfig['range_to'] = $config['dhcpd'][$if]['range']['to'];
-$pconfig['deftime'] = $config['dhcpd'][$if]['defaultleasetime'];
-$pconfig['maxtime'] = $config['dhcpd'][$if]['maxleasetime'];
-$pconfig['gateway'] = $config['dhcpd'][$if]['gateway'];
-list($pconfig['wins1'],$pconfig['wins2']) = $config['dhcpd'][$if]['winsserver'];
-list($pconfig['dns1'],$pconfig['dns2']) = $config['dhcpd'][$if]['dnsserver'];
-$pconfig['enable'] = isset($config['dhcpd'][$if]['enable']);
-$pconfig['denyunknown'] = isset($config['dhcpd'][$if]['denyunknown']);
-$pconfig['staticarp'] = isset($config['dhcpd'][$if]['staticarp']);
-$pconfig['ddnsdomain'] = $config['dhcpd'][$if]['ddnsdomain'];
-$pconfig['ddnsupdate'] = isset($config['dhcpd'][$if]['ddnsupdate']);
-list($pconfig['ntp1'],$pconfig['ntp2']) = $config['dhcpd'][$if]['ntpserver'];
-$pconfig['netboot'] = isset($config['dhcpd'][$if]['netboot']);
-$pconfig['nextserver'] = $config['dhcpd'][$if]['next-server'];
-$pconfig['filename'] = $config['dhcpd'][$if]['filename'];
-$pconfig['rootpath'] = $config['dhcpd'][$if]['rootpath'];
-$pconfig['failover_peerip'] = $config['dhcpd'][$if]['failover_peerip'];
-$pconfig['netmask'] = $config['dhcpd'][$if]['netmask'];
-
-$ifcfg = $config['interfaces'][$if];
-
-/*   set the enabled flag which will tell us if DHCP relay is enabled
- *   on any interface.   We will use this to disable DHCP server since
- *   the two are not compatible with each other.
- */
-
-$dhcrelay_enabled = false;
-$dhcrelaycfg = $config['dhcrelay'];
-
-if(is_array($dhcrelaycfg)) {
-	foreach ($dhcrelaycfg as $dhcrelayif => $dhcrelayifconf) {
-		if (isset($dhcrelayifconf['enable']) &&
-			(($dhcrelayif == "lan") ||
-			(isset($config['interfaces'][$dhcrelayif]['enable']) &&
-			$config['interfaces'][$dhcrelayif]['if'] && (!$config['interfaces'][$dhcrelayif]['bridge']))))
-			$dhcrelay_enabled = true;
-	}
-}
-
-
-if (!is_array($config['dhcpd'][$if]['staticmap'])) {
-	$config['dhcpd'][$if]['staticmap'] = array();
-}
-staticmaps_sort($if);
-$a_maps = &$config['dhcpd'][$if]['staticmap'];
-
-function is_inrange($test, $start, $end) {
-	if ( (ip2long($test) < ip2long($end)) && (ip2long($test) > ip2long($start)) )
-		return true;
-	else
-		return false;
-}
-
-if ($_POST) {
-
-	unset($input_errors);
-
-	$pconfig = $_POST;
-
-	/* input validation */
-	if ($_POST['enable']) {
-		$reqdfields = explode(" ", "range_from range_to");
-		$reqdfieldsn = explode(",", "Range begin,Range end");
-
-		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
-
-		foreach($a_maps as $mapent) {
-			if(is_inrange($mapent['ipaddr'], $_POST['range_from'], $_POST['range_to'])) {
-				$input_errors[] = "{$mapent['ipaddr']} is inside the range you specified.";
-			}
-
-		}
-
-		if (($_POST['range_from'] && !is_ipaddr($_POST['range_from']))) {
-			$input_errors[] = "A valid range must be specified.";
-		}
-		if (($_POST['range_to'] && !is_ipaddr($_POST['range_to']))) {
-			$input_errors[] = "A valid range must be specified.";
-		}
-		if (($_POST['gateway'] && !is_ipaddr($_POST['gateway']))) {
-			$input_errors[] = "A valid IP address must be specified for the gateway.";
-		}
-		if (($_POST['wins1'] && !is_ipaddr($_POST['wins1'])) || ($_POST['wins2'] && !is_ipaddr($_POST['wins2']))) {
-			$input_errors[] = "A valid IP address must be specified for the primary/secondary WINS servers.";
-		}
-		if (($_POST['dns1'] && !is_ipaddr($_POST['dns1'])) || ($_POST['dns2'] && !is_ipaddr($_POST['dns2']))) {
-			$input_errors[] = "A valid IP address must be specified for the primary/secondary DNS servers.";
-		}
-		if ($_POST['deftime'] && (!is_numeric($_POST['deftime']) || ($_POST['deftime'] < 60))) {
-			$input_errors[] = "The default lease time must be at least 60 seconds.";
-		}
-		if ($_POST['maxtime'] && (!is_numeric($_POST['maxtime']) || ($_POST['maxtime'] < 60) || ($_POST['maxtime'] <= $_POST['deftime']))) {
-			$input_errors[] = "The maximum lease time must be at least 60 seconds and higher than the default lease time.";
-		}
-		if (($_POST['ddnsdomain'] && !is_domain($_POST['ddnsdomain']))) {
-			$input_errors[] = "A valid domain name must be specified for the dynamic DNS registration.";
-		}
-		if (($_POST['ntp1'] && !is_ipaddr($_POST['ntp1'])) || ($_POST['ntp2'] && !is_ipaddr($_POST['ntp2']))) {
-			$input_errors[] = "A valid IP address must be specified for the primary/secondary NTP servers.";
-		}
-		if (($_POST['nextserver'] && !is_ipaddr($_POST['nextserver']))) {
-			$input_errors[] = "A valid IP address must be specified for the network boot server.";
-		}
-
-
-		if (!$input_errors) {
-			/* make sure the range lies within the current subnet */
-			$subnet_start = (ip2long($ifcfg['ipaddr']) & gen_subnet_mask_long($ifcfg['subnet']));
-			$subnet_end = (ip2long($ifcfg['ipaddr']) | (~gen_subnet_mask_long($ifcfg['subnet'])));
-
-			if ((ip2long($_POST['range_from']) < $subnet_start) || (ip2long($_POST['range_from']) > $subnet_end) ||
-			    (ip2long($_POST['range_to']) < $subnet_start) || (ip2long($_POST['range_to']) > $subnet_end)) {
-				$input_errors[] = "The specified range lies outside of the current subnet.";
-			}
-
-			if (ip2long($_POST['range_from']) > ip2long($_POST['range_to']))
-				$input_errors[] = "The range is invalid (first element higher than second element).";
-
-			/* make sure that the DHCP Relay isn't enabled on this interface */
-			if (isset($config['dhcrelay'][$if]['enable']))
-				$input_errors[] = "You must disable the DHCP relay on the {$iflist[$if]} interface before enabling the DHCP server.";
-		}
-	}
-
-	if (!$input_errors) {
-		$config['dhcpd'][$if]['range']['from'] = $_POST['range_from'];
-		$config['dhcpd'][$if]['range']['to'] = $_POST['range_to'];
-		$config['dhcpd'][$if]['defaultleasetime'] = $_POST['deftime'];
-		$config['dhcpd'][$if]['maxleasetime'] = $_POST['maxtime'];
-		$config['dhcpd'][$if]['netmask'] = $_POST['netmask'];
-		$previous = $config['dhcpd'][$if]['failover_peerip'];
-		if($previous <> $_POST['failover_peerip']) {
-			mwexec("rm -rf /var/dhcpd/var/db/*");
-		}
-		$config['dhcpd'][$if]['failover_peerip'] = $_POST['failover_peerip'];
-
-		unset($config['dhcpd'][$if]['winsserver']);
-		if ($_POST['wins1'])
-			$config['dhcpd'][$if]['winsserver'][] = $_POST['wins1'];
-		if ($_POST['wins2'])
-			$config['dhcpd'][$if]['winsserver'][] = $_POST['wins2'];
-
-		unset($config['dhcpd'][$if]['dnsserver']);
-		if ($_POST['dns1'])
-			$config['dhcpd'][$if]['dnsserver'][] = $_POST['dns1'];
-		if ($_POST['dns2'])
-			$config['dhcpd'][$if]['dnsserver'][] = $_POST['dns2'];
-
-		$config['dhcpd'][$if]['gateway'] = $_POST['gateway'];
-		$config['dhcpd'][$if]['denyunknown'] = ($_POST['denyunknown']) ? true : false;
-		$config['dhcpd'][$if]['enable'] = ($_POST['enable']) ? true : false;
-		$config['dhcpd'][$if]['staticarp'] = ($_POST['staticarp']) ? true : false;
-		$config['dhcpd'][$if]['ddnsdomain'] = $_POST['ddnsdomain'];
-		$config['dhcpd'][$if]['ddnsupdate'] = ($_POST['ddnsupdate']) ? true : false;
-
-		unset($config['dhcpd'][$if]['ntpserver']);
-		if ($_POST['ntp1'])
-			$config['dhcpd'][$if]['ntpserver'][] = $_POST['ntp1'];
-		if ($_POST['ntp2'])
-			$config['dhcpd'][$if]['ntpserver'][] = $_POST['ntp2'];
-
-		$config['dhcpd'][$if]['netboot'] = ($_POST['netboot']) ? true : false;
-		$config['dhcpd'][$if]['next-server'] = $_POST['nextserver'];
-		$config['dhcpd'][$if]['filename'] = $_POST['filename'];
-                $config['dhcpd'][$if]['rootpath'] = $_POST['rootpath'];
-
-		write_config();
-
-		/* static arp configuration */
-		interfaces_staticarp_configure($if);
-
-		$retval = 0;
-		$retvaldhcp = 0;
-		$retvaldns = 0;
-		config_lock();
-		/* Stop DHCP so we can cleanup leases */
-		killbyname("dhcpd");
-		dhcp_clean_leases();
-		/* dnsmasq_configure calls dhcpd_configure */
-		/* no need to restart dhcpd twice */
-		if (isset($config['dnsmasq']['regdhcpstatic']))	{
-			$retvaldns = services_dnsmasq_configure();
-			if ($retvaldns == 0) {
-				if (file_exists($d_hostsdirty_path))
-					unlink($d_hostsdirty_path);
-				if (file_exists($d_staticmapsdirty_path))
-					unlink($d_staticmapsdirty_path);
-			}					
-		} else {
-			$retvaldhcp = services_dhcpd_configure();	
-			if ($retvaldhcp == 0) {
-				if (file_exists($d_staticmapsdirty_path))
-					unlink($d_staticmapsdirty_path);
-			}
-		}	
-		config_unlock();
-		if($retvaldhcp == 1 || $retvaldns == 1)
-			$retval = 1;
-		$savemsg = get_std_save_message($retval);
-	}
-}
-
-if ($_GET['act'] == "del") {
-	if ($a_maps[$_GET['id']]) {
-		unset($a_maps[$_GET['id']]);
-		write_config();
-		if(isset($config['dhcpd'][$if]['enable'])) {
-			touch($d_staticmapsdirty_path);
-			if (isset($config['dnsmasq']['regdhcpstatic']))
-				touch($d_hostsdirty_path);
-		}
-		header("Location: services_dhcp.php?if={$if}");
-		exit;
-	}
-}
-
-$pgtitle = "Services: DHCP server";
-include("head.inc");
-
-?>
-
-<script type="text/javascript" language="JavaScript">
-
-function enable_change(enable_over) {
-	var endis;
-	endis = !(document.iform.enable.checked || enable_over);
-	document.iform.range_from.disabled = endis;
-	document.iform.range_to.disabled = endis;
-	document.iform.wins1.disabled = endis;
-	document.iform.wins2.disabled = endis;
-	document.iform.dns1.disabled = endis;
-	document.iform.dns2.disabled = endis;
-	document.iform.deftime.disabled = endis;
-	document.iform.maxtime.disabled = endis;
-	document.iform.gateway.disabled = endis;
-	document.iform.failover_peerip.disabled = endis;
-	document.iform.staticarp.disabled = endis;
-	document.iform.ddnsdomain.disabled = endis;
-	document.iform.ddnsupdate.disabled = endis;
-	document.iform.ntp1.disabled = endis;
-	document.iform.ntp2.disabled = endis;
-	document.iform.netboot.disabled = endis;
-	document.iform.nextserver.disabled = endis;
-	document.iform.filename.disabled = endis;
-        document.iform.rootpath.disabled = endis;
-	document.iform.denyunknown.disabled = endis;
-}
-
-function show_ddns_config() {
-	document.getElementById("showddnsbox").innerHTML='';
-	aodiv = document.getElementById('showddns');
-	aodiv.style.display = "block";
-}
-
-function show_ntp_config() {
-	document.getElementById("showntpbox").innerHTML='';
-	aodiv = document.getElementById('showntp');
-	aodiv.style.display = "block";
-}
-
-function show_netboot_config() {
-	document.getElementById("shownetbootbox").innerHTML='';
-	aodiv = document.getElementById('shownetboot');
-	aodiv.style.display = "block";
-}
-
-</script>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
-<form action="services_dhcp.php" method="post" name="iform" id="iform">
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<?php 
-	if ($dhcrelay_enabled) {
-		echo "DHCP Relay is currently enabled.  Cannot enable the DHCP Server service while the DHCP Relay is enabled on any interface.";
-		include("fend.inc"); 
-		echo "</body>";
-		echo "</html>";
-		exit;
-	}
-?>
-<?php if (file_exists($d_staticmapsdirty_path)): ?><p>
-<?php print_info_box_np("The static mapping configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
-<?php endif; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td>
-  <?php
-	/* active tabs */
-	$tab_array = array();
-	$tabscounter = 0;
-	$i = 0;
-	foreach ($iflist as $ifent => $ifname) {
-		if ($ifent == $if)
-			$active = true;
-		else
-			$active = false;
-		$tab_array[] = array($ifname, $active, "services_dhcp.php?if={$ifent}");
-	}
-	display_top_tabs($tab_array);
-  ?>
-  </td></tr>
-  <tr>
-    <td>
-	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
-                      <tr>
-                        <td width="22%" valign="top" class="vtable">&nbsp;</td>
-                        <td width="78%" class="vtable">
-			  <input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)">
-                          <strong>Enable DHCP server on
-                          <?=htmlspecialchars($iflist[$if]);?>
-                          interface</strong></td>
-                      </tr>
-				  <tr>
-	              <td width="22%" valign="top" class="vtable">&nbsp;</td>
-                      <td width="78%" class="vtable">
-			<input name="denyunknown" id="denyunknown" type="checkbox" value="yes" <?php if ($pconfig['denyunknown']) echo "checked"; ?>>
-                      <strong>Deny unknown clients</strong><br>
-                      If this is checked, only the clients defined below will get DHCP leases from this server. </td>
-		      		  </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncellreq">Subnet</td>
-                        <td width="78%" class="vtable">
-                          <?=gen_subnet($ifcfg['ipaddr'], $ifcfg['subnet']);?>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncellreq">Subnet
-                          mask</td>
-                        <td width="78%" class="vtable">
-                          <?=gen_subnet_mask($ifcfg['subnet']);?>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncellreq">Available
-                          range</td>
-                        <td width="78%" class="vtable">
-                          <?=long2ip(ip2long($ifcfg['ipaddr']) & gen_subnet_mask_long($ifcfg['subnet']));?>
-                          -
-                          <?=long2ip(ip2long($ifcfg['ipaddr']) | (~gen_subnet_mask_long($ifcfg['subnet']))); ?>
-                        </td>
-                      </tr>
-					  <?php if($is_olsr_enabled): ?>
-                      <tr>
-                        <td width="22%" valign="top" class="vncellreq">Subnet Mask</td>
-                        <td width="78%" class="vtable">
-	                        <select name="netmask" class="formfld" id="netmask">
-							<?php
-							for ($i = 32; $i > 0; $i--) {
-								if($i <> 31) {
-									echo "<option value=\"{$i}\" ";
-									if ($i == $pconfig['netmask']) echo "selected";
-									echo ">" . $i . "</option>";
-								}
-							}
-							?>
-							</select>
-                        </td>
-                      </tr>
-                      <?php endif; ?>
-                      <tr>
-                        <td width="22%" valign="top" class="vncellreq">Range</td>
-                        <td width="78%" class="vtable">
-                          <input name="range_from" type="text" class="formfld" id="range_from" size="20" value="<?=htmlspecialchars($pconfig['range_from']);?>">
-                          &nbsp;to&nbsp; <input name="range_to" type="text" class="formfld" id="range_to" size="20" value="<?=htmlspecialchars($pconfig['range_to']);?>">
-			</td>
-                      </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncell">WINS servers</td>
-                        <td width="78%" class="vtable">
-                          <input name="wins1" type="text" class="formfld" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>"><br>
-                          <input name="wins2" type="text" class="formfld" id="wins2" size="20" value="<?=htmlspecialchars($pconfig['wins2']);?>">
-			</td>
-                      </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncell">DNS servers</td>
-                        <td width="78%" class="vtable">
-                          <input name="dns1" type="text" class="formfld" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>"><br>
-                          <input name="dns2" type="text" class="formfld" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>"><br>
-			  NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.  
-			</td>
-                      </tr>
-                     <tr>
-                       <td width="22%" valign="top" class="vncell">Gateway</td>
-                       <td width="78%" class="vtable">
-                         <input name="gateway" type="text" class="formfld" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>"><br>
-			 The default is to use the IP on this interface of the firewall as the gateway.  Specify an alternate gateway here if this is not the correct gateway for your network.
-			</td>
-                     </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncell">Default lease
-                          time</td>
-                        <td width="78%" class="vtable">
-                          <input name="deftime" type="text" class="formfld" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>">
-                          seconds<br>
-                          This is used for clients that do not ask for a specific
-                          expiration time.<br>
-                          The default is 7200 seconds.
-			</td>
-                      </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncell">Maximum lease
-                          time</td>
-                        <td width="78%" class="vtable">
-                          <input name="maxtime" type="text" class="formfld" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>">
-                          seconds<br>
-                          This is the maximum lease time for clients that ask
-                          for a specific expiration time.<br>
-                          The default is 86400 seconds.
-			</td>
-                      </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncell">Failover peer IP:</td>
-                        <td width="78%" class="vtable">
-				<input name="failover_peerip" type="text" class="formfld" id="failover_peerip" size="20" value="<?=htmlspecialchars($pconfig['failover_peerip']);?>"><br>
-				Leave blank to disable.  Enter the REAL address of the other machine.  Machines must be using CARP.
-			</td>
-		      </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncell">Static ARP</td>
-                        <td width="78%" class="vtable">
-				<table>
-					<tr>
-						<td>
-							<input valign="middle" type="checkbox" value="yes" name="staticarp" id="staticarp" <?php if($pconfig['staticarp']) echo " checked"; ?>>&nbsp;
-						</td>
-						<td>
-							<b>Enable Static ARP entries</b>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							&nbsp;
-						</td>
-						<td>
-							<span class="red"><strong>Note:</strong></span> Only the machines listed below will be able to communicate with the firewall on this NIC.
-						</td>
-					</tr>
-				</table>
-			</td>
-                      </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncell">Dynamic DNS</td>
-                        <td width="78%" class="vtable">
-				<div id="showddnsbox">
-					<input type="button" onClick="show_ddns_config()" value="Advanced"></input> - Show Dynamic DNS</a>
-				</div>
-				<div id="showddns" style="display:none">
-					<input valign="middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if($pconfig['ddnsupdate']) echo " checked"; ?>>&nbsp;
-					<b>Enable registration of DHCP client names in DNS.</b><br />
-					<p>
-					<input name="ddnsdomain" type="text" class="formfld" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>"><br />
-					Note: Leave blank to disable dynamic DNS registration.<br />
-					Enter the dynamic DNS domain which will be used to register client names in the DNS server.
-				</div>
-			</td>
-		      </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncell">NTP servers</td>
-                        <td width="78%" class="vtable">
-				<div id="showntpbox">
-					<input type="button" onClick="show_ntp_config()" value="Advanced"></input> - Show NTP configuration</a>
-				</div>
-				<div id="showntp" style="display:none">
-					<input name="ntp1" type="text" class="formfld" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>"><br>
-					<input name="ntp2" type="text" class="formfld" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>">
-				</div>
-			</td>
-                      </tr>
-                      <tr>
-                        <td width="22%" valign="top" class="vncell">Enable Network booting</td>
-                        <td width="78%" class="vtable">
-				<div id="shownetbootbox">
-					<input type="button" onClick="show_netboot_config()" value="Advanced"></input> - Show Network booting</a>
-				</div>
-				<div id="shownetboot" style="display:none">
-					<input valign="middle" type="checkbox" value="yes" name="netboot" id="netboot" <?php if($pconfig['netboot']) echo " checked"; ?>>&nbsp;
-					<b>Enables network booting.</b>
-					<p>
-					<input name="nextserver" type="text" class="formfld" id="nextserver" size="20" value="<?=htmlspecialchars($pconfig['nextserver']);?>"><br>
-					Enter the IP address from the network boot server.
-					<p>
-					<input name="filename" type="text" class="formfld" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>"><br>
-					Enter the filename used for network booting.<br />
-                                        Note: You need both a filename and a boot server configured for this to work!<br />
-                                        <p>
-                                        <input name="rootpath" type="text" class="formfld" id="rootpath" size="20" value="<?=htmlspecialchars($pconfig['rootpath']);?>"><br>
-                                        Enter option root-path.
-				</div>
-			</td>
-		      </tr>
-                      <tr>
-                        <td width="22%" valign="top">&nbsp;</td>
-                        <td width="78%">
-                          <input name="if" type="hidden" value="<?=$if;?>">
-                          <input name="Submit" type="submit" class="formbtn" value="Save" onclick="enable_change(true)">
-                        </td>
-                      </tr>
-                      <tr>
-                        <td width="22%" valign="top">&nbsp;</td>
-                        <td width="78%"> <p><span class="vexpl"><span class="red"><strong>Note:<br>
-                            </strong></span>The DNS servers entered in <a href="system.php">System:
-                            General setup</a> (or the <a href="services_dnsmasq.php">DNS
-                            forwarder</a>, if enabled) </span><span class="vexpl">will
-                            be assigned to clients by the DHCP server.<br>
-                            <br>
-                            The DHCP lease table can be viewed on the <a href="diag_dhcp_leases.php">Status:
-                            DHCP leases</a> page.<br>
-                            </span></p>
-			</td>
-                      </tr>
-                    </table>
-              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                  <td width="25%" class="listhdrr">MAC address</td>
-                  <td width="15%" class="listhdrr">IP address</td>
-				  <td width="20%" class="listhdrr">Hostname</td>
-                  <td width="30%" class="listhdr">Description</td>
-                  <td width="10%" class="list">
-                    <table border="0" cellspacing="0" cellpadding="1">
-                      <tr>
-			<td valign="middle" width="17"></td>
-                        <td valign="middle"><a href="services_dhcp_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-                      </tr>
-                    </table>
-		  </td>
-		</tr>
-			  <?php if(is_array($a_maps)): ?>
-			  <?php $i = 0; foreach ($a_maps as $mapent): ?>
-			  <?php if($mapent['mac'] <> "" or $mapent['ipaddr'] <> ""): ?>
-                <tr>
-                  <td class="listlr" ondblclick="document.location='services_dhcp_edit.php?if=<?=$if;?>&id=<?=$i;?>';">
-                    <?=htmlspecialchars($mapent['mac']);?>
-                  </td>
-                  <td class="listr" ondblclick="document.location='services_dhcp_edit.php?if=<?=$if;?>&id=<?=$i;?>';">
-                    <?=htmlspecialchars($mapent['ipaddr']);?>&nbsp;
-                  </td>
-                  <td class="listr" ondblclick="document.location='services_dhcp_edit.php?if=<?=$if;?>&id=<?=$i;?>';">
-                    <?=htmlspecialchars($mapent['hostname']);?>&nbsp;
-                  </td>	
-                  <td class="listbg" ondblclick="document.location='services_dhcp_edit.php?if=<?=$if;?>&id=<?=$i;?>';">
-                    <font color="#FFFFFF"><?=htmlspecialchars($mapent['descr']);?>&nbsp;</font>
-                  </td>
-                  <td valign="middle" nowrap class="list">
-                    <table border="0" cellspacing="0" cellpadding="1">
-                      <tr>
-                        <td valign="middle"><a href="services_dhcp_edit.php?if=<?=$if;?>&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-                        <td valign="middle"><a href="services_dhcp.php?if=<?=$if;?>&act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this mapping?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-		<?php endif; ?>
-		<?php $i++; endforeach; ?>
-		<?php endif; ?>
-                <tr>
-                  <td class="list" colspan="4"></td>
-                  <td class="list">
-                    <table border="0" cellspacing="0" cellpadding="1">
-                      <tr>
-			<td valign="middle" width="17"></td>
-                        <td valign="middle"><a href="services_dhcp_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-              </table>
-	</div>
-    </td>
-  </tr>
-</table>
-</form>
-<script language="JavaScript">
-<!--
-enable_change(false);
-//-->
-</script>
-<?php include("fend.inc"); ?>
-</body>
-</html>