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

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

@ -320,7 +320,7 @@ returns the output.
sub view {
my $self = shift;
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")) {
my $out = $cache->get($self->getViewCacheKey);
return $out if $out;
@ -384,7 +384,7 @@ sub view {
}
$p->appendTemplateVars(\%var);
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")) {
$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
# Add any global variables
# Admin
if ($self->session->var->isAdminOn) {
if ($self->session->isAdminOn) {
$var->{'admin'} = 1;
$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 {
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 {
my $self = shift;
return 1 if ($self->canManage && $self->session->var->isAdminOn());
return 1 if ($self->canManage && $self->session->isAdminOn());
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"} = '
<script type="text/javascript">
dragable_init("'.$self->getUrl.'");
@ -459,10 +459,10 @@ sub www_view {
unless ($self->canView) {
if ($self->state eq "published") { # no privileges, make em log in
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"));
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"));
return undef;
} 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;
}
my $hidden
= ($field->{status} eq 'hidden' && !$session->var->isAdminOn)
= ($field->{status} eq 'hidden' && !$session->isAdminOn)
|| ($field->{isMailField} && !$self->get('mailData'));
# populate Rich Editor field if the field is an HTMLArea
@ -955,7 +955,7 @@ sub getRecordTemplateVars {
for my $field_form (@fields) {
my ($field, $form) = @{ $field_form };
# need a copy
my $hidden = ($field->{status} eq 'hidden' && !$session->var->isAdminOn)
my $hidden = ($field->{status} eq 'hidden' && !$session->isAdminOn)
|| ($field->{isMailField} && !$self->mailData);
# 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');
### 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 .= '.cookie';
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;
$vars{showAdmin} = ($session->var->isAdminOn && $self->canEdit && $self->canEditIfLocked);
$vars{showAdmin} = ($session->isAdminOn && $self->canEdit && $self->canEditIfLocked);
my $splitter = $self->{_viewSplitter} = $self->getSeparator;
@ -369,7 +369,7 @@ override www_view => sub {
my $self = shift;
my $session = $self->session;
# slashdot / burst protection hack
if ($session->var->get("userId") eq "1"
if ($session->user->isVisitor
&& $session->form->param() == 0
&& !$session->scratch->get('isExporting')
) {

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

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

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

@ -99,7 +99,7 @@ sub view {
my $self = shift;
my $cache = $self->session->cache;
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 ) };
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();
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) };
}
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 {
my $self = shift;
return undef
unless $self->canEdit && $self->session->var->isAdminOn;
unless $self->canEdit && $self->session->isAdminOn;
if ($self->getToolbarState) {
my $toolbar = '';
if ($self->canEditIfLocked) {

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

@ -435,7 +435,7 @@ sub view {
my $self = shift;
my $cache = $self->session->cache;
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 ) };
return $out if $out;
}
@ -461,7 +461,7 @@ sub view {
}
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 ) };
}
return $out;

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

@ -368,13 +368,13 @@ sub view {
# try the cached version
my $cache = $session->cache;
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;
# generate from scratch
my $feed = $self->generateFeed;
$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);
}
return $out;

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

@ -1134,7 +1134,7 @@ sub getViewThingVars {
[$self->getId,$thingId]);
while (my %field = $fields->hash) {
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 $value = $self->getFieldValue($originalValue,\%field);
@ -2468,7 +2468,7 @@ sub editThingData {
$field{value} = $fieldValue || $field{defaultValue};
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};
$value = $self->getFieldValue($value,\%field);