From 45ca3ea8d8e5ea157f86b73d3002efa36d71d7fe Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Tue, 19 Apr 2011 11:43:21 -0500 Subject: [PATCH] remove switchAdminOn. anyone in group 12 always has admin on --- lib/WebGUI/Admin.pm | 3 -- lib/WebGUI/Session.pm | 38 ++---------------- ..._import_adminconsole_admin-interface.wgpkg | Bin 4091 -> 4172 bytes 3 files changed, 4 insertions(+), 37 deletions(-) diff --git a/lib/WebGUI/Admin.pm b/lib/WebGUI/Admin.pm index ed365a939..adf9df585 100644 --- a/lib/WebGUI/Admin.pm +++ b/lib/WebGUI/Admin.pm @@ -800,9 +800,6 @@ sub www_view { my $var; $var->{backToSiteUrl} = $url->page; - # temporary! We are now in admin mode! - $session->switchAdminOn; - # Add vars for AdminBar $var->{adminPlugins} = $self->getAdminPluginTemplateVars; $var->{newContentTabs} = $self->getNewContentTemplateVars; diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm index 0c9a77c96..d9dff6809 100644 --- a/lib/WebGUI/Session.pm +++ b/lib/WebGUI/Session.pm @@ -779,6 +779,9 @@ sub start { $self->{_sessionId} = $sessionId; $self->cache->set($sessionId, $self->{_var}, $timeout); delete $self->{_var}{nextCacheFlush}; + if ( $self->user->isInGroup( 12 ) ) { # Turn Admin On!! + $self->{_var}{adminOn} = 1; + } $self->db->setRow("userSession","sessionId",$self->{_var}, $sessionId); $self->scratch->set('webguiCsrfToken', $self->id->generate); # create cross site request forgery token } @@ -815,39 +818,6 @@ sub style { return $self->{_style} } - -#------------------------------------------------------------------- - -=head2 switchAdminOff ( ) - -Disables admin mode. - -=cut - -sub switchAdminOff { - my $self = shift; - $self->{_var}{adminOn} = 0; - $self->cache->set($self->getId, $self->{_var}, $self->setting->get('sessionTimeout')); - delete $self->{_var}{nextCacheFlush}; - $self->db->setRow("userSession","sessionId", $self->{_var}); -} - -#------------------------------------------------------------------- - -=head2 switchAdminOn ( ) - -Enables admin mode. - -=cut - -sub switchAdminOn { - my $self = shift; - $self->{_var}{adminOn} = 1; - $self->cache->set($self->getId, $self->{_var}, $self->setting->get('sessionTimeout')); - delete $self->{_var}{nextCacheFlush}; - $self->db->setRow("userSession","sessionId", $self->{_var}); -} - #------------------------------------------------------------------- =head2 url ( ) @@ -889,13 +859,13 @@ sub user { my $option = shift; if (defined $option) { my $userId = $option->{userId} || $option->{user}->userId; - $self->start($userId,$self->getId); if ($self->setting->get("passiveProfilingEnabled")) { $self->db->write("update passiveProfileLog set userId = ? where sessionId = ?",[$userId,$self->getId]); } delete $self->{_stow}; $self->{_user} = $option->{user} || WebGUI::User->new($self, $userId); $self->request->env->{REMOTE_USER} = $self->{_user}->username if $self->request; + $self->start($userId,$self->getId); } elsif (!exists $self->{_user}) { $self->{_user} = WebGUI::User->new($self, $self->get('userId')); diff --git a/share/upgrades/7.10.4-8.0.0/root_import_adminconsole_admin-interface.wgpkg b/share/upgrades/7.10.4-8.0.0/root_import_adminconsole_admin-interface.wgpkg index 73bd45b1ae4b879c24bb2ad8d90556a6f72b1614..a33fe00225f6e8c2e6c54c3007a0d33d69b68f8b 100644 GIT binary patch literal 4172 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