Removed reloadplan action because duplicates feature of startstop

4 files changed, 5 insertions, 63 deletions

diff --git a/kamailio-controller.lua b/kamailio-controller.lua
index 5a8b613..84ff5e7 100644
--- a/kamailio-controller.lua
+++ b/kamailio-controller.lua
@@ -58,11 +58,6 @@ function createdatabase(self)
 	return self:redirect_to_referrer(self.model.create_database())
 end
 
-function reloadplan(self)
-	return self:redirect_to_referrer(self.model.reloadplan())
-end
-
-
 searchdatabase = function( self )
 	return self.model.search_database(self.clientdata.id, self.clientdata.value, self.clientdata.comparison)
 end
diff --git a/kamailio-model.lua b/kamailio-model.lua
index cfc5c76..b8f7bec 100644
--- a/kamailio-model.lua
+++ b/kamailio-model.lua
@@ -173,14 +173,6 @@ function update_filedetails(self, filedetails)
 	return modelfunctions.setfiledetails(self, filedetails, is_valid_filename)
 end
 
-function reloadplan()
-	local cmd = path .. " sercmd mi_dg dp_reload"
-	local f = io.popen(cmd)
-	local result = f:read("*a")
-	f:close()
-	return cfe({value=result, label="Reloading Dial Plan Result"})
-end
-
 function list_files()
 	local retval = {}
 	for file in fs.find(null, baseurl) do
diff --git a/kamailio-status-html.lsp b/kamailio-status-html.lsp
index 65f4a8b..b2f8480 100644..120000
--- a/kamailio-status-html.lsp
+++ b/kamailio-status-html.lsp
@@ -1,46 +1 @@
-<% local data, viewlibrary, page_info, session = ... 
-require("htmlviewfunctions")
-%>
-
-<% htmlviewfunctions.displaycommandresults({"install","edit"}, session) %>
-<% htmlviewfunctions.displaycommandresults({"startstop"}, session) %>
-<% htmlviewfunctions.displaycommandresults({"reloadplan"}, session) %>
-
-<H1>System Info</H1>
-<DL>
-<%
-htmlviewfunctions.displayitem(data.value.status)
-
-htmlviewfunctions.displayitem(data.value.version)
-if data.value.version and data.value.version.errtxt and viewlibrary.check_permission("apk-tools/apk/install") then
-%>
-	<DT>Install package</DT>
-	<DD><form action="<%= html.html_escape(page_info.script .. "/apk-tools/apk/install") %>" method="POST">
-	<input type='hidden' name='package' value='<%= html.html_escape(data.value.version.name) %>'>
-	<input class='submit' type='submit' name='submit' value='Install'></form></DD>
-<%
-end
-
-htmlviewfunctions.displayitem(data.value.autostart)
-if not (data.value.version and data.value.version.errtxt) and data.value.autostart and data.value.autostart.errtxt and viewlibrary.check_permission("alpine-baselayout/rc/edit") then
-%>
-	<DT>Enable autostart</DT>
-	<DD><form action="<%= html.html_escape(page_info.script .. "/alpine-baselayout/rc/edit") %>" method="POST">
-	<input type='hidden' name='servicename' value='<%= html.html_escape(data.value.autostart.name) %>'>
-	<input type='hidden' name='redir' value='<%= html.html_escape(page_info.orig_action) %>'>
-	<input class='submit' type='submit' value='Enable'></form></DD>
-<% end %>
-</DL>
-
-<% if viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("startstop") then
-	viewlibrary.dispatch_component("startstop")
-end %>
-
-<% if viewlibrary.check_permission("reloadplan") then %>
-<H1>Reload Dial Plan</H1>
-<DL>
-	<DT>Reload dial plan into memory</DT>
-	<DD><form action="<%= html.html_escape(page_info.script .. page_info.prefix) %>kamailio/reloadplan" method="POST">
-	<input class="submit" type="submit" name="submit" value="Reload"></form></DD>
-</DL>
-<% end %>
+../status-html.lsp
\ No newline at end of file
diff --git a/kamailio.roles b/kamailio.roles
index c5f2ba3..be6e771 100644
--- a/kamailio.roles
+++ b/kamailio.roles
@@ -1,4 +1,4 @@
-USER=kamailio:status,kamailio:startstop,kamailio:listusers,kamailio:reloadplan
-EDITOR=kamailio:createuser,kamailio:updateuser,kamailio:deleteuser,kamailio:listtables,kamailio:viewtable,kamailio:deletetableentry,kamailio:updatetableentry,kamailio:createtableentry,kamailio:searchdatabase,kamailio:reloadplan
-EXPERT=kamailio:listfiles,kamailio:edit,kamailio:createdatabase,kamailio:reloadplan
-ADMIN=kamailio:status,kamailio:startstop,kamailio:listusers,kamailio:createuser,kamailio:updateuser,kamailio:deleteuser,kamailio:listfiles,kamailio:edit,kamailio:listtables,kamailio:viewtable,kamailio:deletetableentry,kamailio:updatetableentry,kamailio:createtableentry,kamailio:createdatabase,kamailio:searchdatabase,kamailio:reloadplan
+USER=kamailio:status,kamailio:startstop,kamailio:listusers
+EDITOR=kamailio:createuser,kamailio:updateuser,kamailio:deleteuser,kamailio:listtables,kamailio:viewtable,kamailio:deletetableentry,kamailio:updatetableentry,kamailio:createtableentry,kamailio:searchdatabase
+EXPERT=kamailio:listfiles,kamailio:edit,kamailio:createdatabase
+ADMIN=kamailio:status,kamailio:startstop,kamailio:listusers,kamailio:createuser,kamailio:updateuser,kamailio:deleteuser,kamailio:listfiles,kamailio:edit,kamailio:listtables,kamailio:viewtable,kamailio:deletetableentry,kamailio:updatetableentry,kamailio:createtableentry,kamailio:createdatabase,kamailio:searchdatabase