Added suppress_view option to dispatch_component and return viewtable.

Removed hostname from pageinfo and replaced with component load in template.
A little cleanup to use pageinfo in views.

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

3 files changed, 6 insertions, 6 deletions

diff --git a/app/acf-util/password-html.lsp b/app/acf-util/password-html.lsp
index 9de2d4f..8b6d563 100755
--- a/app/acf-util/password-html.lsp
+++ b/app/acf-util/password-html.lsp
@@ -1,4 +1,4 @@
-<? local form = ... ?>
+<? local form, viewlibrary, pageinfo = ... ?>
 <? require("viewfunctions") ?>
 <?
 --[[ DEBUG INFORMATION
@@ -18,7 +18,7 @@ io.write("</span>")
 		form.value.password_confirm.type = "password"
 	end
 	-- If not in newuser action, disable userid
-	if nil == string.find(ENV["PATH_INFO"], "/newuser") then
+	if pageinfo.action ~= "newuser" then
 		form.value.userid.contenteditable = false
 	end
 	local order = { "userid", "username", "roles", "password", "password_confirm" }
diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index f544884..0db0256 100755
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -1,4 +1,4 @@
-<? local form = ... ?>
+<? local form, viewlibrary, pageinfo = ... ?>
 <?
 --[[ DEBUG INFORMATION
 io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
@@ -31,7 +31,7 @@ io.write("</span>")
 			<TD>
 			[<A HREF='edituser?userid=<?= name ?>'>Edit this account</A>]
 			[<A HREF='deleteuser?userid=<?= name ?>'>Delete this account</A>]
-			[<A HREF='<?= ENV.SCRIPT_NAME ?>/acf-util/roles/viewuserroles?userid=<?= name ?>'>View roles for this account</A>]
+			[<A HREF='<?= pageinfo.appuri ?>/acf-util/roles/viewuserroles?userid=<?= name ?>'>View roles for this account</A>]
 			</TD>
 		</TR>
 	</TABLE></DD>
diff --git a/app/acf-util/roles-editrole-html.lsp b/app/acf-util/roles-editrole-html.lsp
index d96ac56..2094b54 100644
--- a/app/acf-util/roles-editrole-html.lsp
+++ b/app/acf-util/roles-editrole-html.lsp
@@ -1,4 +1,4 @@
-<? local form= ... ?> 
+<? local form, viewtable, pageinfo = ... ?> 
 <? --[[
 	io.write(html.cfe_unpack(form))
 	io.write(html.cfe_unpack(FORM))
@@ -11,7 +11,7 @@
 	form.action = ""
 	form.submit = "Save"
 	-- If editing existing role, disable role
-	if nil == string.find(ENV.PATH_INFO, "/newrole") then
+	if pageinfo.action ~= "newrole" then
 		form.value.role.contenteditable = false
 	end
 	local order = { "role", "permissions" }