Merge branch 'master' into survey

* master: (121 commits)
  Fix a POD typo.
  correct inbox message from user preface
  Fix a typo in the Default gallery view template
  Documentation bug in buildArrayRefOfHashRefs
  changed screenshots in Matrix Listing view to popup
  matrix privileging fixes
  Fix an i18n typo in the Post user defined variables.
  Remove debugging code.
  approval workflow fix
  matrix upgrade and privileging fixes
  fixed: Template parser cannot be set
  forward porting gallery bug fixes
  preparing for 7.7.0 dev
  parser should be a selectbox, not a selectlist.
  labeling survey as beta
  fixeding my borkes to the changelog
  fixed #9852: Users can accept private messages from Visitor, but Visitor cannot send messages
  preparing for 7.6.14 release
  fix AdSpace, Ad tests
  Restore the original properties for the profile category that was modified for test.
  ...

Conflicts:
	docs/gotcha.txt
	docs/upgrades/upgrade_7.6.10-7.6.11.pl
	lib/WebGUI/Asset/Wobject/Survey.pm
	lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm

docs/upgrades/_upgrade.skeleton

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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

docs/upgrades/upgrade_7.5.24-7.6.0.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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

docs/upgrades/upgrade_7.5.40-7.6.10.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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
@@ -254,7 +254,7 @@ sub upgradeMatrix {
     my $session = shift;
     print "\tUpgrading matrix assets... \n" unless $quiet;
     my $db = $session->db;
-    $db->write("alter table Matrix drop column groupToRate, drop column groupToAdd, drop column privilegedGroup,
+    $db->write("alter table Matrix drop column groupToRate, drop column privilegedGroup,
         drop column ratingTimeout, drop column ratingTimeoutPrivileged, drop column ratingDetailTemplateId,
         drop column visitorCacheTimeout");
     $db->write("alter table Matrix add column defaultSort char(22) not null default 'score',
@@ -295,7 +295,8 @@ sub upgradeMatrix {
     $db->write("alter table Matrix_rating rename MatrixListing_rating");
     $db->write("alter table Matrix_ratingSummary rename MatrixListing_ratingSummary");
     $db->write("alter table Matrix_field rename Matrix_attribute");
-    $db->write("alter table Matrix_attribute drop column label");
+    $db->write("alter table Matrix_attribute drop column name");
+    $db->write("alter table Matrix_attribute change label name char(255)");
     $db->write("alter table Matrix_attribute add column options text");
     $db->write("alter table Matrix_attribute change fieldType fieldType char(255) not null default 'MatrixCompare'");
     $db->write("alter table Matrix_attribute change fieldId attributeId char(22) not null");
@@ -336,6 +337,7 @@ sub upgradeMatrix {
             $listing->{title}   = $listing->{productName};
             $listing->{version} = $listing->{versionNumber};
             $listing->{screenshots} = $listing->{storageId};
+            $listing->{ownerUserId} = $listing->{maintainerId};
         $listing->{productURL} = $listing->{productUrl};		
         $listing->{manufacturerURL} = $listing->{manufacturerUrl};
             my $newMatrixListing = $matrix->addChild($listing,undef,undef,{skipAutoCommitWorkflows=>1});

docs/upgrades/upgrade_7.6.0-7.6.1.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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

docs/upgrades/upgrade_7.6.1-7.6.2.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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

docs/upgrades/upgrade_7.6.10-7.6.11.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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
@@ -35,8 +35,7 @@ removeBrokenWorkflowInstances($session);
 undotBinaryExtensions($session);
 removeProcessRecurringPaymentsFromConfig($session);
 noSessionSwitch($session);
-surveyDoAfterTimeLimit($session);
-surveyRemoveResponseTemplate($session);
+addReCaptchaSettings($session);
 
 fixDottedAssetIds($session);  ##This one should run last
 finish($session); # this line required
@@ -61,6 +60,27 @@ sub removeProcessRecurringPaymentsFromConfig {
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
+sub addReCaptchaSettings {
+    my $session = shift;
+    print "\tAdding settings for reCAPTCHA..." unless $quiet;
+    my $currentSetting;
+
+    $currentSetting = $session->setting->get('useRecaptcha');
+    $session->setting->remove('useRecaptcha');
+    $session->setting->add('useRecaptcha', $currentSetting);
+
+    $currentSetting = $session->setting->get('recaptchaPublicKey');
+    $session->setting->remove('recaptchaPublicKey');
+    $session->setting->add('recaptchaPublicKey', $currentSetting);
+
+    $currentSetting = $session->setting->get('recaptchaPrivateKey');
+    $session->setting->remove('recaptchaPrivateKey');
+    $session->setting->add('recaptchaPrivateKey', $currentSetting);
+
+    print "Done.\n" unless $quiet;
+}
+
 #----------------------------------------------------------------------------
 sub hideGalleryAlbums {
     my $session = shift;
@@ -84,26 +104,6 @@ sub undotBinaryExtensions {
     print "DONE!\n" unless $quiet;
 }
 
-#----------------------------------------------------------------------------
-sub surveyDoAfterTimeLimit {
-    my $session = shift;
-    print "\tAdding column doAfterTimeLimit to Survey table... " unless $quiet;
-    $session->db->write('alter table Survey add doAfterTimeLimit char(22)');
-    print "DONE!\n" unless $quiet;
-    print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-sub surveyRemoveResponseTemplate {
-    my $session = shift;
-    print "\tRemoving responseTemplate... " unless $quiet;
-    $session->db->write('alter table Survey drop responseTemplateId');
-    if (my $template = WebGUI::Asset->new($session, 'PBtmpl0000000000000064')) {
-        $template->purge();
-    }
-    print "DONE!\n" unless $quiet;
-}
-
 #----------------------------------------------------------------------------
 sub fixDottedAssetIds {
     my $session = shift;

docs/upgrades/upgrade_7.6.11-7.6.12.pl

@@ -0,0 +1,185 @@
+#!/usr/bin/env perl
+
+#-------------------------------------------------------------------
+# 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
+#-------------------------------------------------------------------
+
+our ($webguiRoot);
+
+BEGIN {
+    $webguiRoot = "../..";
+    unshift (@INC, $webguiRoot."/lib");
+}
+
+use strict;
+use Getopt::Long;
+use WebGUI::Session;
+use WebGUI::Storage;
+use WebGUI::Asset;
+use WebGUI::Utility qw/isIn/;
+
+
+my $toVersion = '7.6.12';
+my $quiet; # this line required
+
+
+my $session = start(); # this line required
+addAssetDiscoveryServiceAgain( $session );
+changeMatrixAttributeIndexing( $session );
+fixCollaborationGroupToEditPost( $session );
+convertLongVarcharsToText( $session );
+
+# upgrade functions go here
+
+finish($session); # this line required
+
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+#sub exampleFunction {
+#    my $session = shift;
+#    print "\tWe're doing some stuff here that you should know about... " unless $quiet;
+#    # and here's our code
+#    print "DONE!\n" unless $quiet;
+#}
+
+#----------------------------------------------------------------------------
+sub convertLongVarcharsToText {
+    my $session = shift;
+    print "\tConverting Survey VARCHAR fields to TEXT... " unless $quiet;
+    $session->db->write("ALTER TABLE Survey MODIFY COLUMN exitURL TEXT");
+    $session->db->write("ALTER TABLE Survey_tempReport MODIFY COLUMN sectionName TEXT");
+    $session->db->write("ALTER TABLE Survey_tempReport MODIFY COLUMN questionName TEXT");
+    # and here's our code
+    print "Done.\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+sub addAssetDiscoveryServiceAgain {
+    my $session = shift;
+    print "\tAdding asset discovery service..." unless $quiet;
+    my @handlers = @{ $session->config->get('contentHandlers') };
+    if (isIn( 'WebGUI::Content::AssetDiscovery', @handlers) ) {
+        print "Done.\n" unless $quiet;
+        return;
+    }
+    my @newHandlers = ();
+    foreach my $handler (@handlers) {
+        if ($handler eq 'WebGUI::Content::Operation') {
+            push @newHandlers, 'WebGUI::Content::AssetDiscovery';
+        }
+        push @newHandlers, $handler;
+    }
+    $session->config->set('contentHandlers', \@newHandlers);
+    print "Done.\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+sub changeMatrixAttributeIndexing {
+    my $session = shift;
+    print "\tChanging Matrix attribute indexing..." unless $quiet;
+    $session->db->write("alter table MatrixListing_attribute drop primary key, add primary key(attributeId,matrixListingId)");
+    print "Done.\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+# Fix the groupToEditPost in the Collaboration (should not be "")
+sub fixCollaborationGroupToEditPost {
+    my $session = shift;
+    print "\tFixing group to edit post in Collaboration..." unless $quiet;
+    # and here's our code
+    $session->db->write(<<'SQL');
+UPDATE Collaboration 
+SET groupToEditPost= ( 
+    SELECT groupIdEdit FROM assetData 
+    WHERE assetData.assetId=Collaboration.assetId 
+        AND assetData.revisionDate = Collaboration.revisionDate
+) 
+WHERE groupToEditPost = "";
+SQL
+    print "DONE!\n" unless $quiet;
+}
+# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
+
+#----------------------------------------------------------------------------
+# Add a package to the import node
+sub addPackage {
+    my $session     = shift;
+    my $file        = shift;
+
+    # Make a storage location for the package
+    my $storage     = WebGUI::Storage->createTemp( $session );
+    $storage->addFileFromFilesystem( $file );
+
+    # Import the package into the import node
+    my $package = WebGUI::Asset->getImportNode($session)->importPackage( $storage );
+
+    # Make the package not a package anymore
+    $package->update({ isPackage => 0 });
+    
+    # Set the default flag for templates added
+    my $assetIds
+        = $package->getLineage( ['self','descendants'], {
+            includeOnlyClasses  => [ 'WebGUI::Asset::Template' ],
+        } );
+    for my $assetId ( @{ $assetIds } ) {
+        my $asset   = WebGUI::Asset->newByDynamicClass( $session, $assetId );
+        if ( !$asset ) {
+            print "Couldn't instantiate asset with ID '$assetId'. Please check package '$file' for corruption.\n";
+            next;
+        }
+        $asset->update( { isDefault => 1 } );
+    }
+
+    return;
+}
+
+#-------------------------------------------------
+sub start {
+    my $configFile;
+    $|=1; #disable output buffering
+    GetOptions(
+        'configFile=s'=>\$configFile,
+        'quiet'=>\$quiet
+    );
+    my $session = WebGUI::Session->open($webguiRoot,$configFile);
+    $session->user({userId=>3});
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->set({name=>"Upgrade to ".$toVersion});
+    return $session;
+}
+
+#-------------------------------------------------
+sub finish {
+    my $session = shift;
+    updateTemplates($session);
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->commit;
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->close();
+}
+
+#-------------------------------------------------
+sub updateTemplates {
+    my $session = shift;
+    return undef unless (-d "packages-".$toVersion);
+    print "\tUpdating packages.\n" unless ($quiet);
+    opendir(DIR,"packages-".$toVersion);
+    my @files = readdir(DIR);
+    closedir(DIR);
+    my $newFolder = undef;
+    foreach my $file (@files) {
+        next unless ($file =~ /\.wgpkg$/);
+        # Fix the filename to include a path
+        $file       = "packages-" . $toVersion . "/" . $file;
+        addPackage( $session, $file );
+    }
+}
+
+#vim:ft=perl

docs/upgrades/upgrade_7.6.12-7.6.13.pl

@@ -0,0 +1,125 @@
+#!/usr/bin/env perl
+
+#-------------------------------------------------------------------
+# 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
+#-------------------------------------------------------------------
+
+our ($webguiRoot);
+
+BEGIN {
+    $webguiRoot = "../..";
+    unshift (@INC, $webguiRoot."/lib");
+}
+
+use strict;
+use Getopt::Long;
+use WebGUI::Session;
+use WebGUI::Storage;
+use WebGUI::Asset;
+
+
+my $toVersion = '7.6.13';
+my $quiet; # this line required
+
+
+my $session = start(); # this line required
+
+# upgrade functions go here
+
+finish($session); # this line required
+
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+#sub exampleFunction {
+#    my $session = shift;
+#    print "\tWe're doing some stuff here that you should know about... " unless $quiet;
+#    # and here's our code
+#    print "DONE!\n" unless $quiet;
+#}
+
+
+# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
+
+#----------------------------------------------------------------------------
+# Add a package to the import node
+sub addPackage {
+    my $session     = shift;
+    my $file        = shift;
+
+    # Make a storage location for the package
+    my $storage     = WebGUI::Storage->createTemp( $session );
+    $storage->addFileFromFilesystem( $file );
+
+    # Import the package into the import node
+    my $package = WebGUI::Asset->getImportNode($session)->importPackage( $storage );
+
+    # Make the package not a package anymore
+    $package->update({ isPackage => 0 });
+    
+    # Set the default flag for templates added
+    my $assetIds
+        = $package->getLineage( ['self','descendants'], {
+            includeOnlyClasses  => [ 'WebGUI::Asset::Template' ],
+        } );
+    for my $assetId ( @{ $assetIds } ) {
+        my $asset   = WebGUI::Asset->newByDynamicClass( $session, $assetId );
+        if ( !$asset ) {
+            print "Couldn't instantiate asset with ID '$assetId'. Please check package '$file' for corruption.\n";
+            next;
+        }
+        $asset->update( { isDefault => 1 } );
+    }
+
+    return;
+}
+
+#-------------------------------------------------
+sub start {
+    my $configFile;
+    $|=1; #disable output buffering
+    GetOptions(
+        'configFile=s'=>\$configFile,
+        'quiet'=>\$quiet
+    );
+    my $session = WebGUI::Session->open($webguiRoot,$configFile);
+    $session->user({userId=>3});
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->set({name=>"Upgrade to ".$toVersion});
+    return $session;
+}
+
+#-------------------------------------------------
+sub finish {
+    my $session = shift;
+    updateTemplates($session);
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->commit;
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->close();
+}
+
+#-------------------------------------------------
+sub updateTemplates {
+    my $session = shift;
+    return undef unless (-d "packages-".$toVersion);
+    print "\tUpdating packages.\n" unless ($quiet);
+    opendir(DIR,"packages-".$toVersion);
+    my @files = readdir(DIR);
+    closedir(DIR);
+    my $newFolder = undef;
+    foreach my $file (@files) {
+        next unless ($file =~ /\.wgpkg$/);
+        # Fix the filename to include a path
+        $file       = "packages-" . $toVersion . "/" . $file;
+        addPackage( $session, $file );
+    }
+}
+
+#vim:ft=perl

docs/upgrades/upgrade_7.6.13-7.6.14.pl

@@ -0,0 +1,125 @@
+#!/usr/bin/env perl
+
+#-------------------------------------------------------------------
+# 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
+#-------------------------------------------------------------------
+
+our ($webguiRoot);
+
+BEGIN {
+    $webguiRoot = "../..";
+    unshift (@INC, $webguiRoot."/lib");
+}
+
+use strict;
+use Getopt::Long;
+use WebGUI::Session;
+use WebGUI::Storage;
+use WebGUI::Asset;
+
+
+my $toVersion = '7.6.14';
+my $quiet; # this line required
+
+
+my $session = start(); # this line required
+
+# upgrade functions go here
+
+finish($session); # this line required
+
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+#sub exampleFunction {
+#    my $session = shift;
+#    print "\tWe're doing some stuff here that you should know about... " unless $quiet;
+#    # and here's our code
+#    print "DONE!\n" unless $quiet;
+#}
+
+
+# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
+
+#----------------------------------------------------------------------------
+# Add a package to the import node
+sub addPackage {
+    my $session     = shift;
+    my $file        = shift;
+
+    # Make a storage location for the package
+    my $storage     = WebGUI::Storage->createTemp( $session );
+    $storage->addFileFromFilesystem( $file );
+
+    # Import the package into the import node
+    my $package = WebGUI::Asset->getImportNode($session)->importPackage( $storage );
+
+    # Make the package not a package anymore
+    $package->update({ isPackage => 0 });
+    
+    # Set the default flag for templates added
+    my $assetIds
+        = $package->getLineage( ['self','descendants'], {
+            includeOnlyClasses  => [ 'WebGUI::Asset::Template' ],
+        } );
+    for my $assetId ( @{ $assetIds } ) {
+        my $asset   = WebGUI::Asset->newByDynamicClass( $session, $assetId );
+        if ( !$asset ) {
+            print "Couldn't instantiate asset with ID '$assetId'. Please check package '$file' for corruption.\n";
+            next;
+        }
+        $asset->update( { isDefault => 1 } );
+    }
+
+    return;
+}
+
+#-------------------------------------------------
+sub start {
+    my $configFile;
+    $|=1; #disable output buffering
+    GetOptions(
+        'configFile=s'=>\$configFile,
+        'quiet'=>\$quiet
+    );
+    my $session = WebGUI::Session->open($webguiRoot,$configFile);
+    $session->user({userId=>3});
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->set({name=>"Upgrade to ".$toVersion});
+    return $session;
+}
+
+#-------------------------------------------------
+sub finish {
+    my $session = shift;
+    updateTemplates($session);
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->commit;
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->close();
+}
+
+#-------------------------------------------------
+sub updateTemplates {
+    my $session = shift;
+    return undef unless (-d "packages-".$toVersion);
+    print "\tUpdating packages.\n" unless ($quiet);
+    opendir(DIR,"packages-".$toVersion);
+    my @files = readdir(DIR);
+    closedir(DIR);
+    my $newFolder = undef;
+    foreach my $file (@files) {
+        next unless ($file =~ /\.wgpkg$/);
+        # Fix the filename to include a path
+        $file       = "packages-" . $toVersion . "/" . $file;
+        addPackage( $session, $file );
+    }
+}
+
+#vim:ft=perl

docs/upgrades/upgrade_7.6.14-7.7.0.pl

@@ -0,0 +1,151 @@
+#!/usr/bin/env perl
+
+#-------------------------------------------------------------------
+# 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
+#-------------------------------------------------------------------
+
+our ($webguiRoot);
+
+BEGIN {
+    $webguiRoot = "../..";
+    unshift (@INC, $webguiRoot."/lib");
+}
+
+use strict;
+use Getopt::Long;
+use WebGUI::Session;
+use WebGUI::Storage;
+use WebGUI::Asset;
+
+
+my $toVersion = '7.7.0';
+my $quiet; # this line required
+
+
+my $session = start(); # this line required
+
+# upgrade functions go here
+
+addGroupToAddToMatrix( $session );
+addScreenshotTemplatesToMatrix( $session );
+
+finish($session); # this line required
+
+#----------------------------------------------------------------------------
+sub addGroupToAddToMatrix {
+    my $session = shift;
+    print "\tAdding groupToAdd to Matrix table, if needed... \n" unless $quiet;
+    my $sth = $session->db->read('describe Matrix groupToAdd');
+    if (! defined $sth->hashRef) {
+        $session->db->write("alter table Matrix add column groupToAdd char(22) default 2");
+    }
+    print "Done.\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+sub addScreenshotTemplatesToMatrix {
+    my $session = shift;
+    print "\tAdding screenshot templates to Matrix table \n" unless $quiet;
+    
+    $session->db->write("alter table Matrix add screenshotsConfigTemplateId char(22);");
+    $session->db->write("update Matrix set screenshotsConfigTemplateId = 'matrixtmpl000000000007';");
+    $session->db->write("alter table Matrix add screenshotsTemplateId char(22);");
+    $session->db->write("update Matrix set screenshotsTemplateId = 'matrixtmpl000000000006';");
+    
+    print "Done.\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+#sub exampleFunction {
+#    my $session = shift;
+#    print "\tWe're doing some stuff here that you should know about... " unless $quiet;
+#    # and here's our code
+#    print "DONE!\n" unless $quiet;
+#}
+
+
+# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
+
+#----------------------------------------------------------------------------
+# Add a package to the import node
+sub addPackage {
+    my $session     = shift;
+    my $file        = shift;
+
+    # Make a storage location for the package
+    my $storage     = WebGUI::Storage->createTemp( $session );
+    $storage->addFileFromFilesystem( $file );
+
+    # Import the package into the import node
+    my $package = WebGUI::Asset->getImportNode($session)->importPackage( $storage );
+
+    # Make the package not a package anymore
+    $package->update({ isPackage => 0 });
+    
+    # Set the default flag for templates added
+    my $assetIds
+        = $package->getLineage( ['self','descendants'], {
+            includeOnlyClasses  => [ 'WebGUI::Asset::Template' ],
+        } );
+    for my $assetId ( @{ $assetIds } ) {
+        my $asset   = WebGUI::Asset->newByDynamicClass( $session, $assetId );
+        if ( !$asset ) {
+            print "Couldn't instantiate asset with ID '$assetId'. Please check package '$file' for corruption.\n";
+            next;
+        }
+        $asset->update( { isDefault => 1 } );
+    }
+
+    return;
+}
+
+#-------------------------------------------------
+sub start {
+    my $configFile;
+    $|=1; #disable output buffering
+    GetOptions(
+        'configFile=s'=>\$configFile,
+        'quiet'=>\$quiet
+    );
+    my $session = WebGUI::Session->open($webguiRoot,$configFile);
+    $session->user({userId=>3});
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->set({name=>"Upgrade to ".$toVersion});
+    return $session;
+}
+
+#-------------------------------------------------
+sub finish {
+    my $session = shift;
+    updateTemplates($session);
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->commit;
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->close();
+}
+
+#-------------------------------------------------
+sub updateTemplates {
+    my $session = shift;
+    return undef unless (-d "packages-".$toVersion);
+    print "\tUpdating packages.\n" unless ($quiet);
+    opendir(DIR,"packages-".$toVersion);
+    my @files = readdir(DIR);
+    closedir(DIR);
+    my $newFolder = undef;
+    foreach my $file (@files) {
+        next unless ($file =~ /\.wgpkg$/);
+        # Fix the filename to include a path
+        $file       = "packages-" . $toVersion . "/" . $file;
+        addPackage( $session, $file );
+    }
+}
+
+#vim:ft=perl

docs/upgrades/upgrade_7.6.2-7.6.3.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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

docs/upgrades/upgrade_7.6.3-7.6.4.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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
@@ -61,7 +61,7 @@ sub upgradeMatrix {
     my $session = shift;
     print "\tUpgrading matrix assets... \n" unless $quiet;
     my $db = $session->db;
-    $db->write("alter table Matrix drop column groupToRate, drop column groupToAdd, drop column privilegedGroup,
+    $db->write("alter table Matrix drop column groupToRate, drop column privilegedGroup,
         drop column ratingTimeout, drop column ratingTimeoutPrivileged, drop column ratingDetailTemplateId,
         drop column visitorCacheTimeout");
     $db->write("alter table Matrix add column defaultSort char(22) not null default 'score',
@@ -102,7 +102,8 @@ sub upgradeMatrix {
     $db->write("alter table Matrix_rating rename MatrixListing_rating");
     $db->write("alter table Matrix_ratingSummary rename MatrixListing_ratingSummary");
     $db->write("alter table Matrix_field rename Matrix_attribute");
-    $db->write("alter table Matrix_attribute drop column label");
+    $db->write("alter table Matrix_attribute drop column name");
+    $db->write("alter table Matrix_attribute change label name char(255)");
     $db->write("alter table Matrix_attribute add column options text");
     $db->write("alter table Matrix_attribute change fieldType fieldType char(255) not null default 'MatrixCompare'");
     $db->write("alter table Matrix_attribute change fieldId attributeId char(22) not null");
@@ -143,6 +144,7 @@ sub upgradeMatrix {
             $listing->{title}   = $listing->{productName};
             $listing->{version} = $listing->{versionNumber};
             $listing->{screenshots} = $listing->{storageId};
+            $listing->{ownerUserId} = $listing->{maintainerId};
 		$listing->{productURL} = $listing->{productUrl};		
 		$listing->{manufacturerURL} = $listing->{manufacturerUrl};
             my $newMatrixListing = $matrix->addChild($listing,undef,undef,{skipAutoCommitWorkflows=>1});

docs/upgrades/upgrade_7.6.4-7.6.5.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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

docs/upgrades/upgrade_7.6.5-7.6.6.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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

docs/upgrades/upgrade_7.6.6-7.6.7.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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

docs/upgrades/upgrade_7.6.7-7.6.8.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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

docs/upgrades/upgrade_7.6.8-7.6.9.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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

docs/upgrades/upgrade_7.6.9-7.6.10.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+# 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