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

fix [ 1364965 ] Assets in Trash give Permission Denied in stead of Not Found

Browse source
This commit is contained in:
JT Smith 2005-12-08 02:11:10 +00:00
parent 4d76a7a14a
commit 5e4b39f41c
4 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/6.x.x.txt
View file

@ -1,4 +1,6 @@
6.8.1
- fix [ 1364965 ] Assets in Trash give Permission Denied in stead of Not
Found
- Removed duplicate processing of metadata.
- fix [ 1373649 ] Username isn't populated in 6.8.0 Discussions
- fix [ 1373707 ] File Pile not uploading images

2
lib/WebGUI/AdminConsole.pm
View file

@ -187,7 +187,7 @@ sub getAdminFunction {
},
icon=>"trash.gif",
func=>"manageTrash",
group=>"4"
group=>"12"
},
"databases"=>{
title=>{

15
lib/WebGUI/Asset/Wobject.pm
View file

@ -574,7 +574,20 @@ Renders self->view based upon current style, subject to timeouts. Returns Privil
sub www_view {
my $self = shift;
my $disableCache = shift;
return WebGUI::Privilege::noAccess() unless $self->canView;
unless ($self->canView) {
if ($self->get("state") eq "published") { # no privileges, make em log in
return WebGUI::Privilege::noAccess();
} elsif ($session{var}{adminOn} && $self->get("state") =~ /^trash/) { # show em trash
WebGUI::HTTP::setRedirect($self->getUrl("func=manageTrash"));
return "";
} elsif ($session{var}{adminOn} && $self->get("state") =~ /^clipboard/) { # show em clipboard
WebGUI::HTTP::setRedirect($self->getUrl("func=manageClipboard"));
return "";
} else { # tell em it doesn't exist anymore
WebGUI::HTTP::setStatus("410");
return WebGUI::Asset->getNotFound->www_view;
}
}
if ($self->get("encryptPage") && $session{env}{HTTPS} ne "on") {
WebGUI::HTTP::setRedirect($self->getUrl);
return "";

2
lib/WebGUI/AssetTrash.pm
View file

@ -185,7 +185,7 @@ Returns an AdminConsole to deal with assets in the Trash. If isInGroup(4) is Fal
sub www_manageTrash {
my $self = shift;
my $ac = WebGUI::AdminConsole->new("trash");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
my ($header, $limit);
$ac->setHelp("trash manage");
if ($session{form}{systemTrash} && WebGUI::Grouping::isInGroup(3)) {