8 files changed, 94 insertions, 94 deletions
diff --git a/app/acf-util/logon-html.lsp b/app/acf-util/logon-html.lsp
index 22deb4d..3d131bc 100644
--- a/app/acf-util/logon-html.lsp
+++ b/app/acf-util/logon-html.lsp
@@ -1,12 +1,12 @@
-<? local form = ... ?>
-<? require("viewfunctions") ?>
-<? --[[
+<% local form = ... %>
+<% require("viewfunctions") %>
+<% --[[
        io.write(html.cfe_unpack(form))
-   --]] ?>
+   --]] %>
 
-<h1><?= form.label ?></h1>
-<?
+<h1><%= form.label %></h1>
+<%
    form.value.password.type = "password"
    local order = { "userid", "password" }
    displayform(form, order)
-?>
+%>
diff --git a/app/acf-util/logon-logout-html.lsp b/app/acf-util/logon-logout-html.lsp
index b3e2f08..a658ea9 100644
--- a/app/acf-util/logon-logout-html.lsp
+++ b/app/acf-util/logon-logout-html.lsp
@@ -1,6 +1,6 @@
-<? local view= ... ?> 
+<% local view= ... %> 
 <h1>Log Out</h1>
 
-<?= html.cfe_unpack(view) ?>
+<%= html.cfe_unpack(view) %>
 
-<?= view.logout.value ?>
+<%= view.logout.value %>
diff --git a/app/acf-util/logon-status-html.lsp b/app/acf-util/logon-status-html.lsp
index 661b588..5fb70c9 100644
--- a/app/acf-util/logon-status-html.lsp
+++ b/app/acf-util/logon-status-html.lsp
@@ -1,8 +1,8 @@
-<? local view= ... ?> 
-<? --[[
+<% local view= ... %> 
+<% --[[
 	io.write(html.cfe_unpack(view))
---]] ?>
+--]] %>
 <h1>User Status </h1>
 <p> Below is your current Session id <p>
-<?= view.value.sessionid.value ?>
-<p>You are currently known to the system as <?= view.value.username.value ?>.</p>
+<%= view.value.sessionid.value %>
+<p>You are currently known to the system as <%= view.value.username.value %>.</p>
diff --git a/app/acf-util/password-html.lsp b/app/acf-util/password-html.lsp
index d845316..dca559d 100755
--- a/app/acf-util/password-html.lsp
+++ b/app/acf-util/password-html.lsp
@@ -1,16 +1,16 @@
-<? local form, viewlibrary, pageinfo = ... ?>
-<? require("viewfunctions") ?>
-<?
+<% local form, viewlibrary, pageinfo = ... %>
+<% 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(html.cfe_unpack(FORM))
 io.write("</span>")
 --]]
-?>
+%>
 
-<H1><?= form.label ?></H1>
-<? 
+<H1><%= form.label %></H1>
+<% 
 	if form.value.password and form.value.password_confirm then
 		form.value.password.type = "password"
 		form.value.password_confirm.type = "password"
@@ -21,4 +21,4 @@ io.write("</span>")
 	end
 	local order = { "userid", "username", "roles", "password", "password_confirm" }
 	displayform(form, order)
-?>
+%>
diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index c16e0d6..26416ce 100755
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -1,14 +1,14 @@
-<? local form, viewlibrary, pageinfo, session = ... ?>
-<? require("viewfunctions") ?>
-<?
+<% local form, viewlibrary, pageinfo, session = ... %>
+<% 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>")
 --]]
-?>
+%>
 
-<? displaycommandresults({"deleteuser"}, session) ?>
+<% displaycommandresults({"deleteuser"}, session) %>
 
 <H1>User Accounts</H1>
 <H2>Create new account</H2>
@@ -17,26 +17,26 @@ io.write("</span>")
 </form>
 <H2>Existing account</H2>
 <DL>
-<? for name,user in pairs(form.value) do ?>
-	<DT><IMG SRC='/skins/static/tango/16x16/apps/system-users.png' HEIGHT='16' WIDTH='16'> <?= name ?></DT>
+<% for name,user in pairs(form.value) do %>
+	<DT><IMG SRC='/skins/static/tango/16x16/apps/system-users.png' HEIGHT='16' WIDTH='16'> <%= name %></DT>
 	<DD><TABLE>
 		<TR>
