From ee7b3354f03abc865abe51a5ccea07b376d932ce Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 28 Jul 2008 06:48:16 +0000 Subject: use <% %> instead of git-svn-id: svn://svn.alpinelinux.org/acf/shorewall/trunk@1323 ab2d0c66-481e-0410-8bed-d214d4d58bed --- shorewall-check-html.lsp | 22 ++++---- shorewall-config-html.lsp | 122 ++++++++++++++++++++-------------------- shorewall-confirmation-html.lsp | 16 +++--- shorewall-edit-html.lsp | 36 ++++++------ shorewall-expert-html.lsp | 24 ++++---- shorewall-html.lsp | 22 ++++---- shorewall-logfile-html.lsp | 18 +++--- shorewall-startstop-html.lsp | 24 ++++---- shorewall-status-html.lsp | 12 ++-- shorewall-statusbasic-html.lsp | 8 +-- 10 files changed, 152 insertions(+), 152 deletions(-) diff --git a/shorewall-check-html.lsp b/shorewall-check-html.lsp index f970a97..6e39399 100644 --- a/shorewall-check-html.lsp +++ b/shorewall-check-html.lsp @@ -1,26 +1,26 @@ -DEBUGGING

DEBUG INFO: CFE

") io.write(html.cfe_unpack(view)) io.write("") --]] -?> +%> - +end %>

CONFIGURATION

- +<% local myform = form.config %>

CHECK CONFIGURATION

- +%>
-") end -?> +%>
- +end %> diff --git a/shorewall-config-html.lsp b/shorewall-config-html.lsp index ab830f0..5704df8 100644 --- a/shorewall-config-html.lsp +++ b/shorewall-config-html.lsp @@ -1,4 +1,4 @@ -DEBUGGING

DEBUG INFO: CFE

") @@ -28,162 +28,162 @@ local descr = { ['width'] = { "100", "70", "70", "70", "100", } }, } -?> +%> - +end %> - +<% local myform = form.config %>

GUIDED CONFIGURATION

Defince zones

- +<% local myform = "zones" %> - - - +<% for i=1,#descr[myform]['labels'] do %> + +<% end %> - +%> - - - + <% for ii=1,#descr[myform]['labels'] do %> + + <% end %> - +%>
">"><% io.write(descr[myform]['labels'][i] or "") %>
<% io.write(form.config[myform]['option'][i][ii] or "") %>

Interfaces

- +<% local myform = "interfaces" %> - - - +<% for i=1,#descr[myform]['labels'] do %> + +<% end %> - +%> - - - + <% for ii=1,#descr[myform]['labels'] do %> + + <% end %> - +%>
">"><% io.write(descr[myform]['labels'][i] or "") %>
<% io.write(form.config[myform]['option'][i][ii] or "") %>

Default policy

- +<% local myform = "policy" %> - - - +<% for i=1,#descr[myform]['labels'] do %> + +<% end %> - +%> - - - + <% for ii=1,#descr[myform]['labels'] do %> + + <% end %> - +%>
">"><% io.write(descr[myform]['labels'][i] or "") %>
<% io.write(form.config[myform]['option'][i][ii] or "") %>

Rules

- +%> - - - +<% for k,i in pairs(val) do %> + +<% end %> - +%> - - - + <% for ii,vv in pairs(val) do %> + + <% end %> - +%>
">"><% io.write(descr[myform]['labels'][i] or "") %>
<% io.write(form.config[myform]['option'][i][ii] or "") %>

Masq

- +<% local myform = "masq" %> - - - +<% for i=1,#descr[myform]['labels'] do %> + +<% end %> - +%> - - - + <% for ii=1,#descr[myform]['labels'] do %> + + <% end %> - +%>
">"><% io.write(descr[myform]['labels'][i] or "") %>
<% io.write(form.config[myform]['option'][i][ii] or "") %>
diff --git a/shorewall-confirmation-html.lsp b/shorewall-confirmation-html.lsp index c0e6268..8cef35e 100644 --- a/shorewall-confirmation-html.lsp +++ b/shorewall-confirmation-html.lsp @@ -1,4 +1,4 @@ - +<% local view = ... %>

SECURITY CONFIRMATION

@@ -9,29 +9,29 @@
Undo and go back
-
+
Preform check of configs
-
" method="POST">
+
" method="POST">
- +<% if (view.previousaction) then %>
Confirm action
- +
- +<% elseif (view.startstop) and (view.startstop.cmdresult) then %>
Result of previous action
-
+ 
<%= view.startstop.cmdresult %>
- +<% end %> diff --git a/shorewall-edit-html.lsp b/shorewall-edit-html.lsp index e6231b0..f808a72 100644 --- a/shorewall-edit-html.lsp +++ b/shorewall-edit-html.lsp @@ -1,44 +1,44 @@ - +%> - +end %>

