From 37cf3e0ef18cbe4dd4c9b38e3948b96dca412790 Mon Sep 17 00:00:00 2001
From: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Date: Sun, 1 Mar 2015 20:37:00 +0100
Subject: luci-app-privoxy: cleanup and fixes for #298 #334 #335

* remove extra apperror.lua page
* so no nore need for extra directory inside model/cbi
* add option temporary_directory needed for external filters
* remove special handling of bootstrap theme #298 #334
* modified version handling suggested in #335

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
---
 .../luasrc/model/cbi/privoxy/apperror.lua          | 47 ----------------------
 1 file changed, 47 deletions(-)
 delete mode 100755 applications/luci-app-privoxy/luasrc/model/cbi/privoxy/apperror.lua

(limited to 'applications/luci-app-privoxy/luasrc/model/cbi/privoxy/apperror.lua')

diff --git a/applications/luci-app-privoxy/luasrc/model/cbi/privoxy/apperror.lua b/applications/luci-app-privoxy/luasrc/model/cbi/privoxy/apperror.lua
deleted file mode 100755
index fcbb88074d..0000000000
--- a/applications/luci-app-privoxy/luasrc/model/cbi/privoxy/apperror.lua
+++ /dev/null
@@ -1,47 +0,0 @@
--- Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
--- Licensed under the Apache License, Version 2.0
-
-local CTRL = require "luci.controller.privoxy"	-- this application's controller
-local DISP = require "luci.dispatcher"
-local SYS  = require "luci.sys"
-
-local HELP = [[<a href="http://www.privoxy.org/user-manual/config.html#%s" target="_blank">%s</a>]]
-
--- cbi-map -- ##################################################################
-local m	= Map("privoxy")
-m.title	= [[</a><a href="javascript:alert(']]
-		.. translate("Version Information")
-		.. [[\n\nluci-app-privoxy]]
-		.. [[\n\t]] .. translate("Version") .. [[:\t]]
-		.. SYS.exec([[opkg list-installed ]] .. [[luci-app-privoxy]] .. [[ | cut -d " " -f 3 ]])
-		.. [[\n\nprivoxy ]] .. translate("required") .. [[:]]
-		.. [[\n\t]] .. translate("Version") .. [[:\t]] .. CTRL.PRIVOXY_MIN .. [[ ]] .. translate("or higher")
-		.. [[\n\nprivoxy ]] .. translate("installed") .. [[:]]
-		.. [[\n\t]] .. translate("Version") .. [[:\t]]
-		.. SYS.exec([[opkg list-installed ]] .. [[privoxy]] .. [[ | cut -d " " -f 3 ]])
-		.. [[\n\n]]
- 	.. [[')">]]
-	.. translate("Privoxy WEB proxy")
-m.description = translate("Privoxy is a non-caching web proxy with advanced filtering "
-		.. "capabilities for enhancing privacy, modifying web page data and HTTP headers, "
-		.. "controlling access, and removing ads and other obnoxious Internet junk.")
-
--- cbi-section -- ##############################################################
-local s = m:section(SimpleSection)
-s.title = [[<font color="red">]] .. [[<strong>]]
-	.. translate("Software update required")
-	.. [[</strong>]] .. [[</font>]]
-
--- old privoxy sofware version --------------------------------------------------------------
-local v    = s:option(DummyValue, "_update_needed")
-v.titleref = DISP.build_url("admin", "system", "packages")
-v.rawhtml  = true
---v.title    = [[<h3>]] .. [[<font color="red">]] .. [[<strong>]]
---	   .. translate("Software update required")
---	   .. [[</strong>]] .. [[</font>]] .. [[</h3>]] .. [[<br />]]
-v.value    = [[<h3>]] .. [[<strong>]]
-	   .. translate("The currently installed 'privoxy' package is not supported by LuCI application.")
-	   .. [[<br />]]
-	   .. translate("Please update to the current version!")
-	   .. [[</strong>]] .. [[</h3>]]
-return m
-- 
cgit v1.2.3