use <% %> instead of <? ?>

git-svn-id: svn://svn.alpinelinux.org/acf/squid/trunk@1323 ab2d0c66-481e-0410-8bed-d214d4d58bed

7 files changed, 60 insertions, 60 deletions

diff --git a/squid-advanced-html.lsp b/squid-advanced-html.lsp
index 2a62e88..a175159 100644
--- a/squid-advanced-html.lsp
+++ b/squid-advanced-html.lsp
@@ -1,4 +1,4 @@
-<? 
+<% 
 require("viewfunctions")
 
    local form = ... 
@@ -12,14 +12,14 @@ require("viewfunctions")
    	srv2fill = ""
    end
    
-?>
+%>
 <H1>SYSTEM INFO</H1>
 <DL>
-<? 
+<% 
 local myform = form.info
 local tags = { "status", "version", "autostart", }
 displayinfo(myform,tags,"viewonly")
-?>
+%>
 </DL>
 
 
@@ -34,7 +34,7 @@ displayinfo(myform,tags,"viewonly")
 
 <h2>Configuration</h2>
 <form action="" method="POST">
-<textarea name="config"><? io.write( service.config ) ?></textarea>
+<textarea name="config"><% io.write( service.config ) %></textarea>
 
 <h3>Save Changes</h3>
 <dl>
@@ -48,10 +48,10 @@ the configuration files for the service are changed. However, the changes will n
 <h1>MANAGEMENT</h1>
 <form action="" method="POST">
 <dl>
