From d619a9cafd514e7fcf9ccd522c85c516569f49d9 Mon Sep 17 00:00:00 2001
From: Mika Havela <mika.havela@gmail.com>
Date: Wed, 6 Feb 2008 08:40:23 +0000
Subject: Renamed read to status.

git-svn-id: svn://svn.alpinelinux.org/acf/openvpn/trunk@697 ab2d0c66-481e-0410-8bed-d214d4d58bed
---
 Makefile                |  2 +-
 openvpn-controller.lua  |  5 ++---
 openvpn-read-html.lsp   | 44 --------------------------------------------
 openvpn-status-html.lsp | 44 ++++++++++++++++++++++++++++++++++++++++++++
 openvpn.menu            |  2 +-
 5 files changed, 48 insertions(+), 49 deletions(-)
 delete mode 100644 openvpn-read-html.lsp
 create mode 100644 openvpn-status-html.lsp

diff --git a/Makefile b/Makefile
index 7296c8c..610c311 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ APP_DIST=openvpn-client_config-html.lsp \
 	openvpn-logfile-html.lsp	\
 	openvpn-model.lua		\
 	openvpn-pem_info-html.lsp	\
-	openvpn-read-html.lsp		\
+	openvpn-status-html.lsp		\
 	openvpn-server_config-html.lsp	\
 	openvpn-status_info-html.lsp	\
 	openvpn-unknown_config-html.lsp	\
diff --git a/openvpn-controller.lua b/openvpn-controller.lua
index c2f5a4c..cf38b26 100644
--- a/openvpn-controller.lua
+++ b/openvpn-controller.lua
@@ -6,7 +6,7 @@ module (..., package.seeall)
 -- 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 = "read"
+	self.conf.action = "status"
 	self.conf.type = "redir"
 	error (self.conf)
 end
@@ -21,8 +21,7 @@ mvc.on_load = function(self, parent)
 
 end
 
-
-read = function (self)
+status = function (self)
 	-- FIXME: If return 1 rows go direct to that config-page
 	return ( {conflistfiles = self.model:get_conflist(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller, version = self.model:openvpn_version()} )
 end
diff --git a/openvpn-read-html.lsp b/openvpn-read-html.lsp
deleted file mode 100644
index 98475d2..0000000
--- a/openvpn-read-html.lsp
+++ /dev/null
@@ -1,44 +0,0 @@
-<? local view = ... ?>
-<h1>SYSTEM INFO</h1>
-
-<dl>
-<dt>Program version</dt>
-<DD><?= view.version ?></DD>
-</dl>
-
-<H2>PROGRAM SPECIFIC OPTIONS/INFORMATION</H2>
-
-<H3>Available configs (Click on config-name to see details)</H3>
-<TABLE>
-	<TR style="background:#eee;font-weight:bold;vertical-align:top;">
-		<TD>Config</TD>
-		<TD>Type</TD>
-		<TD>Status</TD>
-		<TD>Connected<BR>Clients</TD>
-		<TD>Notes</TD>
-	</TR>		
-
-<? for i = 1, table.maxn(view.conflistfiles) do ?>
-	<TR >
-		<TD><?= html.link{value = view.url .. "/" .. view.conflistfiles[i].type .. "_config?name=" .. view.conflistfiles[i].name , label=view.conflistfiles[i].name } ?></TD>
-		<TD><?= view.conflistfiles[i].type ?></TD>
-		<TD><?= view.conflistfiles[i].status ?></TD>
-		<TD><? if ( view.conflistfiles[i].type == "server" ) then ?><? if ( view.conflistfiles[i].clients > 0 ) then ?><?= html.link{value = view.url .. "/status_info?name=" .. view.conflistfiles[i].name  , label=view.conflistfiles[i].clients } ?><? else ?><?= view.conflistfiles[i].clients ?><? end ?><? end ?></TD>
-		<TD style="color:red"><i><?= view.conflistfiles[i].err ?></i></TD>
-	</TR>		
-<? end ?>
-
-<? if (#view.conflistfiles == 0) then ?>
-	<TR>
-	<TD colspan=3>(No existing config-files)</TD>
-	</TR>
-<? end ?>
-</TABLE>
-
-<?
---[[ DEBUG INFORMATION
-require("debugs")
-io.write(debugs.variables(view))
---]]
-?>
-
diff --git a/openvpn-status-html.lsp b/openvpn-status-html.lsp
new file mode 100644
index 0000000..98475d2
--- /dev/null
+++ b/openvpn-status-html.lsp
@@ -0,0 +1,44 @@
+<? local view = ... ?>
+<h1>SYSTEM INFO</h1>
+
+<dl>
+<dt>Program version</dt>
+<DD><?= view.version ?></DD>
+</dl>
+
+<H2>PROGRAM SPECIFIC OPTIONS/INFORMATION</H2>
+
+<H3>Available configs (Click on config-name to see details)</H3>
+<TABLE>
+	<TR style="background:#eee;font-weight:bold;vertical-align:top;">
+		<TD>Config</TD>
+		<TD>Type</TD>
+		<TD>Status</TD>
+		<TD>Connected<BR>Clients</TD>
+		<TD>Notes</TD>
+	</TR>		
+
+<? for i = 1, table.maxn(view.conflistfiles) do ?>
+	<TR >
+		<TD><?= html.link{value = view.url .. "/" .. view.conflistfiles[i].type .. "_config?name=" .. view.conflistfiles[i].name , label=view.conflistfiles[i].name } ?></TD>
+		<TD><?= view.conflistfiles[i].type ?></TD>
+		<TD><?= view.conflistfiles[i].status ?></TD>
+		<TD><? if ( view.conflistfiles[i].type == "server" ) then ?><? if ( view.conflistfiles[i].clients > 0 ) then ?><?= html.link{value = view.url .. "/status_info?name=" .. view.conflistfiles[i].name  , label=view.conflistfiles[i].clients } ?><? else ?><?= view.conflistfiles[i].clients ?><? end ?><? end ?></TD>
+		<TD style="color:red"><i><?= view.conflistfiles[i].err ?></i></TD>
+	</TR>		
+<? end ?>
+
+<? if (#view.conflistfiles == 0) then ?>
+	<TR>
+	<TD colspan=3>(No existing config-files)</TD>
+	</TR>
+<? end ?>
+</TABLE>
+
+<?
+--[[ DEBUG INFORMATION
+require("debugs")
+io.write(debugs.variables(view))
+--]]
+?>
+
diff --git a/openvpn.menu b/openvpn.menu
index 8feef32..96edf76 100644
--- a/openvpn.menu
+++ b/openvpn.menu
@@ -1,2 +1,2 @@
 #CAT  		GROUP/DESC	TAB		ACTION
-Networking	OpenVPN 	OpenVPN 	read
+Networking	40OpenVPN		status		status
-- 
cgit v1.2.3