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

merge 8376

Browse source
This commit is contained in:
Doug Bell 2008-11-14 23:08:10 +00:00
parent 2f8869292f
commit 0d9dcbfb12
4 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Group.pm
View file

@ -1079,7 +1079,7 @@ sub new {
$self->{_groupId} = shift;
my $override = shift;
my $cached = $self->{_session}->stow->get("groupObj");
my $cached = $self->{_session}->stow->get("groupObj", { noclone => 1});
return $cached->{$self->{_groupId}} if ($cached->{$self->{_groupId}});
bless $self, $class;

44
lib/WebGUI/Session/Stow.pm
View file

@ -95,33 +95,49 @@ sub DESTROY {
=head2 get( varName )
Retrieves the current value of a stow variable. Note that if you use references, you're
getting back a reference and modifying the contents of the reference will change the
contents of the stow variable.
Retrieves the current value of a stow variable. By default, will try
to create a safe copy.
WARNING: Not all structures can be made completely safe. Objects will
not be cloned.
=head3 varName
The name of the variable.
=head3 options
A hashref of options with the following keys:
noclone - If true, will not create a safe copy. This can be much much
faster than creating a safe copy. Defaults to false.
=cut
sub get {
my $self = shift;
my $var = shift;
my $self = shift;
my $var = shift;
my $opt = shift || {};
return undef if $self->session->config->get("disableCache");
my $ref = $self->{_data}{$var};
if (ref $ref eq 'ARRAY') {
my @safeArray = @{ $ref };
my $value = $self->{_data}{$var};
return unless $value;
my $ref = ref $value;
return $value if ( !$ref || $opt->{noclone} );
# Try to clone
# NOTE: Clone and Storable::dclone do not currently work here, but
# would be safer if they did
if ($ref eq 'ARRAY') {
my @safeArray = @{ $value };
return \@safeArray;
}
elsif (ref $ref eq 'HASH') {
my %safeHash = %{ $ref };
elsif ($ref eq 'HASH') {
my %safeHash = %{ $value };
return \%safeHash;
}
else {
return $ref
}
return $self->{_data}{$var};
# Can't figure out how to clone
return $value;
}

2
lib/WebGUI/User.pm
View file

@ -486,7 +486,7 @@ sub isInGroup {
return 1 if ($gid eq '1' && $uid eq '1'); # visitors are in the visitors group
return 1 if ($gid eq '2' && $uid ne '1'); # if you're not a visitor, then you're a registered user
### Get data for auxillary checks.
my $isInGroup = $self->session->stow->get("isInGroup");
my $isInGroup = $self->session->stow->get("isInGroup", { noclone => 1 });
### Look to see if we've already looked up this group.
return $isInGroup->{$uid}{$gid} if exists $isInGroup->{$uid}{$gid};
### Lookup the actual groupings.