Merge commit 'v7.10.15' into 8

Conflicts:
	docs/gotcha.txt
	docs/previousVersion.sql
	docs/templates.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/Event.pm
	lib/WebGUI/Asset/File.pm
	lib/WebGUI/Asset/MapPoint.pm
	lib/WebGUI/Asset/RichEdit.pm
	lib/WebGUI/Asset/Sku/Product.pm
	lib/WebGUI/Asset/Snippet.pm
	lib/WebGUI/Asset/Story.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Template/TemplateToolkit.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Carousel.pm
	lib/WebGUI/Asset/Wobject/Collaboration.pm
	lib/WebGUI/Asset/Wobject/Dashboard.pm
	lib/WebGUI/Asset/Wobject/DataForm.pm
	lib/WebGUI/Asset/Wobject/Folder.pm
	lib/WebGUI/Asset/Wobject/Map.pm
	lib/WebGUI/Asset/Wobject/Search.pm
	lib/WebGUI/Asset/Wobject/Shelf.pm
	lib/WebGUI/Asset/Wobject/StockData.pm
	lib/WebGUI/Asset/Wobject/StoryTopic.pm
	lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/Asset/Wobject/WeatherData.pm
	lib/WebGUI/AssetClipboard.pm
	lib/WebGUI/AssetCollateral/DataForm/Entry.pm
	lib/WebGUI/AssetExportHtml.pm
	lib/WebGUI/AssetLineage.pm
	lib/WebGUI/AssetMetaData.pm
	lib/WebGUI/AssetTrash.pm
	lib/WebGUI/AssetVersioning.pm
	lib/WebGUI/Auth.pm
	lib/WebGUI/Cache/CHI.pm
	lib/WebGUI/Content/AssetManager.pm
	lib/WebGUI/Fork/ProgressBar.pm
	lib/WebGUI/Form/JsonTable.pm
	lib/WebGUI/Form/TimeField.pm
	lib/WebGUI/Form/Zipcode.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/International.pm
	lib/WebGUI/Macro/AssetProxy.pm
	lib/WebGUI/Macro/FileUrl.pm
	lib/WebGUI/Operation/SSO.pm
	lib/WebGUI/Operation/User.pm
	lib/WebGUI/Role/Asset/Subscribable.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/Transaction.pm
	lib/WebGUI/Shop/TransactionItem.pm
	lib/WebGUI/Test.pm
	lib/WebGUI/URL/Content.pm
	lib/WebGUI/URL/Uploads.pm
	lib/WebGUI/User.pm
	lib/WebGUI/Workflow/Activity/ExtendCalendarRecurrences.pm
	lib/WebGUI/Workflow/Activity/SendNewsletters.pm
	lib/WebGUI/i18n/English/Asset.pm
	lib/WebGUI/i18n/English/WebGUI.pm
	sbin/installClass.pl
	sbin/rebuildLineage.pl
	sbin/search.pl
	sbin/testEnvironment.pl
	t/Asset/Asset.t
	t/Asset/AssetClipboard.t
	t/Asset/AssetLineage.t
	t/Asset/AssetMetaData.t
	t/Asset/Event.t
	t/Asset/File.t
	t/Asset/File/Image.t
	t/Asset/Post/notification.t
	t/Asset/Sku.t
	t/Asset/Story.t
	t/Asset/Template.t
	t/Asset/Wobject/Collaboration/templateVariables.t
	t/Asset/Wobject/Collaboration/unarchiveAll.t
	t/Asset/Wobject/Shelf.t
	t/Auth.t
	t/Macro/EditableToggle.t
	t/Macro/FilePump.t
	t/Shop/Cart.t
	t/Shop/Transaction.t
	t/Storage.t
	t/User.t
	t/Workflow.t

lib/WebGUI/Macro/AssetProxy.pm

