From 9238c028c6c74f29fee9cd95ccf1d77883a38acf Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Fri, 18 Feb 2005 01:04:05 +0000
Subject: [PATCH] more bug fixes

---
 docs/upgrades/upgrade_6.2.11-6.3.0.pl  | 13 +++++++------
 docs/upgrades/upgrade_6.2.11-6.3.0.sql |  4 ++--
 lib/WebGUI/Asset.pm                    | 18 ++++++++++++++++++
 lib/WebGUI/Asset/File.pm               |  1 +
 lib/WebGUI/Asset/File/Image.pm         |  1 +
 lib/WebGUI/Macro/AssetProxy.pm         |  3 ++-
 lib/WebGUI/Macro/RandomAssetProxy.pm   |  7 ++++---
 lib/WebGUI/Macro/a_account.pm          |  4 ++--
 8 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/docs/upgrades/upgrade_6.2.11-6.3.0.pl b/docs/upgrades/upgrade_6.2.11-6.3.0.pl
index fb6d8d336..9f8b6865f 100644
--- a/docs/upgrades/upgrade_6.2.11-6.3.0.pl
+++ b/docs/upgrades/upgrade_6.2.11-6.3.0.pl
@@ -182,7 +182,7 @@ WebGUI::SQL->write("alter table WobjectProxy add column shortcutToAssetId varcha
 my $sth = WebGUI::SQL->read("select proxiedWobjectId from WobjectProxy");
 while (my ($wobjectId) = $sth->array) {
 	my ($assetId) = WebGUI::SQL->quickArray("select assetId from wobject where wobjectId=".quote($wobjectId));
-	WebGUI::SQL->write("update WobjectProxy set shortcutToAssetId=".quote($assetId)." where wobjectId=".quote($wobjectId));
+	WebGUI::SQL->write("update WobjectProxy set shortcutToAssetId=".quote($assetId)." where proxiedWobjectId=".quote($wobjectId));
 }
 $sth->finish;
 foreach my $namespace (@allWobjects) {
@@ -456,7 +456,7 @@ WebGUI::SQL->setRow("wobject","assetId",{
 	styleTemplateId=>"1",
 	printableStyleTemplateId=>"3"
 	},undef,$collateralRootId);
-WebGUI::SQL->setRow("Navigation","assetId",{
+WebGUI::SQL->setRow("Folder","assetId",{
 	assetId=>$collateralRootId,
 	templateId=>"PBtmpl0000000000000078"
 	},undef,$collateralRootId);
@@ -470,7 +470,7 @@ while (my $data = $sth->hashRef) {
 	$folderNameCache{$data->{name}} = $url;
 	my $folderId = WebGUI::SQL->setRow("asset","assetId",{
 		assetId=>"new",
-		className=>'WebGUI::Asset::Layout',
+		className=>'WebGUI::Asset::Wobject::Folder',
 		lineage=>$collateralRootLineage.sprintf("%06d",$collateralRankCounter),
 		parentId=>$collateralRootId,
 		ownerUserId=>'3',
@@ -488,8 +488,8 @@ while (my $data = $sth->hashRef) {
 		printableStyleTemplateId=>"3",
 		description=>$data->{description}
 		},undef,$folderId);
-	WebGUI::SQL->setRow("Layout","assetId",{
-		templateId=>'15',
+	WebGUI::SQL->setRow("Folder","assetId",{
+		templateId=>'PBtmpl0000000000000078',
 		assetId=>$folderId
 		},undef,$folderId);
 	$folderCache{$data->{collateralFolderId}} = {
@@ -533,6 +533,7 @@ while (my $data = $sth->hashRef) {
 			snippet=>$data->{parameters}
 			},undef,$collateralId);
 		$fileSize = length($data->{parameters});
+		$class = 'WebGUI::Asset::Snippet';
 	}
 	my $url = fixUrl($collateralId,$data->{name});
 	$macroCache{$data->{name}} = $macroCache{$data->{collateralId}} = $url;
@@ -1512,7 +1513,7 @@ sub walkTree {
 				WebGUI::SQL->write("update asset set className='WebGUI::Asset::Wobject::Navigation' where assetId=".quote($wobjectId));
 				WebGUI::SQL->write("update wobject set namespace='Navigation'  where assetId=".quote($wobjectId));
 			} elsif ($wobject->{namespace} eq "FileManager") {
-				print "\t\t\tConverting File Manager ".$wobject->{wobjectId}." into File Folder Layout\n" unless ($quiet);
+				print "\t\t\tConverting File Manager ".$wobject->{wobjectId}." into File Folder\n" unless ($quiet);
 				WebGUI::SQL->write("update asset set className='WebGUI::Asset::Folder' where assetId=".quote($wobjectId));
 				WebGUI::SQL->write("insert into Folder (assetId,templateId) values (".quote($wobjectId).", '15')");
 				WebGUI::SQL->write("update wobject set namespace='Folder' where wobjectId=".quote($wobject->{wobjectId}));
diff --git a/docs/upgrades/upgrade_6.2.11-6.3.0.sql b/docs/upgrades/upgrade_6.2.11-6.3.0.sql
index d3e9ea40b..eff69c98e 100644
--- a/docs/upgrades/upgrade_6.2.11-6.3.0.sql
+++ b/docs/upgrades/upgrade_6.2.11-6.3.0.sql
@@ -222,8 +222,8 @@ INSERT INTO template VALUES ('7','Side By Side','<a href=\"<tmpl_var assetId>\">
 INSERT INTO template VALUES ('6','Right Column','<a href=\"<tmpl_var assetId>\"></a>\r\n\r\n<tmpl_if displayTitle>\r\n  <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n  <p><tmpl_var description></p>\r\n</tmpl_if>\r\n\r\n<tmpl_if showAdmin>\r\n<p><tmpl_var controls></p>\r\n</tmpl_if>\r\n\r\n<div style=\"clear: both;\">&nbsp;</div>\r\n\r\n<div>\r\n<!-- begin position 1 -->\r\n<div style=\"width: 66%; float: left;\">\r\n<tmpl_if showAdmin>\r\n	<table border=\"0\" id=\"position1\" class=\"content\"><tbody>\r\n</tmpl_if>\r\n\r\n<tmpl_loop position1_loop>\r\n	<tmpl_if showAdmin>\r\n            	<tr id=\"td<tmpl_var id>\">\r\n            		<td><div id=\"td<tmpl_var id>_div\" class=\"dragable\">      \r\n	</tmpl_if>\r\n\r\n	<div class=\"content\"><tmpl_var dragger.icon><tmpl_var content></div>\r\n\r\n	<tmpl_if showAdmin>\r\n         			</div></td>\r\n            	</tr>\r\n	</tmpl_if>\r\n</tmpl_loop>\r\n\r\n<tmpl_if showAdmin> \r\n            </tbody></table>\r\n</tmpl_if>\r\n</div>\r\n<!-- end position 1 -->\r\n\r\n<!-- begin position 2 -->\r\n<div style=\"width: 34%; float: left;\">\r\n<tmpl_if showAdmin>\r\n	<table border=\"0\" id=\"position2\" class=\"content\"><tbody>\r\n</tmpl_if>\r\n\r\n<tmpl_loop position2_loop>\r\n	<tmpl_if showAdmin>\r\n            	<tr id=\"td<tmpl_var id>\">\r\n            		<td><div id=\"td<tmpl_var id>_div\" class=\"dragable\">      \r\n	</tmpl_if>\r\n\r\n	<div class=\"content\"><tmpl_var dragger.icon><tmpl_var content></div>\r\n\r\n	<tmpl_if showAdmin>\r\n         			</div></td>\r\n            	</tr>\r\n	</tmpl_if>\r\n</tmpl_loop>\r\n\r\n<tmpl_if showAdmin> \r\n            </tbody></table>\r\n</tmpl_if>\r\n</div>\r\n<!-- end position 2 -->\r\n</div>\r\n\r\n<div style=\"clear: both;\">&nbsp;</div>\r\n\r\n\r\n<tmpl_if showAdmin> \r\n	<table><tr id=\"blank\" class=\"hidden\"><td><div><div class=\"empty\">&nbsp;</div></div></td></tr></table>\r\n            <tmpl_var dragger.init>\r\n</tmpl_if>\r\n		','page',1,1);
 INSERT INTO template VALUES ('1','Default Page','<a href=\"<tmpl_var assetId>\"></a>\r\n\r\n<tmpl_if displayTitle>\r\n  <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n  <p><tmpl_var description></p>\r\n</tmpl_if>\r\n\r\n<tmpl_if showAdmin>\r\n<p><tmpl_var controls></p>\r\n</tmpl_if>\r\n\r\n<tmpl_if showAdmin>\r\n	<table border=\"0\" id=\"position1\" class=\"content\"><tbody>\r\n</tmpl_if>\r\n\r\n<tmpl_loop position1_loop>\r\n	<tmpl_if showAdmin>\r\n            	<tr id=\"td<tmpl_var id>\">\r\n            		<td><div id=\"td<tmpl_var id>_div\" class=\"dragable\">      \r\n	</tmpl_if>\r\n\r\n	<div class=\"content\"><tmpl_var dragger.icon><tmpl_var content></div>\r\n\r\n	<tmpl_if showAdmin>\r\n         			</div></td>\r\n            	</tr>\r\n	</tmpl_if>\r\n</tmpl_loop>\r\n\r\n<tmpl_if showAdmin> \r\n            </tbody></table>\r\n</tmpl_if>\r\n\r\n<tmpl_if showAdmin> \r\n	<table><tr id=\"blank\" class=\"hidden\"><td><div><div class=\"empty\">&nbsp;</div></div></td></tr></table>\r\n            <tmpl_var dragger.init>\r\n</tmpl_if>\r\n		','page',1,1);
 
-INSERT INTO template VALUES ('1','File','<tmpl_if session.var.adminOn>\r\n<p><tmpl_var controls></p>\r\n</tmpl_if>\r\n<a href=\"<tmpl_var fileUrl>\"><img src=\"<tmpl_var fileIcon>\" alt=\"<tmpl_var title>\" border=\"0\" /><tmpl_var filename></a>','FileAsset',1,1);
-INSERT INTO template VALUES ('2','Image','<tmpl_if session.var.adminOn>\r\n<p><tmpl_var controls></p>\r\n</tmpl_if>\r\n<img src=\"<tmpl_var fileUrl>\" <tmpl_var parameters> />','ImageAsset',1,1);
+INSERT INTO template VALUES ('1','File','<tmpl_if session.var.adminOn>\r\n<tmpl_var controls>\r\n</tmpl_if>\r\n<a href=\"<tmpl_var fileUrl>\"><img src=\"<tmpl_var fileIcon>\" alt=\"<tmpl_var title>\" border=\"0\" /><tmpl_var filename></a>','FileAsset',1,1);
+INSERT INTO template VALUES ('2','Image','<tmpl_if session.var.adminOn>\r\n<tmpl_var controls>\r\n</tmpl_if>\r\n<img src=\"<tmpl_var fileUrl>\" <tmpl_var parameters> />','ImageAsset',1,1);
 
 INSERT INTO template VALUES ('15','File Folder','<a name=\"<tmpl_var assetId>\"></a><tmpl_if session.var.adminOn>\r\n <p><tmpl_var controls></p>\r\n</tmpl_if>\r\n\r\n<tmpl_if displayTitle>\r\n      <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n     <p><tmpl_var description></p>\r\n</tmpl_if>\r\n\r\n<table width=\"100%\" cellpadding=\"3\" cellspacing=\"0\" class=\"content\">\r\n<tmpl_loop subfolder_loop>\r\n<tr>\r\n    <td class=\"tableData\" valign=\"top\"><a href=\"<tmpl_var url>\"><img src=\"<tmpl_var icon.small>\" border=\"0\" alt=\"<tmpl_var title>\"></a> <a href=\"<tmpl_var url>\"><tmpl_var title></td>\r\n<td valign=\"top\" colspan=\"3\"><tmpl_var synopsis></td></tr>\r\n</tmpl_loop>\r\n<tmpl_loop file_loop>\r\n<tr>\r\n <td valign=\"top\" class=\"tableData\"><a href=\"<tmpl_var url>\"><img src=\"<tmpl_var icon.small>\" border=\"0\" alt=\"<tmpl_var title>\"></a> <a href=\"<tmpl_var url>\"><tmpl_var title></td>\r\n   <td class=\"tableData\" valign=\"top\"><tmpl_var synopsis></td>\r\n <td class=\"tableData\" valign=\"top\"><tmpl_var synopsis></td>\r\n     <td class=\"tableData\" valign=\"top\">^D(\"%z %Z\",<tmpl_var date.epoch>);</td>\r\n   <td class=\"tableData\" valign=\"top\"><tmpl_var size></td>\r\n</tr>\r\n</tmpl_loop>\r\n\r\n</table>', 'Folder',1,1);
 
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index a01659096..a2a38f706 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1436,6 +1436,7 @@ Returns a toolbar with a set of icons that hyperlink to functions that delete, e
 
 sub getToolbar {
 	my $self = shift;
+	return undef if ($self->{_toolbarOff});
 	my $toolbar = deleteIcon('func=delete',$self->get("url"),WebGUI::International::get(43))
               	.editIcon('func=edit',$self->get("url"))
              	.moveUpIcon('func=promote',$self->get("url"))
@@ -2032,6 +2033,23 @@ sub trash {
 
 #-------------------------------------------------------------------
 
+=head2 toggleToolbar ( ) 
+
+Toggles whether to render a toolbar in an asset. This is mostly useful for macros that wish to proxy an asset but not display the toolbar.
+
+=cut
+
+sub toggleToolbar {
+	my $self = shift;
+	if ($self->{_toolbarOff}) {
+		$self->{_toolbarOff} = 0;
+	} else {
+		$self->{_toolbarOff} = 1;
+	}
+}
+
+#-------------------------------------------------------------------
+
 =head2 update ( properties )
 
 Returns 1. Updates properties of an Asset to given or default values.
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index 11c5ec9e6..11ef82b9a 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -248,6 +248,7 @@ sub view {
 	my $self = shift;
 	my %var = %{$self->get};
 	$var{controls} = $self->getToolbar;
+	$var{controls} = '<p>'.$var{controls}.'</p>' if (exists $var{controls});
 	$var{fileUrl} = $self->getFileUrl;
 	$var{fileIcon} = $self->getFileIconUrl;
 	return $self->processTemplate(\%var,"PBtmpl0000000000000024");
diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index 0957f9576..f64b6b0d3 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -193,6 +193,7 @@ sub view {
 	my $self = shift;
 	my %var = %{$self->get};
 	$var{controls} = $self->getToolbar;
+	$var{controls} = '<p>'.$var{controls}.'</p>' if (exists $var{controls});
 	$var{fileUrl} = $self->getFileUrl;
 	$var{fileIcon} = $self->getFileIconUrl;
 	$var{thumbnail} = $self->getThumbnailUrl;
diff --git a/lib/WebGUI/Macro/AssetProxy.pm b/lib/WebGUI/Macro/AssetProxy.pm
index 0afc3209d..da1bfba44 100644
--- a/lib/WebGUI/Macro/AssetProxy.pm
+++ b/lib/WebGUI/Macro/AssetProxy.pm
@@ -20,7 +20,8 @@ sub process {
         my ($url) = WebGUI::Macro::getParams(shift);
 	my $asset = WebGUI::Asset->newByUrl($url);
 	if (defined $asset) {
-		return $asset->canView ? $asset->view : "";
+		$asset->toggleToolbar if ($asset->get("className") =~ /WebGUI::Asset::File/ || $asset->get("className") =~ /WebGUI::Asset::Snippet/ );
+		return $asset->canView ? $asset->view : undef;
 	} else {
 		return "Invalid Asset URL";
 	}
diff --git a/lib/WebGUI/Macro/RandomAssetProxy.pm b/lib/WebGUI/Macro/RandomAssetProxy.pm
index 309135c97..f8f11e7db 100644
--- a/lib/WebGUI/Macro/RandomAssetProxy.pm
+++ b/lib/WebGUI/Macro/RandomAssetProxy.pm
@@ -21,11 +21,12 @@ sub process {
 	my $asset = WebGUI::Asset->newByUrl($url);
 	if (defined $asset) {
 		my $children = $asset->getLineage(["children"]);
-		randomize;
-		my $randomAssetId = $children->[rand(scalar(@{$children})];	
+		#randomize;
+		my $randomAssetId = $children->[rand(scalar(@{$children}))];	
 		my $randomAsset = WebGUI::Asset->newByDynamicClass($randomAssetId);
 		if (defined $randomAsset) {
-			return $randomAsset->canView ? $randomAsset->view : "";
+			$randomAsset->toggleToolbar;
+			return $randomAsset->canView ? $randomAsset->view : undef;
 		} else {
 			return "Asset has no children.";
 		}
diff --git a/lib/WebGUI/Macro/a_account.pm b/lib/WebGUI/Macro/a_account.pm
index 88b00c4a0..d01474d65 100644
--- a/lib/WebGUI/Macro/a_account.pm
+++ b/lib/WebGUI/Macro/a_account.pm
@@ -20,11 +20,11 @@ use WebGUI::URL;
 #-------------------------------------------------------------------
 sub process {
        my %var;
-         my  @param = WebGUI::Macro::getParams($_[0]);
+         my  @param = WebGUI::Macro::getParams(shift);
 	return WebGUI::URL::page("op=displayAccount") if ($param[0] eq "linkonly");
        $var{'account.url'} = WebGUI::URL::page('op=displayAccount');
        $var{'account.text'} = $param[0] || WebGUI::International::get(46);
-         return WebGUI::Asset::Template->newByUrl($param[1])->process(\%var);
+         return WebGUI::Asset::Template->newByUrl($param[1]||"default_account_macro")->process(\%var);
 }