-			<TD STYLE='border:none;'><B><?= user.value.userid.label ?></B></TD>
-			<TD STYLE='border:none;' WIDTH='90%'><?= user.value.userid.value ?></TD>
+			<TD STYLE='border:none;'><B><%= user.value.userid.label %></B></TD>
+			<TD STYLE='border:none;' WIDTH='90%'><%= user.value.userid.value %></TD>
 		</TR><TR>
-			<TD STYLE='border:none;'><B><?= user.value.username.label ?></B></TD>
-			<TD STYLE='border:none;'><?= user.value.username.value ?></TD>
+			<TD STYLE='border:none;'><B><%= user.value.username.label %></B></TD>
+			<TD STYLE='border:none;'><%= user.value.username.value %></TD>
 		</TR><TR>
-			<TD STYLE='border:none;'><B><?= user.value.roles.label ?></B></TD>
-			<TD STYLE='border:none;'><?= table.concat(user.value.roles.value, " / ") ?></TD>
+			<TD STYLE='border:none;'><B><%= user.value.roles.label %></B></TD>
+			<TD STYLE='border:none;'><%= table.concat(user.value.roles.value, " / ") %></TD>
 		</TR><TR>
 			<TD STYLE='border:none;'><B>Option</B></TD>
 			<TD STYLE='border:none;'>
-			[<A HREF='edituser?userid=<?= name ?>'>Edit this account</A>]
-			[<A HREF='deleteuser?userid=<?= name ?>'>Delete this account</A>]
-			[<A HREF='<?= pageinfo.script ?>/acf-util/roles/viewuserroles?userid=<?= name ?>'>View roles for this account</A>]
+			[<A HREF='edituser?userid=<%= name %>'>Edit this account</A>]
+			[<A HREF='deleteuser?userid=<%= name %>'>Delete this account</A>]
+			[<A HREF='<%= pageinfo.script %>/acf-util/roles/viewuserroles?userid=<%= name %>'>View roles for this account</A>]
 			</TD>
 		</TR>
 	</TABLE></DD>
-<? end ?>
+<% end %>
 </DL>
diff --git a/app/acf-util/roles-editrole-html.lsp b/app/acf-util/roles-editrole-html.lsp
index d0e1e3f..5f106fc 100644
--- a/app/acf-util/roles-editrole-html.lsp
+++ b/app/acf-util/roles-editrole-html.lsp
@@ -1,12 +1,12 @@
-<? local form, viewtable, page_info = ... ?> 
-<? require("viewfunctions") ?>
+<% local form, viewtable, page_info = ... %> 
+<% require("viewfunctions") %>
 
-<? --[[
+<% --[[
 	io.write(html.cfe_unpack(form))
---]] ?>
+--]] %>
 
-<H1><?= form.label ?></H1>
-<?
+<H1><%= form.label %></H1>
+<%
 	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
 	-- If editing existing role, disable role
 	if page_info.action ~= "newrole" then
@@ -14,4 +14,4 @@
 	end
 	local order = { "role", "permissions" }
 	displayform(form, order)
-?>
+%>
diff --git a/app/acf-util/roles-html.lsp b/app/acf-util/roles-html.lsp
index a5c89dc..16e4747 100644
--- a/app/acf-util/roles-html.lsp
+++ b/app/acf-util/roles-html.lsp
@@ -1,33 +1,33 @@
-<? local view= ... ?> 
-<? --[[
+<% local view= ... %> 
+<% --[[
 	io.write(html.cfe_unpack(view))
---]] ?>
+--]] %>
 
-<? ---[[ ?>
-<? if view.value.userid then ?>
-	<H1>Roles/Permission list for <?= view.value.userid.value ?>:</H1>
-<? elseif view.value.role then ?>
-	<H1>Permission list for <?= view.value.role.value ?>:</H1>
-<? else ?>
+<% ---[[ %>
+<% if view.value.userid then %>
+	<H1>Roles/Permission list for <%= view.value.userid.value %>:</H1>
+<% elseif view.value.role then %>
+	<H1>Permission list for <%= view.value.role.value %>:</H1>
+<% else %>
 	<H1>Complete permission list:</H1>
-<? end ?>
+<% end %>
 
-<? if view.value.roles then ?>
-	<H2><?= view.value.userid.value ?> is valid in these roles</H2>
-	<? for a,b in pairs(view.value.roles.value) do
+<% if view.value.roles then %>
+	<H2><%= view.value.userid.value %> is valid in these roles</H2>
+	<% for a,b in pairs(view.value.roles.value) do
 		print("<li>",b,"</li>")
-	end ?>
-<? end ?>
-<? --]] ?>
+	end %>
+<% end %>
+<% --]] %>
 
