oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Syntax clean.

Browse source
This commit is contained in:
Colin Kuskie 2010-11-17 16:34:11 -08:00
parent b5d263e693
commit c4553012d1
44 changed files with 88 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Admin.pm
View file

@ -754,7 +754,7 @@ sub www_view {
$var->{backToSiteUrl} = $url->page; $var->{backToSiteUrl} = $url->page;
# temporary! We are now in admin mode! # temporary! We are now in admin mode!
$session->var->switchAdminOn; $session->switchAdminOn;
# Add vars for AdminBar # Add vars for AdminBar
$var->{adminPlugins} = $self->getAdminPluginTemplateVars; $var->{adminPlugins} = $self->getAdminPluginTemplateVars;

17
lib/WebGUI/Asset.pm
View file

@ -454,7 +454,7 @@ The missing URL.
sub addMissing { sub addMissing {
my $self = shift; my $self = shift;
my $assetUrl = shift; my $assetUrl = shift;
return undef unless ($self->session->var->isAdminOn); return undef unless ($self->session->isAdminOn);
my $i18n = WebGUI::International->new($self->session, "Asset"); my $i18n = WebGUI::International->new($self->session, "Asset");
my $output = $i18n->get("missing page query"); my $output = $i18n->get("missing page query");
$output .= '<ul> $output .= '<ul>
@ -592,14 +592,15 @@ to SSL.
sub checkView { sub checkView {
my $self = shift; my $self = shift;
return $self->session->privilege->noAccess() unless $self->canView; return $self->session->privilege->noAccess() unless $self->canView;
my ($conf, $var, $http) = $self->session->quick(qw(config var http)); my $session = $self->session;
my ($conf, $http) = $self->session->quick(qw(config http));
if ($conf->get("sslEnabled") && $self->get("encryptPage") && ! $self->session->request->secure) { if ($conf->get("sslEnabled") && $self->get("encryptPage") && ! $self->session->request->secure) {
# getUrl already changes url to https if 'encryptPage' # getUrl already changes url to https if 'encryptPage'
$http->setRedirect($self->getUrl); $http->setRedirect($self->getUrl);
$http->sendHeader; $http->sendHeader;
return "chunked"; return "chunked";
} }
elsif ($var->isAdminOn && $self->get("state") =~ /^trash/) { # show em trash elsif ($session->isAdminOn && $self->get("state") =~ /^trash/) { # show em trash
my $queryFrag = "func=manageTrash"; my $queryFrag = "func=manageTrash";
if ($self->session->form->process('revision')) { if ($self->session->form->process('revision')) {
$queryFrag .= ";revision=".$self->session->form->process('revision'); $queryFrag .= ";revision=".$self->session->form->process('revision');
@ -608,7 +609,7 @@ sub checkView {
$http->sendHeader; $http->sendHeader;
return "chunked"; return "chunked";
} }
elsif ($var->isAdminOn && $self->get("state") =~ /^clipboard/) { # show em clipboard elsif ($session->isAdminOn && $self->get("state") =~ /^clipboard/) { # show em clipboard
my $queryFrag = "func=manageClipboard"; my $queryFrag = "func=manageClipboard";
if ($self->session->form->process('revision')) { if ($self->session->form->process('revision')) {
$queryFrag .= ";revision=".$self->session->form->process('revision'); $queryFrag .= ";revision=".$self->session->form->process('revision');
@ -679,7 +680,7 @@ sub dispatch {
my $session = $self->session; my $session = $self->session;
my $state = $self->get('state'); my $state = $self->get('state');
##Only allow interaction with assets in certain states ##Only allow interaction with assets in certain states
return if $state ne 'published' && $state ne 'archived' && !$session->var->isAdminOn; return if $state ne 'published' && $state ne 'archived' && !$session->isAdminOn;
my $func = $session->form->param('func') || 'view'; my $func = $session->form->param('func') || 'view';
my $viewing = $func eq 'view' ? 1 : 0; my $viewing = $func eq 'view' ? 1 : 0;
my $sub = $self->can('www_'.$func); my $sub = $self->can('www_'.$func);
@ -1594,7 +1595,7 @@ Returns a toolbar with a set of icons that hyperlink to functions that delete, e
sub getToolbar { sub getToolbar {
my $self = shift; my $self = shift;
return undef unless $self->canEdit && $self->session->var->isAdminOn; return undef unless $self->canEdit && $self->session->isAdminOn;
return $self->{_toolbar} return $self->{_toolbar}
if (exists $self->{_toolbar}); if (exists $self->{_toolbar});
my $userUiLevel = $self->session->user->profileField("uiLevel"); my $userUiLevel = $self->session->user->profileField("uiLevel");
@ -2370,7 +2371,7 @@ sub processTemplate {
} }
if (! Exception::Class->caught() ) { if (! Exception::Class->caught() ) {
$var = { %{ $var }, %{ $self->getMetaDataAsTemplateVariables } }; $var = { %{ $var }, %{ $self->getMetaDataAsTemplateVariables } };
$var->{'controls'} = $self->getToolbar if $session->var->isAdminOn; $var->{'controls'} = $self->getToolbar if $session->isAdminOn;
$var->{'assetIdHex'} = $session->id->toHex($self->getId); $var->{'assetIdHex'} = $session->id->toHex($self->getId);
my %vars = ( my %vars = (
%{$self->get}, %{$self->get},
@ -2681,7 +2682,7 @@ The default view method for any asset that doesn't define one. Under all normal
sub view { sub view {
my $self = shift; my $self = shift;
if ($self->session->var->isAdminOn) { if ($self->session->isAdminOn) {
return $self->getToolbar.' '.$self->getTitle; return $self->getToolbar.' '.$self->getTitle;
} else { } else {
return ""; return "";

4
lib/WebGUI/Asset/File.pm
View file

@ -564,7 +564,7 @@ Generate the view method for the Asset, and handle caching.
sub view { sub view {
my $self = shift; my $self = shift;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) { if (!$self->session->isAdminOn && $self->get("cacheTimeout") > 10) {
my $out = $self->session->cache->get($self->getViewCacheKey); my $out = $self->session->cache->get($self->getViewCacheKey);
return $out if $out; return $out if $out;
} }
@ -574,7 +574,7 @@ sub view {
$var{fileIcon} = $self->getFileIconUrl; $var{fileIcon} = $self->getFileIconUrl;
$var{fileSize} = Number::Format::format_bytes($self->get("assetSize")); $var{fileSize} = Number::Format::format_bytes($self->get("assetSize"));
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate}); my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) { if (!$self->session->isAdminOn && $self->get("cacheTimeout") > 10) {
$self->session->cache->set($self->getViewCacheKey, $out, $self->get("cacheTimeout")); $self->session->cache->set($self->getViewCacheKey, $out, $self->get("cacheTimeout"));
} }
return $out; return $out;

4
lib/WebGUI/Asset/File/Image.pm
View file

@ -210,7 +210,7 @@ sub view {
my $session = $self->session; my $session = $self->session;
my $cache = $session->cache; my $cache = $session->cache;
my $cacheKey = $self->getWwwCacheKey('view'); my $cacheKey = $self->getWwwCacheKey('view');
if (!$session->var->isAdminOn && $self->cacheTimeout > 10) { if (!$session->isAdminOn && $self->cacheTimeout > 10) {
my $out = $cache->get( $cacheKey ); my $out = $cache->get( $cacheKey );
return $out if $out; return $out if $out;
} }
@ -233,7 +233,7 @@ sub view {
$var{annotateJs} = $crop_js . $domMe; $var{annotateJs} = $crop_js . $domMe;
$var{parameters} .= sprintf(q{ id="%s"}, $self->getId); $var{parameters} .= sprintf(q{ id="%s"}, $self->getId);
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate}); my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$session->var->isAdminOn && $self->cacheTimeout > 10) { if (!$session->isAdminOn && $self->cacheTimeout > 10) {
$cache->set( $cacheKey, $out, $self->get("cacheTimeout") ); $cache->set( $cacheKey, $out, $self->get("cacheTimeout") );
} }
return $out; return $out;

6
lib/WebGUI/Asset/File/ZipArchive.pm
View file

@ -209,7 +209,7 @@ sub view {
my $self = shift; my $self = shift;
my $cache = $self->session->cache; my $cache = $self->session->cache;
my $cacheKey = $self->getWwwCacheKey('view'); my $cacheKey = $self->getWwwCacheKey('view');
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) { if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
my $out = $cache->get( $cacheKey ); my $out = $cache->get( $cacheKey );
return $out if $out; return $out if $out;
} }
@ -232,7 +232,7 @@ sub view {
$var{noInitialPage} = $i18n->get('noInitialPage'); $var{noInitialPage} = $i18n->get('noInitialPage');
$var{noFileSpecified} = $i18n->get('noFileSpecified'); $var{noFileSpecified} = $i18n->get('noFileSpecified');
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate}); my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) { if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
$cache->set( $cacheKey, $out, $self->cacheTimeout); $cache->set( $cacheKey, $out, $self->cacheTimeout);
} }
return $out; return $out;
@ -268,7 +268,7 @@ Web facing method which is the default view page. This method does a
sub www_view { sub www_view {
my $self = shift; my $self = shift;
return $self->session->privilege->noAccess() unless $self->canView; return $self->session->privilege->noAccess() unless $self->canView;
if ($self->session->var->isAdminOn) { if ($self->session->isAdminOn) {
return $self->session->asset($self->getContainer)->www_view; return $self->session->asset($self->getContainer)->www_view;
} }
$self->session->http->setRedirect($self->getFileUrl($self->showPage)); $self->session->http->setRedirect($self->getFileUrl($self->showPage));

4
lib/WebGUI/Asset/Redirect.pm
View file

@ -99,7 +99,7 @@ Display the redirect url when in admin mode.
sub view { sub view {
my $self = shift; my $self = shift;
if ($self->session->var->isAdminOn) { if ($self->session->isAdminOn) {
return $self->getToolbar.' '.$self->getTitle.' '.$self->redirectUrl; return $self->getToolbar.' '.$self->getTitle.' '.$self->redirectUrl;
} }
else { else {
@ -121,7 +121,7 @@ sub www_view {
my $i18n = WebGUI::International->new($self->session, "Asset_Redirect"); my $i18n = WebGUI::International->new($self->session, "Asset_Redirect");
my $url = $self->redirectUrl; my $url = $self->redirectUrl;
WebGUI::Macro::process($self->session, \$url); WebGUI::Macro::process($self->session, \$url);
if ($self->session->var->isAdminOn() && $self->canEdit) { if ($self->session->isAdminOn() && $self->canEdit) {
return $self->getAdminConsole->render($i18n->get("what do you want to do with this redirect").' return $self->getAdminConsole->render($i18n->get("what do you want to do with this redirect").'
<ul> <ul>
<li><a href="'.$url.'">'.$i18n->get("go to the redirect url").'</a></li> <li><a href="'.$url.'">'.$i18n->get("go to the redirect url").'</a></li>

14
lib/WebGUI/Asset/Shortcut.pm
View file

@ -239,7 +239,7 @@ Shortcut that the Visitor would see, or their own.
sub discernUserId { sub discernUserId {
my $self = shift; my $self = shift;
return ($self->canManage && $self->session->var->isAdminOn) ? '1' : $self->session->user->userId; return ($self->canManage && $self->session->isAdminOn) ? '1' : $self->session->user->userId;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -464,7 +464,7 @@ admin mode is on.
sub _overridesCacheTag { sub _overridesCacheTag {
my $self = shift; my $self = shift;
#cache by userId, assetId of this shortcut, and whether adminMode is on or not. #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->isAdminOn]; return ["shortcutOverrides", $self->getId, $self->session->user->userId, $self->session->isAdminOn];
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -488,7 +488,7 @@ sub getOverrides {
my $overridesRef = $cache->get($self->_overridesCacheTag); my $overridesRef = $cache->get($self->_overridesCacheTag);
##If admin mode is not on, and the cache is valid, and not expired, and the user object was not updated, ##If admin mode is not on, and the cache is valid, and not expired, and the user object was not updated,
##return the cached value. ##return the cached value.
if ( ! $session->var->isAdminOn if ( ! $session->isAdminOn
&& $overridesRef && $overridesRef
&& $overridesRef->{cacheNotExpired} && $overridesRef->{cacheNotExpired}
&& $overridesRef->{userLastUpdated} >= $u->get('lastUpdated')) { && $overridesRef->{userLastUpdated} >= $u->get('lastUpdated')) {
@ -591,7 +591,7 @@ sub getShortcutByCriteria {
if ($assetId) { if ($assetId) {
$scratchId = "Shortcut_" . $assetId; $scratchId = "Shortcut_" . $assetId;
if($self->session->scratch->get($scratchId) && !$self->disableContentLock) { if($self->session->scratch->get($scratchId) && !$self->disableContentLock) {
unless ($self->session->var->isAdminOn) { unless ($self->session->isAdminOn) {
return WebGUI::Asset->newById($self->session, $self->session->scratch->get($scratchId)); return WebGUI::Asset->newById($self->session, $self->session->scratch->get($scratchId));
} }
} }
@ -990,8 +990,8 @@ sub www_getUserPrefsForm {
my @fielden = $self->getPrefFieldsToShow; my @fielden = $self->getPrefFieldsToShow;
my $f = WebGUI::HTMLForm->new($self->session,extras=>' onsubmit="submitForm(this,\''.$self->getId.'\',\''.$self->getUrl.'\');return false;"'); my $f = WebGUI::HTMLForm->new($self->session,extras=>' onsubmit="submitForm(this,\''.$self->getId.'\',\''.$self->getUrl.'\');return false;"');
$f->raw('<table cellspacing="0" cellpadding="3" border="0">'); $f->raw('<table cellspacing="0" cellpadding="3" border="0">');
my $allowedToSave = ( ! $session->var->isAdminOn && $self->getParent->canPersonalize ) my $allowedToSave = ( ! $session->isAdminOn && $self->getParent->canPersonalize )
|| ( $session->var->isAdminOn && $session->user->isInGroup($session->setting->get('groupIdAdminUser')) ); || ( $session->isAdminOn && $session->user->isInGroup($session->setting->get('groupIdAdminUser')) );
if ($allowedToSave) { if ($allowedToSave) {
$f->hidden( $f->hidden(
-name => 'func', -name => 'func',
@ -1090,7 +1090,7 @@ sub www_saveUserPrefs {
my $self = shift; my $self = shift;
my $session = $self->session; my $session = $self->session;
return '' unless $self->getParent->canPersonalize return '' unless $self->getParent->canPersonalize
|| ( $session->var->isAdminOn && $session->user->isInGroup($session->setting->get('groupIdAdminUser')) ); || ( $session->isAdminOn && $session->user->isInGroup($session->setting->get('groupIdAdminUser')) );
my @fellowFields = $self->getPrefFieldsToShow; my @fellowFields = $self->getPrefFieldsToShow;
my %data = (); my %data = ();
$self->uncacheOverrides; $self->uncacheOverrides;

4
lib/WebGUI/Asset/Sku/Product.pm
View file

@ -1654,7 +1654,7 @@ sub view {
my $session = $self->session; my $session = $self->session;
my $cache = $session->cache; my $cache = $session->cache;
my $cacheKey = $self->getWwwCacheKey( 'view' ); my $cacheKey = $self->getWwwCacheKey( 'view' );
if (!$session->var->isAdminOn && $self->get("cacheTimeout") > 10){ if (!$session->isAdminOn && $self->get("cacheTimeout") > 10){
my $out = $cache->get( $cacheKey ); my $out = $cache->get( $cacheKey );
return $out if $out; return $out if $out;
} }
@ -1856,7 +1856,7 @@ sub view {
$var{continueShoppingUrl} = $self->getUrl; $var{continueShoppingUrl} = $self->getUrl;
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate}); my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10 && $self->{_hasAddedToCart} != 1){ if (!$self->session->isAdminOn && $self->cacheTimeout > 10 && $self->{_hasAddedToCart} != 1){
$cache->set( $cacheKey, $out, $self->cacheTimeout ); $cache->set( $cacheKey, $out, $self->cacheTimeout );
} }
return $out; return $out;

4
lib/WebGUI/Asset/Snippet.pm
View file

@ -253,7 +253,7 @@ sub view {
my $session = $self->session; my $session = $self->session;
my $versionTag = WebGUI::VersionTag->getWorking($session, 1); my $versionTag = WebGUI::VersionTag->getWorking($session, 1);
my $noCache = my $noCache =
$session->var->isAdminOn $session->isAdminOn
|| $self->cacheTimeout <= 10 || $self->cacheTimeout <= 10
|| ($versionTag && $versionTag->getId eq $self->tagId); || ($versionTag && $versionTag->getId eq $self->tagId);
my $cacheKey = $self->getWwwCacheKey('view', $calledAsWebMethod); my $cacheKey = $self->getWwwCacheKey('view', $calledAsWebMethod);
@ -265,7 +265,7 @@ sub view {
? $self->snippetPacked ? $self->snippetPacked
: $self->snippet : $self->snippet
; ;
$output = $self->getToolbar.$output if ($session->var->isAdminOn && !$calledAsWebMethod); $output = $self->getToolbar.$output if ($session->isAdminOn && !$calledAsWebMethod);
if ($self->processAsTemplate) { if ($self->processAsTemplate) {
$output = WebGUI::Asset::Template->processRaw($session, $output, $self->get); $output = WebGUI::Asset::Template->processRaw($session, $output, $self->get);
} }

4
lib/WebGUI/Asset/Template.pm
View file

@ -564,13 +564,13 @@ sub process {
my $i18n = WebGUI::International->new($session, 'Asset_Template'); my $i18n = WebGUI::International->new($session, 'Asset_Template');
$session->log->warn('process called on template in trash: '.$self->getId $session->log->warn('process called on template in trash: '.$self->getId
.'. The template was called through this url: '.$session->asset->url); .'. The template was called through this url: '.$session->asset->url);
return $session->var->isAdminOn ? $i18n->get('template in trash') : ''; return $session->isAdminOn ? $i18n->get('template in trash') : '';
} }
elsif ($self->state =~ /^clipboard/) { elsif ($self->state =~ /^clipboard/) {
my $i18n = WebGUI::International->new($session, 'Asset_Template'); my $i18n = WebGUI::International->new($session, 'Asset_Template');
$session->log->warn('process called on template in clipboard: '.$self->getId $session->log->warn('process called on template in clipboard: '.$self->getId
.'. The template was called through this url: '.$session->asset->url); .'. The template was called through this url: '.$session->asset->url);
return $session->var->isAdminOn ? $i18n->get('template in clipboard') : ''; return $session->isAdminOn ? $i18n->get('template in clipboard') : '';
} }
# Return a JSONinfied version of vars if JSON is the only requested content type. # Return a JSONinfied version of vars if JSON is the only requested content type.

2
lib/WebGUI/Asset/Template/Parser.pm
View file

@ -39,7 +39,7 @@ sub addSessionVars {
$vars->{"session.user.username"} = $self->session->user->username; $vars->{"session.user.username"} = $self->session->user->username;
$vars->{"session.user.firstDayOfWeek"} = $self->session->user->profileField("firstDayOfWeek"); $vars->{"session.user.firstDayOfWeek"} = $self->session->user->profileField("firstDayOfWeek");
$vars->{"session.config.extrasurl"} = $self->session->url->extras(); $vars->{"session.config.extrasurl"} = $self->session->url->extras();
$vars->{"session.var.adminOn"} = $self->session->var->isAdminOn; $vars->{"session.var.adminOn"} = $self->session->isAdminOn;
$vars->{"session.setting.companyName"} = $self->session->setting->get("companyName"); $vars->{"session.setting.companyName"} = $self->session->setting->get("companyName");
$vars->{"session.setting.anonymousRegistration"} = $self->session->setting->get("anonymousRegistration"); $vars->{"session.setting.anonymousRegistration"} = $self->session->setting->get("anonymousRegistration");
my $forms = $self->session->form->paramsHashRef(); my $forms = $self->session->form->paramsHashRef();

4
lib/WebGUI/Asset/Wobject/Article.pm
View file

@ -320,7 +320,7 @@ returns the output.
sub view { sub view {
my $self = shift; my $self = shift;
my $cache = $self->session->cache; my $cache = $self->session->cache;
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10 && !$self->session->form->process("overrideTemplateId") && if (!$self->session->isAdminOn && $self->cacheTimeout > 10 && !$self->session->form->process("overrideTemplateId") &&
!$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) { !$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) {
my $out = $cache->get($self->getViewCacheKey); my $out = $cache->get($self->getViewCacheKey);
return $out if $out; return $out if $out;
@ -384,7 +384,7 @@ sub view {
} }
$p->appendTemplateVars(\%var); $p->appendTemplateVars(\%var);
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate}); my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10 && !$self->session->form->process("overrideTemplateId") && if (!$self->session->isAdminOn && $self->cacheTimeout > 10 && !$self->session->form->process("overrideTemplateId") &&
!$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) { !$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) {
$cache->set($self->getViewCacheKey, $out, $self->cacheTimeout); $cache->set($self->getViewCacheKey, $out, $self->cacheTimeout);
} }

2
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -957,7 +957,7 @@ sub view {
##### Process the template ##### Process the template
# Add any global variables # Add any global variables
# Admin # Admin
if ($self->session->var->isAdminOn) { if ($self->session->isAdminOn) {
$var->{'admin'} = 1; $var->{'admin'} = 1;
$var->{'adminControls'} = $self->getToolbar; $var->{'adminControls'} = $self->getToolbar;
} }

10
lib/WebGUI/Asset/Wobject/Dashboard.pm
View file

@ -121,7 +121,7 @@ Dashboard that Visitor would see, or their own.
sub discernUserId { sub discernUserId {
my $self = shift; my $self = shift;
return ($self->canManage && $self->session->var->isAdminOn) ? '1' : $self->session->user->userId; return ($self->canManage && $self->session->isAdminOn) ? '1' : $self->session->user->userId;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -243,7 +243,7 @@ turned on.
sub isManaging { sub isManaging {
my $self = shift; my $self = shift;
return 1 if ($self->canManage && $self->session->var->isAdminOn()); return 1 if ($self->canManage && $self->session->isAdminOn());
return 0; return 0;
} }
@ -415,7 +415,7 @@ sub view {
} }
} }
} }
$vars{showAdmin} = ($self->session->var->isAdminOn && $self->canEdit); $vars{showAdmin} = ($self->session->isAdminOn && $self->canEdit);
$vars{"dragger.init"} = ' $vars{"dragger.init"} = '
<script type="text/javascript"> <script type="text/javascript">
dragable_init("'.$self->getUrl.'"); dragable_init("'.$self->getUrl.'");
@ -459,10 +459,10 @@ sub www_view {
unless ($self->canView) { unless ($self->canView) {
if ($self->state eq "published") { # no privileges, make em log in if ($self->state eq "published") { # no privileges, make em log in
return $self->session->privilege->noAccess(); return $self->session->privilege->noAccess();
} elsif ($self->session->var->isAdminOn && $self->state =~ /^trash/) { # show em trash } elsif ($self->session->isAdminOn && $self->state =~ /^trash/) { # show em trash
$self->session->http->setRedirect($self->getUrl("func=manageTrash")); $self->session->http->setRedirect($self->getUrl("func=manageTrash"));
return undef; return undef;
} elsif ($self->session->var->isAdminOn && $self->state =~ /^clipboard/) { # show em clipboard } elsif ($self->session->isAdminOn && $self->state =~ /^clipboard/) { # show em clipboard
$self->session->http->setRedirect($self->getUrl("func=manageClipboard")); $self->session->http->setRedirect($self->getUrl("func=manageClipboard"));
return undef; return undef;
} else { # tell em it doesn't exist anymore } else { # tell em it doesn't exist anymore

4
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -301,7 +301,7 @@ sub _getFormFields {
$value = $formValue; $value = $formValue;
} }
my $hidden my $hidden
= ($field->{status} eq 'hidden' && !$session->var->isAdminOn) = ($field->{status} eq 'hidden' && !$session->isAdminOn)
|| ($field->{isMailField} && !$self->get('mailData')); || ($field->{isMailField} && !$self->get('mailData'));
# populate Rich Editor field if the field is an HTMLArea # populate Rich Editor field if the field is an HTMLArea
@ -955,7 +955,7 @@ sub getRecordTemplateVars {
for my $field_form (@fields) { for my $field_form (@fields) {
my ($field, $form) = @{ $field_form }; my ($field, $form) = @{ $field_form };
# need a copy # need a copy
my $hidden = ($field->{status} eq 'hidden' && !$session->var->isAdminOn) my $hidden = ($field->{status} eq 'hidden' && !$session->isAdminOn)
|| ($field->{isMailField} && !$self->mailData); || ($field->{isMailField} && !$self->mailData);
# populate Rich Editor field if the field is an HTMLArea # populate Rich Editor field if the field is an HTMLArea

2
lib/WebGUI/Asset/Wobject/HttpProxy.pm
View file

@ -296,7 +296,7 @@ sub view {
my $i18n = WebGUI::International->new($self->session, 'Asset_HttpProxy'); my $i18n = WebGUI::International->new($self->session, 'Asset_HttpProxy');
### Set up a cookie jar ### Set up a cookie jar
my $cookiebox = $self->session->url->escape($self->session->var->get("sessionId")); my $cookiebox = $self->session->url->escape($self->session->getId);
$cookiebox =~ s/[^A-Za-z0-9\-\.\_]//g; #removes all funky characters $cookiebox =~ s/[^A-Za-z0-9\-\.\_]//g; #removes all funky characters
$cookiebox .= '.cookie'; $cookiebox .= '.cookie';
my $jar = HTTP::Cookies->new(File => $self->getCookieJar->getPath($cookiebox), AutoSave => 1, Ignore_Discard => 1); my $jar = HTTP::Cookies->new(File => $self->getCookieJar->getPath($cookiebox), AutoSave => 1, Ignore_Discard => 1);

4
lib/WebGUI/Asset/Wobject/Layout.pm
View file

@ -169,7 +169,7 @@ sub prepareView {
} }
my %vars; my %vars;
$vars{showAdmin} = ($session->var->isAdminOn && $self->canEdit && $self->canEditIfLocked); $vars{showAdmin} = ($session->isAdminOn && $self->canEdit && $self->canEditIfLocked);
my $splitter = $self->{_viewSplitter} = $self->getSeparator; my $splitter = $self->{_viewSplitter} = $self->getSeparator;
@ -369,7 +369,7 @@ override www_view => sub {
my $self = shift; my $self = shift;
my $session = $self->session; my $session = $self->session;
# slashdot / burst protection hack # slashdot / burst protection hack
if ($session->var->get("userId") eq "1" if ($session->user->isVisitor
&& $session->form->param() == 0 && $session->form->param() == 0
&& !$session->scratch->get('isExporting') && !$session->scratch->get('isExporting')
) { ) {

4
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -479,7 +479,7 @@ sub getListings {
my ($listings, $listingsEncoded); my ($listings, $listingsEncoded);
my $noCache = my $noCache =
$session->var->isAdminOn $session->isAdminOn
|| $self->listingsCacheTimeout <= 10 || $self->listingsCacheTimeout <= 10
|| ($versionTag && $versionTag->getId eq $self->tagId); || ($versionTag && $versionTag->getId eq $self->tagId);
my $cache = $session->cache; my $cache = $session->cache;
@ -645,7 +645,7 @@ sub view {
my $versionTag = WebGUI::VersionTag->getWorking($session, 1); my $versionTag = WebGUI::VersionTag->getWorking($session, 1);
my $noCache = my $noCache =
$session->var->isAdminOn $session->isAdminOn
|| $self->statisticsCacheTimeout <= 10 || $self->statisticsCacheTimeout <= 10
|| ($versionTag && $versionTag->getId eq $self->tagId); || ($versionTag && $versionTag->getId eq $self->tagId);
my $cache = $session->cache; my $cache = $session->cache;

4
lib/WebGUI/Asset/Wobject/MultiSearch.pm
View file

@ -99,7 +99,7 @@ sub view {
my $self = shift; my $self = shift;
my $cache = $self->session->cache; my $cache = $self->session->cache;
my $cacheKey = $self->getWwwCacheKey( 'view' ); my $cacheKey = $self->getWwwCacheKey( 'view' );
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) { if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
my $out = eval { $cache->get( $cacheKey ) }; my $out = eval { $cache->get( $cacheKey ) };
return $out if $out; return $out if $out;
} }
@ -112,7 +112,7 @@ sub view {
$var{'submit'} = WebGUI::Form::Submit->new($self->session, {name=>'SearchSubmit',value=>$i18n->get('submit','WebGUI')})->toHtml(); $var{'submit'} = WebGUI::Form::Submit->new($self->session, {name=>'SearchSubmit',value=>$i18n->get('submit','WebGUI')})->toHtml();
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate}); my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) { if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
eval { $cache->set( $cacheKey, $out, $self->cacheTimeout) }; eval { $cache->set( $cacheKey, $out, $self->cacheTimeout) };
} }
return $out; return $out;

2
lib/WebGUI/Asset/Wobject/Navigation.pm
View file

@ -307,7 +307,7 @@ Returns a toolbar with a set of icons that hyperlink to functions that delete, e
override getToolbar => sub { override getToolbar => sub {
my $self = shift; my $self = shift;
return undef return undef
unless $self->canEdit && $self->session->var->isAdminOn; unless $self->canEdit && $self->session->isAdminOn;
if ($self->getToolbarState) { if ($self->getToolbarState) {
my $toolbar = ''; my $toolbar = '';
if ($self->canEditIfLocked) { if ($self->canEditIfLocked) {

4
lib/WebGUI/Asset/Wobject/SQLReport.pm
View file

@ -435,7 +435,7 @@ sub view {
my $self = shift; my $self = shift;
my $cache = $self->session->cache; my $cache = $self->session->cache;
my $cacheKey = $self->getWwwCacheKey( 'view' ); my $cacheKey = $self->getWwwCacheKey( 'view' );
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) { if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
my $out = eval{ $cache->get( $cacheKey ) }; my $out = eval{ $cache->get( $cacheKey ) };
return $out if $out; return $out if $out;
} }
@ -461,7 +461,7 @@ sub view {
} }
my $out = $self->processTemplate($var,undef,$self->{_viewTemplate}); my $out = $self->processTemplate($var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) { if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
eval { $cache->set( $cacheKey, $out, $self->cacheTimeout ) }; eval { $cache->set( $cacheKey, $out, $self->cacheTimeout ) };
} }
return $out; return $out;

4
lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
View file

@ -368,13 +368,13 @@ sub view {
# try the cached version # try the cached version
my $cache = $session->cache; my $cache = $session->cache;
my $out = $cache->get("view_".$self->getId); my $out = $cache->get("view_".$self->getId);
return $out if ($out ne "" && !$session->var->isAdminOn); return $out if ($out ne "" && !$session->isAdminOn);
#return $out if $out; #return $out if $out;
# generate from scratch # generate from scratch
my $feed = $self->generateFeed; my $feed = $self->generateFeed;
$out = $self->processTemplate($self->getTemplateVariables($feed),undef,$self->{_viewTemplate}); $out = $self->processTemplate($self->getTemplateVariables($feed),undef,$self->{_viewTemplate});
if (!$session->var->isAdminOn && $self->cacheTimeout > 10) { if (!$session->isAdminOn && $self->cacheTimeout > 10) {
$cache->set("view_".$self->getId, $out, $self->cacheTimeout); $cache->set("view_".$self->getId, $out, $self->cacheTimeout);
} }
return $out; return $out;

4
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -1134,7 +1134,7 @@ sub getViewThingVars {
[$self->getId,$thingId]); [$self->getId,$thingId]);
while (my %field = $fields->hash) { while (my %field = $fields->hash) {
next unless ($field{display} eq '1'); next unless ($field{display} eq '1');
my $hidden = ($field{status} eq "hidden" && !$self->session->var->isAdminOn); my $hidden = ($field{status} eq "hidden" && !$self->session->isAdminOn);
my $originalValue = $thingData{"field_".$field{fieldId}}; my $originalValue = $thingData{"field_".$field{fieldId}};
my $value = $self->getFieldValue($originalValue,\%field); my $value = $self->getFieldValue($originalValue,\%field);
@ -2468,7 +2468,7 @@ sub editThingData {
$field{value} = $fieldValue || $field{defaultValue}; $field{value} = $fieldValue || $field{defaultValue};
my $formElement .= $self->getFormPlugin(\%field,($resetForm eq ""))->toHtml; my $formElement .= $self->getFormPlugin(\%field,($resetForm eq ""))->toHtml;
my $hidden = ($field{status} eq "hidden" && !$self->session->var->isAdminOn); my $hidden = ($field{status} eq "hidden" && !$self->session->isAdminOn);
my $value = $field{value}; my $value = $field{value};
$value = $self->getFieldValue($value,\%field); $value = $self->getFieldValue($value,\%field);

6
lib/WebGUI/AssetExportHtml.pm
View file

@ -266,7 +266,7 @@ sub exportAsHtml {
# the exported assets are taken from that user's perspective. # the exported assets are taken from that user's perspective.
my $exportSession = WebGUI::Session->open($session->config); my $exportSession = WebGUI::Session->open($session->config);
my $esGuard = Scope::Guard->new(sub { my $esGuard = Scope::Guard->new(sub {
$exportSession->var->end; $exportSession->end;
$exportSession->close; $exportSession->close;
}); });
@ -394,7 +394,7 @@ sub exportBranch {
$cs->output->setHandle($handle); $cs->output->setHandle($handle);
my $guard = guard { my $guard = guard {
close $handle; close $handle;
$cs->var->end; $cs->end;
$cs->close(); $cs->close();
$asset->$report('collateral notes', $output) if $output; $asset->$report('collateral notes', $output) if $output;
}; };
@ -553,7 +553,7 @@ sub exportGetDescendants {
$session = WebGUI::Session->open($session->config); $session = WebGUI::Session->open($session->config);
$session->user( { userId => $user->userId } ); $session->user( { userId => $user->userId } );
$sGuard = Scope::Guard->new(sub { $sGuard = Scope::Guard->new(sub {
$session->var->end; $session->end;
$session->close; $session->close;
}); });
# clone self in the new session # clone self in the new session

2
lib/WebGUI/Auth.pm
View file

@ -1229,7 +1229,7 @@ Superclass method that performs standard logout routines.
sub www_logout { sub www_logout {
my $self = shift; my $self = shift;
$self->session->var->end($self->session->var->get("sessionId")); $self->session->end();
$self->session->user({userId=>'1'}); $self->session->user({userId=>'1'});
my $u = WebGUI::User->new($self->session,1); my $u = WebGUI::User->new($self->session,1);
$self->{user} = $u; $self->{user} = $u;

4
lib/WebGUI/Content/Asset.pm
View file

@ -83,7 +83,7 @@ sub dispatch {
} }
} }
$session->clearAsset; $session->clearAsset;
if ($session->var->isAdminOn) { if ($session->isAdminOn) {
my $asset = WebGUI::Asset->newByUrl($session, $session->url->getRefererUrl) || WebGUI::Asset->getDefault($session); my $asset = WebGUI::Asset->newByUrl($session, $session->url->getRefererUrl) || WebGUI::Asset->getDefault($session);
return $asset->addMissing($assetUrl); return $asset->addMissing($assetUrl);
} }
@ -163,7 +163,7 @@ The content handler for this package.
sub handler { sub handler {
my ($session) = @_; my ($session) = @_;
my ($log, $http, $var, $asset, $request, $config) = $session->quick(qw(errorHandler http var asset request config)); my ($log, $http, $asset, $request, $config) = $session->quick(qw(errorHandler http asset request config));
my $output = ""; my $output = "";
if (my $perfLog = $log->performanceLogger) { #show performance indicators if required if (my $perfLog = $log->performanceLogger) { #show performance indicators if required
my $t = [Time::HiRes::gettimeofday()]; my $t = [Time::HiRes::gettimeofday()];

2
lib/WebGUI/Macro/AdminBar.pm
View file

@ -34,7 +34,7 @@ process takes one optional parameters for customizing the layout of the Admin ba
sub process { sub process {
my $session = shift; my $session = shift;
return undef unless $session->var->isAdminOn; return undef unless $session->isAdminOn;
my $i18n = WebGUI::International->new($session,'Macro_AdminBar'); my $i18n = WebGUI::International->new($session,'Macro_AdminBar');
my ($url, $style, $asset, $user, $config) = $session->quick(qw(url style asset user config)); my ($url, $style, $asset, $user, $config) = $session->quick(qw(url style asset user config));
$style->setScript($url->extras('yui/build/utilities/utilities.js')); $style->setScript($url->extras('yui/build/utilities/utilities.js'));

2
lib/WebGUI/Macro/AdminText.pm
View file

@ -33,7 +33,7 @@ string is returned.
sub process { sub process {
my $session = shift; my $session = shift;
my @param = @_; my @param = @_;
return "" unless ($session->var->isAdminOn); return "" unless ($session->isAdminOn);
return $param[0]; return $param[0];
} }

2
lib/WebGUI/Macro/AdminToggle.pm
View file

@ -52,7 +52,7 @@ sub process {
my $i18n = WebGUI::International->new($session,'Macro_AdminToggle'); my $i18n = WebGUI::International->new($session,'Macro_AdminToggle');
my %var; my %var;
$var{'toggle_text'} = $turnOn || $i18n->get(516); $var{'toggle_text'} = $turnOn || $i18n->get(516);
if ($session->var->isAdminOn) { if ($session->isAdminOn) {
$var{'toggle_url'} = '#' $var{'toggle_url'} = '#'
} }
else { else {

6
lib/WebGUI/Macro/AssetProxy.pm
View file

@ -55,7 +55,7 @@ sub process {
if (Exception::Class->caught()) { if (Exception::Class->caught()) {
$session->log->warn('AssetProxy macro called invalid asset: '.$identifier $session->log->warn('AssetProxy macro called invalid asset: '.$identifier
.'. The macro was called through this url: '.$session->asset->get('url')); .'. The macro was called through this url: '.$session->asset->get('url'));
if ($session->var->isAdminOn) { if ($session->isAdminOn) {
my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy'); my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
return $i18n->get('invalid url'); return $i18n->get('invalid url');
} }
@ -63,7 +63,7 @@ sub process {
elsif ($asset->get('state') =~ /^trash/) { elsif ($asset->get('state') =~ /^trash/) {
$session->log->warn('AssetProxy macro called on asset in trash: '.$identifier $session->log->warn('AssetProxy macro called on asset in trash: '.$identifier
.'. The macro was called through this url: '.$session->asset->get('url')); .'. The macro was called through this url: '.$session->asset->get('url'));
if ($session->var->isAdminOn) { if ($session->isAdminOn) {
my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy'); my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
return $i18n->get('asset in trash'); return $i18n->get('asset in trash');
} }
@ -71,7 +71,7 @@ sub process {
elsif ($asset->get('state') =~ /^clipboard/) { elsif ($asset->get('state') =~ /^clipboard/) {
$session->log->warn('AssetProxy macro called on asset in clipboard: '.$identifier $session->log->warn('AssetProxy macro called on asset in clipboard: '.$identifier
.'. The macro was called through this url: '.$session->asset->get('url')); .'. The macro was called through this url: '.$session->asset->get('url'));
if ($session->var->isAdminOn) { if ($session->isAdminOn) {
my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy'); my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
return $i18n->get('asset in clipboard'); return $i18n->get('asset in clipboard');
} }

2
lib/WebGUI/Macro/EditableToggle.pm
View file

@ -55,7 +55,7 @@ sub process {
my $i18n = WebGUI::International->new( $session, 'Macro_EditableToggle' ); my $i18n = WebGUI::International->new( $session, 'Macro_EditableToggle' );
my $turnOn = $param[0] || $i18n->get(516); my $turnOn = $param[0] || $i18n->get(516);
my $turnOff = $param[1] || $i18n->get(517); my $turnOff = $param[1] || $i18n->get(517);
if ( $session->var->isAdminOn ) { if ( $session->isAdminOn ) {
$var{'toggle.url'} = $session->url->page('op=switchOffAdmin'); $var{'toggle.url'} = $session->url->page('op=switchOffAdmin');
$var{'toggle.text'} = $turnOff; $var{'toggle.text'} = $turnOff;
} }

2
lib/WebGUI/Macro/FilePump.pm
View file

@ -96,7 +96,7 @@ sub process {
my $extrasUrl = Path::Class::Dir->new($session->url->make_urlmap_work($session->config->get('extrasURL'))); my $extrasUrl = Path::Class::Dir->new($session->url->make_urlmap_work($session->config->get('extrasURL')));
##Normal mode ##Normal mode
if (! $session->var->isAdminOn) { if (! $session->isAdminOn) {
# Built files live at /path/to/uploads/filepump/bundle.timestamp/ which is # Built files live at /path/to/uploads/filepump/bundle.timestamp/ which is
# a sub-dir of uploadsDir, so resolve the dir relative to uploads # a sub-dir of uploadsDir, so resolve the dir relative to uploads
my $dir = $bundle->getPathClassDir->relative($uploadsDir); my $dir = $bundle->getPathClassDir->relative($uploadsDir);

2
lib/WebGUI/Macro/L_loginBox.pm
View file

@ -68,7 +68,7 @@ sub process {
my $templateId = $param[2] || "PBtmpl0000000000000044"; my $templateId = $param[2] || "PBtmpl0000000000000044";
my %var; my %var;
my $i18n = WebGUI::International->new($session,'Macro_L_loginBox'); my $i18n = WebGUI::International->new($session,'Macro_L_loginBox');
$var{'user.isVisitor'} = ($session->var->get("userId") eq "1"); $var{'user.isVisitor'} = ($session->user->isVisitor);
$var{'customText'} = $param[1]; $var{'customText'} = $param[1];
$var{'customText'} =~ s/%(.*?)%/_createURL($session,$1)/ge; $var{'customText'} =~ s/%(.*?)%/_createURL($session,$1)/ge;
$var{'hello.label'} = $i18n->get(48); $var{'hello.label'} = $i18n->get(48);

2
lib/WebGUI/Middleware/WGAccess.pm
View file

@ -61,7 +61,7 @@ sub call {
} }
require WebGUI::Asset; require WebGUI::Asset;
my $userId = $session->var->get('userId'); my $userId = $session->get('userId');
return return
if grep { $_ eq '1' || $_ eq $userId } @{ $privs->{users} } if grep { $_ eq '1' || $_ eq $userId } @{ $privs->{users} }

2
lib/WebGUI/Operation/ActiveSessions.pm
View file

@ -53,7 +53,7 @@ $session->form->process("sid"). Afterwards, it calls www_viewActiveSessions.
sub www_killSession { sub www_killSession {
my $session = shift; my $session = shift;
return www_viewActiveSessions($session) if $session->form->process("sid") eq $session->var->get("sessionId"); return www_viewActiveSessions($session) if $session->form->process("sid") eq $session->getId;
return $session->privilege->adminOnly unless canView($session); return $session->privilege->adminOnly unless canView($session);
$session->db->write("delete from userSession where sessionId=?",[$session->form->process("sid")]); $session->db->write("delete from userSession where sessionId=?",[$session->form->process("sid")]);
$session->db->write("delete from userSessionScratch where sessionId=?", [$session->form->process("sid")]); $session->db->write("delete from userSessionScratch where sessionId=?", [$session->form->process("sid")]);

6
lib/WebGUI/Operation/Admin.pm
View file

@ -43,7 +43,7 @@ sub www_adminConsole {
=head2 www_switchOffAdmin ( ) =head2 www_switchOffAdmin ( )
If the current user is in the Turn On Admin Group, then allow them to turn off Admin mode If the current user is in the Turn On Admin Group, then allow them to turn off Admin mode
via WebGUI::Session::Var::switchAdminOff() via WebGUI::Session::switchAdminOff()
=cut =cut
@ -52,7 +52,7 @@ sub www_switchOffAdmin {
my $session = shift; my $session = shift;
return "" unless ($session->user->canUseAdminMode); return "" unless ($session->user->canUseAdminMode);
$session->http->setCacheControl("none"); $session->http->setCacheControl("none");
$session->var->switchAdminOff(); $session->switchAdminOff();
return ""; return "";
} }
@ -68,7 +68,7 @@ sub www_switchOnAdmin {
my $session = shift; my $session = shift;
return "" unless ($session->user->canUseAdminMode); return "" unless ($session->user->canUseAdminMode);
$session->http->setCacheControl("none"); $session->http->setCacheControl("none");
$session->var->switchAdminOn(); $session->switchAdminOn();
return ""; return "";
} }

2
lib/WebGUI/Operation/User.pm
View file

@ -581,7 +581,7 @@ sub www_becomeUser {
my $session = shift; my $session = shift;
return $session->privilege->adminOnly() unless canEdit($session) && $session->form->validToken; return $session->privilege->adminOnly() unless canEdit($session) && $session->form->validToken;
return undef unless WebGUI::User->validUserId($session, $session->form->process("uid")); return undef unless WebGUI::User->validUserId($session, $session->form->process("uid"));
$session->var->end($session->var->get("sessionId")); $session->end();
$session->user({userId=>$session->form->process("uid")}); $session->user({userId=>$session->form->process("uid")});
return ""; return "";
} }

4
lib/WebGUI/PassiveProfiling.pm
View file

@ -58,8 +58,8 @@ sub add {
my $assetId = shift; my $assetId = shift;
$session->db->write("insert into passiveProfileLog (passiveProfileLogId, userId, sessionId, assetId, dateOfEntry) values (?,?,?,?,?)", $session->db->write("insert into passiveProfileLog (passiveProfileLogId, userId, sessionId, assetId, dateOfEntry) values (?,?,?,?,?)",
[ [
$session->id->generate(), $session->user->userId, $session->id->generate(), $session->user->userId,
$session->var->get("sessionId"), $assetId, $session->getId, $assetId,
time(), time(),
]); ]);
return undef; return undef;

2
lib/WebGUI/Role/Asset/Comments.pm
View file

@ -89,7 +89,7 @@ sub addComment {
comment => $comment, comment => $comment,
rating => $rating, rating => $rating,
date => time(), date => time(),
ip => $session->var->get('lastIP'), ip => $session->get('lastIP'),
}; };
# calculate average # calculate average

1
lib/WebGUI/Session.pm
View file

@ -38,7 +38,6 @@ use WebGUI::Session::Setting;
use WebGUI::Session::Stow; use WebGUI::Session::Stow;
use WebGUI::Session::Style; use WebGUI::Session::Style;
use WebGUI::Session::Url; use WebGUI::Session::Url;
use WebGUI::Session::Var;
=head1 NAME =head1 NAME

7
lib/WebGUI/Session/Http.pm
View file

@ -251,13 +251,14 @@ sub sendHeader {
return undef if ($self->{_http}{noHeader}); return undef if ($self->{_http}{noHeader});
return $self->_sendMinimalHeader unless defined $self->session->db(1); return $self->_sendMinimalHeader unless defined $self->session->db(1);
my ($request, $response, $config, $var) = $self->session->quick(qw(request response config var)); my $session = $self->session;
my ($request, $response, $config) = $session->quick(qw(request response config ));
return undef unless $request; return undef unless $request;
my $userId = $var->get("userId"); my $userId = $session->get("userId");
# send webgui session cookie # send webgui session cookie
my $cookieName = $config->getCookieName; my $cookieName = $config->getCookieName;
$self->setCookie($cookieName,$var->getId, $config->getCookieTTL, $config->get("cookieDomain")) unless $var->getId eq $request->cookies->{$cookieName}; $self->setCookie($cookieName, $session->getId, $config->getCookieTTL, $config->get("cookieDomain")) unless $session->getId eq $request->cookies->{$cookieName};
$self->setNoHeader(1); $self->setNoHeader(1);
my %params; my %params;

2
lib/WebGUI/Test/Mechanize.pm
View file

@ -88,7 +88,7 @@ sub DESTROY {
my $self = shift; my $self = shift;
try { try {
my $session = $self->session; my $session = $self->session;
$session->var->end; $session->end;
$session->close; $session->close;
}; };
} }

2
lib/WebGUI/VersionTag.pm
View file

@ -263,7 +263,7 @@ sub commitAsUser {
} }
} }
#End the new session #End the new session
$new_session->var->end; $new_session->end;
$new_session->close; $new_session->close;
return 1; return 1;
} }

2
lib/WebGUI/Workflow/Activity/DeleteExpiredSessions.pm
View file

@ -89,7 +89,7 @@ sub execute {
} }
my $session = WebGUI::Session->open($self->session->config, undef, $sessionId, 1); my $session = WebGUI::Session->open($self->session->config, undef, $sessionId, 1);
if (defined $session) { if (defined $session) {
$session->var->end; $session->end;
$session->close; $session->close;
} }
if ((time() - $time) > $ttl) { if ((time() - $time) > $ttl) {