From 1dc555e078430187f089319744ffc551ee0ffa91 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Wed, 23 Feb 2005 16:43:08 +0000
Subject: [PATCH] bug fixes

---
 lib/WebGUI/Asset.pm                           | 60 +++++++++----------
 lib/WebGUI/Asset/Event.pm                     |  2 +-
 lib/WebGUI/Asset/File.pm                      |  7 ---
 lib/WebGUI/Asset/Post.pm                      | 21 ++++---
 lib/WebGUI/Asset/Post/Thread.pm               |  2 +-
 lib/WebGUI/Asset/Wobject.pm                   |  2 +-
 lib/WebGUI/Asset/Wobject/Article.pm           |  2 +-
 lib/WebGUI/Asset/Wobject/Collaboration.pm     |  3 +-
 lib/WebGUI/Asset/Wobject/DataForm.pm          | 26 ++++----
 lib/WebGUI/Asset/Wobject/EventsCalendar.pm    |  2 +-
 lib/WebGUI/Asset/Wobject/Folder.pm            |  2 +-
 lib/WebGUI/Asset/Wobject/HttpProxy.pm         |  2 +-
 lib/WebGUI/Asset/Wobject/IndexedSearch.pm     |  2 +-
 lib/WebGUI/Asset/Wobject/Layout.pm            |  4 +-
 lib/WebGUI/Asset/Wobject/MessageBoard.pm      |  2 +-
 lib/WebGUI/Asset/Wobject/Navigation.pm        |  2 +-
 lib/WebGUI/Asset/Wobject/Poll.pm              |  2 +-
 lib/WebGUI/Asset/Wobject/Product.pm           |  2 +-
 lib/WebGUI/Asset/Wobject/SQLReport.pm         |  2 +-
 lib/WebGUI/Asset/Wobject/Survey.pm            |  6 +-
 lib/WebGUI/Asset/Wobject/SyndicatedContent.pm |  2 +-
 lib/WebGUI/Asset/Wobject/WSClient.pm          |  2 +-
 lib/WebGUI/Operation/ActiveSessions.pm        |  4 +-
 lib/WebGUI/Operation/Commerce.pm              |  8 +--
 lib/WebGUI/Operation/DatabaseLink.pm          |  2 +-
 lib/WebGUI/Operation/Group.pm                 | 38 ++++++------
 lib/WebGUI/Operation/Help.pm                  |  4 +-
 lib/WebGUI/Operation/LoginHistory.pm          |  2 +-
 lib/WebGUI/Operation/ProfileSettings.pm       | 22 +++----
 lib/WebGUI/Operation/Replacements.pm          |  8 +--
 lib/WebGUI/Operation/Settings.pm              |  4 +-
 lib/WebGUI/Operation/Statistics.pm            |  2 +-
 lib/WebGUI/Operation/Subscription.pm          | 20 +++----
 lib/WebGUI/Operation/User.pm                  | 18 +++---
 lib/WebGUI/Privilege.pm                       | 16 ++---
 35 files changed, 152 insertions(+), 153 deletions(-)

diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index f11cead7e..66975f604 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -2170,7 +2170,7 @@ Duplicates self, cuts duplicate, returns self->getContainer->www_view if canEdit
 
 sub www_copy {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	my $newAsset = $self->duplicate;
 	$newAsset->cut;
 	return $self->getContainer->www_view;
@@ -2186,7 +2186,7 @@ Copies to clipboard assets in a list, then returns self calling method www_manag
 
 sub www_copyList {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	foreach my $assetId ($session{cgi}->param("assetId")) {
 		my $asset = WebGUI::Asset->newByDynamicClass($assetId);
 		if ($asset->canEdit) {
@@ -2234,7 +2234,7 @@ Cuts (removes to clipboard) self, returns the www_view of the Parent if canEdit.
 
 sub www_cut {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->cut;
 	$session{asset} = $self->getParent;
 	return $self->getParent->www_view;
@@ -2250,7 +2250,7 @@ Cuts assets in a list (removes to clipboard), then returns self calling method w
 
 sub www_cutList {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	foreach my $assetId ($session{cgi}->param("assetId")) {
 		my $asset = WebGUI::Asset->newByDynamicClass($assetId);
 		if ($asset->canEdit) {
@@ -2270,8 +2270,8 @@ Moves self to trash, returns www_view() method of Parent if canEdit. Otherwise r
 
 sub www_delete {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
-	return $self->getAdminConsole->render(WebGUI::Privilege::vitalComponent()) if (isIn($self->getId, $session{setting}{defaultPage}, $session{setting}{notFoundPage}));
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
+	return WebGUI::Privilege::vitalComponent() if (isIn($self->getId, $session{setting}{defaultPage}, $session{setting}{notFoundPage}));
 	$self->trash;
 	$session{asset} = $self->getParent;
 	return $self->getParent->www_view;
@@ -2287,7 +2287,7 @@ Moves list of assets to trash, returns www_manageAssets() method of self if canE
 
 sub www_deleteList {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	foreach my $assetId ($session{cgi}->param("assetId")) {
 		my $asset = WebGUI::Asset->newByDynamicClass($assetId);
 		if ($asset->canEdit) {
@@ -2308,7 +2308,7 @@ Deletes a MetaDataField and returns www_manageMetaData on self, if user isInGrou
 sub www_deleteMetaDataField {
 	my $self = shift;
 	my $ac = WebGUI::AdminConsole->new("content profiling");
-	return $ac->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(4));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
 	$self->deleteMetaDataField($session{form}{fid});
 	return $self->www_manageMetaData;
 }
@@ -2323,7 +2323,7 @@ Demotes self and returns www_view method of getContainer of self if canEdit, oth
 
 sub www_demote {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->demote;
 	return $self->getContainer->www_view; 
 }
@@ -2338,7 +2338,7 @@ Returns "". Deploys a Package. If canEdit is Fales, renders an insufficient Priv
 
 sub www_deployPackage {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	my $packageMasterAssetId = $session{form}{assetId};
 	if (defined $packageMasterAssetId) {
 		my $packageMasterAsset = WebGUI::Asset->newByDynamicClass($packageMasterAssetId);
@@ -2362,7 +2362,7 @@ Renders an AdminConsole EditForm, unless canEdit returns False.
 
 sub www_edit {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	return $self->getAdminConsole->render($self->getEditForm->print);
 }
 
@@ -2376,7 +2376,7 @@ Saves and updates history. If canEdit, returns www_manageAssets() if a new Asset
 
 sub www_editSave {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	my $object;
 	if ($session{form}{assetId} eq "new") {
 		$object = $self->addChild({className=>$session{form}{class}});	
@@ -2406,7 +2406,7 @@ Returns a rendered page to edit MetaData.  Will return an insufficient Privilege
 sub www_editMetaDataField {
 	my $self = shift;
 	my $ac = WebGUI::AdminConsole->new("content profiling");
-	return $ac->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(4));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
         my $fieldInfo;
 	if($session{form}{fid} && $session{form}{fid} ne "new") {
 		$fieldInfo = WebGUI::MetaData::getField($session{form}{fid});
@@ -2444,7 +2444,7 @@ Verifies that MetaData fields aren't duplicated or blank, assigns default values
 sub www_editMetaDataFieldSave {
 	my $self = shift;
 	my $ac = WebGUI::AdminConsole->new("content profiling");
-	return $ac->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(4));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
 	$ac->setHelp("metadata edit property","Asset");
 	# Check for duplicate field names
 	my $sql = "select count(*) from metaData_properties where fieldName = ".
@@ -2495,7 +2495,7 @@ Creates a tabform to edit the Asset Tree. If canEdit returns False, returns insu
 sub www_editTree {
 	my $self = shift;
 	my $ac = WebGUI::AdminConsole->new("assets");
-	return $ac->render(WebGUI::Privilege::insufficient()) unless ($self->canEdit);
+	return WebGUI::Privilege::insufficient() unless ($self->canEdit);
 	my $tabform = WebGUI::TabForm->new;
 	$tabform->hidden({name=>"func",value=>"editTreeSave"});
 	$tabform->addTab("properties",WebGUI::International::get("properties","Asset"),9);
@@ -2655,7 +2655,7 @@ Verifies proper inputs in the Asset Tree and saves them. Returns ManageAssets me
 
 sub www_editTreeSave {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless ($self->canEdit);
+	return WebGUI::Privilege::insufficient() unless ($self->canEdit);
 	my %data;
 	$data{isHidden} = WebGUI::FormProcessor::yesNo("isHidden") if (WebGUI::FormProcessor::yesNo("change_isHidden"));
 	$data{newWindow} = WebGUI::FormProcessor::yesNo("newWindow") if (WebGUI::FormProcessor::yesNo("change_newWindow"));
@@ -2715,7 +2715,7 @@ Moves assets in clipboard to trash. Returns www_manageClipboard() when finished.
 sub www_emptyClipboard {
 	my $self = shift;
 	my $ac = WebGUI::AdminConsole->new("clipboard");
-	return $ac->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(4));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
 	foreach my $assetData (@{$self->getAssetsInClipboard($session{form}{systemClipboard} && WebGUI::Grouping::isInGroup(3))}) {
 		my $asset = WebGUI::Asset->newByDynamicClass($assetData->{assetId},$assetData->{className});
 		$asset->trash;
@@ -2734,7 +2734,7 @@ Calls the purgeTree() method to delete all items in Trash. Returns the www_manag
 sub www_emptyTrash {
 	my $self = shift;
 	my $ac = WebGUI::AdminConsole->new("trash");
-	return $ac->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(4));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
 	foreach my $assetData (@{$self->getAssetsInTrash($session{form}{systemTrash} && WebGUI::Grouping::isInGroup(3))}) {
 		my $asset = WebGUI::Asset->newByDynamicClass($assetData->{assetId},$assetData->{className});
 		$asset->purgeTree;
@@ -2752,7 +2752,7 @@ Displays the export page administrative interface
 
 sub www_export {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(13));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(13));
         $self->getAdminConsole->setHelp("page export");
         my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
         $f->hidden("func","exportStatus");
@@ -2797,7 +2797,7 @@ Displays the export status page
 
 sub www_exportStatus {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(13));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(13));
 	my $iframeUrl = $self->getUrl('func=exportGenerate');
 	$iframeUrl = WebGUI::URL::append($iframeUrl, 'index='.$session{form}{index});
 	$iframeUrl = WebGUI::URL::append($iframeUrl, 'depth='.$session{form}{depth});
@@ -2818,7 +2818,7 @@ Executes the export process and displays real time status. This operation is dis
 
 sub www_exportGenerate {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(13));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(13));
 	# This routine is called in an IFRAME and prints status output directly to the browser.
 	$|++;				# Unbuffered data output
         $session{page}{empty} = 1;      # Write directly to the browser
@@ -2891,7 +2891,7 @@ Main page to manage assets. Renders an AdminConsole with a list of assets. If ca
 
 sub www_manageAssets {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	my $children = $self->getLineage(["children"],{returnObjects=>1});
 	my $output = $self->getAssetManagerControl($children);
 	$output .= ' <div class="adminConsoleSpacer">
@@ -2942,7 +2942,7 @@ Returns an AdminConsole to deal with assets in the Clipboard. If isInGroup(12) i
 sub www_manageClipboard {
 	my $self = shift;
 	my $ac = WebGUI::AdminConsole->new("clipboard");
-	return $ac->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(12));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
 	my @assets;
 	my ($header,$limit);
         $ac->setHelp("clipboard manage");
@@ -2974,7 +2974,7 @@ Returns an AdminConsole to deal with MetaDataFields. If isInGroup(4) is False, r
 sub www_manageMetaData {
 	my $self = shift;
 	my $ac = WebGUI::AdminConsole->new("content profiling");
-	return $ac->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(4));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
 	my $output;
 	my $fields = $self->getMetaDataFields();
 	foreach my $fieldId (keys %{$fields}) {
@@ -2997,7 +2997,7 @@ Returns an AdminConsole to deal with assets in the Trash. If isInGroup(4) is Fal
 sub www_manageTrash {
 	my $self = shift;
 	my $ac = WebGUI::AdminConsole->new("trash");
-	return $ac->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(4));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
 	my @assets;
 	my ($header, $limit);
         $ac->setHelp("trash manage");
@@ -3029,7 +3029,7 @@ Returns "". Pastes an asset. If canEdit is False, returns an insufficient privil
 
 sub www_paste {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->paste($session{form}{assetId});
 	return "";
 }
@@ -3044,7 +3044,7 @@ Returns a www_manageAssets() method. Pastes a selection of assets. If canEdit is
 
 sub www_pasteList {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	foreach my $clipId ($session{cgi}->param("assetId")) {
 		$self->paste($clipId);
 	}
@@ -3061,7 +3061,7 @@ Returns www_view method of getContainer of self. Promotes self. If canEdit is Fa
 
 sub www_promote {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->promote;
 	return $self->getContainer->www_view;
 }
@@ -3077,7 +3077,7 @@ Returns a www_manageAssets() method. Sets a new parent via the results of a form
 
 sub www_setParent {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	my $newParent = $session{form}{assetId};
 	$self->setParent($newParent) if (defined $newParent);
 	return $self->www_manageAssets();
@@ -3094,7 +3094,7 @@ Returns a www_manageAssets() method. Sets a new rank via the results of a form.
 
 sub www_setRank {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	my $newRank = $session{form}{rank};
 	$self->setRank($newRank) if (defined $newRank);
 	$session{asset} = $self->getParent;
diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm
index 8ca7ea795..066edf3fe 100644
--- a/lib/WebGUI/Asset/Event.pm
+++ b/lib/WebGUI/Asset/Event.pm
@@ -431,7 +431,7 @@ sub www_editSave {
 	
 	if ($session{form}{assetId} eq "new") {
 		$self = $self->getParent() if ($self->getValue("className") eq "WebGUI::Asset::Event");
-		return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless ($self->canEdit);
+		return WebGUI::Privilege::insufficient() unless ($self->canEdit);
 		my (@startDate, @endDate, @regStartDate, @regEndDate, @reminderStartDate, 
 		@reminderEndDate, $until, @eventId, $i, $recurringEventId);
 		$startDate[0] = WebGUI::DateTime::setToEpoch($session{form}{eventStartDate});
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index 11c5ec9e6..be7cb8fb1 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -85,13 +85,6 @@ sub definition {
 }
 
 
-#-------------------------------------------------------------------
-sub DESTROY {
-	my $self = shift;
-	$self->{_storageLocation}->DESTROY if (exists $self->{_storageLocation});
-	$self->SUPER::DESTROY;
-}
-
 #-------------------------------------------------------------------
 
 sub duplicate {
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index c95e9c3e7..974c47d93 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -801,14 +801,14 @@ sub www_deny {
 sub www_edit {
 	my $self = shift;
 	my %var = %{$self->getTemplateVars};
-        $var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getParent->getUrl})
-		.WebGUI::Form::hidden({
-                	name=>"func",
-			value=>"add"
-			});
 	my $content;
 	my $title;
 	if ($session{form}{func} eq "add") { # new post
+        	$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getParent->getUrl})
+			.WebGUI::Form::hidden({
+                		name=>"func",
+				value=>"add"
+				});
         	$var{'isNewPost'} = 1;
 		$var{'form.header'} .= WebGUI::Form::hidden({
 			name=>"assetId",
@@ -819,7 +819,7 @@ sub www_edit {
 			});
 		if ($session{form}{class} eq "WebGUI::Asset::Post") { # new reply
 			$self->{_thread} = $self->getParent->getThread;
-			return $self->getThread->getParent->processStyle(WebGUI::Privilege::insufficient()) unless ($self->getThread->canReply);
+			return WebGUI::Privilege::insufficient() unless ($self->getThread->canReply);
 			$var{isReply} = 1;
 			if ($session{form}{content} || $session{form}{title}) {
 				$content = $session{form}{content};
@@ -834,7 +834,7 @@ sub www_edit {
 				value=>$session{form}{subscribe}
 				});
 		} elsif ($session{form}{class} eq "WebGUI::Asset::Post::Thread") { # new thread
-			return $self->getThread->getParent->processStyle(WebGUI::Privilege::insufficient()) unless ($self->getThread->getParent->canPost);
+			return WebGUI::Privilege::insufficient() unless ($self->getThread->getParent->canPost);
 			$var{isNewThread} = 1;
                 	if ($self->getThread->getParent->canModerate) {
                         	$var{'sticky.form'} = WebGUI::Form::yesNo({
@@ -853,7 +853,12 @@ sub www_edit {
                 }
                 $content .= "\n\n".$session{user}{signature} if ($session{user}{signature});
 	} else { # edit
-		return $self->getThread->getParent->processStyle(WebGUI::Privilege::insufficient()) unless ($self->canEdit);
+		return WebGUI::Privilege::insufficient() unless ($self->canEdit);
+        	$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getUrl})
+			.WebGUI::Form::hidden({
+                		name=>"func",
+				value=>"edit"
+				});
 		$var{isEdit} = 1;
 		$content = $self->getValue("content");
 		$title = $self->getValue("title");
diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm
index f4c252cd9..97e3d4a2e 100644
--- a/lib/WebGUI/Asset/Post/Thread.pm
+++ b/lib/WebGUI/Asset/Post/Thread.pm
@@ -702,7 +702,7 @@ sub www_unsubscribe {
 #-------------------------------------------------------------------
 sub www_view {
 	my $self = shift;
-	return $self->getParent->processStyle(WebGUI::Privilege::noAccess()) unless $self->canView;
+	return WebGUI::Privilege::noAccess() unless $self->canView;
 	return $self->getParent->processStyle($self->view);
 }
 
diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm
index 10b88a813..757976afc 100644
--- a/lib/WebGUI/Asset/Wobject.pm
+++ b/lib/WebGUI/Asset/Wobject.pm
@@ -560,8 +560,8 @@ Renders self->view based upon current style, subject to timeouts. Returns Privil
 =cut
 sub www_view {
 	my $self = shift;
+	return WebGUI::Privilege::noAccess() unless $self->canView;
 	$self->logView();
-	return $self->processStyle(WebGUI::Privilege::noAccess()) unless $self->canView;
 	my $cache;
 	my $output;
         my $useCache = (
diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index 9b8a1b121..cf2715249 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -216,7 +216,7 @@ sub view {
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->getAdminConsole->setHelp("article add/edit");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","Article"));
 }
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index 5a126d0a2..7cd36aede 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -817,7 +817,7 @@ sub view {
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 #	$self->getAdminConsole->setHelp("user submission system add/edit");
         return $self->getAdminConsole->render($self->getEditForm->print,"Edit Collaboration System");
 }
@@ -873,6 +873,7 @@ sub www_search {
         $var{'form.search'} = WebGUI::Form::submit({value=>WebGUI::International::get(170)});
         $var{'form.end'} = WebGUI::Form::formFooter();
         $var{'back.url'} = $self->getUrl;
+	$self->appendTemplateLabels(\%var);
         $var{doit} = $session{form}{doit};
         if ($session{form}{doit}) {
                 my @fieldsToSearch = qw(asset.title asset.synopsis Post.content Post.username Post.userDefined1 Post.userDefined2 Post.userDefined3 Post.userDefined4 Post.userDefined5);
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 3f3a79948..0e8add953 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -617,7 +617,7 @@ sub view {
 #-------------------------------------------------------------------
 sub www_deleteEntry {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
         my $entryId = $session{form}{entryId};
 	$self->deleteCollateral("DataForm_entry","DataForm_entryId",$entryId);
         $session{form}{entryId} = 'list';
@@ -627,7 +627,7 @@ sub www_deleteEntry {
 #-------------------------------------------------------------------
 sub www_deleteFieldConfirm {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->deleteCollateral("DataForm_field","DataForm_fieldId",$session{form}{fid});
 	$self->reorderCollateral("DataForm_field","DataForm_fieldId");
        	return "";
@@ -636,7 +636,7 @@ sub www_deleteFieldConfirm {
 #-------------------------------------------------------------------
 sub www_deleteTabConfirm {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->deleteCollateral("DataForm_tab","DataForm_tabId",$session{form}{tid});
 	$self->deleteCollateral("DataForm_field","DataForm_tabId",$session{form}{tid});
 	$self->reorderCollateral("DataForm_tab","DataForm_tabId");
@@ -646,7 +646,7 @@ sub www_deleteTabConfirm {
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->getAdminConsole->setHelp("data form add/edit");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("7","DataForm"));
 }
@@ -654,7 +654,7 @@ sub www_edit {
 #-------------------------------------------------------------------
 sub www_editField {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
     	my (%field, $f, %fieldStatus,$tab);
     	tie %field, 'Tie::CPHash';
     	tie %fieldStatus, 'Tie::IxHash';
@@ -764,7 +764,7 @@ sub www_editField {
 #-------------------------------------------------------------------
 sub www_editFieldSave {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$session{form}{name} = $session{form}{label} if ($session{form}{name} eq "");
 	$session{form}{tid} = "0" if ($session{form}{tid} eq "");
 	$session{form}{name} = WebGUI::URL::urlize($session{form}{name});
@@ -800,7 +800,7 @@ sub www_editFieldSave {
 #-------------------------------------------------------------------
 sub www_editTab {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
     	my (%tab, $f);
     	tie %tab, 'Tie::CPHash';
         $session{form}{tid} = "new" if ($session{form}{tid} eq "");
@@ -840,7 +840,7 @@ sub www_editTab {
 #-------------------------------------------------------------------
 sub www_editTabSave {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$session{form}{name} = $session{form}{label} if ($session{form}{name} eq "");
 	$session{form}{name} = WebGUI::URL::urlize($session{form}{name});
         $session{form}{name} =~ s/\-//g;
@@ -860,7 +860,7 @@ sub www_editTabSave {
 #-------------------------------------------------------------------
 sub www_exportTab {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	WebGUI::HTTP::setFilename($self->get("url").".tab","text/plain");
 	my %fields = WebGUI::SQL->buildHash("select DataForm_fieldId,name from DataForm_field where assetId=".quote($self->getId)." order by sequenceNumber");
 	my $select = "select a.DataForm_entryId as entryId, a.ipAddress, a.username, a.userId, a.submissionDate";
@@ -883,7 +883,7 @@ sub www_exportTab {
 #-------------------------------------------------------------------
 sub www_moveFieldDown {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->moveCollateralDown("DataForm_field","DataForm_fieldId",$session{form}{fid},_tonull("DataForm_tabId",$session{form}{tid}));
 	return "";
 }
@@ -891,7 +891,7 @@ sub www_moveFieldDown {
 #-------------------------------------------------------------------
 sub www_moveFieldUp {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->moveCollateralUp("DataForm_field","DataForm_fieldId",$session{form}{fid},_tonull("DataForm_tabId",$session{form}{tid}));
 	return "";
 }
@@ -899,7 +899,7 @@ sub www_moveFieldUp {
 #-------------------------------------------------------------------
 sub www_moveTabRight {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->moveCollateralDown("DataForm_tab","DataForm_tabId",$session{form}{tid});
 	return "";
 }
@@ -907,7 +907,7 @@ sub www_moveTabRight {
 #-------------------------------------------------------------------
 sub www_moveTabLeft {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->moveCollateralUp("DataForm_tab","DataForm_tabId",$session{form}{tid});
 	return "";
 }
diff --git a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
index ee921fa06..5142f6948 100644
--- a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
+++ b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
@@ -534,7 +534,7 @@ sub www_addStyledEvent {
 #-------------------------------------------------------------------
 sub www_edit {
 	my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->getAdminConsole->setHelp("events calendar add/edit");
 	return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","EventsCalendar"));
 }
diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm
index 53a198ada..00dd12340 100644
--- a/lib/WebGUI/Asset/Wobject/Folder.pm
+++ b/lib/WebGUI/Asset/Wobject/Folder.pm
@@ -175,7 +175,7 @@ sub view {
 
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
         return $self->getAdminConsole->render($self->getEditForm->print,"Edit Folder");
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index beb8b94d9..3d8147324 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -344,7 +344,7 @@ sub view {
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->getAdminConsole->setHelp("http proxy add/edit");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("2","HttpProxy"));
 }
diff --git a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
index c38bc52a7..0eed49e97 100644
--- a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
+++ b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
@@ -390,7 +390,7 @@ sub view {
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;
-        return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+        return WebGUI::Privilege::insufficient() unless $self->canEdit;
         $self->getAdminConsole->setHelp("search add/edit");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("26","Article"));
 }
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index 91af30b84..e362d1cb5 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -198,13 +198,13 @@ sub view {
 
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
         return $self->getAdminConsole->render($self->getEditForm->print,"Edit Layout");
 }
 
 sub www_setContentPositions {
 	my $self = shift;
-	return WebGUI::Style::process(WebGUI::Privilege::insufficient(),$self->get("styleTemplateId")) unless ($self->canEdit);
+	return WebGUI::Privilege::insufficient() unless ($self->canEdit);
 	$self->update({
 		contentPositions=>$session{form}{map}
 		});
diff --git a/lib/WebGUI/Asset/Wobject/MessageBoard.pm b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
index 5b932a476..c603fa03d 100644
--- a/lib/WebGUI/Asset/Wobject/MessageBoard.pm
+++ b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
@@ -119,7 +119,7 @@ sub view {
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->getAdminConsole->setHelp("message board add/edit");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("6","MessageBoard"));
 }
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 82ace355f..3861f4d24 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -356,7 +356,7 @@ sub view {
 
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->getAdminConsole->setHelp("navigation add/edit");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("22","Navigation"));
 }
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index fb37c024a..b5b301766 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -353,7 +353,7 @@ sub view {
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->getAdminConsole->setHelp("poll add/edit");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("9","Poll"));
 }
diff --git a/lib/WebGUI/Asset/Wobject/Product.pm b/lib/WebGUI/Asset/Wobject/Product.pm
index 2129d0d83..700d709b8 100644
--- a/lib/WebGUI/Asset/Wobject/Product.pm
+++ b/lib/WebGUI/Asset/Wobject/Product.pm
@@ -452,7 +452,7 @@ sub www_deleteSpecificationConfirm {
 #-------------------------------------------------------------------
 sub www_edit {
    my $self = shift;
-   return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+   return WebGUI::Privilege::insufficient() unless $self->canEdit;
    $self->getAdminConsole->setHelp("product add/edit");
    return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("6","Product"));
 }
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index e5917a2b6..1ccd0197a 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -265,7 +265,7 @@ sub view {
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->getAdminConsole->setHelp("sql report add/edit");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("8","SQLReport"));
 }
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 81a9d7519..39724daf4 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -666,7 +666,7 @@ sub www_deleteAllResponsesConfirm {
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->getAdminConsole->setHelp("survey add/edit");
 	return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get(2,'Survey'));
 }
@@ -687,7 +687,7 @@ sub www_editAnswer {
         my ($question, $f, $answer, $self);
 	$self = shift;
 	
-        return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless ($self->canEdit);
+        return WebGUI::Privilege::insufficient() unless ($self->canEdit);
         
 	$answer = $self->getCollateral("Survey_answer","Survey_answerId",$session{form}{aid});
         $f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
@@ -768,7 +768,7 @@ sub www_editQuestion {
 	my ($f, $question, $answerFieldType, $sth, %data, $self);
 	$self = shift;
 
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless ($self->canEdit);
+	return WebGUI::Privilege::insufficient() unless ($self->canEdit);
 
 	tie %data, 'Tie::CPHash';
 	$question = $self->getCollateral("Survey_question","Survey_questionId",$session{form}{qid});
diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
index 341fbaf1a..45e31f0c8 100644
--- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
@@ -389,7 +389,7 @@ sub view {
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
         $self->getAdminConsole->setHelp("syndicated content add/edit");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("4","SyndicatedContent"));
 }
diff --git a/lib/WebGUI/Asset/Wobject/WSClient.pm b/lib/WebGUI/Asset/Wobject/WSClient.pm
index 627816ab9..5db34596b 100644
--- a/lib/WebGUI/Asset/Wobject/WSClient.pm
+++ b/lib/WebGUI/Asset/Wobject/WSClient.pm
@@ -250,7 +250,7 @@ sub getEditForm {
 #-------------------------------------------------------------------
 sub www_edit {
         my $self = shift;
-	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
 	$self->getAdminConsole->setHelp("web services client add/edit");
         return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("20","WSClient"));
 }
diff --git a/lib/WebGUI/Operation/ActiveSessions.pm b/lib/WebGUI/Operation/ActiveSessions.pm
index 7d5410eae..b271d00dc 100644
--- a/lib/WebGUI/Operation/ActiveSessions.pm
+++ b/lib/WebGUI/Operation/ActiveSessions.pm
@@ -23,14 +23,14 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub www_killSession {
-        return WebGUI::AdminConsole->new("activeSessions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	WebGUI::Session::end($session{form}{sid});
 	return www_viewActiveSessions();
 }
 
 #-------------------------------------------------------------------
 sub www_viewActiveSessions {
-        return WebGUI::AdminConsole->new("activeSessions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $p, @row, $i, $sth, %data);
 	tie %data, 'Tie::CPHash';
 	$sth = WebGUI::SQL->read("select users.username,users.userId,userSession.sessionId,userSession.expires,
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 62066eae6..63cec3356 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -217,7 +217,7 @@ sub www_checkoutSubmit {
 
 #-------------------------------------------------------------------
 sub www_completePendingTransaction {
-	return WebGUI::AdminConsole->new("commerce")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 
 	WebGUI::Commerce::Transaction->new($session{form}{tid})->completeTransaction;
 
@@ -247,7 +247,7 @@ sub www_confirmTransaction {
 #-------------------------------------------------------------------
 sub www_editCommerceSettings {
 	my (%tabs, $tabform, $jscript, $currentPlugin, $ac, $jscript, $i18n, $paymentPlugin, @paymentPlugins, %paymentPlugins, @failedPaymentPlugins, $plugin);
-	return WebGUI::AdminConsole->new("commerce")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	$i18n = WebGUI::International->new('Commerce');
 	
@@ -342,7 +342,7 @@ sub www_editCommerceSettings {
 
 #-------------------------------------------------------------------
 sub www_editCommerceSettingsSave {
-	return WebGUI::AdminConsole->new("commerce")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	foreach (keys(%{$session{form}})) {
 		# Store the plugin confiuration data in a special table for security and the general settings in the
@@ -365,7 +365,7 @@ sub www_editCommerceSettingsSave {
 #-------------------------------------------------------------------
 sub www_listPendingTransactions {
 	my ($p, $transactions, $output, $properties, $i18n);
-	return WebGUI::AdminConsole->new("commerce")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	$i18n = WebGUI::International->new("Commerce");
 
diff --git a/lib/WebGUI/Operation/DatabaseLink.pm b/lib/WebGUI/Operation/DatabaseLink.pm
index b0299b930..be37ac5a9 100644
--- a/lib/WebGUI/Operation/DatabaseLink.pm
+++ b/lib/WebGUI/Operation/DatabaseLink.pm
@@ -120,7 +120,7 @@ sub www_editDatabaseLinkSave {
 
 #-------------------------------------------------------------------
 sub www_listDatabaseLinks {
-        return WebGUI::AdminConsole->new("databases")->render(WebGUI::Privilege::adminOnly()) unless(WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless(WebGUI::Grouping::isInGroup(3));
         my ($output, $p, $sth, %data, @row, $i);
         $sth = WebGUI::SQL->read("select * from databaseLink order by title");
 	$row[$i] = '<tr><td valign="top" class="tableData"></td><td valign="top" class="tableData">'.WebGUI::International::get(1076).'</td></tr>';
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 7d643dadc..451e7498c 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -137,7 +137,7 @@ sub getGroupSearchForm {
 
 #-------------------------------------------------------------------
 sub www_addGroupsToGroupSave {
-        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my @groups = $session{cgi}->param('groups');
 	WebGUI::Grouping::addGroupsToGroups(\@groups,[$session{form}{gid}]);
         return www_manageGroupsInGroup();
@@ -145,7 +145,7 @@ sub www_addGroupsToGroupSave {
 
 #-------------------------------------------------------------------
 sub www_addUsersToGroupSave {
-        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my @users = $session{cgi}->param('users');
 	WebGUI::Grouping::addUsersToGroups(\@users,[$session{form}{gid}]);
         return www_manageUsersInGroup();
@@ -153,7 +153,7 @@ sub www_addUsersToGroupSave {
 
 #-------------------------------------------------------------------
 sub www_addUsersToGroupSecondarySave {
-        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless _hasSecondaryPrivilege($session{form}{gid});
+        return WebGUI::Privilege::adminOnly() unless _hasSecondaryPrivilege($session{form}{gid});
         my @users = $session{cgi}->param('users');
 	WebGUI::Grouping::addUsersToGroups(\@users,[$session{form}{gid}]);
         return www_manageUsersInGroupSecondary();
@@ -181,7 +181,7 @@ sub www_autoDeleteFromGroup {
 
 #-------------------------------------------------------------------
 sub www_deleteGroup {
-	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output);
         return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::vitalComponent()) if ($session{form}{gid} < 26 && $session{form}{gid} > 0);
         $output .= WebGUI::International::get(86).'<p>';
@@ -194,7 +194,7 @@ sub www_deleteGroup {
 
 #-------------------------------------------------------------------
 sub www_deleteGroupConfirm {
-	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::vitalComponent()) if ($session{form}{gid} < 26 && $session{form}{gid} > 0);
 	my $g = WebGUI::Group->new($session{form}{gid});
 	$g->delete;
@@ -203,14 +203,14 @@ sub www_deleteGroupConfirm {
 
 #-------------------------------------------------------------------
 sub www_deleteGroupGrouping {
-	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	WebGUI::Grouping::deleteGroupsFromGroups([$session{form}{delete}],[$session{form}{gid}]);
         return www_manageGroupsInGroup();
 }
 
 #-------------------------------------------------------------------
 sub www_deleteGrouping {
-        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         if (($session{user}{userId} == $session{form}{uid} || $session{form}{uid} == 3) && $session{form}{gid} == 3) {
                 return _submenu(WebGUI::Privilege::vitalComponent());
         }
@@ -225,7 +225,7 @@ sub www_deleteGrouping {
                                                                                                                                                        
 #-------------------------------------------------------------------
 sub www_deleteGroupingSecondary {
-        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless _hasSecondaryPrivilege($session{form}{gid});
+        return WebGUI::Privilege::adminOnly() unless _hasSecondaryPrivilege($session{form}{gid});
         if ($session{user}{userId} eq $session{form}{uid}) {
                 return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::vitalComponent());
         }
@@ -235,7 +235,7 @@ sub www_deleteGroupingSecondary {
 
 #-------------------------------------------------------------------
 sub www_editGroup {
-	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output, $f, $g);
 	if ($session{form}{gid} eq "new") {
 		$g = WebGUI::Group->new("");
@@ -312,7 +312,7 @@ sub www_editGroup {
 
 #-------------------------------------------------------------------
 sub www_editGroupSave {
-	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my $g = WebGUI::Group->new($session{form}{gid});
 	$g->description($session{form}{description});
 	$g->name($session{form}{groupName});
@@ -334,7 +334,7 @@ sub www_editGroupSave {
 
 #-------------------------------------------------------------------
 sub www_editGrouping {
-	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my $f = WebGUI::HTMLForm->new;
         $f->hidden("op","editGroupingSave");
         $f->hidden("uid",$session{form}{uid});
@@ -355,7 +355,7 @@ sub www_editGrouping {
 
 #-------------------------------------------------------------------
 sub www_editGroupingSave {
-	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         WebGUI::Grouping::userGroupExpireDate($session{form}{uid},$session{form}{gid},setToEpoch($session{form}{expireDate}));
         WebGUI::Grouping::userGroupAdmin($session{form}{uid},$session{form}{gid},$session{form}{groupAdmin});
         return www_manageUsersInGroup();
@@ -363,7 +363,7 @@ sub www_editGroupingSave {
 
 #-------------------------------------------------------------------
 sub www_emailGroup {
-	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($output,$f);
 	$f = WebGUI::HTMLForm->new;
 	$f->hidden("op","emailGroupSend");
@@ -389,7 +389,7 @@ sub www_emailGroup {
 
 #-------------------------------------------------------------------
 sub www_emailGroupSend {
-	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($sth, $email);
 	$sth = WebGUI::SQL->read("select b.fieldData from groupings a left join userProfileData b 
 		on a.userId=b.userId and b.fieldName='email' where a.groupId=".quote($session{form}{gid}));
@@ -404,7 +404,7 @@ sub www_emailGroupSend {
 
 #-------------------------------------------------------------------
 sub www_listGroups {
-	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my $output = getGroupSearchForm("listGroups");
 	my ($groupCount) = WebGUI::SQL->quickArray("select count(*) from groups");
         return _submenu($output) unless ($session{form}{doit} || $groupCount<250 || $session{form}{pn} > 1);
@@ -431,7 +431,7 @@ sub www_listGroups {
 
 #-------------------------------------------------------------------
 sub www_listGroupsSecondary {
-	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(11));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(11));
         my ($output, $p, $sth, @data, @row, $i, $userCount);
 	my @editableGroups = WebGUI::SQL->buildArray("select groupId from groupings where userId=".quote($session{user}{userId})." and groupAdmin=1");
 	push (@editableGroups,0);
@@ -462,7 +462,7 @@ sub www_listGroupsSecondary {
 
 #-------------------------------------------------------------------
 sub www_manageGroupsInGroup {
-        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $p, $group, $groups, $f);
         $f = WebGUI::HTMLForm->new;
         $f->hidden("op","addGroupsToGroupSave");
@@ -498,7 +498,7 @@ sub www_manageGroupsInGroup {
 
 #-------------------------------------------------------------------
 sub www_manageUsersInGroup {
-        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my $output = WebGUI::Form::formHeader()
 		.WebGUI::Form::hidden({
 			name=>"gid",
@@ -561,7 +561,7 @@ sub www_manageUsersInGroup {
 
 #-------------------------------------------------------------------
 sub www_manageUsersInGroupSecondary {
-        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless _hasSecondaryPrivilege($session{form}{gid});
+        return WebGUI::Privilege::adminOnly() unless _hasSecondaryPrivilege($session{form}{gid});
         my ($output, $sth, %hash);
         tie %hash, 'Tie::CPHash';
 	my $group = WebGUI::Group->new($session{form}{gid});
diff --git a/lib/WebGUI/Operation/Help.pm b/lib/WebGUI/Operation/Help.pm
index 1dd58f7bf..007db1e87 100644
--- a/lib/WebGUI/Operation/Help.pm
+++ b/lib/WebGUI/Operation/Help.pm
@@ -46,7 +46,7 @@ sub _seeAlso {
 
 #-------------------------------------------------------------------
 sub www_viewHelp {
-	return WebGUI::AdminConsole->new("help")->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(12));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
 	my $ac = WebGUI::AdminConsole->new("help");
 	my $namespace = $session{form}{namespace} || "WebGUI";
 	my $help = _get($session{form}{hid},$namespace);
@@ -63,7 +63,7 @@ sub www_viewHelp {
 
 #-------------------------------------------------------------------
 sub www_viewHelpIndex {
-	return WebGUI::AdminConsole->new("help")->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(12));
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
 	my %helpIndex;
 	tie %helpIndex, "Tie::IxHash";
 	my $i;
diff --git a/lib/WebGUI/Operation/LoginHistory.pm b/lib/WebGUI/Operation/LoginHistory.pm
index a335b2300..cef1246f0 100644
--- a/lib/WebGUI/Operation/LoginHistory.pm
+++ b/lib/WebGUI/Operation/LoginHistory.pm
@@ -23,7 +23,7 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub www_viewLoginHistory {
-        return WebGUI::AdminConsole->new("loginHistory")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $p, @row, $i, $sth, %data);
 	tie %data, 'Tie::CPHash';
 	$sth = WebGUI::SQL->read("select * from users,userLoginLog where users.userId=userLoginLog.userId order by userLoginLog.timeStamp desc");	
diff --git a/lib/WebGUI/Operation/ProfileSettings.pm b/lib/WebGUI/Operation/ProfileSettings.pm
index fd0e6af57..faf847eef 100644
--- a/lib/WebGUI/Operation/ProfileSettings.pm
+++ b/lib/WebGUI/Operation/ProfileSettings.pm
@@ -71,7 +71,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_deleteProfileCategoryConfirm {
-        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::vitalComponent()) if ($session{form}{cid} < 1000 && $session{form}{cid} > 0);
 	WebGUI::SQL->write("delete from userProfileCategory where profileCategoryId=".quote($session{form}{cid}));
 	WebGUI::SQL->write("update userProfileField set profileCategoryId='1' where profileCategoryId=".quote($session{form}{cid}));
@@ -80,7 +80,7 @@ sub www_deleteProfileCategoryConfirm {
 
 #-------------------------------------------------------------------
 sub www_deleteProfileFieldConfirm {
-        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($protected);
 	($protected) = WebGUI::SQL->quickArray("select protected from userProfileField where fieldname=".quote($session{form}{fid}));
         return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::vitalComponent()) if ($protected);
@@ -91,7 +91,7 @@ sub www_deleteProfileFieldConfirm {
 
 #-------------------------------------------------------------------
 sub www_editProfileCategory {
-        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $f, %data);
 	tie %data, 'Tie::CPHash';
 	$f = WebGUI::HTMLForm->new;
@@ -121,7 +121,7 @@ sub www_editProfileCategory {
 
 #-------------------------------------------------------------------
 sub www_editProfileCategorySave {
-        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($sequenceNumber, $test);
 	$session{form}{categoryName} = 'Unamed' if ($session{form}{categoryName} eq "" || $session{form}{categoryName} eq "''");
 	$test = eval($session{form}{categoryName});
@@ -140,7 +140,7 @@ sub www_editProfileCategorySave {
 
 #-------------------------------------------------------------------
 sub www_editProfileField {
-        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $f, %data, %hash, $key);
 	tie %data, 'Tie::CPHash';
         $f = WebGUI::HTMLForm->new;
@@ -194,7 +194,7 @@ sub www_editProfileField {
 
 #-------------------------------------------------------------------
 sub www_editProfileFieldSave {
-        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($sequenceNumber, $fieldName, $test);
         $session{form}{fieldLabel} = 'Unamed' if ($session{form}{fieldLabel} eq "" || $session{form}{fieldLabel} eq "''");
         $test = eval($session{form}{fieldLabel});
@@ -233,7 +233,7 @@ sub www_editProfileFieldSave {
 
 #-------------------------------------------------------------------
 sub www_editProfileSettings {
-        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $a, %category, %field, $b);
 	tie %category, 'Tie::CPHash';
 	tie %field, 'Tie::CPHash';
@@ -266,7 +266,7 @@ sub www_editProfileSettings {
 
 #-------------------------------------------------------------------
 sub www_moveProfileCategoryDown {
-        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($id, $thisSeq);
         ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from userProfileCategory where profileCategoryId=".quote($session{form}{cid}));
         ($id) = WebGUI::SQL->quickArray("select profileCategoryId from userProfileCategory where sequenceNumber=$thisSeq+1");
@@ -280,7 +280,7 @@ sub www_moveProfileCategoryDown {
 
 #-------------------------------------------------------------------
 sub www_moveProfileCategoryUp {
-        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($id, $thisSeq);
         ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from userProfileCategory where profileCategoryId=".quote($session{form}{cid}));
         ($id) = WebGUI::SQL->quickArray("select profileCategoryId from userProfileCategory where sequenceNumber=$thisSeq-1");
@@ -294,7 +294,7 @@ sub www_moveProfileCategoryUp {
 
 #-------------------------------------------------------------------
 sub www_moveProfileFieldDown {
-        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($id, $thisSeq, $profileCategoryId);
         ($thisSeq,$profileCategoryId) = WebGUI::SQL->quickArray("select sequenceNumber,profileCategoryId from userProfileField where fieldName=".quote($session{form}{fid}));
         ($id) = WebGUI::SQL->quickArray("select fieldName from userProfileField where profileCategoryId=".quote($profileCategoryId)." and sequenceNumber=$thisSeq+1");
@@ -308,7 +308,7 @@ sub www_moveProfileFieldDown {
 
 #-------------------------------------------------------------------
 sub www_moveProfileFieldUp {
-        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($id, $thisSeq, $profileCategoryId);
         ($thisSeq,$profileCategoryId) = WebGUI::SQL->quickArray("select sequenceNumber,profileCategoryId from userProfileField where fieldName=".quote($session{form}{fid}));
         ($id) = WebGUI::SQL->quickArray("select fieldName from userProfileField where profileCategoryId=".quote($profileCategoryId)." and sequenceNumber=$thisSeq-1");
diff --git a/lib/WebGUI/Operation/Replacements.pm b/lib/WebGUI/Operation/Replacements.pm
index 84002df33..b6656912b 100644
--- a/lib/WebGUI/Operation/Replacements.pm
+++ b/lib/WebGUI/Operation/Replacements.pm
@@ -38,14 +38,14 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_deleteReplacement {
-	return WebGUI::AdminConsole->new("contentFilters")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	WebGUI::SQL->write("delete from replacements where replacementId=".quote($session{form}{replacementId}));
 	return www_listReplacements();
 }
 
 #-------------------------------------------------------------------
 sub www_editReplacement {
-	return WebGUI::AdminConsole->new("contentFilters")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my $data = WebGUI::SQL->getRow("replacements","replacementId",$session{form}{replacementId});
 	my $f = WebGUI::HTMLForm->new;
 	$f->hidden(
@@ -76,7 +76,7 @@ sub www_editReplacement {
 
 #-------------------------------------------------------------------
 sub www_editReplacementSave {
-	return WebGUI::AdminConsole->new("contentFilters")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	WebGUI::SQL->setRow("replacements","replacementId",{
 		replacementId=>$session{form}{replacementId},
 		searchFor=>$session{form}{searchFor},
@@ -87,7 +87,7 @@ sub www_editReplacementSave {
 
 #-------------------------------------------------------------------
 sub www_listReplacements {
-	return WebGUI::AdminConsole->new("contentFilters")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my $output = '<table>';
 	my $sth = WebGUI::SQL->read("select replacementId,searchFor from replacements order by searchFor");
 	while (my $data = $sth->hashRef) {
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index 9534cc2a8..40b8942cc 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -26,7 +26,7 @@ use WebGUI::URL;
 
 #-------------------------------------------------------------------
 sub www_editSettings {
-	return WebGUI::AdminConsole->new("settings")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my $i18n = WebGUI::International->new("WebGUI");
 	my %tabs;
 	tie %tabs, 'Tie::IxHash';
@@ -245,7 +245,7 @@ sub www_editSettings {
 
 #-------------------------------------------------------------------
 sub www_saveSettings {
-	return WebGUI::AdminConsole->new("settings")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($key, $value);
 	foreach $key (keys %{$session{form}}) {
 		$value = $session{form}{$key};
diff --git a/lib/WebGUI/Operation/Statistics.pm b/lib/WebGUI/Operation/Statistics.pm
index d9b4e7241..b143894a9 100644
--- a/lib/WebGUI/Operation/Statistics.pm
+++ b/lib/WebGUI/Operation/Statistics.pm
@@ -34,7 +34,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_viewStatistics {
-        return WebGUI::AdminConsole->new("statistics")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output, $data);
 	my $url = "http://www.plainblack.com/downloads/latest-version.txt";
 	my $cache = WebGUI::Cache->new($url,"URL");
diff --git a/lib/WebGUI/Operation/Subscription.pm b/lib/WebGUI/Operation/Subscription.pm
index 56f5c8f95..28d72d927 100644
--- a/lib/WebGUI/Operation/Subscription.pm
+++ b/lib/WebGUI/Operation/Subscription.pm
@@ -52,7 +52,7 @@ sub _submenu {
 #-------------------------------------------------------------------
 sub www_createSubscriptionCodeBatch {
 	my (%subscriptions, $f, $error, $errorMessage);
-	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	$error = shift;
 	my $i18n = WebGUI::International->new("Subscription");
@@ -101,7 +101,7 @@ sub www_createSubscriptionCodeBatch {
 sub www_createSubscriptionCodeBatchSave {
 	my ($numberOfCodes, $description, $expires, $batchId, @codeElements, $currentCode, $code, $i, @subscriptions, 
 		@error, $creationEpoch);
-	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	my $i18n = WebGUI::International->new("Subscription");	
 	
@@ -139,7 +139,7 @@ sub www_createSubscriptionCodeBatchSave {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscription {
-	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	WebGUI::Subscription->new($session{form}{sid})->delete;
 	return www_listSubscriptions();
@@ -147,7 +147,7 @@ sub www_deleteSubscription {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscriptionCodeBatch {
-	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	WebGUI::SQL->write("delete from subscriptionCodeBatch where batchId=".quote($session{form}{bid}));
 	WebGUI::SQL->write("delete from subscriptionCode where batchId=".quote($session{form}{bid}));
@@ -157,7 +157,7 @@ sub www_deleteSubscriptionCodeBatch {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscriptionCodes {
-	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	if ($session{form}{selection} eq 'dc') {
 		WebGUI::SQL->write("delete from subscriptionCode where dateCreated >= ".quote($session{form}{dcStart}).
@@ -173,7 +173,7 @@ sub www_deleteSubscriptionCodes {
 #-------------------------------------------------------------------
 sub www_editSubscription {
 	my ($properties, $subscriptionId, $durationInterval, $durationUnits, $f);
-	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	my $i18n = WebGUI::International->new("Subscription");
 	
@@ -236,7 +236,7 @@ sub www_editSubscription {
 #-------------------------------------------------------------------
 sub www_editSubscriptionSave {
 	my (@relevantFields);
-	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	@relevantFields = qw(subscriptionId name price description subscriptionGroup duration executeOnSubscription karma);
 	WebGUI::Subscription->new($session{form}{sid})->set({map {$_ => $session{form}{$_}} @relevantFields});
@@ -247,7 +247,7 @@ sub www_editSubscriptionSave {
 #-------------------------------------------------------------------
 sub www_listSubscriptionCodeBatches {
 	my ($p, $batches, $output);
-	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	my $i18n = WebGUI::International->new("Subscription");
 	
@@ -274,7 +274,7 @@ sub www_listSubscriptionCodeBatches {
 #-------------------------------------------------------------------
 sub www_listSubscriptionCodes {
 	my ($p, $codes, $output, $where, $ops, $delete);
-	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 
 	my $i18n = WebGUI::International->new("Subscription");
 	
@@ -355,7 +355,7 @@ sub www_listSubscriptionCodes {
 #-------------------------------------------------------------------
 sub www_listSubscriptions {
 	my ($p, $subscriptions, $output);
-	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	
 	my $i18n = WebGUI::International->new("Subscription");
 	
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 15f3c401d..493e71547 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -151,7 +151,7 @@ sub getUserSearchForm {
 
 #-------------------------------------------------------------------
 sub www_becomeUser {
-	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         WebGUI::Session::end($session{var}{sessionId});
 	WebGUI::Session::start($session{form}{uid});
 	return "";
@@ -159,7 +159,7 @@ sub www_becomeUser {
 
 #-------------------------------------------------------------------
 sub www_deleteGrouping {
-	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	if (($session{user}{userId} eq $session{form}{uid} || $session{form}{uid} eq '3') && $session{form}{gid} eq '3') {
 		return _submenu(WebGUI::Privilege::vitalComponent());
         }
@@ -178,7 +178,7 @@ sub www_deleteGrouping {
 #-------------------------------------------------------------------
 sub www_deleteUser {
         my ($output);
-	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         if ($session{form}{uid} eq '1' || $session{form}{uid} eq '3') {
 		return _submenu(WebGUI::Privilege::vitalComponent());
         } else {
@@ -193,7 +193,7 @@ sub www_deleteUser {
 
 #-------------------------------------------------------------------
 sub www_deleteUserConfirm {
-	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
 	my ($u);
         if ($session{form}{uid} eq '1' || $session{form}{uid} eq '') {
 	   return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::vitalComponent());
@@ -206,7 +206,7 @@ sub www_deleteUserConfirm {
 
 #-------------------------------------------------------------------
 sub www_editUser {
-	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(11));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(11));
 	my $error = shift;
 	my $i18n = WebGUI::International->new("WebGUI");
 	my %tabs;
@@ -354,7 +354,7 @@ sub www_editUserSave {
 	unless ($isAdmin) {
 		$isSecondary = (WebGUI::Grouping::isInGroup(11) && $session{form}{uid} eq "new");
 	}
-	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless ($isAdmin || $isSecondary);
+	return WebGUI::Privilege::adminOnly() unless ($isAdmin || $isSecondary);
 	my ($uid) = WebGUI::SQL->quickArray("select userId from users where username=".quote($session{form}{username}));
 	my $error;
 	if ($uid eq $session{form}{uid} || $uid eq "") {
@@ -390,7 +390,7 @@ sub www_editUserSave {
 
 #-------------------------------------------------------------------
 sub www_editUserKarma {
-	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output, $f, $a, %user, %data, $method, $values, $category, $label, $default, $previousCategory);
         $f = WebGUI::HTMLForm->new;
         $f->hidden("op","editUserKarmaSave");
@@ -404,7 +404,7 @@ sub www_editUserKarma {
 
 #-------------------------------------------------------------------
 sub www_editUserKarmaSave {
-	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($u);
         $u = WebGUI::User->new($session{form}{uid});
         $u->karma($session{form}{amount},$session{user}{username}." (".$session{user}{userId}.")",$session{form}{description});
@@ -418,7 +418,7 @@ sub www_listUsers {
 			$session{form}{uid} = "new";
 			return www_editUser();
 		}
-		return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly());
+		return WebGUI::Privilege::adminOnly();
 	}
 	my %status;
 	my $output = getUserSearchForm("listUsers");
diff --git a/lib/WebGUI/Privilege.pm b/lib/WebGUI/Privilege.pm
index 6d5cd079a..126ac9801 100644
--- a/lib/WebGUI/Privilege.pm
+++ b/lib/WebGUI/Privilege.pm
@@ -17,6 +17,7 @@ package WebGUI::Privilege;
 use strict;
 use WebGUI::HTTP;
 use WebGUI::International;
+use WebGUI::Operation::Shared;
 use WebGUI::Session;
 
 =head1 NAME
@@ -55,7 +56,7 @@ sub adminOnly {
 	my ($output, $sth, @data);
         $output = '<h1>'.WebGUI::International::get(35).'</h1>';
 	$output .= WebGUI::International::get(36);
-	return $output;
+	return WebGUI::Operation::Shared::userStyle($output);
 }
 
 
@@ -73,7 +74,7 @@ sub insufficient {
 	$output = '<h1>'.WebGUI::International::get(37).'</h1>';
 	$output .= WebGUI::International::get(38);
 	$output .= '<p>';
-	return $output;
+	return WebGUI::Operation::Shared::userStyle($output);
 }
 
 
@@ -87,15 +88,14 @@ Returns a message stating that the user does not have the privileges necessary t
 
 sub noAccess {
 	WebGUI::HTTP::setStatus("401", "No Access");
-   	my ($output);
    	if ($session{user}{userId} eq '1') {
-      		$output = WebGUI::Operation::Auth::www_auth("init");
+      		return WebGUI::Operation::Auth::www_auth("init");
    	} else {
-      		$output = '<h1>'.WebGUI::International::get(37).'</h1>';
+      		my $output = '<h1>'.WebGUI::International::get(37).'</h1>';
       		$output .= WebGUI::International::get(39);
       		$output .= '<p>';
+		return WebGUI::Operation::Shared::userStyle($output);
    	}
-   	return $output;
 }
 
 #-------------------------------------------------------------------
@@ -112,7 +112,7 @@ sub notMember {
 	$output = '<h1>'.WebGUI::International::get(345).'</h1>';
 	$output .= WebGUI::International::get(346);
 	$output .= '<p>';
-	return $output;
+	return WebGUI::Operation::Shared::userStyle($output);
 }
 
 #-------------------------------------------------------------------
@@ -129,7 +129,7 @@ sub vitalComponent {
         $output = '<h1>'.WebGUI::International::get(40).'</h1>';
 	$output .= WebGUI::International::get(41);
 	$output .= '<p>';
-	return $output;
+	return WebGUI::Operation::Shared::userStyle($output);
 }