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

fixed: AssetProxy allows proxying content in the trash or clipboard

Browse source
This commit is contained in:
Graham Knop 2008-09-15 21:51:26 +00:00
parent 6991a1d72c
commit 95ea885cdc
3 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -1,5 +1,6 @@
7.6.0
- Made the charset metatag the highest thing in the head block.
- fixed: AssetProxy allows proxying content in the trash or clipboard
- fixed: Textarea resizer has a gap between textbox and resizer initially
- added: getLineageIterator method to simplify working on large sets of assets
- fixed: Syndicated Content doesn't decode alternate character sets

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

@ -42,36 +42,47 @@ Defaults to 'url'. But if you want to use an assetId as the first parameter, the
#-------------------------------------------------------------------
sub process {
my ($session, $identifier, $type) = @_;
my $t = ($session->errorHandler->canShowPerformanceIndicators()) ? [Time::HiRes::gettimeofday()] : undef;
my $asset;
my $t = ($session->errorHandler->canShowPerformanceIndicators()) ? [Time::HiRes::gettimeofday()] : undef;
my $asset;
if ($type eq 'assetId') {
$asset = WebGUI::Asset->newByDynamicClass($session, $identifier);
}
else {
$asset = WebGUI::Asset->newByUrl($session,$identifier);
}
#Sorry, you cannot proxy the notfound page.
if (defined $asset && $asset->getId ne $session->setting->get("notFoundPage")) {
if ($asset->canView) {
$asset->toggleToolbar;
$asset->prepareView;
my $output = $asset->view;
$output .= "AssetProxy:".Time::HiRes::tv_interval($t) if ($session->errorHandler->canShowPerformanceIndicators());
return $output;
}
return undef;
}
else {
if (!defined $asset) {
$session->errorHandler->warn('AssetProxy macro called invalid asset: '.$identifier
.'. The macro was called through this url: '.$session->asset->get('url'));
if ($session->var->get("adminOn")){
my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
return $i18n->get('invalid url');
if ($session->var->isAdminOn) {
my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
return $i18n->get('invalid url');
}
else{
return '';
}
elsif ($asset->get('state') =~ /^trash/) {
$session->errorHandler->warn('AssetProxy macro called on asset in trash: '.$identifier
.'. The macro was called through this url: '.$session->asset->get('url'));
if ($session->var->isAdminOn) {
my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
return $i18n->get('asset in trash');
}
}
}
elsif ($asset->get('state') =~ /^clipboard/) {
$session->errorHandler->warn('AssetProxy macro called on asset in clipboard: '.$identifier
.'. The macro was called through this url: '.$session->asset->get('url'));
if ($session->var->isAdminOn) {
my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
return $i18n->get('asset in clipboard');
}
}
elsif ($asset->canView) {
$asset->toggleToolbar;
$asset->prepareView;
my $output = $asset->view;
$output .= "AssetProxy:" . Time::HiRes::tv_interval($t)
if $t;
return $output;
}
return '';
}

12
lib/WebGUI/i18n/English/Macro_AssetProxy.pm
View file

@ -4,8 +4,16 @@ use strict;
our $I18N = {
'invalid url' => {
message => q|Invalid Asset URL|,
lastUpdated => 1134769012,
message => q|AssetProxy: Invalid Asset URL|,
lastUpdated => 1221160383,
},
'asset in trash' => {
message => q|AssetProxy: Asset in trash|,
},
'asset in clipboard' => {
message => q|AssetProxy: Asset in clipboard|,
},
};