moved the dansguardian stuff into its own acf

git-svn-id: svn://svn.alpinelinux.org/acf/squid/trunk@612 ab2d0c66-481e-0410-8bed-d214d4d58bed

8 files changed, 0 insertions, 836 deletions

diff --git a/dansguardian-advanced-html.lsp b/dansguardian-advanced-html.lsp
deleted file mode 100644
index 3c0fc2b..0000000
--- a/dansguardian-advanced-html.lsp
+++ /dev/null
@@ -1,63 +0,0 @@
-<? 
-   local form = ... 
-   local data = form.option
-   local service = form.service
-   local config = form.service.config
-   
-   local srv1fill = ""
-   local srv2fill = "disabled"
-   if service.status == "running" then
-   	srv1fill = "disabled"
-   	srv2fill = ""
-   end
-   
-   local ifthen = function( variable, value, result )
-      if variable == value then
-         io.write( result )
-      end
-   end
-   
-?>
-<h1>Content Filter</h1>
-<h2>General Information</h2>
-<p>
-DansGuardian is web content filtering software. It works as a web proxy, 
-making web requests in behalf of the client, and inspecting the returned 
-content before passing on to the client. DansGuardian uses phraselists to 
-identify harmful content. This means that updated "blacklists" are 
-generally not necessary. DansGuardian must be used in combination with a 
-"smart proxy", such as squid. 
-</p>
-<p>
-This page lets you manually configure the filter rule files for DansGuardian.
-</p>
-
-<h2>Status</h2>
-<dt>Program version</dt><dd><? io.write( form.info.version.value ) ?></dd>
-<dt>Process status</dt><dd><? io.write( form.info.status.value ) ?></dd>
-<dt>Process information</dt><dd>This process runs as a service. When you make and save changes, the configuration
-files for the service are changed. However, the changes will not be <i>applied</i>
-until you restart the service.</dd>
-<form action="" method="POST">
-<dt>Daemon control</dt>
-<dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?> style="width:100px">
-<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?> style="width:100px">
-<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?> style="width:100px"></dd>
-<p class="error"><? io.write( service.message ) ?></p>
-</form>
-
-<h2>Configuration</h2>
-<pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre>
-<h3>Files</h3>
-<p>
-Click on one of the files to edit it.
-</p>
-
-<table>
-<?
-   for k,v in ipairs( config.files ) do
-      io.write( "<tr><td><a href=\"" .. data.script .. data.prefix .. data.controller .. "/edit?name=" .. v .. "\">" .. v .. "</a></td></tr>\n" )
-   end
-?>
-</table>
-
diff --git a/dansguardian-category-html.lsp b/dansguardian-category-html.lsp
deleted file mode 100644
index d9ddcac..0000000
--- a/dansguardian-category-html.lsp
+++ /dev/null
@@ -1,60 +0,0 @@
-<? 
-   local form = ... 
-   local data = form.option
-   local service = form.service
-   local config = form.service.config
-   
-   local srv1fill = ""
-   local srv2fill = "disabled"
-   if service.status == "running" then
-   	srv1fill = "disabled"
-   	srv2fill = ""
-   end
-   
-   local ifthen = function( variable, value, result )
-      if variable == value then
-         io.write( result )
-      end
-   end
-   
-?>
-<h1>Content Filter</h1>
-DansGuardian is web content filtering software. It works as a web proxy, 
-making web requests in behalf of the client, and inspecting the returned 
-content before passing on to the client. DansGuardian uses phraselists to 
-identify harmful content. This means that updated "blacklists" are 
-generally not necessary. DansGuardian must be used in combination with a 
-"smart proxy", such as squid. 
-<b>This page lets you manually add/remove categories for DansGuardian.</b><br><br>
-
-<h1>Status</h1>
-<form action="" method="POST">
-<table><tr>
-<td>dansguardian is: <b><? io.write( service.status ) ?> </b> </td>
-<td><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?> style="width:100px"></td>
-<td><input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?> style="width:100px"></td>
-<td><input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?> style="width:100px"></td>
-</tr></table>
-</form>
-
-<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre><br>
-
-This process runs as a service. When you make and save changes, the configuration 
-files for the service are changed. However, the changes will not be <i>applied</i> 
-until you restart the service.<br><br><br>
-
-<h1>Categories</h1>
-<pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre><br>
-<h2>Delete Category</h2>
-
-<form action="" method="POST">
-<table>
-<?
-   for k,v in ipairs( config ) do
-      io.write( "<tr><td><input type=\"checkbox\" name=\"cats\" value=\"" .. v .. "\"> " .. v .. "</td></tr>\n" )
-   end
-?>
-<tr><td><input class="submit" type="submit" name="cmd" value="delete"></td></tr>
-</table>
-</form>
-
diff --git a/dansguardian-controller.lua b/dansguardian-controller.lua
deleted file mode 100644
index 0d6c7e8..0000000
--- a/dansguardian-controller.lua
+++ /dev/null
@@ -1,178 +0,0 @@
--- the squid  controller
-
-module (..., package.seeall)
-
--- Cause an http redirect to our "read" action
--- We use the self.conf table because it already has prefix,controller,etc
--- The redir code is defined in the application error handler (acf-controller)
-local list_redir = function (self)
-	self.conf.action = "general"
-	self.conf.type = "redir"
-	error (self.conf)
-end
-
-local pvt = {}
-mvc= {}
-mvc.on_load = function( self, parent )
-	-- If they try to run a bogus action, send them to read
-	if ( rawget(self.worker, self.conf.action) == nil ) then
-		list_redir(self)
-	end
-	pvt.parent_on_exec = parent.worker.mvc.post_exec
-end
-
-mvc.pre_exec = function( self ) 
-	-- pvt.parent_on_exec ()
-end
-
-mvc.post_exec = function( self )
-	return pvt.parent_on_exec()	
-end
-
-general = function( self )
-
-	local info = { status = { value = "stopped" }, version = { value = self.model.get_dansguardian_version() }, srvctrl = { value = srvctrl} };
-
-	local option = { script = ENV["SCRIPT_NAME"],
-	                 prefix = self.conf.prefix,
-	                 controller = self.conf.controller,
-	                 action = self.conf.action,
-	                 extra = ""
-	               }
-	               
-	local service = { message="", status="", config="" }
-	
-	if self.clientdata.srvcmd then
-		srvcmd = self.clientdata.srvcmd
-		if srvcmd == "start" or srvcmd == "stop" or srvcmd == "restart" then
-			service.message = self.model.service_control( srvcmd )
-		end
-	end
-	
-	if self.clientdata.cmd then
-		if self.clientdata.cmd == "save" then
-			local conf = self.clientdata
-			local config = { filterip = conf.filterip, filterport = conf.filterport,
-			                 proxyip = conf.proxyip, proxyport = conf.proxyport,
-			                 accessdeniedaddress = conf.accessdeniedaddress,
-			                 naughtynesslimit = conf.naughtynesslimit
-			               }
-			              
-			self.model.update_general_config( config )
-		end
-	end
-	
-	service.status = self.model.get_status()
-	info.status.value = service.status
-	service.config, service.cfgerr = self.model.get_general_config()
-	
-	return ( cfe ({ option = option, service = service, info = info }) )
-end
-
-advanced = function( self )
-							
-	local info = { status = { value = "stopped" }, version = { value = self.model.get_dansguardian_version() }, srvctrl = { value = srvctrl} };
-	
-	local option = { script = ENV["SCRIPT_NAME"],
-	                 prefix = self.conf.prefix,
-	                 controller = self.conf.controller,
-	                 action = self.conf.action,
-	                 extra = ""
-	               }
-	               
-	local service = { message="", status="", config="" }
-	
-	if self.clientdata.srvcmd then
-		srvcmd = self.clientdata.srvcmd
-		if srvcmd == "start" or srvcmd == "stop" or srvcmd == "restart" then
-			service.message = self.model.service_control( srvcmd )
-		end
-	end
-	
-	service.status = self.model.get_status()
-	info.status.value = service.status
-	service.config, service.cfgerr = self.model.get_advanced_config()
-	
-	return ( cfe ({ option = option, service = service, info = info }) )
-end
-
-plain = function( self )
-
-	local option = { script = ENV["SCRIPT_NAME"],
-	                 prefix = self.conf.prefix,
-	                 controller = self.conf.controller,
-	                 action = self.conf.action,
-	                 extra = ""
-	               }
-	               
-	local service = { message="", status="", config="" }
-	
-	if self.clientdata.srvcmd then
-		srvcmd = self.clientdata.srvcmd
-		if srvcmd == "start" or srvcmd == "stop" or srvcmd == "restart" then
-			service.message = self.model.service_control( srvcmd )
-		end
-	end
-	
-	if self.clientdata.cmd then
-		if self.clientdata.cmd == "save" then
-			local conf = self.clientdata
-			local config = conf.config
-			self.model.update_plain_config( config )
-		end
-	end
-
-	service.status = self.model.get_status()
-	service.config, service.cfgerr = self.model.get_plain_config()
-	
-	return ( cfe ({ option = option, service = service }) )
-end
-
-edit = function( self )
-
-	if not self.clientdata.name then
-		list_redir( self )
-	end
-
-	local option = { script = ENV["SCRIPT_NAME"],
-	                 prefix = self.conf.prefix,
-	                 controller = self.conf.controller,
-	                 action = self.conf.action,
-	                 extra = ""
-	               }
-	               
-	local service = { message="", status="", config="" }
-
-	if self.clientdata.cmd then
-		if self.clientdata.cmd == "save" then 
-			self.model.update_edit_config( self.clientdata.name, self.clientdata.config )
-		end
-	end	
-	
-	service.status = self.model.get_status()
-	service.config, service.cfgerr = self.model.get_edit_config( self.clientdata.name )
-	service.name = self.clientdata.name
-	
-	if service.cfgerr == "Hacker" then
-		list_redir( self )
-	end
-	
-	return ( cfe ({ option = option, service = service }) )
-end
-
-category = function( self )
-
-	local option = { script = ENV["SCRIPT_NAME"],
-	                 prefix = self.conf.prefix,
-	                 controller = self.conf.controller,
-	                 action = self.conf.action,
-	                 extra = ""
-	               }
-	               
-	local service = { message="", status="", config="" }
-	
-	service.config = self.model.get_categories()
-	
-	return ( cfe ({ option = option, service = service }) )
-end
-
diff --git a/dansguardian-edit-html.lsp b/dansguardian-edit-html.lsp
deleted file mode 100644
index fe6205c..0000000
--- a/dansguardian-edit-html.lsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<? 
-   local form = ... 
-   local data = form.option
-   local service = form.service
-   local config = form.service.config
-   
-   local srv1fill = ""
-   local srv2fill = "disabled"
-   if service.status == "running" then
-   	srv1fill = "disabled"
-   	srv2fill = ""
-   end
-   
-   local ifthen = function( variable, value, result )
-      if variable == value then
-         io.write( result )
-      end
-   end
-   
-?>
-<h1>Content Filter (<? io.write( service.name ) ?>)</h1>
-
-<form action="" method="POST">
-<pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre><br>
-These parameters define the interface and port that Dansguardian uses to accept connections.<br><br>
-
-<table>
-<tr><td><textarea name="config" style="width:100%"><? io.write( service.config ) ?></textarea></td></tr>
-</table><br>
-<input class="text" type="hidden" name="name" value="<? io.write( service.name ) ?>">
-
-<h3>Save Changes</h3>
-<dt>Save the content of the above box</dt><dd><input class="submit" type="submit" name="cmd" value="save" style="width:100px"></dd>
-</form>
-
diff --git a/dansguardian-general-html.lsp b/dansguardian-general-html.lsp
deleted file mode 100644
index 3dec93f..0000000
--- a/dansguardian-general-html.lsp
+++ /dev/null
@@ -1,82 +0,0 @@
-<? 
-   local form = ... 
-   local data = form.option
-   local service = form.service
-   local config = form.service.config
-   
-   local srv1fill = ""
-   local srv2fill = "disabled"
-   if form.info.status.value == "running" then
-   	srv1fill = "disabled"
-   	srv2fill = ""
-   end
-   
-   local ifthen = function( variable, value, result )
-      if variable == value then
-         io.write( result )
-      end
-   end
-   
-?>
-<h1>Content Filter</h1>
-<h2>General Information</h2>
-<p>
-DansGuardian is web content filtering software. It works as a web proxy, 
-making web requests in behalf of the client, and inspecting the returned 
-content before passing on to the client. DansGuardian uses phraselists to 
-identify harmful content. This means that updated "blacklists" are 
-generally not necessary. DansGuardian must be used in combination with a 
-"smart proxy", such as squid. 
-</p><p>
-This page defines the basic network configuration settings for DansGuardian.
-</p>
-
-<h2>Status</h2>
-<dt>Program version</dt><dd><? io.write( form.info.version.value ) ?></dd>
-<dt>Process status</dt><dd><? io.write( form.info.status.value ) ?></dd>
-<dt>Process information</dt><dd>This process runs as a service. When you make 
-and save changes, the configuration files for the service are changed. 
-However, the changes will not be applied until you restart the service.</dd>
-<form action="" method="POST">
-<dt>Daemon control</dt>
-<dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?> style="width:100px">
-<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?> style="width:100px">
-<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?> style="width:100px"></dd>
-</form>
-
-<p>
-<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre>
-</p>
-
-<form action="" method="POST">
-<h2>Configuration</h2>
-<pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre>
-<p>
-These parameters define the interface and port that Dansguardian uses to accept connections.
-</p>
-
-<dt>filterip</dt><dd><input class="text" type="text" name="filterip" value="<? io.write( config.filterip.value ) ?>" style="width:100px"></dd>
-<dt>filterport</dt><dd><input class="text" type="text" name="filterport" value="<? io.write( config.filterport.value ) ?>" style="width:100px"></dd>
-
-<h3>Proxy service</h3>
-<p>
-These parameters define the ip address and port that Dansguardian should forward requests on to.
-</p>
-
-<dt>proxyip</dt><dd><input class="text" type="text" name="proxyip" value="<? io.write( config.proxyip.value ) ?>" style="width:100px"></dd>
-<dt>proxyport</dt><dd><input class="text" type="text" name="proxyport" value="<? io.write( config.proxyport.value ) ?>" style="width:100px"></dd>
-
-<h3>Filter Actions</h3>
-<p>
-These parameters define how sensitive the filter is, and where to redirect requests if the content filter 
-determines that the content is inappropriate. The "naughtynesslimit" is more sensitive the lower it is set. 
-The author recommends 50 for "young children", 100 for "older children" and 160 for "young adults".
-</p>
-
-<dt>accessdeniedaddress</dt><dd><input class="text" type="text" name="accessdeniedaddress" value="<? io.write( config.accessdeniedaddress.value ) ?>" style="width:350px"></dd>
-<dt>naughtynesslimit</dt><dd><input class="text" type="text" name="naughtynesslimit" value="<? io.write( config.naughtynesslimit.value ) ?>" style="width:100px"></dd>
-
-<h2>Save Changes</h2>
-<dt>Save the above changes?</dt><dd><input class="submit" type="submit" name="cmd" value="save" style="width:100px"></dd>
-</form>
-
diff --git a/dansguardian-model.lua b/dansguardian-model.lua
deleted file mode 100644
index 1abec68..0000000
--- a/dansguardian-model.lua
+++ /dev/null
@@ -1,354 +0,0 @@
--- acf model for squid
--- Copyright(c) 2007 A. Brodmann - Licensed under terms of GPL2
-module (..., package.seeall)
-
-require "posix"
-require "format"
-
-dansguardiancfg = "/etc/dansguardian/dansguardian.conf"
-dansguardiancfg2 = "/etc/dansguardian/dansguardianf1.conf"
-
-get_status = function()
-
-	local retval = "stopped"
-	
-	local ptr = io.popen( "/bin/pidof dansguardian" )
-	local pid = ptr:read( "*a" )
-	ptr:close()
-	if pid ~= nil then
-		if #pid > 1 then
-			retval = "running"
-		end
-	end
-	
-	return retval
-end
-
-service_control = function( control )
-
-	local retval = ""
-	
-	local ptr = io.popen( "/etc/init.d/dansguardian " .. control, "r" )
-	if ptr ~= nil then
-		local retmsg = ptr:read( "*a" )
-		ptr:close()
-		if retmsg ~= nil then
-			retval = retmsg
-		else
-			retval = "service_control(): Failed to read output from initscript!\n"
-		end
-	else
-		retval = "service_control(): Failed to start/stop/restart service!\n"
-	end
-
-	return retval
-end
-
-get_dansguardian_version = function()
-
-	local retval = ""
-	
-	local ptr = io.popen( "/usr/sbin/dansguardian -v" )
-	if ptr ~= nil then
-		retval = ptr:read( "*l" )
-		ptr:close()
-	else
-		retval = "Error - Failed to program version"
-	end
-	
-	return retval
-end
-
-get_general_config = function()
-
-	local retval = {}
-	local error = ""
-	
-	retval = { filterip = { label="Filter IP", type="text", value="" },
-	           filterport = { label="Filter Port", type="text", value="" },
-	           proxyip = { label="Proxy IP", type="text", value="" },
-	           proxyport = { label="Proxy Port", type="text", value="" },
-	           accessdeniedaddress = { label="AccessDeniedAddress", type="text", value="" },
-	           naughtynesslimit = { label="NaughtynessLimit", type="text", value="" }
-	         }
-	         
-	local fptr = io.open( dansguardiancfg, "r" )
-	if fptr ~= nil then
-		local line = fptr:read( "*l" )
-		while line ~= nil do
-			if string.sub( line, 1, 1 ) ~= "#" then
-				if string.sub( line, 1, 8 ) == "filterip" then
-					retval.filterip.value = get_cfg_value( line )
-				elseif string.sub( line, 1, 10 ) == "filterport" then
-					retval.filterport.value = get_cfg_value( line )
-				elseif string.sub( line, 1, 7 ) == "proxyip" then
-					retval.proxyip.value = get_cfg_value( line )
-				elseif string.sub( line, 1, 9 ) == "proxyport" then
-					retval.proxyport.value = get_cfg_value( line )
-				elseif string.sub( line, 1, 19 ) == "accessdeniedaddress" then
-					retval.accessdeniedaddress.value = get_cfg_value( line )
-				end
-			end
-			line = fptr:read( "*l" )   -- read one config file
-		end
-		fptr:close()
-	else
-		error = "Failed to open " .. dansguardiancfg .. " file!"
-	end
-	
-	local fptr2 = io.open( dansguardiancfg2, "r" )
-	if fptr2 ~= nil then
-		local line = fptr2:read( "*l" )
-		while line ~= nil do
-			if string.sub( line, 1, 1 ) ~= "#" then
-				if string.sub( line, 1, 16 ) == "naughtynesslimit" then
-					retval.naughtynesslimit.value = get_cfg_value( line )
-				end
-			end
-			line = fptr2:read( "*l" ) -- read one config file line
-		end
-		fptr2:close()
-	else
-		error = "Failed to open " .. dansguardiancfg2 .. " file!"
-	end
-	           
-	return retval, error
-end
-
-get_plain_config = function()
-
-	local retval = ""
-	local error = ""
-	
-	local fptr = io.open( dansguardiancfg, "r" )
-	if fptr ~= nil then
-		retval = fptr:read( "*a" )
-		fptr:close()
-		if retval == nil then
-			retval = ""
-			error = "Failed to read " .. dansguardiancfg .. " file!"
-		end
-	else
-		error = "Failed to open " .. dansguardiancfg .. " file!"
-	end
-	
-	return retval, error
-end
-
-get_edit_config = function( name )
-
-	local retval = ""
-	local error = ""
-	
-	if not is_valid_configfile( name ) then
-		return "", "Hacker"
-	end
-	
-	local fptr = io.open( "/etc/dansguardian/" .. name )
-	if fptr ~= nil then
-		retval = fptr:read( "*a" )
-		fptr:close()
-		if retval == nil then
-			retval = ""
-			error = "Failed to read /etc/dansguardian/" .. name .. " file!"
-		end
-	else 
-		error = "Failed to open /etc/dansguardian/" .. name .. " file!"
-	end
-	
-	return retval, error
-end
-
-update_edit_config = function( name, config )
-
-	local retval = ""
-	
-	if not is_valid_configfile( name ) then
-		return "", "Hacker"
-	end
-	
-	local fptr = io.open( "/etc/dansguardian/" .. name, "wb+" )
-	if fptr ~= nil then
-		fptr:write( format.dostounix( config ) )
-		fptr:close()
-		retval = ""
-	else
-		error = "Failed to open /etc/dansguardian/" .. name .. " file!"
-	end
-	
-	return retval
-end
-
-update_general_config = function( config )
-
-	local retval = ""
-	local tmpfilename = os.tmpname()
-	local tmpfile = -1
-	local cfgptr = -1
-	local line = ""
-
-	tmpfile = io.open( tmpfilename, "wb+" )
-	if tmpfile == nil then
-		return "Failed to create temporary config file!"
-	end	
-	
-	cfgptr = io.open( dansguardiancfg, "r" )
-	if cfgptr == nil then
-		tmpfile:close()
-		os.remove( tmpfilename )
-		return "Failed to open " .. dansguardiancfg .. "!"
-	end
-	
-	line = cfgptr:read( "*l" )
-	while line ~= nil do
-		if string.sub( line, 1, 8 ) == "filterip" then
-			tmpfile:write( "filterip = " .. config.filterip .. "\n" )
-		elseif string.sub( line, 1, 10 ) == "filterport" then
-			tmpfile:write( "filterport = " .. config.filterport .. "\n" )
-		elseif string.sub( line, 1, 7 ) == "proxyip" then
-			tmpfile:write( "proxyip = " .. config.proxyip .. "\n" )
-		elseif string.sub( line, 1, 9 ) == "proxyport" then
-			tmpfile:write( "proxyport = " .. config.proxyport .. "\n" )
-		elseif string.sub( line, 1, 19 ) == "accessdeniedaddress" then
-			tmpfile:write( "accessdeniedaddress = " .. config.accessdeniedaddress .. "\n" )
-		else
-			tmpfile:write( line .. "\n" )
-		end
-		line = cfgptr:read( "*l" )
-	end
-	
-	tmpfile:close()
-	cfgptr:close()
-	os.rename( tmpfilename, dansguardiancfg )
-	
-	--- step 2 - dansguardiancfg2
-	
-	tmpfile = io.open( tmpfilename, "wb+" )
-	if tmpfile == nil then
-		return "Failed to create temporary config file!"
-	end
-	
-	cfgptr = io.open( dansguardiancfg2, "r" )
-	if cfgptr == nil then
-		tmpfile:close()
-		os.remove( tmpfilename )
-		return "Failed to open " .. dansguardiancfg2 .. "!"
-	end
-	
-	line = cfgptr:read( "*l" )
-	while line ~= nil do
-		if string.sub( line, 1, 16 ) == "naughtynesslimit" then
-			tmpfile:write( "naughtynesslimit = " .. config.naughtynesslimit .. "\n" )
-		else
-			tmpfile:write( line .. "\n" )
-		end
-		line = cfgptr:read( "*l" )
-	end
-	
-	tmpfile:close()
-	cfgptr:close()
-	os.rename( tmpfilename, dansguardiancfg2 )
-	
-	return retval
-end
-
-update_plain_config = function( config )
-
-	local retval = ""
-	local cfgptr = -1
-	local error = ""
-	
-	cfgptr = io.open( dansguardiancfg, "wb+" )
-	if cfgptr ~= nil then
-		cfgptr:write( config )
-		cfgptr:close()
-	else
-		retval = "Failed to open " .. dansguardiancfg .. " file!"
-	end
-	
-	return retval
-end
-
-get_cfg_value = function( str )
-
-	local retval = ""
-	local pos = 1
-	local found = false
-	local found2 = false
-	
-	while not found and pos < #str -1 do
-		if string.sub( str, pos, pos ) == "=" then
-		  found = true
-		end
-		pos = pos + 1
-	end
-	
-	if found then
-		pos = pos - 1
-		while not found2 and pos < #str -1 do
-			if string.sub( str, pos+1, pos+1 ) ~= " " then
-				found2 = true
-			end
-			pos = pos + 1
-		end
-	end
-	
-	if found2 then
-		retval = string.sub( str, pos )
-	end
-	
-	return retval
-end
-
-get_advanced_config = function()
-
-	local retval = { files = {} }
-	local errmsg = ""
-	
-	get_file_tree( retval.files, "/etc/dansguardian", "" )
-	
-	return retval, errmsg
-end
-
-get_file_tree = function( treetable, dir, prefix ) 
-
-	local entries = posix.dir( dir )
-	local k = ""
-	local v = ""
-	for k,v in ipairs( entries ) do
-		local attrs = posix.stat( dir .. "/" .. v )
-		if attrs.type == "regular" and string.sub( v, -4) ~= ".gif" then
-			table.insert( treetable, prefix .. v )
-		end
-	end
-	
-	entries = posix.dir( dir )
-	for k,v in ipairs( entries ) do
-		local attrs = posix.stat( dir .. "/" .. v )
-		if attrs.type == "directory" and v~= "." and v~= ".." then
-			get_file_tree( treetable, dir .. "/" .. v, prefix .. v .. "/" )
-		end
-	end
-
-	return
-end
-
-is_valid_configfile = function( name )
-
-	local retval = false
-	local ftable = {}
-	local k
-	local v
-	
-	
-	get_file_tree( ftable, "/etc/dansguardian", "" )
-	
-	for k,v in ipairs( ftable ) do
-		if v == name then
-			retval = true
-		end
-	end
-	
-	return retval
-end
-
diff --git a/dansguardian-plain-html.lsp b/dansguardian-plain-html.lsp
deleted file mode 100644
index 2e24fd0..0000000
--- a/dansguardian-plain-html.lsp
+++ /dev/null
@@ -1,61 +0,0 @@
-<? 
-   local form = ... 
-   local data = form.option
-   local service = form.service
-   local config = form.service.config
-   
-   local srv1fill = ""
-   local srv2fill = "disabled"
-   if service.status == "running" then
-   	srv1fill = "disabled"
-   	srv2fill = ""
-   end
-   
-   local ifthen = function( variable, value, result )
-      if variable == value then
-         io.write( result )
-      end
-   end
-   
-?>
-<h1>Content Filter (Plain Config File)</h1>
-<table border="2">
-  <tr>
-    <td style="width:80%">
-      <center>
-        <div style="color: #ff2020; font-weight: bold;">WARNING:</div><br>
-        Modifying the DansGuardian configuration file is generally not necessary.
-        You must be familiar with the configuration file before proceeding.
-      </center>
-    </td>
-  </tr>
-</table><br>
-                                                
-<h2>Status</h2>
-<form action="" method="POST">
-<dt>dansguardian is: <? io.write( service.status ) ?> </dt>
-<dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?> style="width:100px">
-<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?> style="width:100px">
-<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?> style="width:100px"></dd>
-</form>
-<p class="error"><? io.write( service.message ) ?></p>
-
-<p>
-This process runs as a service. When you make and save changes, the configuration 
-files for the service are changed. However, the changes will not be <i>applied</i> 
-until you restart the service.
-</p>
-
-<form action="" method="POST">
-<h2>Configuration</h2>
-<pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre><br>
-These parameters define the interface and port that Dansguardian uses to accept connections.<br><br>
-
-<table>
-<tr><td><textarea name="config" style="width:100%"><? io.write( service.config ) ?></textarea></td></tr>
-</table><br>
-
-<h3>Save Changes</h3>
-<dt>Save the contents of the above box</dt><dd><input class="submit" type="submit" name="cmd" value="save" style="width:100px"></dd>
-</form>
-
diff --git a/dansguardian.menu b/dansguardian.menu
deleted file mode 100644
index 4db6448..0000000
--- a/dansguardian.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-# Prefix and controller are already known at this point
-# Cat	Group		Tab	Action
-Applications	Content_Filter	General	general