From 7bf06aab7b8609f72ab26742fd56e2d912f5a40a Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Thu, 18 Sep 2008 19:51:25 +0000
Subject: [PATCH] make sure we are using var->isAdminOn instead of
 var->get('adminOn')

---
 lib/WebGUI/Asset.pm                    |  2 +-
 lib/WebGUI/Asset/Redirect.pm           |  2 +-
 lib/WebGUI/Asset/Shortcut.pm           |  4 +--
 lib/WebGUI/Asset/Wobject/Dashboard.pm  |  6 ++--
 lib/WebGUI/Asset/Wobject/Navigation.pm | 49 +++-----------------------
 lib/WebGUI/Asset/Wobject/Thingy.pm     |  4 +--
 lib/WebGUI/Macro/AdminText.pm          |  2 +-
 lib/WebGUI/Macro/EditableToggle.pm     |  2 +-
 lib/WebGUI/Operation/Shared.pm         |  2 +-
 9 files changed, 16 insertions(+), 57 deletions(-)

diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 527420a9b..b2a462f26 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -2381,7 +2381,7 @@ The default view method for any asset that doesn't define one. Under all normal
 
 sub view {
 	my $self = shift;
-	if ($self->session->var->get("adminOn")) {
+	if ($self->session->var->isAdminOn) {
 		return $self->getToolbar.' '.$self->getTitle;
 	} else {
 		return "";
diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm
index 7fe91acb8..e63a033b7 100644
--- a/lib/WebGUI/Asset/Redirect.pm
+++ b/lib/WebGUI/Asset/Redirect.pm
@@ -118,7 +118,7 @@ Display the redirect url when in admin mode.
 
 sub view {
 	my $self = shift;
-	if ($self->session->var->get("adminOn")) {
+	if ($self->session->var->isAdminOn) {
 		return $self->getToolbar.' '.$self->getTitle.' '.$self->get('redirectUrl');
 	}
     else {
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index e98423902..3aefef046 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -393,7 +393,7 @@ sub getOverridesList {
 sub _overridesCacheTag {
 	my $self = shift;
 	#cache by userId, assetId of this shortcut, and whether adminMode is on or not.
-	return ["shortcutOverrides", $self->getId, $self->session->user->userId, $self->session->var->get("adminOn")];
+	return ["shortcutOverrides", $self->getId, $self->session->user->userId, $self->session->var->isAdminOn];
 }
 
 #-------------------------------------------------------------------
@@ -492,7 +492,7 @@ sub getShortcutByCriteria {
 	if ($assetId) {
 		$scratchId = "Shortcut_" . $assetId;
 		if($self->session->scratch->get($scratchId) && !$self->getValue("disableContentLock")) {
-			unless ($self->session->var->get("adminOn")) {
+			unless ($self->session->var->isAdminOn) {
 				return WebGUI::Asset->newByDynamicClass($self->session, $self->session->scratch->get($scratchId));
 			}
 		}
diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm
index 32adb5ac0..3fc27c02f 100644
--- a/lib/WebGUI/Asset/Wobject/Dashboard.pm
+++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm
@@ -315,7 +315,7 @@ sub view {
 			}
 		}
 	}
-	$vars{showAdmin} = ($self->session->var->get("adminOn") && $self->canEdit);
+	$vars{showAdmin} = ($self->session->var->isAdminOn && $self->canEdit);
 	$vars{"dragger.init"} = '
 		<script type="text/javascript">
 			dragable_init("'.$self->getUrl.'");
@@ -352,10 +352,10 @@ sub www_view {
         unless ($self->canView) {
                 if ($self->get("state") eq "published") { # no privileges, make em log in
                         return $self->session->privilege->noAccess();
-                } elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^trash/) { # show em trash
+                } elsif ($self->session->var->isAdminOn && $self->get("state") =~ /^trash/) { # show em trash
                         $self->session->http->setRedirect($self->getUrl("func=manageTrash"));
                         return undef;
-                } elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^clipboard/) { # show em clipboard
+                } elsif ($self->session->var->isAdminOn && $self->get("state") =~ /^clipboard/) { # show em clipboard
                         $self->session->http->setRedirect($self->getUrl("func=manageClipboard"));
                         return undef;
                 } else { # tell em it doesn't exist anymore
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 1a0aa2f4e..0c908cdf6 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -515,50 +515,6 @@ sub www_goBackToPage {
 	return undef;
 }
 
-
-#-------------------------------------------------------------------
-# we eventually should reaadd this
-sub www_preview {
-	my $self = shift;
-	$self->session->var->get("adminOn") = 0;
-	return $self->session->privilege->insufficient() unless ($self->session->user->isAdmin);
-	my $nav = WebGUI::Navigation->new(	depth=>$self->session->form->process("depth"),
-						method=>$self->session->form->process("method"),
-						startAt=>$self->session->form->process("startAt"),
-						stopAtLevel=>$self->session->form->process("stopAtLevel"),
-						templateId=>$self->session->form->process("templateId"),
-						showSystemPages=>$self->session->form->process("showSystemPages"),
-						showHiddenPages=>$self->session->form->process("showHiddenPages"),
-						showUnprivilegedPages=>$self->session->form->process("showUnprivilegedPages"),
-	                       			'reverse'=>$self->session->form->process("'reverse'"),
-                                );
-	my $output = qq(
-		<table width="100%" border="0" cellpadding="5" cellspacing="0">
-		<tr><td class="tableHeader" valign="top">
-		Configuration
-		</td><td class="tableHeader" valign="top">Output</td></tr>
-		<tr><td class="tableHeader" valign="top">
-		<font size=1>
-			Identifier: $self->session->form->process("identifier")<br />
-			startAt: $self->session->form->process("startAt")<br />
-			method: $self->session->form->process("method")<br />
-			stopAtLevel: $self->session->form->process("stopAtLevel")<br />
-			depth: $self->session->form->process("depth")<br />
-			templateId: $self->session->form->process("templateId")<br />
-			reverse: $self->session->form->process("'reverse'")<br />
-			showSystemPages: $self->session->form->process("showSystemPages")<br />
-			showHiddenPages: $self->session->form->process("showHiddenPages")<br />
-			showUnprivilegedPages: $self->session->form->process("showUnprivilegedPages")<br />
-		</font>
-		</td><td class="tableData" valign="top">
-		) . $nav->build . qq(</td></tr></table>);
-	
-	# Because of the way the system is set up, the preview is cached. So let's remove it again...
-	WebGUI::Cache->new($self->session,$nav->{_identifier}.$self->session->asset->getId, "Navigation-".$self->session->config->getFilename)->delete;
-	
-	return _submenu($output,"preview"); 
-}
-
 #-------------------------------------------------------------------
 
 =head2 www_view
@@ -579,4 +535,7 @@ sub www_view {
 		$self->session->http->setMimeType($mimeType || 'text/html');
 		return $self->view();
 	}
-}1;
+}
+
+1;
+
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index bf0dc1455..5894b8111 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -1855,7 +1855,7 @@ sub editThingData {
         $field{value} = $fieldValue || $field{defaultValue};     
         my $formElement .= $self->getFormElement(\%field);
         
-        my $hidden = ($field{status} eq "hidden" && !$self->session->var->get("adminOn"));
+        my $hidden = ($field{status} eq "hidden" && !$self->session->var->isAdminOn);
         my $value = $field{value};
         $value = $self->getFieldValue($value,\%field);
 
@@ -2697,7 +2697,7 @@ sub www_viewThingData {
 sequenceNumber');
     while (my %field = $fields->hash) {
         next unless ($field{display} eq '1');
-        my $hidden = ($field{status} eq "hidden" && !$self->session->var->get("adminOn"));
+        my $hidden = ($field{status} eq "hidden" && !$self->session->var->isAdminOn);
 
         my $originalValue = $thingData{"field_".$field{fieldId}};
         my $dateCreated = $thingData{"dateCreated"};
diff --git a/lib/WebGUI/Macro/AdminText.pm b/lib/WebGUI/Macro/AdminText.pm
index 5f335ed86..05a8be71d 100644
--- a/lib/WebGUI/Macro/AdminText.pm
+++ b/lib/WebGUI/Macro/AdminText.pm
@@ -33,7 +33,7 @@ string is returned.
 sub process {	
 	my $session = shift;
         my @param = @_;
-        return "" unless ($session->var->get("adminOn"));
+        return "" unless ($session->var->isAdminOn);
         return $param[0];
 }
 
diff --git a/lib/WebGUI/Macro/EditableToggle.pm b/lib/WebGUI/Macro/EditableToggle.pm
index a011dd5b9..da65650bb 100644
--- a/lib/WebGUI/Macro/EditableToggle.pm
+++ b/lib/WebGUI/Macro/EditableToggle.pm
@@ -55,7 +55,7 @@ sub process {
 	      my $i18n = WebGUI::International->new($session,'Macro_EditableToggle');
               my $turnOn = $param[0] || $i18n->get(516);
               my $turnOff = $param[1] || $i18n->get(517);
-                 if ($session->var->get("adminOn")) {
+                 if ($session->var->isAdminOn) {
                       $var{'toggle.url'} = $session->url->page('op=switchOffAdmin');
                       $var{'toggle.text'} = $turnOff;
                  } else {
diff --git a/lib/WebGUI/Operation/Shared.pm b/lib/WebGUI/Operation/Shared.pm
index bce2d0e2d..f2354d022 100644
--- a/lib/WebGUI/Operation/Shared.pm
+++ b/lib/WebGUI/Operation/Shared.pm
@@ -38,7 +38,7 @@ TODO: DOCUMENT ME
 	
 	if ($session->user->isInGroup(12)) {
 		my %hash;
-		if ($session->var->get("adminOn")) {
+		if ($session->var->isAdminOn) {
 			$hash{'options.display'} .= '<a href="'.$session->url->page('op=switchOffAdmin').'">'.$i18n->get(12).'</a>';
 		} else {
 			$hash{'options.display'} .= '<a href="'.$session->url->page('op=switchOnAdmin').'">'.$i18n->get(63).'</a>';