diff options
-rw-r--r-- | openvpn-clientconfig-html.lsp | 48 | ||||
-rw-r--r-- | openvpn-logfile-html.lsp | 6 | ||||
-rw-r--r-- | openvpn-peminfo-html.lsp | 2 | ||||
-rw-r--r-- | openvpn-serverconfig-html.lsp | 56 | ||||
-rw-r--r-- | openvpn-status-html.lsp | 22 | ||||
-rw-r--r-- | openvpn-statusinfo-html.lsp | 18 | ||||
-rw-r--r-- | openvpn-unknownconfig-html.lsp | 16 |
7 files changed, 84 insertions, 84 deletions
diff --git a/openvpn-clientconfig-html.lsp b/openvpn-clientconfig-html.lsp index 3130f9f..1aa2bc3 100644 --- a/openvpn-clientconfig-html.lsp +++ b/openvpn-clientconfig-html.lsp @@ -1,7 +1,7 @@ -<? local view = ... ?> +<% local view = ... %> <html> <body> -<h1>Client config '<?= view.config.name ?>'</h1> +<h1>Client config '<%= view.config.name %>'</h1> <h2>Client settings</h2> @@ -9,18 +9,18 @@ <dd>client</dd> <dt>User device</dt> -<dd><?= view.config.dev ?></dd> +<dd><%= view.config.dev %></dd> <dt>Remote server</dt> -<dd><?= view.config.remote ?>:<?= view.config.remoteport ?> (<?= view.config.proto ?>)</dd> +<dd><%= view.config.remote %>:<%= view.config.remoteport %> (<%= view.config.proto %>)</dd> <dt>Logfile</dt> -<dd><? if ( view.config.log ) then ?><?= html.link{value = view.url .. "/logfile?name=" .. view.config.linkname , label=view.config.log } ?><? else ?>Syslog<? end ?> (Verbosity level: <?= view.config.verb ?>)</dd> +<dd><% if ( view.config.log ) then %><%= html.link{value = view.url .. "/logfile?name=" .. view.config.linkname , label=view.config.log } %><% else %>Syslog<% end %> (Verbosity level: <%= view.config.verb %>)</dd> <dt>View/Modify configfile</dt> -<dd><?= html.link{value = view.url .. "/unknown_config?name=" .. view.config.linkname , label=view.config.name } ?></dd> +<dd><%= html.link{value = view.url .. "/unknown_config?name=" .. view.config.linkname , label=view.config.name } %></dd> -<? --[[ ?> +<% --[[ %> <h3>Client properties</h3> <dt>Common name</dt> @@ -32,39 +32,39 @@ <dt>Real address</dt> <dd>xxx.xxx.xxx.xxx:xxxx</dd> -<? --]] ?> +<% --]] %> <h2>Startup options</h2> <dt>Process running</dt> -<dd><input type="checkbox" disabled <? if (view.config.status_isrunning ~= "") then io.write("checked='yes'") end ?>></dd> +<dd><input type="checkbox" disabled <% if (view.config.status_isrunning ~= "") then io.write("checked='yes'") end %>></dd> <h2>Certificate files</h2> -<? if (view.config.ca) then ?> +<% if (view.config.ca) then %> <dt>CA Certificate</dt> -<dd><?= view.config.ca ?><? -- html.link{value = view.url .. "/pem_info?name=" .. view.config.ca , label=view.config.ca } ?></dd> -<? end ?> +<dd><%= view.config.ca %><% -- html.link{value = view.url .. "/pem_info?name=" .. view.config.ca , label=view.config.ca } %></dd> +<% end %> -<? if (view.config.cert) then ?> +<% if (view.config.cert) then %> <dt>Client Certificate</dt> -<dd><?= view.config.cert ?><? -- html.link{value = view.url .. "/pem_info?name=" .. view.config.cert , label=view.config.cert } ?></dd> -<? end ?> +<dd><%= view.config.cert %><% -- html.link{value = view.url .. "/pem_info?name=" .. view.config.cert , label=view.config.cert } %></dd> +<% end %> -<? if (view.config.key) then ?> +<% if (view.config.key) then %> <dt>Client Private Key</dt> -<dd><?= view.config.key ?><? -- html.link{value = view.url .. "/pem_info?name=" .. view.config.key , label=view.config.key } ?></dd> -<? end ?> +<dd><%= view.config.key %><% -- html.link{value = view.url .. "/pem_info?name=" .. view.config.key , label=view.config.key } %></dd> +<% end %> -<? if (view.config.tls) then ?> +<% if (view.config.tls) then %> <dt>TLS Authentication</dt> -<dd><?= view.config.tls ?><? -- html.link{value = view.url .. "/pem_info?name=" .. view.config.tls , label=view.config.tls } ?></dd> -<? end ?> +<dd><%= view.config.tls %><% -- html.link{value = view.url .. "/pem_info?name=" .. view.config.tls , label=view.config.tls } %></dd> +<% end %> -<? if (view.config.crl) then ?> +<% if (view.config.crl) then %> <dt>CRL Verify File</dt> -<dd><?= view.config.crl ?><? -- html.link{value = view.url .. "/pem_info?name=" .. view.config.crl , label=view.config.crl } ?> (client side)</dd> -<? end ?> +<dd><%= view.config.crl %><% -- html.link{value = view.url .. "/pem_info?name=" .. view.config.crl , label=view.config.crl } %> (client side)</dd> +<% end %> </body> </html> diff --git a/openvpn-logfile-html.lsp b/openvpn-logfile-html.lsp index 0615b77..22ebabe 100644 --- a/openvpn-logfile-html.lsp +++ b/openvpn-logfile-html.lsp @@ -1,8 +1,8 @@ -<? local view = ... ?> +<% local view = ... %> <html> <body> -<h1>Logfile '<?= view.logfilecontent.name ?>'</h1> -<textarea name=""><?= view.logfilecontent.value ?></textarea> +<h1>Logfile '<%= view.logfilecontent.name %>'</h1> +<textarea name=""><%= view.logfilecontent.value %></textarea> </body> </html> diff --git a/openvpn-peminfo-html.lsp b/openvpn-peminfo-html.lsp index 5f048b4..070399f 100644 --- a/openvpn-peminfo-html.lsp +++ b/openvpn-peminfo-html.lsp @@ -1,4 +1,4 @@ -<? local view = ... ?> +<% local view = ... %> <html> <body> <h1>Certificate Info 'xxx.conf'</h1> diff --git a/openvpn-serverconfig-html.lsp b/openvpn-serverconfig-html.lsp index 6b4b215..fad78dc 100644 --- a/openvpn-serverconfig-html.lsp +++ b/openvpn-serverconfig-html.lsp @@ -1,7 +1,7 @@ -<? local view = ... ?> +<% local view = ... %> <html> <body> -<h1>Server config '<?= view.config.name ?>'</h1> +<h1>Server config '<%= view.config.name %>'</h1> <h2>Server settings</h2> @@ -9,64 +9,64 @@ <dd>server</dd> <dt>User device</dt> -<dd><?= view.config.dev ?></dd> +<dd><%= view.config.dev %></dd> <dt>Listens on</dt> -<dd><?= view.config["local"] ?>:<?= view.config.port ?> (<?= view.config.proto ?>)</dd> +<dd><%= view.config["local"] %>:<%= view.config.port %> (<%= view.config.proto %>)</dd> <dt>Logfile</dt> -<dd><? if ( view.config.log ) then ?><?= html.link{value = view.url .. "/logfile?name=" .. view.config.linkname , label=view.config.log } ?><? else ?>Syslog<? end ?> (Verbosity level: <?= view.config.verb ?>)</dd> +<dd><% if ( view.config.log ) then %><%= html.link{value = view.url .. "/logfile?name=" .. view.config.linkname , label=view.config.log } %><% else %>Syslog<% end %> (Verbosity level: <%= view.config.verb %>)</dd> <dt>View/Modify configfile</dt> -<dd><?= html.link{value = view.url .. "/unknown_config?name=" .. view.config.linkname , label=view.config.name } ?></dd> +<dd><%= html.link{value = view.url .. "/unknown_config?name=" .. view.config.linkname , label=view.config.name } %></dd> <h3>Connected clients status</h3> <dt>Last status was recorded</dt> -<dd><?= view.config.client_lastupdate ?> (This was <b><?= view.config.client_lastdatechangediff ?></b> ago)</dd> +<dd><%= view.config.client_lastupdate %> (This was <b><%= view.config.client_lastdatechangediff %></b> ago)</dd> <dt>Maximum clients</dt> -<dd><?= view.config["max-clients"] ?></dd> +<dd><%= view.config["max-clients"] %></dd> <dt>Connected clients</dt> -<dd><? if ( view.config.client_count > 0 ) then ?><?= html.link{value = view.url .. "/status_info?name=" .. view.config.linkname , label=view.config.client_count } ?><? else ?><?= view.config.client_count ?><? end ?></dd> +<dd><% if ( view.config.client_count > 0 ) then %><%= html.link{value = view.url .. "/status_info?name=" .. view.config.linkname , label=view.config.client_count } %><% else %><%= view.config.client_count %><% end %></dd> <h2>Startup options</h2> <dt>Process running</dt> -<dd><input type="checkbox" disabled <? if (view.config.status_isrunning ~= "") then io.write("checked='yes'") end ?>></dd> +<dd><input type="checkbox" disabled <% if (view.config.status_isrunning ~= "") then io.write("checked='yes'") end %>></dd> <h2>Certificate files</h2> -<? if (view.config.dh) then ?> +<% if (view.config.dh) then %> <dt>DH</dt> -<dd><?= view.config.dh ?><? -- html.link{value = view.url .. "/pem_info?name=" .. view.config.dh , label=view.config.dh } ?></dd> -<? end ?> +<dd><%= view.config.dh %><% -- html.link{value = view.url .. "/pem_info?name=" .. view.config.dh , label=view.config.dh } %></dd> +<% end %> -<? if (view.config.ca) then ?> +<% if (view.config.ca) then %> <dt>CA Certificate</dt> -<dd><?= view.config.ca ?><? -- html.link{value = view.url .. "/pem_info?name=" .. view.config.ca , label=view.config.ca } ?></dd> -<? end ?> +<dd><%= view.config.ca %><% -- html.link{value = view.url .. "/pem_info?name=" .. view.config.ca , label=view.config.ca } %></dd> +<% end %> -<? if (view.config.cert) then ?> +<% if (view.config.cert) then %> <dt>Server Certificate</dt> -<dd><?= view.config.cert ?><? -- html.link{value = view.url .. "/pem_info?name=" .. view.config.cert , label=view.config.cert } ?></dd> -<? end ?> +<dd><%= view.config.cert %><% -- html.link{value = view.url .. "/pem_info?name=" .. view.config.cert , label=view.config.cert } %></dd> +<% end %> -<? if (view.config.key) then ?> +<% if (view.config.key) then %> <dt>Server Private Key</dt> -<dd><?= view.config.key ?><? -- html.link{value = view.url .. "/pem_info?name=" .. view.config.key , label=view.config.key } ?></dd> -<? end ?> +<dd><%= view.config.key %><% -- html.link{value = view.url .. "/pem_info?name=" .. view.config.key , label=view.config.key } %></dd> +<% end %> -<? if (view.config.tls) then ?> +<% if (view.config.tls) then %> <dt>TLS Authentication</dt> -<dd><?= view.config.tls ?><? -- html.link{value = view.url .. "/pem_info?name=" .. view.config.tls , label=view.config.tls } ?></dd> -<? end ?> +<dd><%= view.config.tls %><% -- html.link{value = view.url .. "/pem_info?name=" .. view.config.tls , label=view.config.tls } %></dd> +<% end %> -<? if (view.config.crl) then ?> +<% if (view.config.crl) then %> <dt>CRL Verify File</dt> -<dd><?= view.config.crl ?><? -- html.link{value = view.url .. "/pem_info?name=" .. view.config.crl , label=view.config.crl } ?></dd> -<? end ?> +<dd><%= view.config.crl %><% -- html.link{value = view.url .. "/pem_info?name=" .. view.config.crl , label=view.config.crl } %></dd> +<% end %> </body> </html> diff --git a/openvpn-status-html.lsp b/openvpn-status-html.lsp index c2ed053..8cbe657 100644 --- a/openvpn-status-html.lsp +++ b/openvpn-status-html.lsp @@ -1,9 +1,9 @@ -<? local view = ... ?> +<% local view = ... %> <h1>SYSTEM INFO</h1> <dl> <dt>Program version</dt> -<DD><?= view.version ?></DD> +<DD><%= view.version %></DD> </dl> <H2>PROGRAM SPECIFIC OPTIONS/INFORMATION</H2> @@ -18,20 +18,20 @@ <TD class="header">Notes</TD> </TR> -<? for i = 1, table.maxn(view.conflistfiles) do ?> +<% 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> + <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 ?> +<% end %> -<? if (#view.conflistfiles == 0) then ?> +<% if (#view.conflistfiles == 0) then %> <TR> <TD colspan=3>(No existing config-files)</TD> </TR> -<? end ?> +<% end %> </TABLE> diff --git a/openvpn-statusinfo-html.lsp b/openvpn-statusinfo-html.lsp index 2c28d05..000000f 100644 --- a/openvpn-statusinfo-html.lsp +++ b/openvpn-statusinfo-html.lsp @@ -1,4 +1,4 @@ -<? local view = ... ?> +<% local view = ... %> <html> <body> <h1>Status</h1> @@ -12,18 +12,18 @@ <TD>Bytes<BR>Received</TD> <TD>Bytes<BR>Sent</TD> </TR> -<? for i = 1, table.maxn(view.clientlist) do ?> +<% for i = 1, table.maxn(view.clientlist) do %> <TR> - <TD><?= view.clientlist[i].CN ?></TD> - <TD><?= view.clientlist[i].VIRTADDR ?></TD> - <TD><?= view.clientlist[i].REALADDR ?></TD> - <TD><?= view.clientlist[i].BYTESRCV ?></TD> - <TD><?= view.clientlist[i].BYTESSND ?></TD> + <TD><%= view.clientlist[i].CN %></TD> + <TD><%= view.clientlist[i].VIRTADDR %></TD> + <TD><%= view.clientlist[i].REALADDR %></TD> + <TD><%= view.clientlist[i].BYTESRCV %></TD> + <TD><%= view.clientlist[i].BYTESSND %></TD> </TR> <TR> - <TD COLSPAN=5 style="border-bottom: 1px solid #ccc;"><?= view.clientlist[i].CONN ?></TD> + <TD COLSPAN=5 style="border-bottom: 1px solid #ccc;"><%= view.clientlist[i].CONN %></TD> </TR> -<? end ?> +<% end %> </TABLE> </body> diff --git a/openvpn-unknownconfig-html.lsp b/openvpn-unknownconfig-html.lsp index fe8aa1f..ab37bfc 100644 --- a/openvpn-unknownconfig-html.lsp +++ b/openvpn-unknownconfig-html.lsp @@ -1,27 +1,27 @@ -<? local view = ... ?> +<% local view = ... %> <html> <body> -<h1>Configuration file '<?= view.configfilecontent.name ?>'</h1> +<h1>Configuration file '<%= view.configfilecontent.name %>'</h1> <h2>Details</h2> <dt>File name</dt> -<dd><?= view.configfilecontent.filedetails.longname ?></dd> +<dd><%= view.configfilecontent.filedetails.longname %></dd> <dt>File size</dt> -<dd><?= view.configfilecontent.filedetails.size ?></dd> +<dd><%= view.configfilecontent.filedetails.size %></dd> <dt>Last modified</dt> -<dd><?= view.configfilecontent.filedetails.mtimelong ?></dd> +<dd><%= view.configfilecontent.filedetails.mtimelong %></dd> <dt>This config looks like a</dt> -<dd><a href="<?= view.url ?>/<?= view.configfilecontent.type ?>_config?name=<?= view.configfilecontent.name ?>"><?= view.configfilecontent.type ?></a> config</a></dd> +<dd><a href="<%= view.url %>/<%= view.configfilecontent.type %>_config?name=<%= view.configfilecontent.name %>"><%= view.configfilecontent.type %></a> config</a></dd> <h2>Content</h2> <form name="myform" action="" method="POST"> -<input name="name" type="hidden" value="<?= view.configfilecontent.name ?>"> -<textarea name="modifications"><?= view.configfilecontent.value ?></textarea> +<input name="name" type="hidden" value="<%= view.configfilecontent.name %>"> +<textarea name="modifications"><%= view.configfilecontent.value %></textarea> <input type="submit" name="cmd" class="submit" value="update"></form> |