-<? ---[[ ?>
-<? if view.value.permissions then ?>
-	<? if view.value.userid then ?>
-		<H2><?= view.value.userid.value ?>'s full permissions are</H2>
-	<? elseif view.value.role then ?>
-		<H2><?= view.value.role.value ?>'s full permissions are</H2>
-	<? end ?>
-	<? local controllers = {}
+<% ---[[ %>
+<% if view.value.permissions then %>
+	<% if view.value.userid then %>
+		<H2><%= view.value.userid.value %>'s full permissions are</H2>
+	<% elseif view.value.role then %>
+		<H2><%= view.value.role.value %>'s full permissions are</H2>
+	<% end %>
+	<% local controllers = {}
 	   -- It's nice to have it in alphabetical order
 	   for cont in pairs(view.value.permissions.value) do
 		controllers[#controllers + 1] = cont
@@ -49,6 +49,6 @@
 		io.write("<TD></TR>")
 	    end
 	    io.write("</TABLE>")
-	    ?>
-<? end ?>
-<? --]] ?>
+	    %>
+<% end %>
+<% --]] %>
diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp
index 23e7195..f5ca4d5 100644
--- a/app/acf-util/roles-viewroles-html.lsp
+++ b/app/acf-util/roles-viewroles-html.lsp
@@ -1,39 +1,39 @@
-<? local view, viewlibrary, page_info, session= ... ?>
-<? require("viewfunctions") ?>
+<% local view, viewlibrary, page_info, session= ... %>
+<% require("viewfunctions") %>
 
-<? --[[
+<% --[[
 	io.write(html.cfe_unpack(view))
---]] ?>
+--]] %>
 
-<? displaycommandresults({"deleterole"}, session) ?>
+<% displaycommandresults({"deleterole"}, session) %>
 
 <H1>Roles</H1>
 <H2>Create new role</H2>
-<form action="<?= page_info.script .. page_info.prefix .. page_info.controller ?>/newrole" method="POST">
+<form action="<%= page_info.script .. page_info.prefix .. page_info.controller %>/newrole" method="POST">
 <dl><dt></dt><dd><input class="submit" type="submit" value="New Role"></dd></dl>
 </form>
 
 <H2>Existing roles</H2>
-<? if view.value.default_roles then ?>
+<% if view.value.default_roles then %>
 	<dl>
-	<? for x,role in pairs(view.value.default_roles.value) do ?>
-		<dt><img src='/static/tango/16x16/categories/applications-system.png' height='16' width='16'> <?= role ?></dt>
+	<% for x,role in pairs(view.value.default_roles.value) do %>
+		<dt><img src='/static/tango/16x16/categories/applications-system.png' height='16' width='16'> <%= role %></dt>
 		<dd>
-		[<a href='viewroleperms?role=<?= role ?>'>View this role</a>]
+		[<a href='viewroleperms?role=<%= role %>'>View this role</a>]
 		</dd>
-	<? end ?>
+	<% end %>
 	</dl>
-<? end ?>
-<? if view.value.defined_roles then ?>
+<% end %>
+<% if view.value.defined_roles then %>
 	<dl>
-	<? table.sort(view.value.defined_roles.value) ?>
-	<? for x,role in pairs(view.value.defined_roles.value) do ?>
-		<dt><img src='/static/tango/16x16/apps/system-users.png' height='16' width='16'> <?= role ?></dt>
+	<% table.sort(view.value.defined_roles.value) %>
+	<% for x,role in pairs(view.value.defined_roles.value) do %>
+		<dt><img src='/static/tango/16x16/apps/system-users.png' height='16' width='16'> <%= role %></dt>
 		<dd>
-		[<a href='viewroleperms?role=<?= role ?>'>View this role</a>]
-		[<a href='editrole?role=<?= role ?>'>Edit this role</a>]
-		[<a href='deleterole?role=<?= role ?>'>Delete this role</a>]
+		[<a href='viewroleperms?role=<%= role %>'>View this role</a>]
+		[<a href='editrole?role=<%= role %>'>Edit this role</a>]
+		[<a href='deleterole?role=<%= role %>'>Delete this role</a>]
 		</dd>
-	<? end ?>
+	<% end %>
 	</dl>
-<? end ?>
+<% end %>