diff options
Diffstat (limited to 'squid-controller.lua')
| -rw-r--r-- | squid-controller.lua | 107 |
1 files changed, 18 insertions, 89 deletions
diff --git a/squid-controller.lua b/squid-controller.lua index b16bbd8..cda4b7f 100644 --- a/squid-controller.lua +++ b/squid-controller.lua @@ -6,22 +6,6 @@ require("controllerfunctions") default_action = "status" -dep = function( self ) - - if self.model.dependancy_ok() then - redirect(self) - end - - if self.clientdata.cmd then - if self.clientdata.cmd == "create file" then - self.model.create_cfg_from_template() - redirect(self) - end - end - - return -end - status = function( self ) return self.model.getstatus() end @@ -30,87 +14,22 @@ startstop = function( self ) return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.model.getstatus, self.clientdata) end -basic = function( self ) - - local service = {} - - if not self.model.dependancy_ok() then - redirect(self, "dep") - end - - if self.clientdata.cmd then - local cmd = self.clientdata.cmd - if cmd == "save" then - local newconfig = { proxyip = { value=self.clientdata.proxyip, type="text", label="" }, - proxyport = { value=self.clientdata.proxyport, type="text", label="" }, - filterip = { value=self.clientdata.filterip, type="text", label="" }, - filterport = { value=self.clientdata.filterport, type="text", label="" }, - filterregex = { value=self.clientdata.filterregex, type="text", label="" }, - safeports = { value=self.clientdata.safeports, type="text", label="" }, - sslports = { value=self.clientdata.sslports, type="text", label="" }, - accesslog = { value=self.clientdata.accesslog, type="select", label="", option={ "yes", "no" } }, - diskcache = { value=self.clientdata.diskcache, type="select", label="", option={ "yes", "no" } }, - authmethod = { value=self.clientdata.authmethod, type="text", label="" } - } - - self.model.update_basic_config( newconfig ) - end - end - - service.config, service.error = self.model.get_basic_config() - - return ( cfe ({ service = service }) ) +config = function( self ) + return controllerfunctions.handle_form(self, self.model.read_config, self.model.update_config, self.clientdata, "Save", "Edit Config", "Configuration Set") end -authentication = function( self ) +digest = function( self ) + return controllerfunctions.handle_form(self, self.model.read_digest_userlist, self.model.update_digest_userlist, self.clientdata, "Save", "Edit User List", "User List Set") +end - local service = {} - - if self.clientdata.inout then - local newauth = "" - if self.clientdata.inout == " << " then - if self.clientdata.tmpempty then - newauth = self.clientdata.authmethod .. self.clientdata.tmpempty - else - newauth = self.clientdata.authmethod - end - elseif self.clientdata.inout == " >> " then - local tmpauth = self.clientdata.authmethod - local lap = 1 - while lap <= #tmpauth do - if string.sub( tmpauth, lap, lap ) ~= self.clientdata.tmpauth then - newauth = newauth .. string.sub( tmpauth, lap, lap ) - end - lap = lap + 1 - end - end - self.model.upd_authmethod(newauth) - end - - service.config, service.error = self.model.get_basic_config() - - return ( cfe ({ service = service }) ) +enabledigestlist = function( self ) + return self:redirect_to_referrer(self.model.enable_digest_userlist()) end expert = function( self ) return controllerfunctions.handle_form(self, self.model.get_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Config", "Configuration Set") end - -digest = function( self ) - - local service = { message="", status="", config="" } - - if self.clientdata.cmd then - if self.clientdata.cmd == "save" then - service.message = self.model.update_digest_userlist( self.clientdata.userlist ) - end - end - - service.config = self.model.get_digest_userlist() - - return ( cfe ({ service = service }) ) -end - +--[[ saccess = function( self ) local service = { message="", status="", config="" } @@ -130,5 +49,15 @@ saccess = function( self ) return ( cfe ({ service = service }) ) end +listacls = function( self ) + return self.model.read_acls() +end +editacl = function( self ) + return controllerfunctions.handle_form(self, function() return self.model.read_acl(self.clientdata.linenum) end, self.model.update_acl, self.clientdata, "Save", "Edit ACL", "ACL Saved") +end +deleteacl = function( self ) + return self:redirect_to_referrer(self.model.delete_acl(self.clientdata.linenum)) +end +--]] |