-<DT>Daemon control</DT><dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?>> 
-<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?>>
-<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?>>
-<? if (service.message) and (service.message.descr) and (#service.message.descr > 0) then ?><pre><? io.write( service.message.descr ) ?></pre><? end ?></dd>
+<DT>Daemon control</DT><dd><input class="submit" type="submit" name="srvcmd" value="start" <% io.write( srv1fill ) %>> 
+<input class="submit" type="submit" name="srvcmd" value="stop" <% io.write( srv2fill ) %>>
+<input class="submit" type="submit" name="srvcmd" value="restart" <% io.write( srv2fill ) %>>
+<% if (service.message) and (service.message.descr) and (#service.message.descr > 0) then %><pre><% io.write( service.message.descr ) %></pre><% end %></dd>
 </dl>
 </form>
 
diff --git a/squid-authentication-html.lsp b/squid-authentication-html.lsp
index a9e9280..3071134 100644
--- a/squid-authentication-html.lsp
+++ b/squid-authentication-html.lsp
@@ -1,4 +1,4 @@
-<? 
+<% 
 require("viewfunctions")
 
    local form = ... 
@@ -19,15 +19,15 @@ require("viewfunctions")
       end
    end
    
-?>
+%>
 
 <H1>SYSTEM INFO</H1>
 <DL>
-<? 
+<% 
 local myform = form.info
 local tags = { "status", "version", "autostart", }
 displayinfo(myform,tags,"viewonly")
-?>
+%>
 </DL>
 
 <h1>Configuration</h1>
@@ -37,7 +37,7 @@ displayinfo(myform,tags,"viewonly")
 Choose the desired authentication mechanisms and their order.
 </p>
 
-<input type="hidden" name="authmethod" value="<? io.write( config.authmethod.value ) ?>">
+<input type="hidden" name="authmethod" value="<% io.write( config.authmethod.value ) %>">
 <table style="width:100px;">
 <tr>
   <td valign="middle">
@@ -51,7 +51,7 @@ Choose the desired authentication mechanisms and their order.
   </td><td>
     <b>Active</b><br>
     <select class="select" name="tmpauth" size="5" style="width:150px;">
-    <?
+    <%
       local lap = 1
       local method = config.authmethod.value
       if #config.authmethod.value > 0 then
@@ -66,7 +66,7 @@ Choose the desired authentication mechanisms and their order.
             lap = lap + 1
          end
       end
-    ?>
+    %>
     </select>
   </td><td>
     <table><tr><td>
@@ -77,7 +77,7 @@ Choose the desired authentication mechanisms and their order.
   </td><td>
     <b>Selectable</b><br>
     <select name="tmpempty" size="5" style="width:150px;">
-<?
+<%
     if string.match( config.authmethod.value, "D" ) == nil then
        io.write( "<option value=\"D\">Digest</option>\n" )
     end
@@ -87,7 +87,7 @@ Choose the desired authentication mechanisms and their order.
     if string.match( config.authmethod.value, "B" ) == nil then
        io.write( "<option value=\"B\">Basic</option>\n" )
     end
-?>
+%>
     </select>
   </td>
 </tr>
@@ -103,9 +103,9 @@ the changes will not be <i>applied</i> until you restart the service.</dd>
 <h1>MANAGEMENT</h1>
 <form action="" method="POST">
 <dl>
-<DT>Daemon control</DT><dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?>> 
-<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?>>
-<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?>>
-<? if (service.message) and (service.message.descr) and (#service.message.descr > 0) then ?><pre><? io.write( service.message.descr ) ?></pre><? end ?></dd>
+<DT>Daemon control</DT><dd><input class="submit" type="submit" name="srvcmd" value="start" <% io.write( srv1fill ) %>> 
+<input class="submit" type="submit" name="srvcmd" value="stop" <% io.write( srv2fill ) %>>
+<input class="submit" type="submit" name="srvcmd" value="restart" <% io.write( srv2fill ) %>>
+<% if (service.message) and (service.message.descr) and (#service.message.descr > 0) then %><pre><% io.write( service.message.descr ) %></pre><% end %></dd>
 </dl>
 </form>
diff --git a/squid-basic-html.lsp b/squid-basic-html.lsp
index c1dacd9..2ee56dc 100644
--- a/squid-basic-html.lsp
+++ b/squid-basic-html.lsp
@@ -1,4 +1,4 @@
-<? 
+<% 
 require("viewfunctions")
 
    local form = ... 
@@ -19,15 +19,15 @@ require("viewfunctions")
       end
    end
    
-?>
+%>
 
 <H1>SYSTEM INFO</H1>
 <DL>
-<? 
+<% 
 local myform = form.info
 local tags = { "status", "version", "autostart", }
 displayinfo(myform,tags,"viewonly")
-?>
+%>
 </DL>
 
 <h1>Configuration</h1>
@@ -37,9 +37,9 @@ displayinfo(myform,tags,"viewonly")
 
 <dl>
 <dt>proxyip</dt>
-<dd><input class="text" type="text" name="proxyip" value="<? io.write( config.proxyip.value ) ?>"></dd>
+<dd><input class="text" type="text" name="proxyip" value="<% io.write( config.proxyip.value ) %>"></dd>
 <dt>proxyport</dt>
-<dd><input class="text" type="text" name="proxyport" value="<? io.write( config.proxyport.value ) ?>"></dd>
+<dd><input class="text" type="text" name="proxyport" value="<% io.write( config.proxyport.value ) %>"></dd>
 </dl>
 
 <h2>Filter Service</h2>
@@ -51,17 +51,17 @@ for filtering. Anything not matching the regular expression filter will bypass t
 It is safe to leave this at the default settings.</p>
 
 <dl>
-<dt>filterip</dt><dd><input class="text" type="text" name="filterip" value="<? io.write( config.filterip.value ) ?>"</dd>
-<dt>filterport</dt><dd><input class="text" type="text" name="filterport" value="<? io.write( config.filterport.value ) ?>"></dd>
-<dt>FilterRegex</dt><dd><input class="text" type="text" name="filterregex" value="<? io.write( config.filterregex.value ) ?>"></dd>
+<dt>filterip</dt><dd><input class="text" type="text" name="filterip" value="<% io.write( config.filterip.value ) %>"</dd>
+<dt>filterport</dt><dd><input class="text" type="text" name="filterport" value="<% io.write( config.filterport.value ) %>"></dd>
+<dt>FilterRegex</dt><dd><input class="text" type="text" name="filterregex" value="<% io.write( config.filterregex.value ) %>"></dd>
 </dl>
 
 <h2>Access Logs</h2>
 <p>This determines if the visited sites are logged or not.</p>
 <dl>
 <dt>Log visited sites</dt>
-<dd><input type="radio" name="accesslog" value="no"<? ifthen( config.accesslog.value, "no", " checked" ); ?>> No access log
-<input type="radio" name="accesslog" value="yes"<? ifthen( config.accesslog.value, "yes", " checked" ); ?>> Use access log</dd>
+<dd><input type="radio" name="accesslog" value="no"<% ifthen( config.accesslog.value, "no", " checked" ); %>> No access log
+<input type="radio" name="accesslog" value="yes"<% ifthen( config.accesslog.value, "yes", " checked" ); %>> Use access log</dd>
 </dl>
 
 <h2>Disk Cache Parameters</h2>
@@ -70,8 +70,8 @@ but it requires a local hard disk.</p>
 
 <dl>
 <dt>Enable disk caching</dt>
-<dd><input class="radio" type="radio" name="diskcache" value="no"<? ifthen( config.diskcache.value, "no", " checked" ); ?>>No
-<input class="radio" type="radio" name="diskcache" value="yes"<? ifthen( config.diskcache.value, "yes", " checked" ); ?>>Yes</dd>
+<dd><input class="radio" type="radio" name="diskcache" value="no"<% ifthen( config.diskcache.value, "no", " checked" ); %>>No
+<input class="radio" type="radio" name="diskcache" value="yes"<% ifthen( config.diskcache.value, "yes", " checked" ); %>>Yes</dd>
 </dl>
 
 <h2>Allowed Ports</h2>
@@ -81,16 +81,16 @@ servers run on other ports as well. These fields list all ports and port ranges
 <p>It is safe to leave these values at their default values.</p>
 
 <dl>
-<dt>Safe_ports</dt><dd><input class="text" type="text" name="safeports" value="<? io.write( config.safeports.value ) ?>"></dd>
-<dt>SSL_ports</dt><dd><input class="text" type="text" name="sslports" value="<? io.write( config.sslports.value ) ?>"></dd>
+<dt>Safe_ports</dt><dd><input class="text" type="text" name="safeports" value="<% io.write( config.safeports.value ) %>"></dd>
+<dt>SSL_ports</dt><dd><input class="text" type="text" name="sslports" value="<% io.write( config.sslports.value ) %>"></dd>
 </dl>
 
 <h2>Save changes</h2>
 <dl>
 <DT>Save above changes</DT><DD><input class="submit" type="submit" name="cmd" value="save"></DD>
-<? if #service.error > 0 then ?>
-<DT>Config status</DT><DD class="error"><? io.write(service.error ) ?></DD>
-<? end ?>
+<% if #service.error > 0 then %>
+<DT>Config status</DT><DD class="error"><% io.write(service.error ) %></DD>
+<% end %>
 <DT>Process information</DT><DD>This process runs as a service. When you make and save changes, the configuration 
 files for the service are changed. However, the changes will not be <i>applied</i> 
 until you restart the service.</DD>
@@ -101,10 +101,10 @@ until you restart the service.</DD>
 <h1>MANAGEMENT</h1>
 <form action="" method="POST">
 <dl>
-<DT>Daemon control</DT><dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?>> 
-<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?>>
-<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?>>
-<? if (service.message) and (service.message.descr) and (#service.message.descr > 0) then ?><pre><? io.write( service.message.descr ) ?></pre><? end ?></dd>
+<DT>Daemon control</DT><dd><input class="submit" type="submit" name="srvcmd" value="start" <% io.write( srv1fill ) %>> 
+<input class="submit" type="submit" name="srvcmd" value="stop" <% io.write( srv2fill ) %>>
+<input class="submit" type="submit" name="srvcmd" value="restart" <% io.write( srv2fill ) %>>
+<% if (service.message) and (service.message.descr) and (#service.message.descr > 0) then %><pre><% io.write( service.message.descr ) %></pre><% end %></dd>
 </dl>
 </form>
 
diff --git a/squid-dep-html.lsp b/squid-dep-html.lsp
index 3cacc54..30d727e 100644
--- a/squid-dep-html.lsp
+++ b/squid-dep-html.lsp
@@ -1,5 +1,5 @@
-<? 
-?>
+<% 
+%>
 <h1>Web Proxy Configuration</h1>
 <h2>Dependancy Check - Failed!</h2>
 <p>
diff --git a/squid-digest-html.lsp b/squid-digest-html.lsp
index b41ecde..b441698 100644
--- a/squid-digest-html.lsp
+++ b/squid-digest-html.lsp
@@ -1,4 +1,4 @@
-<? 
+<% 
    local form = ... 
    local data = form.option
    local service = form.service
@@ -10,7 +10,7 @@
    	srv2fill = ""
    end
    
-?>
+%>
 <h1>Web Proxy Configuration</h1>
 <h2>General Information</h2>
 <p>
@@ -20,7 +20,7 @@
 </p>
 <h2>User List</h2>
 <form action="" method="POST">
-<textarea name="userlist"><? io.write( service.config ) ?></textarea>
+<textarea name="userlist"><% io.write( service.config ) %></textarea>
 
 <h3>Save Changes</h3>
 <DL>
diff --git a/squid-saccess-html.lsp b/squid-saccess-html.lsp
index b864d1f..be3ea5e 100644
--- a/squid-saccess-html.lsp
+++ b/squid-saccess-html.lsp
@@ -1,4 +1,4 @@
-<? 
+<% 
    local form = ... 
    local data = form.option
    local service = form.service
@@ -10,7 +10,7 @@
    	srv2fill = ""
    end
    
-?>
+%>
 <h1>Web Proxy - Special Access</h1>
 <h2>General Information</h2>
 <p>
@@ -27,7 +27,7 @@
 If you wish to specify hosts that may access the Internet by IP address, 
 enter the address(es) in the box below, one per line.
 </p>
-<textarea name="s_ip"><? io.write( service.config.s_ip ) ?></textarea>
+<textarea name="s_ip"><% io.write( service.config.s_ip ) %></textarea>
 
 <h2>Browser Identification</h2>
 <p>
@@ -36,7 +36,7 @@ specify it here. Note that any client identifying itself as this type
 of browser will be allowed anonymous access. Enter the browser identification(s) 
 in the box below, one per line. Regular expressions are allowed.
 </p>
-<textarea name="s_browser"><? io.write( service.config.s_browser ) ?></textarea>
+<textarea name="s_browser"><% io.write( service.config.s_browser ) %></textarea>
 
 <h2>Special Domains</h2>
 <p>
@@ -44,7 +44,7 @@ If you have a specail domain that needs to be accessed in a special way, you
 may specify if here. This will allow anonymous access to the domains listed. 
 Enter the domain url below. Regular expressions are allowed.
 </p>
-<textarea name="s_domain"><? io.write( service.config.s_domain ) ?></textarea>
+<textarea name="s_domain"><% io.write( service.config.s_domain ) %></textarea>
 
 <h3>Save Changes</h3>
 <dl>
diff --git a/squid-status-html.lsp b/squid-status-html.lsp
index 806318f..59cb502 100644
--- a/squid-status-html.lsp
+++ b/squid-status-html.lsp
@@ -1,22 +1,22 @@
-<? local form = ... 
+<% local form = ... 
 require("viewfunctions")
-?>
+%>
 
-<?
+<%
 --[[ DEBUG INFORMATION
 io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
 io.write(html.cfe_unpack(form))
 io.write("</span>")
 --]]
-?>
+%>
 
 <H1>SYSTEM INFO</H1>
 <DL>
-<? 
+<% 
 local myform = form.info
 local tags = { "status", "version", "autostart", }
 displayinfo(myform,tags,"viewonly")
-?>
+%>
 </DL>
 
 <H2>General information</H2>