@@ -43,6 +43,15 @@ Defaults to 'url'. But if you want to use an assetId as the first parameter, the
 #-------------------------------------------------------------------
 sub process {
     my ($session, $identifier, $type) = @_;
+    if (!$identifier) {
+        $session->errorHandler->warn('AssetProxy macro called without an asset to proxy. ' 
+        . 'The macro was called through this url: '.$session->asset->get('url'));
+        if ($session->isAdminOn) {
+            my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
+            return $i18n->get('invalid url');
+        }
+        return;
+    }
     my $perfLog = $session->log->performanceLogger;
     my $t = $perfLog ? [Time::HiRes::gettimeofday()] : undef;
     my $asset;

lib/WebGUI/Macro/FileUrl.pm

@@ -46,14 +46,17 @@ sub process {
     my $asset = eval { WebGUI::Asset->newByUrl($session,$url); };
     my $i18n = WebGUI::International->new($session, 'Macro_FileUrl');
     if (Exception::Class->caught()) {
+        $session->log->warn("Invalid Asset URL for url: " . $url);
         return $i18n->get('invalid url');
     }
     my $storageId = $asset->can('storageId') ? $asset->storageId : undef;
     if (not defined $storageId) {
+        $session->log->warn("No Storage Location for assetId: " . $asset->getId . " url: $url");
         return $i18n->get('no storage');
     }
     my $filename = $asset->can('filename') ? $asset->filename : undef;
     if (not defined $filename) {
+        $session->log->warn("No Filename for assetId: " . $asset->getId . " url: $url");
         return $i18n->get('no filename');
     }
     my $storage = WebGUI::Storage->get($session,$storageId);

lib/WebGUI/Macro/LastUpdatedBy.pm

@@ -0,0 +1,48 @@
+package WebGUI::Macro::LastUpdatedBy;
+
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2009 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use strict;
+use WebGUI::Asset;
+use WebGUI::User;
+
+=head1 NAME
+
+Package WebGUI::Macro::LastUpdatedBy
+
+=head1 DESCRIPTION
+
+Macro for displaying the username of the user that made the most recent revision of current Asset.
+
+=head2 process (  )
+
+Display the username, if the user still exists in the system.  If not, of if the user does not
+have a username, then display an internationalized label for "Unknown".
+
+=cut
+
+
+#-------------------------------------------------------------------
+sub process {
+    my $session = shift;
+    return '' unless $session->asset;
+    
+    my $userId = $session->asset->getContentLastModifiedBy();
+    my $user   = WebGUI::User->new($session, $userId);
+    if ($user && $user->username) {
+        return $user->username;
+    }
+
+    my $i18n = WebGUI::International->new($session,'Macro_LastModified');
+    return $i18n->get('Unknown');
+}
+
+1;

lib/WebGUI/Macro/RenderThingData.pm

@@ -0,0 +1,66 @@
+package WebGUI::Macro::RenderThingData;
+
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2011 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use strict;
+use WebGUI::Group;
+use WebGUI::Asset::Template;
+use WebGUI::Asset::Wobject::Thingy;
+
+=head1 NAME
+
+Package WebGUI::Macro::RenderThingData
+
+=head1 DESCRIPTION
+
+Macro that allows users to render thing data.
+
+=head2 process ( thingURL, templateHint )
+
+=head3 thingHint
+
+The URL from which to pull the thingId and thingDataId
+
+=head3 templateHint
+
+Optional.  Specifies the templateId or template url to use.  If omitted, the default thingy view template will be used.
+
+=cut
+
+
+#-------------------------------------------------------------------
+sub process {
+	my ($session, $thingDataUrl, $templateHint ) = @_;
+	
+    my $uri = URI->new( $thingDataUrl );
+    
+    my $urlHash = { $uri->query_form };
+    my $thingId = $urlHash->{'thingId'};
+    my $thingDataId = $urlHash->{'thingDataId'};
+    
+    my $thing = WebGUI::Asset::Wobject::Thingy->newByUrl( $session, $uri->path );
+    
+    # TODO: i18n
+    return ( "Bad URL: " . $thingDataUrl ) if !$thing || !$thingId || !$thingDataId;
+    
+    # Render
+    my $output = $thing->www_viewThingData( $thingId, $thingDataId, $templateHint );
+    
+    # FIX: Temporary solution (broken map due to template rendering <script> tags)
+    return "RenderThingData: Please specify a template." if !$templateHint;
+    return "RenderThingData: Contained bad tags!" if $output =~ /script>/;
+
+    return $output;
+}
+
+
+1;
+