fixed: AssetProxy allows proxying content in the trash or clipboard

docs/changelog/7.x.x.txt

@@ -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

lib/WebGUI/Macro/AssetProxy.pm

@@ -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 $t = ($session->errorHandler->canShowPerformanceIndicators()) ? [Time::HiRes::gettimeofday()] : undef;
-	my $asset;
+    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) {
-	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 {
         $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")){
+        if ($session->var->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');
         }
-        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 '';
 }
 
 

lib/WebGUI/i18n/English/Macro_AssetProxy.pm

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