summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-07-30 12:40:45 +0000
committerTed Trask <ttrask01@yahoo.com>2012-07-30 12:40:45 +0000
commita039e5778e805607f562847ab103600f0efc30ec (patch)
tree544ef149c736e4ff6856ad81f612e5f9ebdb5ffa
parent3d3db834c28e2366a711587619d82bc7cab9b522 (diff)
downloadacf-freeswitch-a039e5778e805607f562847ab103600f0efc30ec.tar.bz2
acf-freeswitch-a039e5778e805607f562847ab103600f0efc30ec.tar.xz
Removed redirect_to_referrer and updates for handle_form
-rw-r--r--freeswitch-controller.lua6
-rw-r--r--freeswitch-listfiles-html.lsp2
-rw-r--r--freeswitch-model.lua32
3 files changed, 25 insertions, 15 deletions
diff --git a/freeswitch-controller.lua b/freeswitch-controller.lua
index e7be60d..7f9d628 100644
--- a/freeswitch-controller.lua
+++ b/freeswitch-controller.lua
@@ -15,7 +15,7 @@ listfiles = function( self )
end
editfile = function( self )
- return self.handle_form(self, function() return self.model.get_file(self.clientdata.filename) end, self.model.update_file, self.clientdata, "Save", "Edit File", "File Saved")
+ return self.handle_form(self, self.model.get_file, self.model.update_file, self.clientdata, "Save", "Edit File", "File Saved")
end
function createfile(self)
@@ -23,9 +23,9 @@ function createfile(self)
end
function deletefile(self)
- return self:redirect_to_referrer(self.model.deletefile(self.clientdata.filename))
+ return self.handle_form(self, self.model.getdeletefile, self.model.deletefile, self.clientdata, "Delete", "Delete Freeswitch File", "Freeswitch File Deleted")
end
function reloadxml(self)
- return self:redirect_to_referrer(self.model.reload_xml())
+ return self.handle_form(self, self.model.getreloadxml, self.model.reload_xml, self.clientdata, "Reload", "Reload Freeswitch XML")
end
diff --git a/freeswitch-listfiles-html.lsp b/freeswitch-listfiles-html.lsp
index 126bbc4..a6cc926 100644
--- a/freeswitch-listfiles-html.lsp
+++ b/freeswitch-listfiles-html.lsp
@@ -25,7 +25,7 @@ end %>
<%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/editfile?filename="..v.filename.."&redir="..page_info.orig_action, label="Edit "} %>
<% end %>
<% if viewlibrary.check_permission("deletefile") then %>
- <%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/deletefile?filename="..v.filename, label="Delete "} %>
+ <%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/deletefile?submit=true&filename="..v.filename, label="Delete "} %>
<% end %>
</TD>
<TD style="padding-right:20px;white-space:nowrap;text-align:left;"><%= html.html_escape(v.filename) %></TD>
diff --git a/freeswitch-model.lua b/freeswitch-model.lua
index 610d4df..57251c7 100644
--- a/freeswitch-model.lua
+++ b/freeswitch-model.lua
@@ -37,14 +37,19 @@ function startstop_service(self, startstop, action)
return modelfunctions.startstop_service(startstop, action)
end
-function reload_xml()
+function getreloadxml()
+ return cfe({ type="group", value={}, label="Reload Freeswitch XML" })
+end
+
+function reload_xml(self, relo)
local f = io.popen(path.."fs_cli -x reloadxml 2>&1")
- local result = f:read("*a")
+ relo.descr = f:read("*a")
f:close()
- return cfe({ value=result, label="Freeswitch Reload XML result" })
+ return relo
end
-get_file = function(filename)
+get_file = function(self, clientdata)
+ local filename = clientdata.filename
return modelfunctions.getfiledetails(filename, is_valid_filename)
end
@@ -102,16 +107,21 @@ function createfile(self, filedetails)
return filedetails
end
-function deletefile(filename)
- local retval = cfe({ label="Delete Freeswitch File result", errtxt = "Failed to delete Freeswitch File - invalid filename" })
+function getdeletefile(self, clientdata)
+ local retval = {}
+ retval.filename = cfe({ label="File Name", value=clientdata.filename or "" })
+ return cfe({ type="group", value=retval, label="Delete Freeswitch File" })
+end
+
+function deletefile(self, delfile)
+ delfile.errtxt = "Failed to delete Freeswitch File - invalid filename"
for i,file in ipairs(list_files().value) do
- if filename == file.filename then
- retval.value = "Deleted Freeswitch File"
- retval.errtxt = nil
- os.remove(filename)
+ if delfile.value.filename.value == file.filename then
+ delfile.errtxt = nil
+ os.remove(delfile.value.filename.value)
break
end
end
- return retval
+ return delfile
end