CONFIGURATION

- -
" method="POST"> +<% local myform = form.config %> +" method="POST">

EXPERT CONFIGURATION

FILE DETAILS

- +%>
- +<% if (form.config.filecontent) then %>

FILE CONTENT

- -" name="<%= myform.filename.name %>"> +<% io.write(html.form[form.config.filecontent.type](form.config.filecontent)) -?> +%>

SAVE AND APPLY ABOVE SETTINGS

- +%>
- +<% end %> -") end -?> +%>
diff --git a/shorewall-expert-html.lsp b/shorewall-expert-html.lsp index 645d67c..61ad046 100644 --- a/shorewall-expert-html.lsp +++ b/shorewall-expert-html.lsp @@ -1,21 +1,21 @@ - - +<% --[[ DEBUG INFORMATION io.write("

DEBUGGING

DEBUG INFO: CFE

") io.write(html.cfe_unpack(form)) io.write("") --]] -?> +%> - +end %>

EXPERT CONFIGURATION

- +<% local myform = form.config %> @@ -24,12 +24,12 @@ end ?> - +<% for i = 1, table.maxn(myform) do %> - - - + + + - +<% end %>
File
<%= html.link{value = "edit?name=" .. myform[i].value , label=myform[i].value } %><%= myform[i].size %><%= myform[i].mtime %>
diff --git a/shorewall-html.lsp b/shorewall-html.lsp index a875a16..4ea23c6 100644 --- a/shorewall-html.lsp +++ b/shorewall-html.lsp @@ -1,33 +1,33 @@ - - +<% --[[ DEBUG INFORMATION io.write("

DEBUGGING

DEBUG INFO: CFE

") io.write(html.cfe_unpack(form)) io.write("") --]] -?> +%> -
+

EDIT PROPERTIES

- +%> - +%> - +%>
diff --git a/shorewall-logfile-html.lsp b/shorewall-logfile-html.lsp index 4f35c40..d3343b7 100644 --- a/shorewall-logfile-html.lsp +++ b/shorewall-logfile-html.lsp @@ -1,27 +1,27 @@ -DEBUGGING

DEBUG INFO: CFE

") io.write(html.cfe_unpack(view)) io.write("") --]] -?> +%> - +end %>

LOGIFLES

DETAILS

- +<% local myform = form.config %>

FILE DETAILS

- +%>
-

FILE CONTENT

FILE CONTENT<% io.write(html.form[form.config.checkresult.type](form.config.checkresult)) -?> +%> diff --git a/shorewall-startstop-html.lsp b/shorewall-startstop-html.lsp index 3f6492a..3b706a9 100644 --- a/shorewall-startstop-html.lsp +++ b/shorewall-startstop-html.lsp @@ -1,26 +1,26 @@ - - +<% --[[ io.write(html.cfe_unpack(data)) ---]] ?> +--]] %>

MANAGEMENT

Program control-panel
-> -> -> +> +> +>
- +<% if data.value.result then %>
Previous action result
- -

") ?>

- -

") ?>

- +<% if data.value.result.descr then %> +

<%= string.gsub(data.value.result.descr, "\n", "
") %>

+<% end if data.value.result.errtxt then %> +

<%= string.gsub(data.value.result.errtxt, "\n", "
") %>

+<% end end %>
diff --git a/shorewall-status-html.lsp b/shorewall-status-html.lsp index d670e47..f1a2d56 100644 --- a/shorewall-status-html.lsp +++ b/shorewall-status-html.lsp @@ -1,4 +1,4 @@ -DEBUGGING

DEBUG INFO: CFE

") @@ -7,17 +7,17 @@ io.write("----------") io.write(html.cfe_unpack(form)) io.write("") --]] -?> +%> - +end %>

PROGRAM SPECIFIC OPTIONS/INFORMATION

- +%>
diff --git a/shorewall-statusbasic-html.lsp b/shorewall-statusbasic-html.lsp index 861d8a8..99e7895 100644 --- a/shorewall-statusbasic-html.lsp +++ b/shorewall-statusbasic-html.lsp @@ -1,17 +1,17 @@ -DEBUGGING

DEBUG INFO: CFE

") io.write(html.cfe_unpack(form)) io.write("") --]] -?> +%>

SYSTEM INFO

- +%>
-- cgit v1.2.3